[Fmsystem-commits] [17465] prepare for php 7.2

[sigurdne]

Revision: 17465
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17465
Author:   sigurdne
Date:     2017-12-24 07:58:44 -0500 (Sun, 24 Dec 2017)
Log Message:
-----------
prepare for php 7.2

Modified Paths:
--------------
    trunk/phpgwapi/inc/functions.inc.php

Modified: trunk/phpgwapi/inc/functions.inc.php
===================================================================
--- trunk/phpgwapi/inc/functions.inc.php        2017-12-24 11:38:07 UTC (rev 
17464)
+++ trunk/phpgwapi/inc/functions.inc.php        2017-12-24 12:58:44 UTC (rev 
17465)
@@ -533,8 +533,10 @@
                exit;
        }
        reset($GLOBALS['phpgw_domain']);
-       list($GLOBALS['phpgw_info']['server']['default_domain']) = 
each($GLOBALS['phpgw_domain']);
 
+       $_phpgw_domains = array_keys($GLOBALS['phpgw_domain']);
+       $GLOBALS['phpgw_info']['server']['default_domain'] = $_phpgw_domains[0];
+
        if (isset($_POST['login']))     // on login
        {
                $GLOBALS['login'] = $_POST['login'];
@@ -913,17 +915,20 @@
                $GLOBALS['phpgw']->preferences->verify_basic_settings();
 
                /********* Optional classes, which can be disabled for 
performance increases *********/
-               while ($phpgw_class_name = 
each($GLOBALS['phpgw_info']['flags']))
+               if(is_array($GLOBALS['phpgw_info']['flags']))
                {
-                       if (preg_match('/enable_/', $phpgw_class_name[0]))
+                       foreach ($GLOBALS['phpgw_info']['flags'] as 
$phpgw_class_name => $dummy)
                        {
-                               $enable_class = str_replace('enable_', '', 
$phpgw_class_name[0]);
-                               $enable_class = str_replace('_class', '', 
$enable_class);
-                               $GLOBALS['phpgw']->$enable_class = 
createObject("phpgwapi.{$enable_class}");
+                               if (preg_match('/enable_/', $phpgw_class_name))
+                               {
+                                       $enable_class = str_replace('enable_', 
'', $phpgw_class_name);
+                                       $enable_class = str_replace('_class', 
'', $enable_class);
+                                       $GLOBALS['phpgw']->$enable_class = 
createObject("phpgwapi.{$enable_class}");
+                               }                               
                        }
+                       unset($enable_class);
+                       reset($GLOBALS['phpgw_info']['flags']);
                }
-               unset($enable_class);
-               reset($GLOBALS['phpgw_info']['flags']);
 
                
/*************************************************************************\
                * These lines load up the templates class                       
          *