Remove obsolete sessionID constant references

diff --git a/wcfsetup/install/files/acp/js/WCF.ACP.js b/wcfsetup/install/files/acp/js/WCF.ACP.js
index 1397b089812b15e5eef6d834865aae94d787d52e..2acd9c03b0292f15412b09fc9d60e07062c4a660 100644 (file)
--- a/wcfsetup/install/files/acp/js/WCF.ACP.js
+++ b/wcfsetup/install/files/acp/js/WCF.ACP.js
@@ -357,7 +357,7 @@ WCF.ACP.Package.Installation = Class.extend({
                        failure: $.proxy(this._failure, this),
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?' + $actionName + '/&t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?' + $actionName + '/&t=' + SECURITY_TOKEN
                });
        },
        
@@ -1738,7 +1738,7 @@ WCF.ACP.Worker = Class.extend({
                        },
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN
                });
                this._title = title;
        },
@@ -2393,7 +2393,7 @@ WCF.ACP.Import.Manager = Class.extend({
                this._proxy = new WCF.Action.Proxy({
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php?worker-proxy/&t=' + SECURITY_TOKEN
                });
                this._redirectURL = redirectURL;
                
@@ -2420,7 +2420,7 @@ WCF.ACP.Import.Manager = Class.extend({
                                        success: $.proxy(function() {
                                                window.location = this._redirectURL;
                                        }, this),
-                                       url: 'index.php?cache-clear/&t=' + SECURITY_TOKEN + SID_ARG_2ND
+                                       url: 'index.php?cache-clear/&t=' + SECURITY_TOKEN
                                });
                        }, this)).appendTo($form);
                        

diff --git a/wcfsetup/install/files/acp/templates/dataImport.tpl b/wcfsetup/install/files/acp/templates/dataImport.tpl
index 2b7d3d23058b2ebbddec55e9df3a305d84df9312..1e334981e29dddcfbdc53d8e36704d271547c5cf 100644 (file)
--- a/wcfsetup/install/files/acp/templates/dataImport.tpl
+++ b/wcfsetup/install/files/acp/templates/dataImport.tpl
@@ -77,7 +77,7 @@
                                                                                className: 'wcf\\system\\importer\\ImportHandler'
                                                                        },
                                                                        success: function() { window.location.reload(); },
-                                                                       url: 'index.php/AJAXInvoke/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                                                                       url: 'index.php/AJAXInvoke/?t=' + SECURITY_TOKEN
                                                                });
                                                        }
                                                });

diff --git a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
index 1244022b8a34be1bb880ce0e9a3a92a14e5036d2..546e1e3e4fc5b2f52cce223b62bbe7379dd664ee 100644 (file)
--- a/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
+++ b/wcfsetup/install/files/acp/templates/exceptionLogView.tpl
@@ -59,7 +59,6 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-                       {@SID_INPUT_TAG}
                </div>
        </form>
 {/if}

diff --git a/wcfsetup/install/files/acp/templates/labelList.tpl b/wcfsetup/install/files/acp/templates/labelList.tpl
index 06b4aaccfe6b45730edd92c0dda6a35f2f9afbb7..eeed594a47acf5a20b6a6bd428e48ff4f6355944 100644 (file)
--- a/wcfsetup/install/files/acp/templates/labelList.tpl
+++ b/wcfsetup/install/files/acp/templates/labelList.tpl
@@ -79,7 +79,6 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-                       {@SID_INPUT_TAG}
                        {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>

diff --git a/wcfsetup/install/files/acp/templates/tagList.tpl b/wcfsetup/install/files/acp/templates/tagList.tpl
index 950879f55fd63bbe2a108226b00619c8be81f4ed..42832f0ee7ca461cb79c196c22d051c7d95bb087 100644 (file)
--- a/wcfsetup/install/files/acp/templates/tagList.tpl
+++ b/wcfsetup/install/files/acp/templates/tagList.tpl
@@ -47,7 +47,6 @@
                
                <div class="formSubmit">
                        <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
-                       {@SID_INPUT_TAG}
                        {@SECURITY_TOKEN_INPUT_TAG}
                </div>
        </form>

diff --git a/wcfsetup/install/files/acp/templates/templateDiff.tpl b/wcfsetup/install/files/acp/templates/templateDiff.tpl
index 8e51ce0ab06ec8d5e10babe0b39ba99bd3cb9949..da05ab4fecb7b6714bb30181c056a8097c2cdc5c 100644 (file)
--- a/wcfsetup/install/files/acp/templates/templateDiff.tpl
+++ b/wcfsetup/install/files/acp/templates/templateDiff.tpl
@@ -46,7 +46,6 @@
        </section>
        
        <div class="formSubmit">
-               {@SID_INPUT_TAG}
                <input type="hidden" name="id" value="{$templateID}" />
                <input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s" />
        </div>

diff --git a/wcfsetup/install/files/js/WCF.Message.js b/wcfsetup/install/files/js/WCF.Message.js
index 6275b01f85bac620667661db4add530f57e381ca..c008083f7142c0569679186554cda2dab51d5dd5 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Message.js
+++ b/wcfsetup/install/files/js/WCF.Message.js
@@ -1667,7 +1667,7 @@ WCF.Message.Quote.Manager = Class.extend({
                this._proxy = new WCF.Action.Proxy({
                        showLoadingOverlay: false,
                        success: $.proxy(this._success, this),
-                       url: 'index.php/MessageQuote/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php/MessageQuote/?t=' + SECURITY_TOKEN
                });
                
                this._toggleShowQuotes();

diff --git a/wcfsetup/install/files/js/WCF.Poll.js b/wcfsetup/install/files/js/WCF.Poll.js
index c2b70966195ea8544bd39bb720f9617840f4c764..4df48bbff0d58ad43a29efcf8b9cfc63b29ea26d 100644 (file)
--- a/wcfsetup/install/files/js/WCF.Poll.js
+++ b/wcfsetup/install/files/js/WCF.Poll.js
@@ -277,7 +277,7 @@ WCF.Poll.Manager = Class.extend({
                this._polls = { };
                this._proxy = new WCF.Action.Proxy({
                        success: $.proxy(this._success, this),
-                       url: 'index.php/Poll/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php/Poll/?t=' + SECURITY_TOKEN
                });
                
                // init polls

diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index d4ee88c007affc15e52f4c725a73071d2dfe48f4..e5fb377b245d56d2f53be892da9a78b2a90b5b3e 100755 (executable)
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -1476,7 +1476,7 @@ WCF.Action.Proxy = Class.extend({
                        success: null,
                        suppressErrors: false,
                        type: 'POST',
-                       url: 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN + SID_ARG_2ND,
+                       url: 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN
                        aborted: null,
                        autoAbortPrevious: false
                }, options);
@@ -6223,7 +6223,7 @@ WCF.Upload = Class.extend({
                this._options = $.extend(true, {
                        action: 'upload',
                        multiple: false,
-                       url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN
                }, options || { });
                
                this._options.url = WCF.convertLegacyURL(this._options.url);

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Ajax.js b/wcfsetup/install/files/js/WoltLab/WCF/Ajax.js
index be699f5561cf1675b638f453ff64380cf2270571..e0c07e7d0fe613987bc3304bf28d01e0dfffcaac 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/Ajax.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Ajax.js
@@ -39,7 +39,7 @@ define(['AjaxRequest', 'Core', 'ObjectMap'], function(AjaxRequest, Core, ObjectM
                                options.pinData = true;
                                options.callbackObject = callbackObject;
                                
-                               if (!options.url) options.url = 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN + SID_ARG_2ND;
+                               if (!options.url) options.url = 'index.php/AJAXProxy/?t=' + SECURITY_TOKEN
                                
                                request = new AjaxRequest(options);
                                

diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Upload.js b/wcfsetup/install/files/js/WoltLab/WCF/Upload.js
index 2ae6fe9feb0f6ea9a2608c67353d44e2809e00d9..a7bc7f36b675638a7ca508f405dd770eee8f7d33 100644 (file)
--- a/wcfsetup/install/files/js/WoltLab/WCF/Upload.js
+++ b/wcfsetup/install/files/js/WoltLab/WCF/Upload.js
@@ -30,7 +30,7 @@ define(['AjaxRequest', 'Core', 'Dom/ChangeListener', 'Language', 'Dom/Util', 'Do
                        // is true if every file from a multi-file selection is uploaded in its own request
                        singleFileRequests: false,
                        // url for uploading file
-                       url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN + SID_ARG_2ND
+                       url: 'index.php/AJAXUpload/?t=' + SECURITY_TOKEN
                }, options);
                
                this._options.url = WCF.convertLegacyURL(this._options.url);

diff --git a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
index 3cd431d381a49a1fe93f2b5326efbd2fbe8e4b85..02e79e386c921e3470e1f38ca8d7c1a6bc1e5d27 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/InstallPackageAction.class.php
@@ -119,7 +119,7 @@ class InstallPackageAction extends AbstractDialogAction {
                                $application = $statement->fetchObject('wcf\data\application\Application');
                                
                                // build redirect location
-                               $location = $application->getPageURL() . 'acp/index.php?package-list/' . SID_ARG_2ND_NOT_ENCODED;
+                               $location = $application->getPageURL() . 'acp/index.php?package-list/';
                                
                                WCF::resetZendOpcache();
                                

diff --git a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
index 5f7b4c9141805b681b9c3eb6ef8f2364fe21a0d0..7993a3f8c9aac3f2e2160e5611c9eac1d41f0779 100644 (file)
--- a/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
+++ b/wcfsetup/install/files/lib/acp/action/UninstallPackageAction.class.php
@@ -135,7 +135,7 @@ class UninstallPackageAction extends InstallPackageAction {
                        $application = $statement->fetchObject('wcf\data\application\Application');
                        
                        // build redirect location
-                       $location = $application->getPageURL() . 'acp/index.php?package-list/' . SID_ARG_2ND_NOT_ENCODED;
+                       $location = $application->getPageURL() . 'acp/index.php?package-list/';
                        
                        // show success
                        $this->data = array(

diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
index 890e194052e6dab9c39332b983c920b34703da3a..abd3d3596f6fa7c2806056323b3b894eaf4d0b86 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php
@@ -202,18 +202,15 @@ class LoginForm extends AbstractCaptchaForm {
                $this->saved();
                
                if (!empty($this->url)) {
-                       // append session
-                       if (mb_strpos($this->url, '?') !== false) $this->url .= SID_ARG_2ND_NOT_ENCODED;
-                       else $this->url .= SID_ARG_1ST;
                        HeaderUtil::redirect($this->url);
                }
                else {
                        if (RequestHandler::getInstance()->inRescueMode()) {
-                               $path = RouteHandler::getHost() . RouteHandler::getPath() . SID_ARG_1ST;
+                               $path = RouteHandler::getHost() . RouteHandler::getPath();
                        }
                        else {
                                $application = ApplicationHandler::getInstance()->getActiveApplication();
-                               $path = $application->getPageURL() . 'acp/' . SID_ARG_1ST;
+                               $path = $application->getPageURL() . 'acp/';
                        }
                        
                        HeaderUtil::redirect($path);

diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php
index 810b2bb45b44349315e56faf53119c6d0859814b..2f4caa95c0add1494d2db6be60f19cf1c38a367a 100644 (file)
--- a/wcfsetup/install/files/lib/form/LoginForm.class.php
+++ b/wcfsetup/install/files/lib/form/LoginForm.class.php
@@ -97,11 +97,6 @@ class LoginForm extends \wcf\acp\form\LoginForm {
                if (empty($this->url) || mb_stripos($this->url, '?Login/') !== false) {
                        $this->url = LinkHandler::getInstance()->getLink();
                }
-               // append missing session id
-               else if (SID_ARG_1ST != '' && !preg_match('/(?:&|\?)s=[a-z0-9]{40}/', $this->url)) {
-                       if (mb_strpos($this->url, '?') !== false) $this->url .= SID_ARG_2ND_NOT_ENCODED;
-                       else $this->url .= SID_ARG_1ST;
-               }
                
                // drop index.php
                if (!URL_LEGACY_MODE) {

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 7436fb4386f5e499300b93b480894776045e8f41..38242873d15d8e236f997e154a982f10fcf40250 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -153,7 +153,7 @@ class WCFACP extends WCF {
                                // drop session id
                                $redirectURI = preg_replace('~[&\?]s=[a-f0-9]{40}(&|$)~', '', WCF::getSession()->requestURI);
                                
-                               $path = $application->getPageURL() . 'acp/index.php?login/' . SID_ARG_2ND_NOT_ENCODED . '&url=' . rawurlencode(RouteHandler::getProtocol() . $_SERVER['HTTP_HOST'] . $redirectURI);
+                               $path = $application->getPageURL() . 'acp/index.php?login/&url=' . rawurlencode(RouteHandler::getProtocol() . $_SERVER['HTTP_HOST'] . $redirectURI);
                                
                                HeaderUtil::redirect($path);
                                exit;

diff --git a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php
index 65c6813929aaca4b33bb06d70dc38c3b61a225fc..9c34b866bcfa66f1e4cf1e3560d68f1c6bc2b881 100644 (file)
--- a/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php
+++ b/wcfsetup/install/files/lib/system/breadcrumb/Breadcrumb.class.php
@@ -45,23 +45,13 @@ class Breadcrumb {
        }
        
        /**
-        * Sets the target url, by default appends appropriate session id.
+        * Sets the target url.
         * May be left empty to disable url functionality.
         * 
         * @param       string          $url
-        * @param       boolean         $appendSession
+        * @param       boolean         $appendSession  This parameter is unused as of WCF 2.2
         */
        public function setURL($url, $appendSession = false) {
-               // append session id
-               if ($appendSession) {
-                       if (mb_strpos($url, '?') === false) {
-                               $url .= SID_ARG_1ST;
-                       }
-                       else {
-                               $url .= SID_ARG_2ND_NOT_ENCODED;
-                       }
-               }
-               
                $this->url = $url;
        }
        

diff --git a/wcfsetup/setup/template/stepInstallPackages.tpl b/wcfsetup/setup/template/stepInstallPackages.tpl
index 59d0bb4cf1695e352f24820804b5d55016a7cdf3..33021807a750cfdf49f8d9a89baa1028601492a1 100644 (file)
--- a/wcfsetup/setup/template/stepInstallPackages.tpl
+++ b/wcfsetup/setup/template/stepInstallPackages.tpl
@@ -8,7 +8,6 @@
 
 <form method="get" action="{@RELATIVE_WCF_DIR}acp/index.php">
        <div class="formSubmit">
-               {@SID_INPUT_TAG}
                <input type="hidden" name="action" value="WCFSetup" />
        </div>
 </form>