[Phpgroupware-cvs] phpgwapi/inc class.xslttemplates.inc.php

[Bettina Gille]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Branch:         
Changes by:     Bettina Gille <address@hidden>  06/04/13 22:35:32

Modified files:
        inc            : class.xslttemplates.inc.php 

Log message:
        tpl including

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.xslttemplates.inc.php.diff?tr1=1.23&tr2=1.24&r1=text&r2=text

Patches:
Index: phpgwapi/inc/class.xslttemplates.inc.php
diff -u phpgwapi/inc/class.xslttemplates.inc.php:1.23 
phpgwapi/inc/class.xslttemplates.inc.php:1.24
--- phpgwapi/inc/class.xslttemplates.inc.php:1.23       Sun Apr  9 14:00:31 2006
+++ phpgwapi/inc/class.xslttemplates.inc.php    Thu Apr 13 22:35:32 2006
@@ -8,7 +8,7 @@
        * @license http://www.gnu.org/licenses/lpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage gui
-       * @version $Id: class.xslttemplates.inc.php,v 1.23 2006/04/09 14:00:31 
skwashd Exp $
+       * @version $Id: class.xslttemplates.inc.php,v 1.24 2006/04/13 22:35:32 
ceb Exp $
        */
 
        if( (floor(phpversion()) == 4 && !extension_loaded('xslt') )
@@ -115,17 +115,29 @@
                                                        $new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$rootdir);
                                                        
$this->add_file($filename,$new_root,3);
                                                        return;
+                                                       break;
                                                case 3:
-                                                       
$this->add_file($filename,$rootdir,4);
+                                                       $new_root = 
PHPGW_SERVER_ROOT . '/phpgwapi/templates/' . 
$GLOBALS['phpgw_info']['server']['template_set'];
+                                                       
$this->add_file($filename,$new_root,4);
                                                        return;
+                                                       break;
                                                case 4:
+                                                       $new_root = 
PHPGW_SERVER_ROOT . '/phpgwapi/templates/base';
+                                                       
$this->add_file($filename,$new_root,5);
+                                                       return;
+                                                       break;
+                                               case 5:
+                                                       
$this->add_file($filename,$rootdir,6);
+                                                       return;
+                                                       break;
+                                               case 6:
                                                        $this->halt("filename: 
file $new_filename.xsl does not exist.");
                                                        break;
                                                default:
                                                        if (!$this->print)
                                                        {
                                                                $new_root = 
str_replace($GLOBALS['phpgw_info']['server']['template_set'],'base',$rootdir);
-                                                               
$this->add_file($filename,$new_root,4);
+                                                               
$this->add_file($filename,$new_root,6);
                                                                return;
                                                        }
                                                        else