phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] CVS: phpgwapi/inc class.interserver.inc.php,1.21,1.22


From: Miles Lott <address@hidden>
Subject: [Phpgroupware-cvs] CVS: phpgwapi/inc class.interserver.inc.php,1.21,1.22
Date: Fri, 08 Feb 2002 00:21:33 -0500

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

Modified Files:
        class.interserver.inc.php 
Log Message:
formatting

Index: class.interserver.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.interserver.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** class.interserver.inc.php   10 Dec 2001 02:09:31 -0000      1.21
--- class.interserver.inc.php   8 Feb 2002 05:21:30 -0000       1.22
***************
*** 160,164 ****
                {
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(gettype($args) != 'array')
                        {
                                $arr[] = 
CreateObject('phpgwapi.xmlrpcval',$args,'string');
--- 160,164 ----
                {
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(!is_array($args))
                        {
                                $arr[] = 
CreateObject('phpgwapi.xmlrpcval',$args,'string');
***************
*** 169,173 ****
                                while(list($key,$val) = @each($args))
                                {
!                                       if(gettype($val) == 'array')
                                        {
                                                while(list($x,$y) = each($val))
--- 169,173 ----
                                while(list($key,$val) = @each($args))
                                {
!                                       if(is_array($val))
                                        {
                                                while(list($x,$y) = each($val))
***************
*** 191,200 ****
                        $c->setDebug(0);
                        $r = $c->send($f,0,'https');
!                       if (!$r)
                        {
                                $this->debug('send failed');
                        }
                        $v = $r->value();
!                       if (!$r->faultCode())
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
--- 191,200 ----
                        $c->setDebug(0);
                        $r = $c->send($f,0,'https');
!                       if(!$r)
                        {
                                $this->debug('send failed');
                        }
                        $v = $r->value();
!                       if(!$r->faultCode())
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
***************
*** 212,216 ****
                {
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(gettype($args) != 'array')
                        {
                                $arr[] = 
CreateObject('phpgwapi.xmlrpcval',$args,'string');
--- 212,216 ----
                {
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(!is_array($args))
                        {
                                $arr[] = 
CreateObject('phpgwapi.xmlrpcval',$args,'string');
***************
*** 221,225 ****
                                while(list($key,$val) = @each($args))
                                {
!                                       if(gettype($val) == 'array')
                                        {
                                                while(list($x,$y) = each($val))
--- 221,225 ----
                                while(list($key,$val) = @each($args))
                                {
!                                       if(is_array($val))
                                        {
                                                while(list($x,$y) = each($val))
***************
*** 244,253 ****
                        $c->setDebug(0);
                        $r = $c->send($f);
!                       if (!$r)
                        {
                                $this->debug('send failed');
                        }
                        $v = $r->value();
!                       if (!$r->faultCode())
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
--- 244,253 ----
                        $c->setDebug(0);
                        $r = $c->send($f);
!                       if(!$r)
                        {
                                $this->debug('send failed');
                        }
                        $v = $r->value();
!                       if(!$r->faultCode())
                        {
                                $this->debug('<hr>I got this value 
back<br><pre>' . htmlentities($r->serialize()) . '</pre><hr>',$debug);
***************
*** 266,270 ****
                        $method_name = str_replace('.','_',$method_name);
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(gettype($args) != 'array')
                        {
                                $arr[] = 
CreateObject('phpgwapi.soapval','','string',$args);
--- 266,270 ----
                        $method_name = str_replace('.','_',$method_name);
                        list($uri,$hostpart) = $this->_split_url($url);
!                       if(!is_array($args))
                        {
                                $arr[] = 
CreateObject('phpgwapi.soapval','','string',$args);
***************
*** 274,278 ****
                                while(list($key,$val) = @each($args))
                                {
!                                       if(gettype($val) == 'array')
                                        {
                                                while(list($x,$y) = each($val))
--- 274,278 ----
                                while(list($key,$val) = @each($args))
                                {
!                                       if(is_array($val))
                                        {
                                                while(list($x,$y) = each($val))
***************
*** 320,324 ****
                                while(list($key,$val) = @each($args))
                                {
!                                       if(gettype($val) == 'array')
                                        {
                                                while(list($x,$y) = each($val))
--- 320,324 ----
                                while(list($key,$val) = @each($args))
                                {
!                                       if(is_array($val))
                                        {
                                                while(list($x,$y) = each($val))
***************
*** 376,380 ****
                        else
                        {
!                               $_type = (is_long($_req)?'int':gettype($_req));
                                if($recursed)
                                {
--- 376,380 ----
                        else
                        {
!                               $_type = (is_long($_req) ? 'int' : 
gettype($_req));
                                if($recursed)
                                {
***************
*** 419,423 ****
                                $serverid = $this->serverid;
                        }
!                       if($serverid && gettype($this->server) == 'array')
                        {
                                $sql = "UPDATE $this->table SET "
--- 419,423 ----
                                $serverid = $this->serverid;
                        }
!                       if($serverid && is_array($this->server))
                        {
                                $sql = "UPDATE $this->table SET "
***************
*** 441,445 ****
                function create($server_info='')
                {
!                       if(gettype($server_info) != 'array')
                        {
                                return False;
--- 441,445 ----
                function create($server_info='')
                {
!                       if(!is_array($server_info))
                        {
                                return False;
***************
*** 483,491 ****
                function 
get_list($start='',$sort='',$order='',$query='',$offset='',&$total)
                {
!                       if (!$sort)
                        {
                                $sort = 'DESC';
                        }
!                       if ($query)
                        {
                                $whereclause = "WHERE server_name LIKE 
'%$query%'"
--- 483,491 ----
                function 
get_list($start='',$sort='',$order='',$query='',$offset='',&$total)
                {
!                       if(!$sort)
                        {
                                $sort = 'DESC';
                        }
!                       if($query)
                        {
                                $whereclause = "WHERE server_name LIKE 
'%$query%'"
***************
*** 495,499 ****
                                        . "OR admin_email LIKE '%$query%'";
                        }
!                       if ($order)
                        {
                                $orderclause = 'ORDER BY ' . $order . ' ' . 
$sort;
--- 495,499 ----
                                        . "OR admin_email LIKE '%$query%'";
                        }
!                       if($order)
                        {
                                $orderclause = 'ORDER BY ' . $order . ' ' . 
$sort;
***************
*** 507,511 ****
                        $this->db->query($sql,__LINE__,__FILE__);
                        
!                       while ($this->db->next_record())
                        {
                                
$this->servers[$this->db->f('server_name')]['server_id']   = 
$this->db->f('server_id');
--- 507,511 ----
                        $this->db->query($sql,__LINE__,__FILE__);
                        
!                       while($this->db->next_record())
                        {
                                
$this->servers[$this->db->f('server_name')]['server_id']   = 
$this->db->f('server_id');
***************
*** 526,530 ****
                function formatted_list($server_id=0,$java=False,$local=False)
                {
!                       if ($java)
                        {
                                $jselect = ' onChange="this.form.submit();"';
--- 526,530 ----
                function formatted_list($server_id=0,$java=False,$local=False)
                {
!                       if($java)
                        {
                                $jselect = ' onChange="this.form.submit();"';
***************
*** 541,549 ****
                        $x = '';
                        $slist = $this->get_list('','','','','',$x);
!                       while (list($key,$val) = each($slist))
                        {
                                $foundservers = True;
                                $select .= '<option value="' . 
$val['server_id'] . '"';
!                               if ($val['server_id'] == $server_id)
                                {
                                        $select .= ' selected';
--- 541,549 ----
                        $x = '';
                        $slist = $this->get_list('','','','','',$x);
!                       while(list($key,$val) = each($slist))
                        {
                                $foundservers = True;
                                $select .= '<option value="' . 
$val['server_id'] . '"';
!                               if($val['server_id'] == $server_id)
                                {
                                        $select .= ' selected';
***************
*** 606,610 ****
                                return False;
                        }
!                       if(gettype($serverdata) == 'integer')
                        {
                                $serverid = $serverdata;
--- 606,610 ----
                                return False;
                        }
!                       if(is_int($serverdata))
                        {
                                $serverid = $serverdata;
***************
*** 628,632 ****
                function auth($serverdata='')
                {
!                       if(!$serverdata || gettype($serverdata) != 'array')
                        {
                                return False;
--- 628,632 ----
                function auth($serverdata='')
                {
!                       if(!$serverdata || !is_array($serverdata))
                        {
                                return False;
***************
*** 640,644 ****
                        if($this->db->next_record())
                        {
!                               if ($username == 
$GLOBALS['phpgw_info']['server']['site_username'] &&
                                        $password == 
$GLOBALS['phpgw_info']['server']['site_password'] &&
                                        $this->db->f('trust_rel') >= 1)
--- 640,644 ----
                        if($this->db->next_record())
                        {
!                               if($username == 
$GLOBALS['phpgw_info']['server']['site_username'] &&
                                        $password == 
$GLOBALS['phpgw_info']['server']['site_password'] &&
                                        $this->db->f('trust_rel') >= 1)




reply via email to

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