Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-06-12 16:04:28 +0400
committervipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105>2009-06-12 16:04:28 +0400
commit5e86fe0d261d8d3162f0b574819ecf697a7ab8cb (patch)
tree45be2755840731e58bea13fa2d22d6dbf5131429 /plugins/Login
parent26e5c171f43e0143537142cb2a9df827c6cbeb99 (diff)
Fixes #786; versions of IIS before IIS6 fail with method POST and URI
without a script name (i.e., index.php); for consistency, always include the script name in links (GET, POST, and Location: redirects) http://support.microsoft.com/kb/216493
Diffstat (limited to 'plugins/Login')
-rw-r--r--plugins/Login/Form.php2
-rw-r--r--plugins/Login/templates/login.tpl2
-rw-r--r--plugins/Login/templates/lostPassword.tpl2
-rw-r--r--plugins/Login/templates/passwordsent.tpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Login/Form.php b/plugins/Login/Form.php
index 3ae0096ffb..5d6d278975 100644
--- a/plugins/Login/Form.php
+++ b/plugins/Login/Form.php
@@ -27,7 +27,7 @@ class Piwik_Login_Form extends Piwik_Form
function init()
{
// if form_url is not defined go to current url
- $currentUrl = Piwik_Url::getCurrentQueryString();
+ $currentUrl = 'index.php' . Piwik_Url::getCurrentQueryString();
$urlToGoAfter = Piwik_Common::getRequestVar('form_url', $currentUrl, 'string');
// if the current url to redirect contains module=login we insteaed redirect to the referer url
diff --git a/plugins/Login/templates/login.tpl b/plugins/Login/templates/login.tpl
index 3ec3f76e2c..c9d34eba14 100644
--- a/plugins/Login/templates/login.tpl
+++ b/plugins/Login/templates/login.tpl
@@ -35,7 +35,7 @@
<p id="nav">
-<a href="?module=Login&amp;action=lostPassword&amp;form_url={$urlToRedirect|escape:url}" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a>
+<a href="index.php?module=Login&amp;action=lostPassword&amp;form_url={$urlToRedirect|escape:url}" title="{'Login_LostYourPassword'|translate}">{'Login_LostYourPassword'|translate}</a>
</p>
</div>
diff --git a/plugins/Login/templates/lostPassword.tpl b/plugins/Login/templates/lostPassword.tpl
index 3da5ebdec2..b2b33de590 100644
--- a/plugins/Login/templates/lostPassword.tpl
+++ b/plugins/Login/templates/lostPassword.tpl
@@ -32,7 +32,7 @@
<p id="nav">
-<a href="?module=Login&amp;form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
+<a href="index.php?module=Login&amp;form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
</p>
</div>
diff --git a/plugins/Login/templates/passwordsent.tpl b/plugins/Login/templates/passwordsent.tpl
index b45f928f0d..f5921ae969 100644
--- a/plugins/Login/templates/passwordsent.tpl
+++ b/plugins/Login/templates/passwordsent.tpl
@@ -13,7 +13,7 @@
{/if}
<p id="nav">
-<a href="?module=Login&amp;form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
+<a href="index.php?module=Login&amp;form_url={$urlToRedirect}" title="{'Login_LogIn'|translate}">{'Login_LogIn'|translate}</a>
</p>
</div>