[Phpgroupware-cvs] CVS: phpgwapi/inc class.xmlrpc_client.inc.php,1.6,1.7

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv4899

Modified Files:
        class.xmlrpc_client.inc.php 
Log Message:
Change user-agent to phpGroupWare



Index: class.xmlrpc_client.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmlrpc_client.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.xmlrpc_client.inc.php 6 Dec 2001 15:51:06 -0000       1.6
--- class.xmlrpc_client.inc.php 27 May 2002 00:52:00 -0000      1.7
***************
*** 54,58 ****
                function setDebug($in)
                {
!                       if ($in)
                        {
                                $this->debug = 1;
--- 54,58 ----
                function setDebug($in)
                {
!                       if($in)
                        {
                                $this->debug = 1;
***************
*** 81,85 ****
                        $msg->debug = $this->debug;
   
!                       if ($method == 'https')
                        {
                                return $this->sendPayloadHTTPS(
--- 81,85 ----
                        $msg->debug = $this->debug;
   
!                       if($method == 'https')
                        {
                                return $this->sendPayloadHTTPS(
***************
*** 121,125 ****
                                $fp = fsockopen($server, $port, &$this->errno, 
&$this->errstr);
                        }
!                       if (!$fp)
                        {
                                $r = CreateObject(
--- 121,125 ----
                                $fp = fsockopen($server, $port, &$this->errno, 
&$this->errstr);
                        }
!                       if(!$fp)
                        {
                                $r = CreateObject(
***************
*** 140,149 ****
                        // for this
                        $credentials = '';
!                       if ($username && $password)
                        {
                                $credentials = 'Authorization: Basic ' . 
base64_encode($username . ':' . $password) . "\r\n";
                        }
  
!                       $op = 'POST ' . $this->path . " HTTP/1.0\r\nUser-Agent: 
PHP XMLRPC 1.0\r\n"
                                . 'Host: '. $this->server . "\r\n"
                                . 'X-PHPGW-Server: '  . $this->server . ' ' . 
"\r\n"
--- 140,149 ----
                        // for this
                        $credentials = '';
!                       if($username && $password)
                        {
                                $credentials = 'Authorization: Basic ' . 
base64_encode($username . ':' . $password) . "\r\n";
                        }
  
!                       $op = 'POST ' . $this->path . " HTTP/1.0\r\nUser-Agent: 
phpGroupWare\r\n"
                                . 'Host: '. $this->server . "\r\n"
                                . 'X-PHPGW-Server: '  . $this->server . ' ' . 
"\r\n"
***************
*** 154,158 ****
                                . $msg->payload;
  
!                       if (!fputs($fp, $op, strlen($op)))
                        {
                                $this->errstr = 'Write error';
--- 154,158 ----
                                . $msg->payload;
  
!                       if(!fputs($fp, $op, strlen($op)))
                        {
                                $this->errstr = 'Write error';
***************
*** 172,176 ****
                function sendPayloadHTTPS($msg, $server, $port, 
$timeout=0,$username='', $password='', $cert='',$certpass='')
                {
!                       if (!function_exists('curl_init'))
                        {
                                return CreateObject(
--- 172,176 ----
                function sendPayloadHTTPS($msg, $server, $port, 
$timeout=0,$username='', $password='', $cert='',$certpass='')
                {
!                       if(!function_exists('curl_init'))
                        {
                                return CreateObject(
***************
*** 182,186 ****
                        }
  
!                       if ($port == 0)
                        {
                                $port = 443;
--- 182,186 ----
                        }
  
!                       if($port == 0)
                        {
                                $port = 443;
***************
*** 196,204 ****
                        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
                        // results into variable
!                       if ($this->debug)
                        {
                                curl_setopt($curl, CURLOPT_VERBOSE, 1);
                        }
!                       curl_setopt($curl, CURLOPT_USERAGENT, 'PHP XMLRPC 1.0');
                        // required for XMLRPC
                        curl_setopt($curl, CURLOPT_POST, 1);
--- 196,204 ----
                        curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
                        // results into variable
!                       if($this->debug)
                        {
                                curl_setopt($curl, CURLOPT_VERBOSE, 1);
                        }
!                       curl_setopt($curl, CURLOPT_USERAGENT, 'phpGroupWare');
                        // required for XMLRPC
                        curl_setopt($curl, CURLOPT_POST, 1);
***************
*** 213,229 ****
                                'Content-Type: text/xml'
                        ));
!                       if ($timeout)
                        {
                                curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 
1 ? 1 : $timeout - 1);
                        }
!                       if ($username && $password)
                        {
                                curl_setopt($curl, CURLOPT_USERPWD, 
"$username:$password");
                        }
!                       if ($cert)
                        {
                                curl_setopt($curl, CURLOPT_SSLCERT, $cert);
                        }
!                       if ($certpass)
                        {
                                curl_setopt($curl, 
CURLOPT_SSLCERTPASSWD,$certpass);
--- 213,229 ----
                                'Content-Type: text/xml'
                        ));
!                       if($timeout)
                        {
                                curl_setopt($curl, CURLOPT_TIMEOUT, $timeout == 
1 ? 1 : $timeout - 1);
                        }
!                       if($username && $password)
                        {
                                curl_setopt($curl, CURLOPT_USERPWD, 
"$username:$password");
                        }
!                       if($cert)
                        {
                                curl_setopt($curl, CURLOPT_SSLCERT, $cert);
                        }
!                       if($certpass)
                        {
                                curl_setopt($curl, 
CURLOPT_SSLCERTPASSWD,$certpass);
***************
*** 233,237 ****
                        $result = curl_exec($curl);
  
!                       if (!$result)
                        {
                                $this->errstr = 'Write error';
--- 233,237 ----
                        $result = curl_exec($curl);
  
!                       if(!$result)
                        {
                                $this->errstr = 'Write error';