[Phpgroupware-cvs] api class.phpgw.php, 1.1.1.1, 1.1.1.1.2.1 class.setup.php, 1.1.1.1.2.2, 1.1.1.1.2.3 class.xslt.php, 1.1.1.1.2.1, 1.1.1.1.2.2

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/api
In directory subversions:/tmp/cvs-serv5035/api

Modified Files:
      Tag: proposal-branch
        class.phpgw.php class.setup.php class.xslt.php 
Log Message:
added a way for apps to force server rendering of xsl

Index: class.xslt.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.xslt.php,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** class.xslt.php      23 Oct 2003 22:34:44 -0000      1.1.1.1.2.1
--- class.xslt.php      23 Oct 2003 23:53:04 -0000      1.1.1.1.2.2
***************
*** 262,297 ****
                exit;
        }
- /*     
-       function get($args)
-       {
-               list($app,$file) = explode('.',$args['file']);
- 
-               $filename = 
PHPGW_ROOT.SEP.$app.SEP.'skins'.SEP.$args['skin'].SEP.$file.'.xsl';
-               if(!file_exists($filename) && $args['skin'] != 'default')
-               {
-                       $def_filename = 
PHPGW_ROOT.SEP.$app.SEP.'skins'.SEP.'default'.SEP.$file.'.xsl';
-                       if(file_exists($def_filename))
-                       {
-                               $filename = $def_filename;
-                       }
-               }
-               header('Content-type: text/xml');
-               readfile($app.'/skins/default/'.$file.'.xsl');
-               exit;
-       }
- 
-       function getmany($input)
-       {
-               header('Content-type: text/xml');
-               echo '<?xml version="1.0"?>'."\n";
-               echo '<xsl:stylesheet 
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0">'."\n";
-               foreach($input['files'] as $key=>$val)                          
-               {                       
-                       list($app,$file) = explode('.',$val);
-                       echo '  <xsl:include 
href="?op=api.xslt.get&amp;skin='.$input['skin'].'&amp;file='.$app.'.'.$file.'" 
/>'."\n";
-               }
-               echo '</xsl:stylesheet>'."\n";
-               exit;
-       }
- */
  }
--- 262,264 ----

Index: class.setup.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.setup.php,v
retrieving revision 1.1.1.1.2.2
retrieving revision 1.1.1.1.2.3
diff -C2 -d -r1.1.1.1.2.2 -r1.1.1.1.2.3
*** class.setup.php     23 Oct 2003 20:40:09 -0000      1.1.1.1.2.2
--- class.setup.php     23 Oct 2003 23:53:04 -0000      1.1.1.1.2.3
***************
*** 38,41 ****
--- 38,42 ----
                        $args = $args->get(func_get_args(),__LINE__,__FILE__);
                        $GLOBALS['phpgw']->add_xsl('api.setup');
+                       $GLOBALS['phpgw']->xslt_render_force_server = True;
                        $GLOBALS['phpgw']->add_xsl('api.widgets');
                        /* Make sure we have a sane config file. */

Index: class.phpgw.php
===================================================================
RCS file: /cvsroot/phpgroupware/api/class.phpgw.php,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** class.phpgw.php     23 Oct 2003 07:25:01 -0000      1.1.1.1
--- class.phpgw.php     23 Oct 2003 23:53:04 -0000      1.1.1.1.2.1
***************
*** 41,44 ****
--- 41,45 ----
  
                var $xslt_render;
+               var $xslt_render_force_server = False;
  
                
/**************************************************************************\
***************
*** 188,191 ****
--- 189,197 ----
                        /* Start the XSLT class for it to be able to decide how 
to build the strings */
                        $this->xslt_render = createobject('api_xslt');
+                       
+                       if($this->xslt_render_force_server)
+                       {
+                               $this->xslt_render->client_render = False;
+                       }
                        
                        $stylesheet_string = 
$this->xslt_render->setup_stylesheet($this->xsl_files);