phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] phpgwapi/inc class.http.inc.php, 1.8 class.soap_parse


From: powerstat
Subject: [Phpgroupware-cvs] phpgwapi/inc class.http.inc.php, 1.8 class.soap_parser.inc.php, 1.9 class.net_http_client.inc.php, 1.5 class.vfs_dav.inc.php, 1.7 class.wsdl.inc.php, 1.6 class.xml.inc.php, 1.4 class.xmlrpc_client.inc.php, 1.11 class.historylog.inc.php, 1.13 class.soap_client.inc.php, 1.9
Date: Wed, 4 May 2005 15:05:00 +0200

Update of phpgwapi/inc

Modified Files:
     Branch: MAIN
            class.http.inc.php lines: +3 -3
            class.soap_parser.inc.php lines: +2 -2
            class.net_http_client.inc.php lines: +1 -1
            class.vfs_dav.inc.php lines: +4 -4
            class.wsdl.inc.php lines: +2 -2
            class.xml.inc.php lines: +6 -6
            class.xmlrpc_client.inc.php lines: +3 -3
            class.historylog.inc.php lines: +2 -2
            class.soap_client.inc.php lines: +3 -3

Log Message:
Fixes deprecated (since 2003) call by reference functions calls. All function 
declarations were already correct.

====================================================
Index: phpgwapi/inc/class.http.inc.php
diff -u phpgwapi/inc/class.http.inc.php:1.7 phpgwapi/inc/class.http.inc.php:1.8
--- phpgwapi/inc/class.http.inc.php:1.7 Thu Dec 30 06:47:30 2004
+++ phpgwapi/inc/class.http.inc.php     Wed May  4 13:05:20 2005
@@ -132,7 +132,7 @@
                        {
                                $this->OutputDebug("Connecting to 
$host_name...");
                        }
-                       
if(($this->connection=fsockopen($host_name,$host_port,&$error))==0)
+                       
if(($this->connection=fsockopen($host_name,$host_port,$error))==0)
                        {
                                switch($error)
                                {
@@ -504,7 +504,7 @@
                                case 'Connected':
                                        return('2 request was not sent');
                                case 'RequestSent':
-                                       if(($error = 
$this->ReadReplyHeaders(&$headers)) != '')
+                                       if(($error = 
$this->ReadReplyHeaders($headers)) != '')
                                        {
                                                return($error);
                                        }

====================================================
Index: phpgwapi/inc/class.soap_parser.inc.php
diff -u phpgwapi/inc/class.soap_parser.inc.php:1.8 
phpgwapi/inc/class.soap_parser.inc.php:1.9
--- phpgwapi/inc/class.soap_parser.inc.php:1.8  Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.soap_parser.inc.php      Wed May  4 13:05:20 2005
@@ -63,7 +63,7 @@
                                //xml_parser_set_option($parser, 
XML_OPTION_SKIP_WHITE, 1);
                                xml_parser_set_option($this->parser, 
XML_OPTION_CASE_FOLDING, 0);
                                // Set the object for the parser.
-                               xml_set_object($this->parser, &$this);
+                               xml_set_object($this->parser, $this);
                                // Set the element handlers for the parser.
                                xml_set_element_handler($this->parser, 
'start_element','end_element');
                                
xml_set_character_data_handler($this->parser,'character_data');

====================================================
Index: phpgwapi/inc/class.net_http_client.inc.php
diff -u phpgwapi/inc/class.net_http_client.inc.php:1.4 
phpgwapi/inc/class.net_http_client.inc.php:1.5
--- phpgwapi/inc/class.net_http_client.inc.php:1.4      Thu Dec 30 09:00:31 2004
+++ phpgwapi/inc/class.net_http_client.inc.php  Wed May  4 13:05:20 2005
@@ -641,7 +641,7 @@
                                        }
                                }
                                if( $port == "" )  $port = 80;
-                               $this->socket = fsockopen( $host, $port, 
&$this->reply, &$this->replyString );
+                               $this->socket = fsockopen( $host, $port, 
$this->reply, $this->replyString );
                                if( $this->debug & DBGSOCK ) echo "connexion( 
$host, $port) - $this->socket\n";
                                if( ! $this->socket ) {
                                        if( $this->debug & DBGSOCK ) echo 
"FAILED : $this->replyString ($this->reply)\n";

====================================================
Index: phpgwapi/inc/class.vfs_dav.inc.php
diff -u phpgwapi/inc/class.vfs_dav.inc.php:1.6 
phpgwapi/inc/class.vfs_dav.inc.php:1.7
--- phpgwapi/inc/class.vfs_dav.inc.php:1.6      Sun Apr  3 18:49:19 2005
+++ phpgwapi/inc/class.vfs_dav.inc.php  Wed May  4 13:05:20 2005
@@ -1584,19 +1584,19 @@
                        }
                        if ($id=$data['attributes']['owner_id'])
                        {
-                               
$GLOBALS['phpgw']->accounts->get_account_name($id,&$lid,&$fname,&$lname);
+                               
$GLOBALS['phpgw']->accounts->get_account_name($id,$lid,$fname,$lname);
                                $dav_properties['dc:publisher'] = $fname .' '. 
$lname;
                                $dav_properties['publisher_id'] = $id;
                        }
                        if ($id=$data['attributes']['createdby_id'])
                        {
-                               
$GLOBALS['phpgw']->accounts->get_account_name($id,&$lid,&$fname,&$lname);
+                               
$GLOBALS['phpgw']->accounts->get_account_name($id,$lid,$fname,$lname);
                                $dav_properties['dc:creator'] = $fname .' '. 
$lname;
                                $dav_properties['creator_id'] = $id;
                        }
                        if ($id=$data['attributes']['modifiedby_id'])
                        {
-                               
$GLOBALS['phpgw']->accounts->get_account_name($id,&$lid,&$fname,&$lname);
+                               
$GLOBALS['phpgw']->accounts->get_account_name($id,$lid,$fname,$lname);
                                $dav_properties['dc:contributor'] = $fname .' 
'. $lname;
                                $dav_properties['contributor_id'] = $id;
                        }

====================================================
Index: phpgwapi/inc/class.wsdl.inc.php
diff -u phpgwapi/inc/class.wsdl.inc.php:1.5 phpgwapi/inc/class.wsdl.inc.php:1.6
--- phpgwapi/inc/class.wsdl.inc.php:1.5 Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.wsdl.inc.php     Wed May  4 13:05:20 2005
@@ -62,7 +62,7 @@
                                //xml_parser_set_option($parser, 
XML_OPTION_SKIP_WHITE, 1);
                                xml_parser_set_option($this->parser, 
XML_OPTION_CASE_FOLDING, 0);
                                // Set the object for the parser.
-                               xml_set_object($this->parser, &$this);
+                               xml_set_object($this->parser, $this);
                                // Set the element handlers for the parser.
                                xml_set_element_handler($this->parser, 
'start_element','end_element');
                                
xml_set_character_data_handler($this->parser,'character_data');

====================================================
Index: phpgwapi/inc/class.xml.inc.php
diff -u phpgwapi/inc/class.xml.inc.php:1.3 phpgwapi/inc/class.xml.inc.php:1.4
--- phpgwapi/inc/class.xml.inc.php:1.3  Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.xml.inc.php      Wed May  4 13:05:20 2005
@@ -197,7 +197,7 @@
                 xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);

                 // Set the object for the parser.
-                xml_set_object($parser, &$this);
+                xml_set_object($parser, $this);

                 // Set the element handlers for the parser.
                 xml_set_element_handler($parser, "handle_start_element",
@@ -1315,7 +1315,7 @@
                 $method = "handle_axis_".str_replace("-", "_", $axis["axis"]);

                 // Check whether the axis handler is defined.
-                if ( !method_exists(&$this, $method) )
+                if ( !method_exists($this, $method) )
                 {
                     // Display an error message.
                     $this->display_error("While parsing an XPath expression, ".
@@ -1324,7 +1324,7 @@
                 }

                 // Perform an axis action.
-                $contexts = call_user_method($method, &$this, $axis, $context);
+                $contexts = call_user_method($method, $this, $axis, $context);

                 // Check whether there are predicates.
                 if ( count($axis["predicate"]) > 0 )
@@ -1380,7 +1380,7 @@
         $method = "handle_function_".str_replace("-", "_", $function);

         // Check whether the function handling function is available.
-        if ( !method_exists(&$this, $method) )
+        if ( !method_exists($this, $method) )
         {
             // Display an error message.
             $this->display_error("While parsing an XPath expression, ".
@@ -1389,7 +1389,7 @@
         }

         // Return the result of the function.
-        return call_user_method($method, &$this, $node, $arguments);
+        return call_user_method($method, $this, $node, $arguments);
     }

     /**

====================================================
Index: phpgwapi/inc/class.xmlrpc_client.inc.php
diff -u phpgwapi/inc/class.xmlrpc_client.inc.php:1.10 
phpgwapi/inc/class.xmlrpc_client.inc.php:1.11
--- phpgwapi/inc/class.xmlrpc_client.inc.php:1.10       Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.xmlrpc_client.inc.php    Wed May  4 13:05:20 2005
@@ -128,11 +128,11 @@
                        }
                        if($timeout>0)
                        {
-                               $fp = fsockopen($server, $port, &$this->errno, 
&$this->errstr, $timeout);
+                               $fp = fsockopen($server, $port, $this->errno, 
$this->errstr, $timeout);
                        }
                        else
                        {
-                               $fp = fsockopen($server, $port, &$this->errno, 
&$this->errstr);
+                               $fp = fsockopen($server, $port, $this->errno, 
$this->errstr);
                        }
                        if (!$fp)
                        {

====================================================
Index: phpgwapi/inc/class.historylog.inc.php
diff -u phpgwapi/inc/class.historylog.inc.php:1.12 
phpgwapi/inc/class.historylog.inc.php:1.13
--- phpgwapi/inc/class.historylog.inc.php:1.12  Mon May  2 16:38:57 2005
+++ phpgwapi/inc/class.historylog.inc.php       Wed May  4 13:05:20 2005
@@ -144,7 +144,7 @@

                        while (list(,$value) = each($values))
                        {
-                               
$this->nextmatchs->template_alternate_row_color(&$this->template);
+                               
$this->nextmatchs->template_alternate_row_color($this->template);

                                
$this->template->set_var('row_date',$GLOBALS['phpgw']->common->show_date($value['datetime']));
                                
$this->template->set_var('row_owner',$value['owner']);

====================================================
Index: phpgwapi/inc/class.soap_client.inc.php
diff -u phpgwapi/inc/class.soap_client.inc.php:1.8 
phpgwapi/inc/class.soap_client.inc.php:1.9
--- phpgwapi/inc/class.soap_client.inc.php:1.8  Thu Dec 30 06:47:31 2004
+++ phpgwapi/inc/class.soap_client.inc.php      Wed May  4 13:05:20 2005
@@ -105,11 +105,11 @@
                {
                        if($timeout > 0)
                        {
-                               $fp = fsockopen($server, $port,&$this->errno, 
&$this->errstr, $timeout);
+                               $fp = fsockopen($server, $port,$this->errno, 
$this->errstr, $timeout);
                        }
                        else
                        {
-                               $fp = fsockopen($server, $port,&$this->errno, 
&$this->errstr);
+                               $fp = fsockopen($server, $port,$this->errno, 
$this->errstr);
                        }
                        if (!$fp)
                        {






reply via email to

[Prev in Thread] Current Thread [Next in Thread]