[Fmsystem-commits] [16494] preparing for php7.1

[sigurdne]

Revision: 16494
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16494
Author:   sigurdne
Date:     2017-03-30 03:36:55 -0400 (Thu, 30 Mar 2017)
Log Message:
-----------
preparing for php7.1

Modified Paths:
--------------
    trunk/booking/inc/class.socommon.inc.php
    trunk/phpgwapi/inc/class.socommon.inc.php
    trunk/setup/manageheader.php

Modified: trunk/booking/inc/class.socommon.inc.php
===================================================================
--- trunk/booking/inc/class.socommon.inc.php    2017-03-29 13:43:57 UTC (rev 
16493)
+++ trunk/booking/inc/class.socommon.inc.php    2017-03-30 07:36:55 UTC (rev 
16494)
@@ -576,6 +576,7 @@
                                                        while 
($this->db->next_record())
                                                        {
                                                                $id = 
$this->_unmarshal($this->db->f($key, false), 'int');
+                                                               
$results[$id_map[$id]][$field] = array();
                                                                $data = array();
                                                                foreach 
($params['manytomany']['column'] as $intOrCol => $paramsOrCol)
                                                                {
@@ -604,6 +605,7 @@
                                                        while 
($this->db->next_record())
                                                        {
                                                                $id = 
$this->_unmarshal($this->db->f($key, false), 'int');
+                                                               
$results[$id_map[$id]][$field] = array();
                                                                
$results[$id_map[$id]][$field][] = $this->_unmarshal($this->db->f($column, 
false), $params['type']);
                                                        }
                                                }

Modified: trunk/phpgwapi/inc/class.socommon.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.socommon.inc.php   2017-03-29 13:43:57 UTC (rev 
16493)
+++ trunk/phpgwapi/inc/class.socommon.inc.php   2017-03-30 07:36:55 UTC (rev 
16494)
@@ -332,6 +332,7 @@
                                                        while 
($this->db->next_record())
                                                        {
                                                                $id = 
$this->unmarshal($this->db->f($key, false), 'int');
+                                                               
$results[$id_map[$id]][$field] = array();
                                                                
$results[$id_map[$id]][$field][] = $this->unmarshal($this->db->f($column, 
false), $params['type']);
                                                        }
                                                }

Modified: trunk/setup/manageheader.php
===================================================================
--- trunk/setup/manageheader.php        2017-03-29 13:43:57 UTC (rev 16493)
+++ trunk/setup/manageheader.php        2017-03-30 07:36:55 UTC (rev 16494)
@@ -372,6 +372,15 @@
                                $detected .= '<li class="warn">' . lang('you 
need ZipArchive for Excel-support') . "</li>\n";
                        }
 
+                       if(class_exists('SoapClient'))
+                       {
+                               $detected .= '<li>' . lang('You appear to have 
Soap support enabled') . "</li>\n";
+                       }
+                       else
+                       {
+                               $detected .= '<li class="warn">' . lang('you 
may need Soap support for integration with other systems') . "</li>\n";
+                       }
+
                        /* Not currently supported
                        if (extension_loaded('odbc') || 
function_exists('odbc_connect'))
                        {