Changeset 8230 for sandbox/2.5.1-evolucao

Timestamp:

10/04/13 17:45:37 (11 years ago)

Author:

angelo

Message:

Ticket #3491 - Compatibilizar Expresso com novas versoes do PHP

Location:

sandbox/2.5.1-evolucao

Files:

• contactcenter/inc/class.so_contact.inc.php (modified) (4 diffs)
• prototype/api/config.php (modified) (1 diff)
• prototype/services/ImapServiceAdapter.php (modified) (5 diffs)

sandbox/2.5.1-evolucao/contactcenter/inc/class.so_contact.inc.php

@@ -984 +984 @@
                         }
                         
-                        array_push($this->relations['id_contact']['values'], & $this->id);
+                        array_push($this->relations['id_contact']['values'], $this->id);
                         array_push($this->relations['id_related']['values'], $id_related);
                         array_push($this->relations['id_typeof_contact_relation']['values'], $id_type);
@@ -1041 +1041 @@
                         }
                         
-                        array_push($this->addresses['id_contact']['values'], & $this->id);
+                        array_push($this->addresses['id_contact']['values'], $this->id);
                         array_push($this->addresses['id_address']['values'], $id_address);
                         array_push($this->addresses['id_typeof_contact_address']['values'], $id_type);
@@ -1070 +1070 @@
                         }
                         
-                        array_push($this->connections['id_contact']['values'], & $this->id);
+                        array_push($this->connections['id_contact']['values'], $this->id);
                         array_push($this->connections['id_connection']['values'], $id_connection);
                         array_push($this->connections['id_typeof_contact_connection']['values'], $id_type);
@@ -1106 +1106 @@
                                 }
                                 
-                                array_push($this->companies['id_contact']['values'], & $this->id);
+                                array_push($this->companies['id_contact']['values'], $this->id);
                                 array_push($this->companies['id_company']['values'], $company_info['id_company']);
                                 array_push($this->companies['title']['values'], $company_info['title']);

sandbox/2.5.1-evolucao/prototype/api/config.php

@@ -60 +60 @@
                 if ( isset( $_COOKIE[ 'sessionid' ] ) ) 
                 {
-                                session_id( $_COOKIE[ 'sessionid' ] ); 
-                                $GLOBALS['phpgw']->session->sessionid = $_COOKIE[ 'sessionid' ];
+                                session_id( $_COOKIE[ 'sessionid' ] );
+                                if ( isset($GLOBALS['phpgw']) && !is_null($GLOBALS['phpgw']->session) )
+                                        $GLOBALS['phpgw']->session->sessionid = $_COOKIE[ 'sessionid' ];
                 }
                 

sandbox/2.5.1-evolucao/prototype/services/ImapServiceAdapter.php

@@ -136 +136 @@
                                                 );
                                                 
-                                                self::parseFilter($criteria["filter"], &$map);
+                                                self::parseFilter($criteria["filter"], $map);
                                                 
                                                 if (count($map['folderName']) == 0) {
@@ -282 +282 @@
                                         );
                                         
-                                        self::parseFilter($criteria["filter"], &$map);
+                                        self::parseFilter($criteria["filter"], $map);
                                         
                                         if (count($map['folderName']) == 0) {
@@ -328 +328 @@
                                 );
                                 
-                                self::parseFilter($criteria["filter"], &$map);
+                                self::parseFilter($criteria["filter"], $map);
         
                                 if (empty($map['folderName'])) {
@@ -729 +729 @@
                                 );
                                 
-                                self::parseFilter($criteria["filter"], &$map);
+                                self::parseFilter($criteria["filter"], $map);
                                 
                                 if (!$map['folderName']) {
@@ -879 +879 @@
                         case 'and': {
                                 foreach ($filter as $term)
-                                        self::parseFilter($term ,&$map);
+                                        self::parseFilter($term ,$map);
                                 return;
                         }