[debian-edu-commits] debian-edu/slbackup-php.git (#13) - edu-wheezy (branch) updated: debian/0.3-2.2-12-gaa4335d

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  aa4335d7000facc21179f428f0acfd4f6f6b6871 (commit)
      from  399e8e1f07db0356581fa99d6b58b947d2cb01cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/patches/001_slbackup-php_cookie+request-merge.patch |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
index 1d374b4..2592c49 100644
--- a/debian/patches/001_slbackup-php_cookie+request-merge.patch
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -8,8 +8,8 @@ Description: Fix returning to the login page on every click
  next (wheezy) release.
 Forwarded: not-needed
 Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/src/index.php	2012-01-15 12:53:18.000000000 +0100
-+++ b/src/index.php	2012-01-15 14:36:19.000000000 +0100
+--- a/src/index.php
++++ b/src/index.php
 @@ -570,21 +570,33 @@
  loadConfig () ;
  require('/usr/share/php/smarty/libs/Smarty.class.php') ; 
@@ -34,9 +34,9 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 +$allowed_cookie_keys = array('nonhttps', 'xorstring', 'PHPSESSID');
 +foreach ($_COOKIE as $key => $value) {
 +    if ((! array_key_exists($key, $arguments)) && (in_array($key, $allowed_cookie_keys))) {
-+if (is_string($key) && is_string($value)) {
-+$arguments[$key] = $value;
-+}
++	if (is_string($key) && is_string($value)) {
++	    $arguments[$key] = $value;
++	}
 +    }
 +}
  
@@ -55,4 +55,3 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  if ($submit == "logout") {
      unset ($passwd) ; 
      unset ($xorstring) ; 
-


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).