replace PluginEngine::getLink() with trails' own url_for() consistently in all...

replace PluginEngine::getLink() with trails' own url_for() consistently in all views + some other small touchups

views/approving/overview.php

@@ -11,7 +11,7 @@
     <? foreach ($plugins as $marketplugin): ?>
         <tr>
             <td>
-                    <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/details/".$marketplugin->getId()) ?>">
+                <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>">
                     <?= htmlReady($marketplugin['name']) ?>
                 </a>
             </td>
@@ -24,18 +24,20 @@
             ?>
                 <?= date("j.n.Y, G:i", $chdate) ?> <?= _("Uhr") ?>
             </td>
-                <td>
-                    <a href="<?= PluginEngine::getLink($plugin, array(), "approving/review/".$marketplugin->getId()) ?>" data-dialog>
+            <td class="actions">
+                <a href="<?= $controller->url_for('approving/review/' . $marketplugin->getId()) ?>" data-dialog>
                     <?= Assets::img("icons/20/blue/assessment") ?>
                 </a>
             </td>
         </tr>
-        <? endforeach ?>
+    <? endforeach; ?>
 <? else: ?>
         <tr>
-            <td colspan="2" style="text-align: center;"><?= _("Keine Plugins warten auf eine Qualittssicherung") ?></td>
+            <td colspan="2" style="text-align: center;">
+                <?= _("Keine Plugins warten auf eine Qualittssicherung") ?>
+            </td>
         </tr>
-    <? endif ?>
+<? endif; ?>
     </tbody>
 </table>
 

views/approving/review.php

-<form action="<?= PluginEngine::getLink($plugin, array(), "approving/approve/".$marketplugin->getId()) ?>" method="post" class="studip_form">
+<form action="<?= $controller->url_for('approving/approve/' . $marketplugin->getId()) ?>" method="post" class="studip_form">
     <fieldset>
         <legend>
             <?= _("Review schreiben") ?>

views/extern/xml.php

@@ -12,7 +12,7 @@
             version="<?= htmlReady(studip_utf8encode($release['version'])) ?>"
             studipMinVersion="<?= htmlReady(studip_utf8encode($release['studip_min_version'])) ?>"
             studipMaxVersion="<?= htmlReady(studip_utf8encode($release['studip_min_version'])) ?>"
-            url="<?= htmlReady(studip_utf8encode($plugin->getStudipDomain().PluginEngine::getURL($plugin, array(), "presenting/download/".$release->getId()))) ?>"
+            url="<?= htmlReady(studip_utf8encode($plugin->getStudipDomain().$controller->url_for('presenting/download/' . $release->getId()))) ?>"
             />
         <? endforeach ?>
     </plugin>

views/myplugins/edit.php

-<form action="<?= PluginEngine::getLink($plugin, array(), "myplugins/save") ?>" method="post" class="studip_form" enctype="multipart/form-data">
+<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" class="studip_form" enctype="multipart/form-data">
     <input type="hidden" name="id" value="<?= $marketplugin->getId() ?>">
     <fieldset>
         <legend>

views/myplugins/edit_images.php

-<form action="<?= PluginEngine::getLink($plugin, array(), "myplugins/save") ?>" method="post" enctype="multipart/form-data" class="studip_form">
+<form action="<?= $controller->url_for('myplugins/save') ?>" method="post" enctype="multipart/form-data" class="studip_form">
     <input type="hidden" name="id" value="<?= $marketplugin->getId() ?>">
     <?= $this->render_partial("myplugins/_edit_images.php", compact("marketplugin")) ?>
 

views/myplugins/edit_release.php

-<form action="<?= PluginEngine::getLink($plugin, array(), "myplugins/save_release") ?>" method="post" class="studip_form" enctype="multipart/form-data">
+<form action="<?= $controller->url_for('myplugins/save_release') ?>" method="post" class="studip_form" enctype="multipart/form-data">
     <input type="hidden" name="id" value="<?= $release->getId() ?>">
     <input type="hidden" name="plugin_id" value="<?= $marketplugin->getId() ?>">
     <?= $this->render_partial("myplugins/_edit_release.php", array('release' => $release)) ?>

views/myplugins/overview.php

-
 <table class="default">
     <thead>
         <tr>
@@ -15,8 +14,8 @@
             <td>
             <? if ($marketplugin['publiclyvisible'] && !$marketplugin['approved']) : ?>
                 <?= Assets::img("icons/20/red/exclaim-circle", array('title' => _("Plugin wurde noch nicht von einem Administrator freigeschaltet."), 'class' => "text-bottom")) ?>
-                <? endif ?>
-                <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/details/".$marketplugin->getId()) ?>">
+            <? endif; ?>
+                <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>">
                     <?= htmlReady($marketplugin['name']) ?>
                 </a>
             </td>
@@ -34,17 +33,23 @@
                 <?= Assets::img("icons/20/grey/lock-locked.png.png", array('title' => _("Plugin ist nicht ffentlich"))) ?>
             <? endif ?>
             </td>
-            <td>
-                <a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/edit/".$marketplugin->getId()) ?>" data-dialog title="<?= _("Plugin-Info bearbeiten") ?>"><?= Assets::img("icons/20/blue/edit") ?></a>
-                <a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/add_release/".$marketplugin->getId()) ?>" data-dialog title="<?= _("Neues Release hinzufgen") ?>"><?= Assets::img("icons/20/blue/add") ?></a>
+            <td class="actions">
+                <a href="<?= $controller->url_for('myplugins/edit/' . $marketplugin->getId()) ?>" data-dialog title="<?= _("Plugin-Info bearbeiten") ?>">
+                    <?= Assets::img('icons/20/blue/edit') ?>
+                </a>
+                <a href="<?= $controller->url_for('myplugins/add_release/' . $marketplugin->getId()) ?>" data-dialog title="<?= _("Neues Release hinzufgen") ?>">
+                    <?= Assets::img("icons/20/blue/add") ?>
+                </a>
             </td>
         </tr>
-        <? endforeach ?>
+    <? endforeach; ?>
 <? else: ?>
         <tr>
-            <td colspan="4" style="text-align: center;"><?= _("Sie haben noch kein Plugin eingestellt.") ?></td>
+            <td colspan="4" style="text-align: center;">
+                <?= _("Sie haben noch kein Plugin eingestellt.") ?>
+            </td>
         </tr>
-        <? endif ?>
+<? endif; ?>
     </tbody>
 </table>
 
@@ -53,8 +58,7 @@ $sidebar = Sidebar::Get();
 $sidebar->setImage(Assets::image_path("sidebar/plugin-sidebar.png"));
 $actions = new ActionsWidget();
 $actions->addLink(_("Neues Plugin eintragen"),
-                  PluginEngine::getURL($plugin, array(), "myplugins/add"),
-                  'icons/16/blue/add.png',
-                  array('data-dialog' => 1));
+                  $controller->url_for('myplugins/add'),
+                  'icons/16/blue/add.png')->asDialog();
 $sidebar->addWidget($actions);
 

views/presenting/details.php

@@ -29,7 +29,7 @@ if ($icon) {
     </div>
     <? endforeach ?>
     <? if ($marketplugin->isWritable()) : ?>
-    <div><a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/edit_images/".$marketplugin->getId()) ?>" data-dialog title="<?= _("Galerie bearbeiten / neue Bilder hinzufgen") ?>"><?= Assets::img("icons/20/blue/add") ?></a></div>
+    <div><a href="<?= $controller->url_for('myplugins/edit_images/' . $marketplugin->getId()) ?>" data-dialog title="<?= _("Galerie bearbeiten / neue Bilder hinzufgen") ?>"><?= Assets::img("icons/20/blue/add") ?></a></div>
     <? endif ?>
 </ol>
 <? endif ?>
@@ -101,7 +101,7 @@ if ($icon) {
     <? foreach ($marketplugin->releases as $release) : ?>
         <tr>
             <td>
-                <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/download/".$release->getId()) ?>" title="<?= _("Dieses Release runterladen") ?>">
+                <a href="<?= $controller->url_for('presenting/download/' . $release->getId()) ?>" title="<?= _("Dieses Release runterladen") ?>">
                     <?= Assets::img("icons/20/blue/download", array('class' => "text-bottom")) ?>
                     <?= htmlReady($release['version']) ?>
                 </a>
@@ -110,14 +110,14 @@ if ($icon) {
             <td><?= $release['studip_max_version'] ? htmlReady($release['studip_max_version']) : " - " ?></td>
             <td><?= htmlReady($release->getChecksum()) ?></td>
             <td><?= htmlReady($release['downloads']) ?></td>
-            <td>
+            <td class="actions">
                 <? if ($marketplugin->isWritable()) : ?>
-                    <a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/edit_release/".$release->getId()) ?>" data-dialog>
+                    <a href="<?= $controller->url_for('myplugins/edit_release/' . $release->getId()) ?>" data-dialog>
                         <?= Assets::img("icons/20/blue/edit", array('class' => "text-bottom")) ?>
                     </a>
                 <? endif ?>
                 <? if ($GLOBALS['perm']->have_perm("autor")) : ?>
-                    <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/follow_release/".$release->getId()) ?>" title="<?= _("Fr automatische Updates registrieren.") ?>" data-dialog>
+                    <a href="<?= $controller->url_for('presenting/follow_release/' . $release->getId()) ?>" title="<?= _("Fr automatische Updates registrieren.") ?>" data-dialog>
                         <?= Assets::img("icons/20/blue/rss", array('class' => "text-bottom")) ?>
                     </a>
                 <? endif ?>
@@ -129,7 +129,7 @@ if ($icon) {
         <tfoot>
         <tr>
             <td colspan="6">
-                <a href="<?= PluginEngine::getLink($plugin, array(), "myplugins/add_release/".$marketplugin->getId()) ?>" data-dialog>
+                <a href="<?= $controller->url_for('myplugins/add_release/' . $marketplugin->getId()) ?>" data-dialog>
                     <?= Assets::img("icons/20/blue/add") ?>
                 </a>
             </td>
@@ -203,7 +203,7 @@ if ($icon) {
         <div style="text-align: center;">
             <? $score = $marketplugin->getRating() ?>
             <? if ($score === null) : ?>
-                <a style="opacity: 0.3;" title="<?= $GLOBALS['perm']->have_perm("autor") ? _("Geben Sie die erste Bewertung ab.") : _("Noch keine bewertung abgegeben.") ?>" <?= ($GLOBALS['perm']->have_perm("autor") && !$marketplugin->isWritable()) ? 'href="'.PluginEngine::getLink($plugin, array(), "presenting/review/".$marketplugin->getId()).'" data-dialog' : "" ?>>
+                <a style="opacity: 0.3;" title="<?= $GLOBALS['perm']->have_perm("autor") ? _("Geben Sie die erste Bewertung ab.") : _("Noch keine bewertung abgegeben.") ?>" <?= ($GLOBALS['perm']->have_perm("autor") && !$marketplugin->isWritable()) ? 'href="' . $controller->url_for('presenting/review/' . $marketplugin->getId()) . '" data-dialog' : "" ?>>
                     <?= Assets::img($plugin->getPluginURL()."/assets/star.svg", array('width' => "50px")) ?>
                     <?= Assets::img($plugin->getPluginURL()."/assets/star.svg", array('width' => "50px")) ?>
                     <?= Assets::img($plugin->getPluginURL()."/assets/star.svg", array('width' => "50px")) ?>
@@ -211,7 +211,7 @@ if ($icon) {
                     <?= Assets::img($plugin->getPluginURL()."/assets/star.svg", array('width' => "50px")) ?>
                 </a>
             <? else : ?>
-                <a <?= ($GLOBALS['perm']->have_perm("autor") && !$marketplugin->isWritable()) ? 'href="'.PluginEngine::getLink($plugin, array(), "presenting/review/".$marketplugin->getId()).'" data-dialog' : "" ?> title="<?= sprintf(_("%s von 5 Sternen"), round($score / 2, 1)) ?>">
+                <a <?= ($GLOBALS['perm']->have_perm("autor") && !$marketplugin->isWritable()) ? 'href="' . $controller->url_for('presenting/review/' . $marketplugin->getId()) . '" data-dialog' : "" ?> title="<?= sprintf(_("%s von 5 Sternen"), round($score / 2, 1)) ?>">
                     <? $score = round($score, 1) / 2 ?>
                     <? $v = $score >= 1 ? 3 : ($score >= 0.5 ? 2 : "") ?>
                     <?= Assets::img($plugin->getPluginURL()."/assets/star$v.svg", array('width' => "50px")) ?>
@@ -260,11 +260,11 @@ if ($icon) {
 
 <div style="text-align: center">
 <? if ($marketplugin->isWritable()) : ?>
-    <?= \Studip\LinkButton::create(_("bearbeiten"), PluginEngine::getURL($plugin, array(), "myplugins/edit/".$marketplugin->getId()), array('data-dialog' => 1)) ?>
-    <?= \Studip\LinkButton::create(_("Release hinzufgen"), PluginEngine::getURL($plugin, array(), "myplugins/add_release/".$marketplugin->getId()), array('data-dialog' => 1)) ?>
+    <?= \Studip\LinkButton::create(_("bearbeiten"), $controller->url_for('myplugins/edit/' . $marketplugin->getId()), array('data-dialog' => 1)) ?>
+    <?= \Studip\LinkButton::create(_("Release hinzufgen"), $controller->url_for('myplugins/add_release/' . $marketplugin->getId()), array('data-dialog' => 1)) ?>
 <? endif ?>
 <? if ($marketplugin['user_id'] !== $GLOBALS['user']->id) : ?>
-    <?= \Studip\LinkButton::create(_("Plugin abonnieren"), PluginEngine::getURL($plugin, array(), "presenting/register_for_pluginnews/".$marketplugin->getId()), array('title' => _("Neuigkeiten des Plugins per Nachricht bekommen."), 'data-dialog' => "1")) ?>
+    <?= \Studip\LinkButton::create(_("Plugin abonnieren"), $controller->url_for('presenting/register_for_pluginnews/' . $marketplugin->getId()), array('title' => _("Neuigkeiten des Plugins per Nachricht bekommen."), 'data-dialog' => "1")) ?>
 <? endif ?>
 <? if ($marketplugin->isRootable()) : ?>
     <form action="?" method="post" style="display: inline-block; margin: 0px;">

views/presenting/follow_release.php

 <? foreach (PageLayout::getMessages() as $message) : ?>
     <?= $message ?>
 <? endforeach ?>
-<form action="<?= PluginEngine::getLink($plugin, array(), "presenting/follow_release/".$release->getId()) ?>" method="post" data-dialog class="studip_form">
+<form action="<?= $controller->url_for('presenting/follow_release/' . $release->getId()) ?>" method="post" data-dialog class="studip_form">
     <p class="info">
         <?= _("Immer aktuell bleiben mit automatischen Updates! Sie finden in Ihrem eigenen Stud.IP in der Pluginverwaltung rechts neben dem Plugin ein Icon, das Sie zu einem Popup führt. Geben Sie dort die unten stehende Download-URL ein und geben Sie hier die URL ein, die Sie danach dort in Ihrer Pluginverwaltung sehen. Sind beide Systeme korrekt konfiguriert, wird der Marktplatz dann eine jede neue Version dieses Releases automatisch in ihrem Stud.IP installieren.") ?>
     </p>
@@ -9,7 +9,7 @@
         <legend><?= _("Konfigurieren Sie Ihr Stud.IP") ?></legend>
         <label>
             <?= _("Download-URL - geben Sie diese URL in Ihrem Stud.IP in der Pluginverwaltung ein") ?>
-            <input type="text" readonly value="<?= $plugin->getStudipDomain().PluginEngine::getLink($plugin, array(), "presenting/download/".$release->getId()) ?>">
+            <input type="text" readonly value="<?= $plugin->getStudipDomain() . $controller->url_for('presenting/download/' . $release->getId()) ?>">
         </label>
     </fieldset>
     <fieldset>

views/presenting/overview_list.php

@@ -19,7 +19,7 @@
         <? foreach ($plugins as $marketplugin): ?>
             <tr>
                 <td data-sort="<?= htmlReady($marketplugin->name) ?>">
-                    <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/details/" . $marketplugin->getId()) ?>">
+                    <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>">
                         <?= htmlReady($marketplugin->name) ?>
                     </a>
                 </td>

views/presenting/register_for_pluginnews.php

@@ -2,7 +2,7 @@
     <?= $message ?>
 <? endforeach ?>
 
-<form action="<?= PluginEngine::getLink($plugin, array(), "presenting/register_for_pluginnews/".$marketplugin->getId()) ?>" method="post" class="studipform" data-dialog>
+<form action="<?= $controller->url_for('presenting/register_for_pluginnews/' . $marketplugin->getId()) ?>" method="post" class="studipform" data-dialog>
     <?= MessageBox::info(sprintf(_("Durch das Abonnieren des Plugins %s erhalten Sie Stud.IP-Nachrichten, wenn neue Releases hochgeladen werden."), $marketplugin['name'])) ?>
     <div style="text-align: center">
         <? if (MarketPluginFollower::findByUserAndPlugin($GLOBALS['user']->id, $marketplugin->getId())) : ?>

views/presenting/review.php

-<form action="<?= PluginEngine::getLink($plugin, array(), "presenting/save_review/".$review['plugin_id']) ?>" method="post" class="studip_form">
+<form action="<?= $controller->url_for('presenting/save_review/' . $review['plugin_id']) ?>" method="post" class="studip_form">
     <fieldset>
         <legend>
             <?= _("Bewertung") ?>

views/presenting/users_plugins.php

@@ -2,7 +2,7 @@
 <? foreach ($plugins as $marketplugin): ?>
     <tr>
         <td>
-                <a href="<?= PluginEngine::getLink($plugin, array(), "presenting/details/".$marketplugin->getId()) ?>">
+            <a href="<?= $controller->url_for('presenting/details/' . $marketplugin->getId()) ?>">
                 <?= htmlReady($marketplugin['name']) ?>
             </a>
         </td>
@@ -26,13 +26,13 @@
             <div style="max-height: 20px; overflow: hidden;">
             <? foreach ($marketplugin->getTags() as $key => $tag): ?>
                 <?= $key > 0 ? "," : "" ?>
-                        <a href="<?= URLHelper::getLink("plugins.php/pluginmarket/presenting/all", array('tag' => $tag)) ?>">
+                <a href="<?= $controller->url_for('presenting/all', compact('tag')) ?>">
                     <?= Assets::img("icons/16/blue/tag", array('class' => "text-bottom")) ?>
                     <?= htmlReady(ucwords($tag)) ?>
                 </a>
-                    <? endforeach ?>
+            <? endforeach; ?>
             </div>
         </td>
     </tr>
-    <? endforeach ?>
+<? endforeach; ?>
 </table>
\ No newline at end of file