[Fmsystem-commits] [14958] activitycalendar: prepare for php 7

[Sigurd Nes]

Revision: 14958
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14958
Author:   sigurdne
Date:     2016-04-30 21:08:24 +0000 (Sat, 30 Apr 2016)
Log Message:
-----------
activitycalendar: prepare for php 7

Modified Paths:
--------------
    trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
    trunk/activitycalendarfrontend/index.php

Modified: trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php
===================================================================
--- trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2016-04-30 
15:24:22 UTC (rev 14957)
+++ trunk/activitycalendarfrontend/inc/class.uiactivity.inc.php 2016-04-30 
21:08:24 UTC (rev 14958)
@@ -76,8 +76,8 @@
                        $offices = $this->so_activity->select_district_list();
                        $districts = $this->so_activity->get_districts();
                        $buildings = $this->so_arena->get_buildings();
-                       $arenas = $this->so_arena->get(null, null, 
'arena.arena_name', true, null, null, null);
-                       $organizations = $this->so_organization->get(null, 
null, 'org.name', true, null, null, null);
+                       $arenas = $this->so_arena->get(0, 0, 
'arena.arena_name', true, '', '', array());
+                       $organizations = $this->so_organization->get(0, 0, 
'org.name', true, '', '', array());
 
                        $activity = new activitycalendar_activity();
 
@@ -187,7 +187,7 @@
                                {
                                        $new_org = false;
                                        $organization = 
$this->so_organization->get_single($o_id);
-                                       $person_arr = 
$this->so_contact->get(null, null, null, null, null, null, array(
+                                       $person_arr = $this->so_contact->get(0, 
0, '', false, '', '', array(
                                                'organization_id' => $o_id));
                                        foreach ($person_arr as $p)
                                        {

Modified: trunk/activitycalendarfrontend/index.php
===================================================================
--- trunk/activitycalendarfrontend/index.php    2016-04-30 15:24:22 UTC (rev 
14957)
+++ trunk/activitycalendarfrontend/index.php    2016-04-30 21:08:24 UTC (rev 
14958)
@@ -78,7 +78,7 @@
        /*       * ******* Optional classes, which can be disabled for 
performance increases ******** */
        while ($phpgw_class_name = each($GLOBALS['phpgw_info']['flags']))
        {
-               if (ereg('enable_', $phpgw_class_name[0]))
+               if (preg_match('/enable_/', $phpgw_class_name[0]))
                {
                        $enable_class = str_replace('enable_', '', 
$phpgw_class_name[0]);
                        $enable_class = str_replace('_class', '', 
$enable_class);