From 2bcde106430a787747d45d156c3a7328ecaccdd1 Mon Sep 17 00:00:00 2001
From: skeeter <skeeter@alumni.egroupware.org>
Date: Fri, 20 Apr 2001 02:45:42 +0000
Subject: [PATCH] If the template does not exist in the template dir, it will
 now load from the default template set.

---
 phpgwapi/inc/class.Template.inc.php | 31 +++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/phpgwapi/inc/class.Template.inc.php b/phpgwapi/inc/class.Template.inc.php
index 1b1d3146be..54d452cb20 100644
--- a/phpgwapi/inc/class.Template.inc.php
+++ b/phpgwapi/inc/class.Template.inc.php
@@ -296,15 +296,34 @@ class Template {
   /* private: filename($filename)
    * filename: name to be completed.
    */
-  function filename($filename) {
+  function filename($filename,$root='',$time=1) {
+  	global $phpgw_info;
+    if($root=='')
+    {
+    	$root=$this->root;
+    }
     if (substr($filename, 0, 1) != "/") {
-      $filename = $this->root."/".$filename;
+      $new_filename = $root.'/'.$filename;
+    }
+    else
+    {
+    	$new_filename = $filename;
     }
     
-    if (!file_exists($filename))
-      $this->halt("filename: file $filename does not exist.");
-
-    return $filename;
+    if (!file_exists($new_filename))
+    {
+    	if($time==2)
+    	{
+    		$this->halt("filename: file $new_filename does not exist.");
+    	}
+    	else
+    	{
+    		$new_root = str_replace($phpgw_info['server']['template_set'],'default',$root);
+    		$new_filename = $this->filename(str_replace($root.'/','',$new_filename),$new_root,2);
+    	}
+    }
+    	
+    return $new_filename;
   }
   
   /* private: varname($varname)