[Phpgroupware-cvs] CVS: phpgwapi/inc class.browser.inc.php,1.14,1.15 class.xmlrpcval.inc.php,1.6,1.7 class.xmlrpc_server.inc.php,1.22,1.23 class.phpgw.inc.php,1.42,1.43 class.graphics.inc.php,1.5,1.6 class.soapval.inc.php,1.8,1.9 class.soap_parser.inc.php,1.5,1.6

[Miles Lott <address@hidden>]

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

Modified Files:
        class.browser.inc.php class.xmlrpcval.inc.php 
        class.xmlrpc_server.inc.php class.phpgw.inc.php 
        class.graphics.inc.php class.soapval.inc.php 
        class.soap_parser.inc.php 
Log Message:
Cleanup some globals, commented crap



Index: class.browser.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.browser.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.browser.inc.php       27 Dec 2001 15:17:29 -0000      1.14
--- class.browser.inc.php       29 Jan 2002 00:48:03 -0000      1.15
***************
*** 36,40 ****
                function browser ()
                {
!                       global $HTTP_USER_AGENT;
                        /*
                                Determine browser and version
--- 36,40 ----
                function browser ()
                {
!                       $HTTP_USER_AGENT = $GLOBALS['HTTP_USER_AGENT'];
                        /*
                                Determine browser and version

Index: class.xmlrpcval.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmlrpcval.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** class.xmlrpcval.inc.php     7 Dec 2001 21:53:12 -0000       1.6
--- class.xmlrpcval.inc.php     29 Jan 2002 00:48:03 -0000      1.7
***************
*** 109,113 ****
                function addStruct($vals)
                {
- //                    global $xmlrpcTypes;
                        if ($this->mytype!=0)
                        {
--- 109,112 ----

Index: class.xmlrpc_server.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xmlrpc_server.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** class.xmlrpc_server.inc.php 28 Dec 2001 18:41:33 -0000      1.22
--- class.xmlrpc_server.inc.php 29 Jan 2002 00:48:03 -0000      1.23
***************
*** 44,49 ****
                function xmlrpc_server($dispMap='', $serviceNow=0)
                {
-                       global $HTTP_RAW_POST_DATA;
- 
                        // dispMap is a despatch array of methods
                        // mapped to function names and signatures
--- 44,47 ----
***************
*** 75,80 ****
                function service()
                {
-                       global $HTTP_RAW_POST_DATA;
- 
                        $r = $this->parseRequest();
                        $payload = "<?xml version=\"1.0\"?>\n" . 
$this->serializeDebug() . $r->serialize();
--- 73,76 ----
***************
*** 227,235 ****
                function parseRequest($data='')
                {
-                       global $HTTP_RAW_POST_DATA;
-       
                        if ($data == '')
                        {
!                               $data = $HTTP_RAW_POST_DATA;
                        }
                        $parser = 
xml_parser_create($GLOBALS['xmlrpc_defencoding']);
--- 223,229 ----
                function parseRequest($data='')
                {
                        if ($data == '')
                        {
!                               $data = $GLOBALS['HTTP_RAW_POST_DATA'];
                        }
                        $parser = 
xml_parser_create($GLOBALS['xmlrpc_defencoding']);
***************
*** 431,440 ****
                function echoInput()
                {
-                       global $HTTP_RAW_POST_DATA;
- 
                        // a debugging routine: just echos back the input
                        // packet as a string value
  
!                       $r = 
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said 
I: '" . $HTTP_RAW_POST_DATA,'string'));
                        echo $r->serialize();
                }
--- 425,432 ----
                function echoInput()
                {
                        // a debugging routine: just echos back the input
                        // packet as a string value
  
!                       $r = 
CreateObject('phpgwapi.xmlrpcresp',CreateObject('phpgwapi.xmlrpcval',"'Aha said 
I: '" . $GLOBALS['HTTP_RAW_POST_DATA'],'string'));
                        echo $r->serialize();
                }

Index: class.phpgw.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.phpgw.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** class.phpgw.inc.php 12 Dec 2001 19:34:29 -0000      1.42
--- class.phpgw.inc.php 29 Jan 2002 00:48:03 -0000      1.43
***************
*** 101,105 ****
                function link($url = '', $extravars = '')
                {
-                       /* global $phpgw, $phpgw_info, $usercookie, $kp3, 
$PHP_SELF; */
                        return $this->session->link($url, $extravars);
                }
--- 101,104 ----
***************
*** 117,122 ****
                function redirect($url = '')
                {
-                       /* global $HTTP_ENV_VARS; */
- 
                        $iis = 
@strpos($GLOBALS['HTTP_ENV_VARS']['SERVER_SOFTWARE'], 'IIS', 0);
                        
--- 116,119 ----
***************
*** 157,161 ****
                function lang($key, $m1 = '', $m2 = '', $m3 = '', $m4 = '') 
                {
-                       /* global $phpgw; */
                        return $this->translation->translate($key);
                }
--- 154,157 ----

Index: class.graphics.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.graphics.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.graphics.inc.php      26 Jul 2001 11:25:35 -0000      1.5
--- class.graphics.inc.php      29 Jan 2002 00:48:03 -0000      1.6
***************
*** 82,90 ****
                        }
  
!                       global $HTTP_POST_VARS;
! 
!                       if (is_array($HTTP_POST_VARS))
                        {
!                               while( list($key, $val) = 
each($HTTP_POST_VARS)) 
                                {
                                        if (ereg("(.*)_x",$key,$varName) && 
$HTTP_POST_VARS[$varName[1]."_y"])
--- 82,88 ----
                        }
  
!                       if (is_array($GLOBALS['HTTP_POST_VARS']))
                        {
!                               while( list($key, $val) = 
each($GLOBALS['HTTP_POST_VARS']))
                                {
                                        if (ereg("(.*)_x",$key,$varName) && 
$HTTP_POST_VARS[$varName[1]."_y"])

Index: class.soapval.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.soapval.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.soapval.inc.php       10 Dec 2001 02:09:17 -0000      1.8
--- class.soapval.inc.php       29 Jan 2002 00:48:03 -0000      1.9
***************
*** 432,438 ****
                        if ($type)
                        {
- //                            global 
$GLOBALS['namespaces'],$GLOBALS['soapTypes'],$GLOBALS['typemap'];
- //                            global 
$GLOBALS['namespaces'],$GLOBALS['typemap'];
- 
                                @reset($GLOBALS['typemap']);
                                while(list($namespace,$types) = 
@each($GLOBALS['typemap']))
--- 432,435 ----

Index: class.soap_parser.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.soap_parser.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.soap_parser.inc.php   18 Aug 2001 14:37:52 -0000      1.5
--- class.soap_parser.inc.php   29 Jan 2002 00:48:03 -0000      1.6
***************
*** 6,12 ****
                function soap_parser($xml='',$encoding='UTF-8')
                {
!                       global $soapTypes;
! 
!                       $this->soapTypes = $soapTypes;
                        $this->xml = $xml;
                        $this->xml_encoding = $encoding;
--- 6,10 ----
                function soap_parser($xml='',$encoding='UTF-8')
                {
!                       $this->soapTypes = $GLOBALS['soapTypes'];
                        $this->xml = $xml;
                        $this->xml_encoding = $encoding;