Try to get rid of "Invalid argument supplied for foreach()" from Gollem.

For one, we have been using an invalid flag for $session->get(). Make sure it returns an array. Besides that, store the passwords array in the session, even if empty. Bug: 14523
horde · Jan 13, 2017 · 35ddcfa · 35ddcfa
1 parent cc9d6db
commit 35ddcfa
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/gollem/lib/Auth.php b/gollem/lib/Auth.php
@@ -332,12 +332,10 @@ protected static function _getBackends()
     {
         global $session;
 
-        if ($backends = $session->get('gollem', 'backends', $session::TYPE_ARRAY)) {
-            $passwords = $session->get('gollem', 'backends_password', $session::ENCRYPT);
-            if ($passwords) {
-                foreach ($passwords as $key => $val) {
-                    $backends[$key]['params']['password'] = $val;
-                }
+        if (($backends = $session->get('gollem', 'backends', $session::TYPE_ARRAY)) &&
+            ($passwords = $session->get('gollem', 'backends_password', $session::TYPE_ARRAY))) {
+            foreach ($passwords as $key => $val) {
+                $backends[$key]['params']['password'] = $val;
             }
         }
 
@@ -362,9 +360,7 @@ protected static function _setBackends($backends)
         }
 
         $session->set('gollem', 'backends', $backends);
-        if (!empty($passwords)) {
-            $session->set('gollem', 'backends_password', $passwords, $session::ENCRYPT);
-        }
+        $session->set('gollem', 'backends_password', $passwords, $session::ENCRYPT);
     }
 
 }