Usage of LinkHandler including routing
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2011 16:40:28 +0000 (18:40 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Oct 2011 16:40:28 +0000 (18:40 +0200)
Search & Replace with RegEx FTW!

40 files changed:
wcfsetup/install/files/acp/templates/acpSessionLog.tpl
wcfsetup/install/files/acp/templates/acpSessionLogList.tpl
wcfsetup/install/files/acp/templates/cacheList.tpl
wcfsetup/install/files/acp/templates/cronjobAdd.tpl
wcfsetup/install/files/acp/templates/cronjobList.tpl
wcfsetup/install/files/acp/templates/cronjobLogList.tpl
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/acp/templates/login.tpl
wcfsetup/install/files/acp/templates/masterPassword.tpl
wcfsetup/install/files/acp/templates/masterPasswordInit.tpl
wcfsetup/install/files/acp/templates/option.tpl
wcfsetup/install/files/acp/templates/optionImport.tpl
wcfsetup/install/files/acp/templates/packageAutoUpdateList.tpl
wcfsetup/install/files/acp/templates/packageList.tpl
wcfsetup/install/files/acp/templates/packageStartInstall.tpl
wcfsetup/install/files/acp/templates/packageUninstallationDependencies.tpl
wcfsetup/install/files/acp/templates/packageUpdate.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearch.tpl
wcfsetup/install/files/acp/templates/packageUpdateSearchResult.tpl
wcfsetup/install/files/acp/templates/packageView.tpl
wcfsetup/install/files/acp/templates/updateServerAdd.tpl
wcfsetup/install/files/acp/templates/updateServerList.tpl
wcfsetup/install/files/acp/templates/userAdd.tpl
wcfsetup/install/files/acp/templates/userAssignToGroup.tpl
wcfsetup/install/files/acp/templates/userEmailAddressExport.tpl
wcfsetup/install/files/acp/templates/userGroupAdd.tpl
wcfsetup/install/files/acp/templates/userGroupList.tpl
wcfsetup/install/files/acp/templates/userList.tpl
wcfsetup/install/files/acp/templates/userMail.tpl
wcfsetup/install/files/acp/templates/userSearch.tpl
wcfsetup/install/files/acp/templates/usersMassProcessing.tpl
wcfsetup/install/files/lib/acp/form/MasterPasswordForm.class.php
wcfsetup/install/files/lib/acp/form/PackageStartInstallForm.class.php
wcfsetup/install/files/lib/acp/form/PackageUpdateForm.class.php
wcfsetup/install/files/lib/acp/form/PackageUpdateSearchForm.class.php
wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
wcfsetup/install/files/lib/acp/page/UserListPage.class.php
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
wcfsetup/install/files/lib/system/package/PackageUninstallationDispatcher.class.php

index 7c920d1b2020cfc435e99294de566c9e371bdffd..13cf6f6367117159d8192628c038baab7c66af1e 100644 (file)
@@ -8,7 +8,7 @@
 </header>
 
 <div class="contentHeader">
-       {pages print=true assign=pagesLinks controller='ACPSessionLog' id=$sessionLogID link="?pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
+       {pages print=true assign=pagesLinks controller='ACPSessionLog' id=$sessionLogID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 </div>
 
 {hascontent}
index dbf278e4ebe97375740074d6e0d51306deda8e07..f007cb9a639f88eb0292a61b805acdb261b24698 100644 (file)
@@ -37,9 +37,9 @@
                                        {foreach from=$objects item=sessionLog}
                                                <tr class="{if $sessionLog->active} activeContainer{/if}">
                                                        <td class="columnID columnSessionLogID"><p>{@$sessionLog->sessionLogID}</p></td>
-                                                       <td class="columnTitle columnUsername"><p>{if $__wcf->user->userID == $sessionLog->userID}<img src="{@RELATIVE_WCF_DIR}icon/user1.svg" alt="" />{/if} <a href="index.php/ACPSessionLog/{@$sessionLog->sessionLogID}/{@SID_ARG_1ST}">{$sessionLog->username}</a></p></td>
-                                                       <td class="columnURL columnIpAddress"><p><a href="index.php/ACPSessionLog/{@$sessionLog->sessionLogID}/{@SID_ARG_1ST}">{$sessionLog->ipAddress}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br /><a href="index.php/ACPSessionLog/{@$sessionLog->sessionLogID}/{@SID_ARG_1ST}">{$sessionLog->hostname}</a>{/if}</p></td>
-                                                       <td class="columnText columnUserAgent"><p><a href="index.php/ACPSessionLog/{@$sessionLog->sessionLogID}/{@SID_ARG_1ST}">{$sessionLog->userAgent}</a></p></td>
+                                                       <td class="columnTitle columnUsername"><p>{if $__wcf->user->userID == $sessionLog->userID}<img src="{@RELATIVE_WCF_DIR}icon/user1.svg" alt="" />{/if} <a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->username}</a></p></td>
+                                                       <td class="columnURL columnIpAddress"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->ipAddress}</a>{if $sessionLog->hostname != $sessionLog->ipAddress}<br /><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->hostname}</a>{/if}</p></td>
+                                                       <td class="columnText columnUserAgent"><p><a href="{link controller='ACPSessionLog' id=$sessionLog->sessionLogID}{/link}">{$sessionLog->userAgent}</a></p></td>
                                                        <td class="columnDate columnTime"><p>{@$sessionLog->time|time}</p></td>
                                                        <td class="columnDate columnLastActivityTime"><p>{@$sessionLog->lastActivityTime|time}</p></td>
                                                        <td class="columnDigits columnAccesses"><p>{#$sessionLog->accesses}</p></td>
index e602e9821a4f39c2ac70a9d43737ad55c5389f74..46f6373d221b9474d3608021d75ccc9683a1d009 100644 (file)
@@ -51,7 +51,7 @@
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php/CacheClear/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
+                       {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="{link controller='CacheClear'}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -99,7 +99,7 @@
 <div class="contentFooter">
        <nav class="largeButtons">
                <ul>
-                       {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="index.php/CacheClear/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
+                       {if $cacheData.files}<li><a onclick="return confirm('{lang}wcf.acp.cache.clear.sure{/lang}')" href="{link controller='CacheClear'}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.cache.button.clear{/lang}</span></a></li>{/if}
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
index a46de9b43a27e519043020a40de7c2cf652e5d01..eea96c0de551c45b2ca08461216bc90df2900489 100644 (file)
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/CronjobList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
-                       {if $action == 'edit'}<li><a href="index.php/CronjobExecute/{@$cronjobID}/{@SID_ARG_1ST}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
+                       <li><a href="{link controller='CronjobList'}{/link}" title="{lang}wcf.acp.menu.link.cronjob.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/time1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.cronjob.list{/lang}</span></a></li>
+                       {if $action == 'edit'}<li><a href="{link controller='CronjobExecute' id=$cronjobID}{/link}" title="{lang}wcf.acp.cronjob.execute{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/run1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.execute{/lang}</span></a></li>{/if}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/Cronjob{$action|ucfirst}/">
+<form method="post" action="{if $action == 'add'}{link controller='CronjobAdd'}{/link}{else}{link controller='CronjobEdit'}{/link}{/if}">
        <div class="border content">
                
                <fieldset>
index f7eb665dd3da1749d1fb26c1352e72167b36998a..739c68a3829de79b3856e2722b17d364f77e3a07 100644 (file)
@@ -39,7 +39,7 @@
        
        {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
                <nav class="largeButtons">
-                       <ul><li><a href="index.php/CronjobAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+                       <ul><li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
                </nav>
        {/if}
 </div>
@@ -88,7 +88,7 @@
                                                                {/if}
                                                
                                                                {if $cronjob->isEditable()}
-                                                                       <a href="index.php/CronjobEdit/{@$cronjob->cronjobID}/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
+                                                                       <a href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" />
                                                                {/if}
                                                        <td class="columnDate columnStartDow"><p>{$cronjob->startDow|truncate:30:' ...'}</p></td>
                                                        <td class="columnText columnDescription" title="{$cronjob->description}">
                                                                {if $cronjob->isEditable()}
-                                                                       <p><a title="{lang}wcf.acp.cronjob.edit{/lang}" href="index.php/CronjobEdit/{@$cronjob->cronjobID}/{@SID_ARG_1ST}">{$cronjob->description|truncate:50:" ..."}</a></p>
+                                                                       <p><a title="{lang}wcf.acp.cronjob.edit{/lang}" href="{link controller='CronjobEdit' id=$cronjob->cronjobID}{/link}">{$cronjob->description|truncate:50:" ..."}</a></p>
                                                                {else}
                                                                        <p>{$cronjob->description|truncate:50:' ...'}</p>
                                                                {/if}
                
                {if $__wcf->session->getPermission('admin.system.cronjob.canAddCronjob')}
                        <nav class="largeButtons">
-                               <ul><li><a href="index.php/CronjobAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
+                               <ul><li><a href="{link controller='CronjobAdd'}{/link}" title="{lang}wcf.acp.cronjob.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.cronjob.add{/lang}</span></a></li></ul>
                        </nav>
                {/if}
        </div>
index 35ff7dbfad24987f660bc50ae5c1222528f5b298..811abd9ba54f4ee0d1f42d6d92301cea2d920e27 100644 (file)
@@ -13,7 +13,7 @@
 </div>
 
 {hascontent}
-       <form method="post" action="index.php/CronjobLogDelete/">
+       <form method="post" action="{link controller='CronjobLogDelete'}{/link}">
                <div class="border boxTitle">
                        <hgroup>
                                <h1>{lang}wcf.acp.cronjob.log{/lang} <span class="badge" title="{lang}wcf.acp.cronjob.log.count{/lang}">{#$items}</span></h1>
index 828f2e9ffe74b963eeaa8645aba0817c6470c4ca..f062abc09708990493034a3a9f4377e8e9b91e0c 100644 (file)
@@ -87,7 +87,7 @@
                                                        <li id="userMenu" class="userMenu"><!-- ToDo: We need an ID and/or class for each list here, this ID may also change! -->
                                                                <span class="dropdownCaption">{lang}wcf.acp.user.userNote{/lang}</span>
                                                                <ul class="dropdown">
-                                                                       <li><a href="{link}index.php/Logout/?t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
+                                                                       <li><a href="{link controller='Logout'}t={@SECURITY_TOKEN}{/link}" onclick="return confirm('{lang}wcf.user.logout.sure{/lang}')">{lang}wcf.user.logout{/lang}</a></li>
                                                                </ul>
                                                        </li>
                                                </ul>
index ec39993a27085805031487c53a64b29cb13470c1..812873ed11ec0f5d7d2106efae0ecc0da4cc7cf7 100644 (file)
@@ -25,7 +25,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/Login/">
+<form method="post" action="{link controller='Login'}{/link}">
        <fieldset>
                <legend>{lang}wcf.user.login.data{/lang}</legend>
                
index d3cea377fb8131403e75d356cf970e35ad35b6f7..2a4c6c18461ae30f808d8f54752e3fd9d0e974df 100644 (file)
@@ -19,7 +19,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/MasterPassword/">
+<form method="post" action="{link controller='MasterPassword'}{/link}">
        <div class="border content">
                
                <fieldset>
index 56b64e4314d3c4776e46145435e80d2a9f2cfadc..7f4d07029e3bd6efab1cfce998143e6c09c10bf5 100644 (file)
@@ -23,7 +23,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/MasterPasswordInit/">
+<form method="post" action="{link controller='MasterPasswordInit'}{/link}">
        <div class="border content">
                
                <fieldset>
index 7836af9466d66ada177107a2aa67b7e0030c8374..48cfe4f184166ebc70438be6d05ee061b00c9dcb 100644 (file)
@@ -25,7 +25,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/Option/{@$category->categoryID}/">
+<form method="post" action="{link controller='Option' id=$category->categoryID}{/link}">
        <div data-active="{$activeTabMenuItem}" data-store="activeTabMenuItem" class="tabMenuContainer">
                <nav class="tabMenu">
                        <ul>
index d0f612ad967594a08145201d0561f66114b74028..457318029fb026336eb2b1128af2affeaf781523 100644 (file)
@@ -15,7 +15,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/OptionImport/" enctype="multipart/form-data">
+<form method="post" action="{link controller='OptionImport'}{/link}" enctype="multipart/form-data">
        <div>
                
                <fieldset>
@@ -64,7 +64,7 @@
                <dl id="optionExportDiv">
                        <dt><label>{lang}wcf.acp.option.export.download{/lang}</label></dt>
                        <dd>
-                               <p><a href="index.php/OptionExport/{@SID_ARG_1ST}" id="optionExport" class="badge badgeButton">{lang}wcf.acp.option.export{/lang}</a></p>
+                               <p><a href="{link controller='OptionExport'}{/link}" id="optionExport" class="badge badgeButton">{lang}wcf.acp.option.export{/lang}</a></p>
                                <small>{lang}wcf.acp.option.export.download.description{/lang}</small>
                        </dd>
                </dl>
index a6acec38bcf85a764879c1046f44f8b38f7db549..6d446e741b3582a8d2f5c1580410b2323328f93d 100644 (file)
@@ -21,7 +21,7 @@
        //]]>
 </script>
 
-<form method="post" action="index.php/PackageUpdate/" id="updateForm">
+<form method="post" action="{link controller='PackageUpdate'}{/link}" id="updateForm">
        <header class="mainHeading">
                <img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" />
                <hgroup>
index 2678766aec6b0c8d288d25ffa87be80d4679b43f..9de4a0649f656f2d20af109aa66b6dbb4ff2c751 100644 (file)
@@ -68,7 +68,7 @@
 
                                <div style="text-align: right;">
                                        <ul>
-                                               <li style="display: inline-block;"><a href="index.php/PackageView/{@$packageID}/{@SID_ARG_1ST}">details</a></li>
+                                               <li style="display: inline-block;"><a href="{link controller='PackageView' id=$packageID}{/link}">details</a></li>
                                                <li style="display: inline-block;"><a href="{link controller='PackageStartInstall' id=$packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a></li>
                                        </ul>
                                </div>
@@ -98,7 +98,7 @@
 <div class="contentFooter">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/DetailedPackageList/{@SID_ARG_1ST}">detailed package list</a></li>
+                       <li><a href="{link controller='DetailedPackageList'}{/link}">detailed package list</a></li>
                </ul>
        </nav>
 </div>
index 342e5e11fb4d593ac9d9b9b0252c30dce29a4051..25f189cd39d624cced29a1d45c3a3a0118f22376 100644 (file)
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/PackageList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
+                       <li><a href="{link controller='PackageList'}{/link}" title="{lang}wcf.acp.menu.link.package.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.list{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/PackageStartInstall/" enctype="multipart/form-data">
+<form method="post" action="{link controller='PackageStartInstall'}{/link}" enctype="multipart/form-data">
        <div class="border content">
                
                <fieldset>
index e481080b6e95dd74fc12f0a3fb79fbb80ec54271..b5ad9c4a46782a96e169aad405e25995a5b6b93b 100644 (file)
@@ -52,7 +52,7 @@
        {if $packageObj->parentPackageID}
                <dl>
                        <dt>{lang}wcf.acp.package.view.parent{/lang}</dt>
-                       <dd><a href="index.php/PackageView/{@$packageObj->parentPackageID}/{@SID_ARG_1ST}">{$packageObj->getParentPackage()->getName()}</a></dd>
+                       <dd><a href="{link controller='PackageView' id=$packageObj->parentPackageID}{/link}">{$packageObj->getParentPackage()->getName()}</a></dd>
                </dl>
        {/if}
        <dl>
                                <tr>
                                        <td class="columnIcon">
                                                {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                       <a href="index.php/PackageStartInstall/{@$package.packageID}/?action=update{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
+                                                       <a href="{link controller='PackageStartInstall' id=$package.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
                                                {else}
                                                        <img src="{@RELATIVE_WCF_DIR}icon/updateD1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
                                                {/if}
                                                {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $package.package != 'com.woltlab.wcf' && $package.packageID != PACKAGE_ID}
-                                                       <a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="index.php/Package/{@$package.packageID}/?action=startUninstall{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="balloonTooltip" /></a>
+                                                       <a onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" href="{link controller='Package' id=$package.packageID}action=startUninstall{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" class="balloonTooltip" /></a>
                                                {else}
                                                        <img src="{@RELATIVE_WCF_DIR}icon/deleteD1.svg" alt="" title="{lang}wcf.acp.package.view.button.uninstall{/lang}" />
                                                {/if}
                                                        <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                {/if}
                                        </td>
-                                       <td class="columnTitle" title="{$package.packageDescription}"><p><a href="index.php/PackageView/{@$package.packageID}/{@SID_ARG_1ST}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
+                                       <td class="columnTitle" title="{$package.packageDescription}"><p><a href="{link controller='PackageView' id=$package.packageID}{/link}">{$package.packageName}{if $package.instanceNo > 1 && $package.instanceName == ''} (#{#$package.instanceNo}){/if}</a></p></td>
                                        <td class="columnText"><p>{if $package.authorURL}<a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$package.authorURL|rawurlencode}" class="externalURL">{$package.author}</a>{else}{$package.author}{/if}</p></td>
                                        <td class="columnText"><p>{$package.packageVersion}</p></td>
                                        <td class="columnDate"><p>{@$package.packageDate|date}</p></td>
        <input type="hidden" name="action" value="startUninstall" />
        <input type="hidden" name="packageID" value="{@$packageObj->packageID}" />
        <input type="hidden" name="send" value="1" />
-       <input type="button" value="{lang}wcf.global.button.back{/lang}" onclick="document.location.href=fixURL('index.php/PackageView/{@$packageID}/{@SID_ARG_1ST}')" accesskey="c" />
+       <input type="button" value="{lang}wcf.global.button.back{/lang}" onclick="document.location.href=fixURL('{link controller='PackageView' id=$packageID}{/link}')" accesskey="c" />
        <input type="button" id="uninstallPackage" value="{lang}wcf.global.button.next{/lang}" class="default" accesskey="s" />
 </div>
 
index 69b4af38b5fa0e9745120caa11f24dad9b2d7e96..33a550fb50557c2c410d19740f36e0f0acdba0c2 100644 (file)
@@ -27,7 +27,7 @@
 {/if}
 
 {if $packageInstallationStack|count}
-       <form method="post" action="index.php/PackageUpdate/">
+       <form method="post" action="{link controller='PackageUpdate'}{/link}">
                <div class="border content">
                        
                        <fieldset>
index 1320656cb0771884e7e34f601aba82b395e928e5..da50bf35fcce7ffe848f2545868f3e54c858ac94 100644 (file)
@@ -51,7 +51,7 @@
 {if !$updateServers|count}
        <p class="warning">{lang}wcf.acp.updateServer.view.noneAvailable{/lang}</p>
 {else}
-       <form method="post" action="index.php/PackageUpdateSearch/">
+       <form method="post" action="{link controller='PackageUpdateSearch'}{/link}">
                <div class="border content">
                        
                        <fieldset>
index d333d585552d35af87bca87a2598ee23807207bc..0dc59368f37f1a4923ed3352e1270906f911d6a8 100644 (file)
 </header>
 
 <div class="contentHeader">
-       {pages print=true assign=pagesLinks link="index.php/PackageUpdateSearchResult/$searchID/?pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"|concat:SID_ARG_2ND_NOT_ENCODED}
+       {pages print=true assign=pagesLinks controller="PackageUpdateSearchResult" id=$searchID link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
 </div>
 
-<form method="post" action="index.php/PackageUpdate/">
+<form method="post" action="{link controller='PackageUpdate'}{/link}">
        {foreach from=$packages item=package}
                <article class="message content">
                        <div class="messageInner container-{cycle name='styles' values='1,2'}">
index 64b0e53fab3227eb3df2cd6ce83bbe002ee77532..e4b16a0618b6e536a14976ea66eb8ae69aea402f 100644 (file)
@@ -83,7 +83,7 @@
                        {if $package->parentPackageID}
                                <dl>
                                        <dt>{lang}wcf.acp.package.view.parent{/lang}</dt>
-                                       <dd><a href="index.php/PackageView/{@$package->parentPackageID}/{@SID_ARG_1ST}">{$package->getParentPackage()->getName()}</a></dd>
+                                       <dd><a href="{link controller='PackageView' id=$package->parentPackageID}{/link}">{$package->getParentPackage()->getName()}</a></dd>
                                </dl>
                        {/if}
                        <dl>
                                                                        <tr>
                                                                                <td class="columnIcon">
                                                                                        {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                                                               <a href="index.php/PackageStartInstall/{@$requiredPackage.packageID}/?action=update{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
+                                                                                               <a href="{link controller='PackageStartInstall' id=$requiredPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
                                                                                        {else}
                                                                                                <img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
                                                                                        {/if}
                                                                                                <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                                                        {/if}
                                                                                </td>
-                                                                               <td class="columnText" title="{$requiredPackage.packageDescription}"><p><a href="index.php/PackageView/{@$requiredPackage.packageID}/{@SID_ARG_1ST}">{$requiredPackage.packageName}{if $requiredPackage.instanceNo > 1 && $requiredPackage.instanceName == ''} (#{#$requiredPackage.instanceNo}){/if}</a></p></td>
+                                                                               <td class="columnText" title="{$requiredPackage.packageDescription}"><p><a href="{link controller='PackageView' id=$requiredPackage.packageID}{/link}">{$requiredPackage.packageName}{if $requiredPackage.instanceNo > 1 && $requiredPackage.instanceName == ''} (#{#$requiredPackage.instanceNo}){/if}</a></p></td>
                                                                                <td class="columnText">{if $requiredPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$requiredPackage.authorURL|rawurlencode}" class="externalURL">{$requiredPackage.author}</a>{else}{$requiredPackage.author}</p>{/if}</td>
                                                                                <td class="columnText"><p>{$requiredPackage.packageVersion}</p></td>
                                                                                <td class="columnDate"><p>{@$requiredPackage.packageDate|date}</p></td>
                                                                        <tr>
                                                                                <td class="columnIcon">
                                                                                        {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}
-                                                                                               <a href="index.php/PackageStartInstall/{@$dependentPackage.packageID}/?action=update{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
+                                                                                               <a href="{link controller='PackageStartInstall' id=$dependentPackage.packageID}action=update{/link}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" class="balloonTooltip" /></a>
                                                                                        {else}
                                                                                                <img src="{@RELATIVE_WCF_DIR}icon/update1D.svg" alt="" title="{lang}wcf.acp.package.view.button.update{/lang}" />
                                                                                        {/if}
                                                                                                <img src="{@RELATIVE_WCF_DIR}icon/package1.svg" alt="" title="{lang}wcf.acp.package.list.other{/lang}" class="balloonTooltip" />
                                                                                        {/if}
                                                                                </td>
-                                                                               <td class="columnText" title="{$dependentPackage.packageDescription}"><p><a href="index.php/PackageView/{@$dependentPackage.packageID}/{@SID_ARG_1ST}">{$dependentPackage.packageName}{if $dependentPackage.instanceNo > 1 && $dependentPackage.instanceName == ''} (#{#$dependentPackage.instanceNo}){/if}</a></p></td>
+                                                                               <td class="columnText" title="{$dependentPackage.packageDescription}"><p><a href="{link controller='PackageView' id=$dependentPackage.packageID}{/link}">{$dependentPackage.packageName}{if $dependentPackage.instanceNo > 1 && $dependentPackage.instanceName == ''} (#{#$dependentPackage.instanceNo}){/if}</a></p></td>
                                                                                <td class="columnText">{if $dependentPackage.authorURL}<p><a href="{@RELATIVE_WCF_DIR}acp/dereferrer.php?url={$dependentPackage.authorURL|rawurlencode}" class="externalURL">{$dependentPackage.author}</a>{else}{$dependentPackage.author}</p>{/if}</td>
                                                                                <td class="columnText"><p>{$dependentPackage.packageVersion}</p></td>
                                                                                <td class="columnDate"><p>{@$dependentPackage.packageDate|date}</p></td>
                                {if $package->standalone && $package->package != 'com.woltlab.wcf'}<li><a href="{@RELATIVE_WCF_DIR}{$package->packageDir}acp/index.php{@SID_ARG_1ST}" title="{lang}wcf.acp.package.view.button.makeActive{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/packageACP1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.makeActive{/lang}</span></a></li>{/if}
                                {if $__wcf->session->getPermission('admin.system.package.canUninstallPackage') && $noDependentIsActive}<li><a href="{link controller='Package'}action=startUninstall&packageID={@$package->packageID}{/link}" onclick="return confirm('{lang}wcf.acp.package.view.button.uninstall.sure{/lang}')" title="{lang}wcf.acp.package.view.button.uninstall{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.uninstall{/lang}</span></a></li>{/if}
                        {/if}
-                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="index.php/PackageStartInstall/{@$package->packageID}/?action=update{@SID_ARG_2ND}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
+                       {if $__wcf->session->getPermission('admin.system.package.canUpdatePackage')}<li><a href="{link controller='PackageStartInstall' id=$package->packageID}action=update{/link}" title="{lang}wcf.acp.package.view.button.update{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/update1.svg" alt="" /> <span>{lang}wcf.acp.package.view.button.update{/lang}</span></a></li>{/if}
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
index 6d08e0e8f42fa5e1941d396b802408daec524689..14cc152a4ae3b6179ae36acafea5902643c8836e 100644 (file)
 
 <div class="contentHeader">
        <nav class="largeButtons">
-               <ul><li><a href="index.php/UpdateServerList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/server1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li></ul>
+               <ul><li><a href="{link controller='UpdateServerList'}{/link}" title="{lang}wcf.acp.menu.link.package.server.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/server1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.package.server.list{/lang}</span></a></li></ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/UpdateServer{@$action|ucfirst}/{if $packageUpdateServerID|isset}{@$packageUpdateServerID}/{/if}">
+<form method="post" action="{if $action == 'add'}{link controller='UpdateServerAdd'}{/link}{else}{link controller='UpdateServerEdit'}{/link}{/if}">
        <div class="border content">
                
                <fieldset>
@@ -71,6 +71,7 @@
        <div class="formSubmit">
                <input type="reset" value="{lang}wcf.global.button.reset{/lang}" accesskey="r" />
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
+               {if $packageUpdateServerID|isset}<input type="hidden" name="id" value="{@$packageUpdateServerID}" />{/if}
                {@SID_INPUT_TAG}
        </div>
 </form>
index 9fc06894fdce05d907bd546931759a9cacbf7425..d4fa1c2184febb9df37e79ecd75bcabd61f75e1c 100644 (file)
@@ -24,7 +24,7 @@
        {pages print=true assign=pagesLinks controller="UpdateServerList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
        
        <nav class="largeButtons">
-               <ul><li><a href="index.php/UpdateServerAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
+               <ul><li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
        </nav>
 </div>
 
                                                <tr class="updateServerRow">
                                                        <td class="columnIcon">
                                                                <img src="{@RELATIVE_WCF_DIR}icon/{if !$updateServer->disabled}enabled{else}disabled{/if}1.svg" alt="" title="{lang}wcf.global.button.{if !$updateServer->disabled}disable{else}enable{/if}{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-disableMessage="{lang}wcf.global.button.disable{/lang}" data-enableMessage="{lang}wcf.global.button.enable{/lang}" class="toggleButton balloonTooltip" />
-                                                               <a href="index.php/UpdateServerEdit/{@$updateServer->packageUpdateServerID}/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
+                                                               <a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                                <img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" data-objectID="{@$updateServer->packageUpdateServerID}" data-confirmMessage="{lang}wcf.acp.updateServer.delete.sure{/lang}" class="deleteButton balloonTooltip" />
                                                        
                                                                {if $additionalButtons[$updateServer->packageUpdateServerID]|isset}{@$additionalButtons[$updateServer->packageUpdateServerID]}{/if}
                                                        </td>
                                                        <td class="columnID"><p>{@$updateServer->packageUpdateServerID}</p></td>
-                                                       <td class="columnText columnTitle"><p><a href="index.php/UpdateServerEdit/{@$updateServer->packageUpdateServerID}/{@SID_ARG_1ST}" title="{lang}wcf.global.button.edit{/lang}">{$updateServer->serverURL}</a></p></td>
+                                                       <td class="columnText columnTitle"><p><a href="{link controller='UpdateServerEdit' id=$updateServer->packageUpdateServerID}{/link}" title="{lang}wcf.global.button.edit{/lang}">{$updateServer->serverURL}</a></p></td>
                                                        <td class="columnDigits"><p>{#$updateServer->packages}</p></td>
                                                        <td class="columnStatus"><p class="badge{if $updateServer->status == 'online'} badgeSuccess{else} badgeError{/if}">{@$updateServer->status}</p></td>
                                                        <td class="columnText"><p title="{@$updateServer->errorMessage}">{@$updateServer->errorMessage|truncate:"30"}</p></td>
@@ -79,7 +79,7 @@
                {@$pagesLinks}
                
                <nav class="largeButtons">
-                       <ul><li><a href="index.php/UpdateServerAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
+                       <ul><li><a href="{link controller='UpdateServerAdd'}{/link}" title="{lang}wcf.acp.updateServer.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.updateServer.add{/lang}</span></a></li></ul>
                </nav>
        </div>
 {hascontentelse}
index f79d2d9f4bc63107a56ee04d6270c3a7b3694af0..0b80f93a3418f62100dd11ff7154e7239e5dab63 100644 (file)
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/UserList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       <li><a href="index.php/UserSearch/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/User{@$action|ucfirst}/">
+<form method="post" action="{if $action == 'add'}{link controller='UserAdd'}{/link}{else}{link controller='UserEdit'}{/link}{/if}">
        <div class="border content">
                <dl{if $errorType.username|isset} class="formError"{/if}>
                        <dt><label for="username">{lang}wcf.user.username{/lang}</label></dt>
index fa928474f5135f40c130b3912c1270c438d98b89..5497b40d07396f5f5d93ca8fcc5e831a861fcca9 100644 (file)
@@ -11,7 +11,7 @@
        <p class="error">{lang}wcf.global.form.error{/lang}</p>
 {/if}
 
-<form method="post" action="index.php/UserAssignToGroup/">
+<form method="post" action="{link controller='UserAssignToGroup'}{/link}">
 
        <div class="border content">
                
@@ -19,7 +19,7 @@
                        <legend>{lang}wcf.acp.user.assignToGroup.markedUsers{/lang}</legend>
                        
                        <ul>
-                               {implode from=$users item=$user}<li><a href="index.php/UserEdit/{@$user->userID}/{@SID_ARG_1ST}" class="badge badgeButton">{$user}</a></li>{/implode}
+                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}" class="badge badgeButton">{$user}</a></li>{/implode}
                        </ul>
                </fieldset>     
                
index fa6183d3091ee55a677770033a18e788cbd4606d..7fdb1c61ec17879aa58207872d0f17fe457e2a08 100644 (file)
        </hgroup>
 </header>
 
-<form method="post" action="index.php/UserEmailAddressExport/">
+<form method="post" action="{link controller='UserEmailAddressExport'}{/link}">
        <div class="border content">
                <fieldset>
                        <legend>{lang}wcf.acp.user.exportEmailAddress.markedUsers{/lang}</legend>
                        
                        <ul>
-                               {implode from=$users item=$user}<li><a href="index.php/UserEdit/{@$user->userID}/{@SID_ARG_1ST}" class="badge badgeButton">{$user}</a></li>{/implode}
+                               {implode from=$users item=$user}<li><a href="{link controller='UserEdit' id=$user->userID}{/link}" class="badge badgeButton">{$user}</a></li>{/implode}
                        </ul>
                </fieldset>     
                
index 65ef55045829d6179628f5c03266379f7a24c21b..38d083fa965d9cc019f3fb2694839231f0e81ce0 100644 (file)
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/UserGroupList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.group.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
+                       <li><a href="{link controller='UserGroupList'}{/link}" title="{lang}wcf.acp.menu.link.group.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.group.list{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/UserGroup{@$action|ucfirst}/">
+<form method="post" action="{if $action == 'add'}{link controller='UserGroupAdd'}{/link}{else}{link controller='UserGroupEdit'}{/link}{/if}">
        <div class="border content">
                
                <fieldset>
index 9d9e06bd0d5c008d1347e0188fe79c0c012917b7..a27a1e64021320e6e95dc49bb99767f50d1b8c9e 100644 (file)
@@ -11,7 +11,7 @@
        {pages print=true assign=pagesLinks controller="UserGroupList" link="pageNo=%d&sortField=$sortField&sortOrder=$sortOrder"}
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/UserGroupAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                       <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}                       
                </ul>
        </nav>
@@ -40,7 +40,7 @@
                                                <tr id="groupContainer{@$group->groupID}">
                                                        <td class="columnIcon">
                                                                {if $group->isEditable()}
-                                                                       <a href="index.php/UserGroupEdit/{@$group->groupID}/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
+                                                                       <a href="{link controller='UserGroupEdit' id=$group->groupID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="balloonTooltip" /></a>
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.acp.group.edit{/lang}" />
                                                                {/if}
@@ -53,7 +53,7 @@
                                                                {if $additionalButtons[$group->groupID]|isset}{@$additionalButtons[$group->groupID]}{/if}
                                                        </td>
                                                        <td class="columnID columnGroupID"><p>{@$group->groupID}</p></td>
-                                                       <td class="columnTitle columnGroupName">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="index.php/UserGroupEdit/{@$group->groupID}/{@SID_ARG_1ST}">{lang}{$group->groupName}{/lang}</a>{else}{lang}{$group->groupName}{/lang}</p>{/if}</td>
+                                                       <td class="columnTitle columnGroupName">{if $group->isEditable()}<p><a title="{lang}wcf.acp.group.edit{/lang}" href="{link controller='UserGroupEdit' id=$group->groupID}{/link}">{lang}{$group->groupName}{/lang}</a>{else}{lang}{$group->groupName}{/lang}</p>{/if}</td>
                                                        <td class="columnDigits columnMembers"><p><a title="{lang}wcf.acp.group.showMembers{/lang}" href="{link controller='UserSearch'}groupID={@$group->groupID}{/link}">{#$group->members}</p></a></td>
                                                
                                                        {if $additionalColumns[$group->groupID]|isset}{@$additionalColumns[$group->groupID]}{/if}
@@ -69,7 +69,7 @@
                {@$pagesLinks}
                <nav class="largeButtons">
                        <ul>
-                               <li><a href="index.php/UserGroupAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
+                               <li><a href="{link controller='UserGroupAdd'}{/link}" title="{lang}wcf.acp.group.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.group.add{/lang}</span></a></li>
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                        </ul>
                </nav>
index c95b51e342a13b9ed689f4c84d38b124f4d27c04..e22950923dcd82d9bd0d714411596bd796faebb6 100644 (file)
@@ -25,9 +25,9 @@
        <nav class="largeButtons">
                <ul>
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="index.php/UserAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                               <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="index.php/UserSearch/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
@@ -36,7 +36,7 @@
 <div class="border boxTitle">
        <nav class="menu">
                <ul>
-                       <li{if $action == ''} class="active"{/if}><a href="index.php/UserList/{@SID_ARG_1ST}"><span>{lang}wcf.acp.user.list.all{/lang}</span> <span class="badge" title="{lang}wcf.acp.user.list.count{/lang}">{#$items}</span></a></li>
+                       <li{if $action == ''} class="active"{/if}><a href="{link controller='UserList'}{/link}"><span>{lang}wcf.acp.user.list.all{/lang}</span> <span class="badge" title="{lang}wcf.acp.user.list.count{/lang}">{#$items}</span></a></li>
                        {if $additionalUserListOptions|isset}{@$additionalUserListOptions}{/if}
                </ul>
        </nav>
                                                        <td class="columnMark"><input type="checkbox" class="clipboardItem" data-objectID="{@$user->userID}" /></td>
                                                        <td class="columnIcon">
                                                                {if $user->editable}
-                                                                       <a href="index.php/UserEdit/{@$user->userID}/{@SID_ARG_1ST}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.acp.user.edit{/lang}" class="balloonTooltip" /></a>
+                                                                       <a href="{link controller='UserEdit' id=$user->userID}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/edit1.svg" alt="" title="{lang}wcf.acp.user.edit{/lang}" class="balloonTooltip" /></a>
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/edit1D.svg" alt="" title="{lang}wcf.acp.user.edit{/lang}" />
                                                                {/if}
                                                                {if $user->deletable}
-                                                                       <a onclick="return confirm('{lang}wcf.acp.user.delete.sure{/lang}')" href="index.php/UserDelete/{@$user->userID}/?url={@$encodedURL}{@SID_ARG_2ND}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.user.delete{/lang}" class="balloonTooltip" /></a>
+                                                                       <a onclick="return confirm('{lang}wcf.acp.user.delete.sure{/lang}')" href="{link controller='UserDelete' id=$user->userID}url={@$encodedURL}{/link}"><img src="{@RELATIVE_WCF_DIR}icon/delete1.svg" alt="" title="{lang}wcf.acp.user.delete{/lang}" class="balloonTooltip" /></a>
                                                                {else}
                                                                        <img src="{@RELATIVE_WCF_DIR}icon/delete1D.svg" alt="" title="{lang}wcf.acp.user.delete{/lang}" />
                                                                {/if}
@@ -77,7 +77,7 @@
                                                                {if $additionalButtons[$user->userID]|isset}{@$additionalButtons[$user->userID]}{/if}
                                                        </td>
                                                        <td class="columnID columnUserID"><p>{@$user->userID}</p></td>
-                                                       <td class="columnTitle columnUsername"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="index.php/UserEdit/{@$user->userID}/{@SID_ARG_1ST}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
+                                                       <td class="columnTitle columnUsername"><p>{if $user->editable}<a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='UserEdit' id=$user->userID}{/link}">{$user->username}</a>{else}{$user->username}{/if}</p></td>
                                        
                                                        {foreach from=$columnHeads key=column item=columnLanguageVariable}
                                                                <td class="column{$column|ucfirst}"><p>{if $columnValues[$user->userID][$column]|isset}{@$columnValues[$user->userID][$column]}{/if}</p></td>
                <nav class="largeButtons">
                        <ul>
                                {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                                       <li><a href="index.php/UserAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                                       <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                                {/if}
-                               <li><a href="index.php/UserSearch/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                               <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                                {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                        </ul>
                </nav>
index fc30edf28ffef60573b4435d8f9f3cc1812b69b6..af86ab54b228d873b38dd67ad633781027fe6602 100644 (file)
 <div class="contentHeader">
        <nav class="largeButtons">
                <ul>
-                       <li><a href="index.php/UserList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
-                       <li><a href="index.php/UserSearch/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
+                       <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="{link controller='UserSearch'}{/link}" title="{lang}wcf.acp.user.search{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/search1.svg" alt="" /> <span>{lang}wcf.acp.user.search{/lang}</span></a></li>
                        {if $additionalLargeButtons|isset}{@$additionalLargeButtons}{/if}
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/UserMail/">
+<form method="post" action="{link controller='UserMail'}{/link}">
        <div class="border content">
                
                {if $action == ''}
@@ -49,7 +49,7 @@
                                <legend>{lang}wcf.acp.user.sendMail.markedUsers{/lang}</legend>
                                
                                <div>
-                                       {implode from=$users item=$user}<a href="index.php/UserEdit/{@$user->userID}/{@SID_ARG_1ST}">{$user}</a>{/implode}
+                                       {implode from=$users item=$user}<a href="{link controller='UserEdit' id=$user->userID}{/link}">{$user}</a>{/implode}
                                </div>
                        </fieldset>     
                {/if}
index a79499d80303af0a7405b5b2293487b3dea6d5d0..33b1608e47911f033926d684e58dfec0f80b1098 100644 (file)
        <nav class="largeButtons">
                <ul>
                        {if $__wcf->session->getPermission('admin.user.canAddUser')}
-                               <li><a href="index.php/UserAdd/{@SID_ARG_1ST}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
+                               <li><a href="{link controller='UserAdd'}{/link}" title="{lang}wcf.acp.user.add{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/add1.svg" alt="" /> <span>{lang}wcf.acp.user.add{/lang}</span></a></li>
                        {/if}
-                       <li><a href="index.php/UserList/{@SID_ARG_1ST}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
+                       <li><a href="{link controller='UserList'}{/link}" title="{lang}wcf.acp.menu.link.user.list{/lang}"><img src="{@RELATIVE_WCF_DIR}icon/users1.svg" alt="" /> <span>{lang}wcf.acp.menu.link.user.list{/lang}</span></a></li>
                </ul>
        </nav>
 </div>
 
-<form method="post" action="index.php/UserSearch/">
+<form method="post" action="{link controller='UserSearch'}{/link}">
        <div class="border content">
                
                <fieldset>
index 07a842bdbd7b1c3498dfabffea10c0d564c54073..9d68bade3ba9c8b53371d4f9f23b7a1e01d6d63f 100644 (file)
@@ -82,7 +82,7 @@
 
 <p class="warning">{lang}wcf.acp.user.massProcessing.warning{/lang}</p>
 
-<form method="post" action="index.php/UsersMassProcessing/">
+<form method="post" action="{link controller='UsersMassProcessing'}{/link}">
        <div class="border content">
                
                <hgroup class="subHeading">
index d593ce0b186db99a5746808cbc34bcc84e303ca9..f5f3c1fad9010344326bf85137535f0ee1964359 100755 (executable)
@@ -1,6 +1,7 @@
 <?php
 namespace wcf\acp\form;
 use wcf\system\exception\UserInputException;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
@@ -83,7 +84,7 @@ class MasterPasswordForm extends ACPForm {
                
                // forward
                if (empty($this->url)) {
-                       $this->url = 'index.php/Index/'.SID_ARG_1ST;
+                       $this->url = LinkHandler::getInstance()->getLink('', array('controller' => 'Index'));
                }
                HeaderUtil::redirect($this->url, false);
                exit;
index 48c3eebe05ed2691c7938af5a26a7fe81490d4db..bd017f99ae3820fcac02dda4aff1ff82cabf30d4 100755 (executable)
@@ -10,6 +10,7 @@ use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageArchive;
 use wcf\system\package\PackageInstallationDispatcher;
+use wcf\system\request\LinkHandler;
 use wcf\util\FileUtil;
 use wcf\util\HeaderUtil;
 use wcf\util\StringUtil;
@@ -231,7 +232,8 @@ class PackageStartInstallForm extends ACPForm {
                $this->saved();
                
                // open queue
-               HeaderUtil::redirect('index.php/Package/?action=openQueue&processNo='.$processNo.SID_ARG_2ND_NOT_ENCODED);
+               $url = LinkHandler::getInstance()->getLink('action=openQueue&processNo='.$processNo, array('controller' => 'Package'));
+               HeaderUtil::redirect($url);
                exit;
        }
        
index f311efa233775c217fc999c249daa2e30a28a74c..4a194185554370e7dfb89fdbdcf849575d03fea6 100755 (executable)
@@ -3,6 +3,7 @@ namespace wcf\acp\form;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageUpdateDispatcher;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
 use wcf\util\HeaderUtil;
@@ -103,7 +104,8 @@ class PackageUpdateForm extends ACPForm {
                        $this->saved();
                        
                        // open queue
-                       HeaderUtil::redirect('index.php/Package/?action=openQueue&processNo='.$processNo.''.SID_ARG_2ND_NOT_ENCODED);
+                       $url = LinkHandler::getInstance()->getLink('action=openQueue&processNo='.$processNo, array('controller' => 'Package'));
+                       HeaderUtil::redirect($url);
                        exit;
                }
        }
index 2191fc444510a3e83db849cc70b1b629ce0492f3..6eb1acf7636c3cb951ab3f066f17ca359d2665dd 100644 (file)
@@ -5,6 +5,7 @@ use wcf\data\search\SearchEditor;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\UserInputException;
 use wcf\system\package\PackageUpdateDispatcher;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\system\WCFACP;
 use wcf\util\ArrayUtil;
@@ -242,7 +243,11 @@ class PackageUpdateSearchForm extends ACPForm {
                $this->saved();
                
                // forward
-               HeaderUtil::redirect('index.php/PackageUpdateSearchResult/'.$search->searchID.'/'.SID_ARG_1ST);
+               $url = LinkHandler::getInstance()->getLink('', array(
+                       'controller' => 'PackageUpdateSearchResult',
+                       'id' => $search->searchID
+               ));
+               HeaderUtil::redirect($url);
                exit;
        }
        
index efcd45e9d01e6edd6ac07af59bc327b5791d11b0..2012578b2daf2b92034bc1ad22e8226184c3b5c4 100755 (executable)
@@ -8,6 +8,7 @@ use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
+use wcf\system\request\LinkHandler;
 use wcf\system\wcf;
 use wcf\util\ArrayUtil;
 use wcf\util\HeaderUtil;
@@ -214,7 +215,11 @@ class UserSearchForm extends UserOptionListForm {
                $this->saved();
                
                // forward to result page
-               HeaderUtil::redirect('index.php/UserList/'.$this->searchID.'/?sortField='.rawurlencode($this->sortField).'&sortOrder='.rawurlencode($this->sortOrder).''.SID_ARG_2ND_NOT_ENCODED);
+               $url = LinkHandler::getInstance()->getLink('sortField='.rawurlencode($this->sortField).'&sortOrder='.rawurlencode($this->sortOrder), array(
+                       'controller' => 'UserList',
+                       'id' => $this->searchID
+               ));
+               HeaderUtil::redirect($url);
                exit;
        }
        
index 3a739229285f662dd791cf960751c9fa4825f213..05c8dba48daea3ca296d011a0d0c0d808e0b14b7 100644 (file)
@@ -12,6 +12,7 @@ use wcf\system\event\EventHandler;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
 use wcf\system\language\LanguageFactory;
+use wcf\system\request\LinkHandler;
 use wcf\util\ArrayUtil;
 use wcf\util\StringUtil;
                
@@ -194,10 +195,15 @@ class UsersMassProcessingForm extends UserOptionListForm {
                                WCF::getSession()->register('userMailData', $userMailData);
                                $this->saved();
                                
+                               $url = LinkHandler::getInstance()->getLink('', array(
+                                       'controller' => 'UserMail',
+                                       'id' => $mailID
+                               ));
+                               
                                // show worker template
                                WCF::getTPL()->assign(array(
                                        'pageTitle' => WCF::getLanguage()->get('wcf.acp.user.sendMail'),
-                                       'url' => 'index.php/UserMail/'.$mailID.'/'.SID_ARG_1ST
+                                       'url' => $url
                                ));
                                WCF::getTPL()->display('worker');
                                exit;
index 5c6a181bd954b66742cbbab3af88879681f6e21f..fa7fde79746b819061ab59abb9f3db1f8a7cb070 100755 (executable)
@@ -8,6 +8,7 @@ use wcf\system\cache\CacheHandler;
 use wcf\system\clipboard\ClipboardHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\event\EventHandler;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\DateUtil;
 use wcf\util\StringUtil;
@@ -114,7 +115,7 @@ class UserListPage extends SortablePage {
                $this->readUsers();
                
                // build page url
-               $this->url = 'index.php/UserList/?searchID='.$this->searchID.'&action='.rawurlencode($this->action).'&pageNo='.$this->pageNo.'&sortField='.$this->sortField.'&sortOrder='.$this->sortOrder.''.SID_ARG_2ND_NOT_ENCODED;
+               $this->url = LinkHandler::getInstance('searchID='.$this->searchID.'&action='.rawurlencode($this->action).'&pageNo='.$this->pageNo.'&sortField='.$this->sortField.'&sortOrder='.$this->sortOrder, array('controller' => 'UserList'));
        }
        
        /**
index dd681ec471955f2d84511eab569efb25098aafec..e1df4166e15e5bb83f2b32a8af44aa1ab342a066 100644 (file)
@@ -14,6 +14,7 @@ use wcf\system\exception\SystemException;
 use wcf\system\form;
 use wcf\system\form\container;
 use wcf\system\form\element;
+use wcf\system\request\LinkHandler;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\HeaderUtil;
@@ -534,11 +535,13 @@ class PackageInstallationDispatcher {
                $packageInstallation = $statement->fetchArray();
                
                if (!isset($packageInstallation['queueID'])) {
-                       HeaderUtil::redirect('index.php/PackageList/?'.SID_ARG_1ST);
+                       $url = LinkHandler::getInstance()->getLink('', array('controller' => 'PackageList'));
+                       HeaderUtil::redirect($url);
                        exit;
                }
                else {
-                       HeaderUtil::redirect('index.php/Package/?action='.$packageInstallation['action'].'&queueID='.$packageInstallation['queueID'].''.SID_ARG_2ND_NOT_ENCODED);
+                       $url = LinkHandler::getInstance()->getLink('action='.$packageInstallation['action'].'&queueID='.$packageInstallation['queueID'], array('controller' => 'Package'));
+                       HeaderUtil::redirect($url);
                        exit;
                }
        }
index 7b768f8b1f34ff02b71b58807ea3efcc8c88d4a1..8465a50fa30711c529fa79cc920b2b07bbd5cd4c 100644 (file)
@@ -10,6 +10,7 @@ use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\SystemException;
+use wcf\system\request\LinkHandler;
 use wcf\system\setup\Uninstaller;
 use wcf\system\WCF;
 use wcf\util\HeaderUtil;
@@ -280,7 +281,8 @@ class PackageUninstallationDispatcher extends PackageInstallationDispatcher {
                        ));
                }
                
-               HeaderUtil::redirect('index.php/Package/?action=openQueue&processNo='.$processNo.''.SID_ARG_2ND_NOT_ENCODED);
+               $url = LinkHandler::getInstance()->getLink('action=openQueue&processNo='.$processNo, array('controller' => 'Package'));
+               HeaderUtil::redirect($url);
                exit;
        }
 }