appdb/ ./account.php include/util.php

[WineHQ]

ChangeSet ID:	31217
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	[e-mail]	2007/06/17 11:59:42

Modified files:
    .              : account.php 
    include        : util.php

Log message:
    Alexander Nicolaysen Sørnes 
    Encode the sReturnTo argument to the login page, otherwise we may have problems with some urls

Patch: http://cvs.winehq.org/patch.py?id=31217

Old revision  New revision  Changes     Path
 1.36          1.37          +1 -1       appdb/account.php
 1.93          1.94          +1 -1       appdb/include/util.php

Index: appdb/account.php
diff -u -p appdb/account.php:1.36 appdb/account.php:1.37
--- appdb/account.php:1.36	17 Jun 2007 16:59:42 -0000
+++ appdb/account.php	17 Jun 2007 16:59:42 -0000
@@ -209,7 +209,7 @@ function cmd_do_login()

if($iResult == SUCCESS)
     {
-        $sReturnUrl = $aClean['sReturnTo'];
+        $sReturnUrl = urldecode($aClean['sReturnTo']);
         if(!$sReturnUrl)
             $sReturnUrl = apidb_fullurl("index.php");
         addmsg("You are successfully logged in as '$oUser->sRealname'.", "green");
Index: appdb/include/util.php
diff -u -p appdb/include/util.php:1.93 appdb/include/util.php:1.94
--- appdb/include/util.php:1.93	17 Jun 2007 16:59:42 -0000
+++ appdb/include/util.php	17 Jun 2007 16:59:42 -0000
@@ -907,7 +907,7 @@ function util_trim_description($sDescrip
    to the current page once he has logged in */
 function login_url()
 {
-    $sCurrentUrl = $_SERVER['REQUEST_URI'];
+    $sCurrentUrl = urlencode($_SERVER['REQUEST_URI']);
     $sLoginUrl = BASE."account.php?sCmd=login";

/* If we are on the login page that means the URL already contains an sReturnTo value,