[Phpgroupware-cvs] api/interface/class.interface_browser.php, 1.1.2.9

[nomail]

Update of /api/interface
Modified Files:
        Branch: proposal-branch
          class.interface_browser.php

date: 2004/04/16 20:59:49;  author: seek3r;  state: Exp;  lines: +12 -17

Log Message:
bringing savannah cvs back up to date with what we were doing on our private 
cvs server. We will not be doing dev from this cvs tree
=====================================================================
No syntax errors detected in -
=====================================================================
Index: api/interface/class.interface_browser.php
diff -u api/interface/class.interface_browser.php:1.1.2.8 
api/interface/class.interface_browser.php:1.1.2.9
--- api/interface/class.interface_browser.php:1.1.2.8   Tue Feb 24 10:51:02 2004
+++ api/interface/class.interface_browser.php   Fri Apr 16 20:59:49 2004
@@ -28,11 +28,11 @@
        {
                var $statecache;
                var $xslt_render;
-               var $xslt_render_force_server = False;
+               var $xslt_render_force_server = false;
 
                function api_interface()
                {
-                       reg_var('op', 'any', 'any','##NOVAL##');
+                       reg_var('op', 'any', 'any');
                }
 
                function get_op()
@@ -43,7 +43,7 @@
                function login()
                {
                        $GLOBALS['phpgw']->add_xsl('api.login');
-                       $GLOBALS['phpgw']->finish(False);
+                       $GLOBALS['phpgw']->finish(false);
                }
 
                function good_login()
@@ -55,7 +55,7 @@
                {
                        if($reason == 'invalid')
                        {
-                               $GLOBALS['msgbox']->add('Login 
failed!',__LINE__,__FILE__, 'notice');
+                               $GLOBALS['msgbox']->add('Login failed!', 
'notice');
                        }
                        $this->login();
                }
@@ -74,7 +74,7 @@
                                $msg = lang($msg);
                        }
 
-                       $GLOBALS['msgbox']->add(lang($msg.' 
').$methodname,__LINE__,__FILE__, 'access');
+                       $GLOBALS['msgbox']->add(lang($msg.' ').$methodname, 
'access');
                        foreach($inputs as $key=>$val)                          
                        {
                                $input_list[] = array('name'=>$key, 
'val'=>$val);
@@ -84,7 +84,7 @@
 
                function get_inputs()
                {
-                       $inputs = 
array_merge($GLOBALS['HTTP_SESSION_VARS']['phpgw_session'], 
$GLOBALS['HTTP_COOKIE_VARS'], $GLOBALS['HTTP_GET_VARS'], 
$GLOBALS['HTTP_POST_VARS']);
+                       $inputs = array_merge($_SESSION['phpgw_session'], 
$GLOBALS['HTTP_COOKIE_VARS'], $_GET, $_POST);
                        $op = $inputs['op'];
 
                        unset($inputs['phpgw_lid'], 
$inputs['PHPSESSID'],$inputs['session_lid'],$inputs['sid']);
@@ -137,7 +137,7 @@
                */
                function handle_result($result)
                {
-                       if (! $GLOBALS['missing_critical'])
+                       if (! $GLOBALS['force_setup'])
                        {
                                //$result = 
$GLOBALS['phpgw']->statecache->restore($result);
                        }
@@ -174,11 +174,11 @@
                        
$GLOBALS['phpgw']->base_xml->add_node($GLOBALS['phpgw_xmldoc']);
 
                        /* Start the XSLT class for it to be able to decide how 
to build the strings */
-                       $this->xslt_render = createobject('api_xslt');
+                       $this->xslt_render = createObject('api_xslt');
                        
                        if($this->xslt_render_force_server)
                        {
-                               $this->xslt_render->client_render = False;
+                               $this->xslt_render->client_render = false;
                        }
                        
                        $stylesheet_string = 
$this->xslt_render->setup_stylesheet($GLOBALS['phpgw']->xsl_files);
@@ -192,11 +192,6 @@
                        $this->xslt_render->set_xml($xml_result);
 
                        /* Have XSLT class output as it determins as best */
-                       //echo '<pre>'; print_r($GLOBALS); echo '</pre>';
-                       $GLOBALS['performance_timer']->start('xslt_out');
-                       echo $this->xslt_render->getOutput();
-                       $GLOBALS['performance_timer']->stop('xslt_out');
+                       return $this->xslt_render->getOutput();
                }
        }
-
-