[debian-edu-commits] debian-edu/slbackup-php.git (#2) - edu-wheezy (branch) updated: debian/0.3-2.2-1-gd43efc7

[Mike Gabriel]

The branch, edu-wheezy has been updated
       via  d43efc72d662da0af31c558e300a339a035656b8 (commit)
      from  3bb5bbd72a471dc6f298555b10bb1d1416e0d7c7 (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/changelog                                   |    8 +++++
 .../001_slbackup-php_cookie+request-merge.patch    |   31 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 40 insertions(+)
 create mode 100644 debian/patches/001_slbackup-php_cookie+request-merge.patch
 create mode 100644 debian/patches/series

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5ca7731..69fd4ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+slbackup-php (0.3-2.3) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Add patch: 001_slbackup-php_cookie+request-merge.patch. Fix reappearing
+    login page on every click.
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 15 Jan 2012 13:40:20 +0100
+
 slbackup-php (0.3-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/001_slbackup-php_cookie+request-merge.patch b/debian/patches/001_slbackup-php_cookie+request-merge.patch
new file mode 100644
index 0000000..cce246a
--- /dev/null
+++ b/debian/patches/001_slbackup-php_cookie+request-merge.patch
@@ -0,0 +1,31 @@
+root at tjener:/usr/share/slbackup-php/web# diff -u index.php index.php.fixed
+--- a/src/index.php	2007-04-25 10:15:47.000000000 +0200
++++ b/src/index.php	2012-01-15 12:28:24.000000000 +0100
+@@ -582,9 +582,17 @@
+ $ssh_askpass = sprintf ("%s/script/mypass.sh", 
+                         dirname (dirname ($_SERVER["SCRIPT_FILENAME"])));
+ 
++$arguments = $_REQUEST;
++
++# merge _COOKIE and _REQUEST
++foreach ($_COOKIE as $key => $value) {
++    if (! array_key_exists($key, $arguments)) {
++	$arguments[$key] = $value;
++    }
++}
+ 
+ # Fetch arguments passed as the script is executed
+-foreach ($_REQUEST as $key => $value) {
++foreach ($arguments as $key => $value) {
+     switch ($key) {
+         case "smarty_templ": 
+         case "smarty_compile": 
+@@ -640,6 +648,8 @@
+     }
+ }
+ 
++unset ($arguments);
++
+ if ($submit == "logout") {
+     unset ($passwd) ; 
+     unset ($xorstring) ; 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5e2069d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+001_slbackup-php_cookie+request-merge.patch


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).