From 7e538b6df2468390902c275ebbc61db338c3b795 Mon Sep 17 00:00:00 2001
From: jengo <jengo@alumni.egroupware.org>
Date: Tue, 26 Jun 2001 21:40:45 +0000
Subject: [PATCH] Removed legecy variables that should have been removed before

---
 phpgwapi/inc/functions.inc.php             | 18 +-------
 phpgwapi/templates/justweb/navbar.inc.php  | 48 ++++++++++------------
 phpgwapi/templates/verdilak/navbar.inc.php |  4 +-
 3 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/phpgwapi/inc/functions.inc.php b/phpgwapi/inc/functions.inc.php
index 4e3e74cf69..40bd088c21 100644
--- a/phpgwapi/inc/functions.inc.php
+++ b/phpgwapi/inc/functions.inc.php
@@ -334,10 +334,7 @@
 	* This is a global constant that should be used                              *
 	* instead of / or \ in file paths                                            *
 	\****************************************************************************/
-	define("SEP",filesystem_separator());
-	/* Legacy vars that can be delete after 0.9.11 is release (Seek3r) */
-	$sep = SEP;
-	$phpgw_info['server']['dir_separator'] = SEP;
+	define('SEP',filesystem_separator());
 
 	/****************************************************************************\
 	* Stuff to use if logging in or logging out                                  *
@@ -376,24 +373,13 @@
 		define('PHPGW_APP_TPL', $phpgw->common->get_tpl_dir());
 		define('PHPGW_IMAGES', $phpgw->common->get_image_path());
 		define('PHPGW_APP_IMAGES_DIR', $phpgw->common->get_image_dir());
+
 		define('PHPGW_ACL_READ',1);
 		define('PHPGW_ACL_ADD',2);
 		define('PHPGW_ACL_EDIT',4);
 		define('PHPGW_ACL_DELETE',8);
 		define('PHPGW_ACL_PRIVATE',16);
 
-		/********* Load up additional phpgw_info["server"] values *********/
-		/* LEGACY SUPPORT!!! WILL BE DELETED AFTER 0.9.11 IS RELEASED !!! */
-		$phpgw_info['server']['template_dir']     = PHPGW_TEMPLATE_DIR;
-		$phpgw_info['server']['images_dir']       = PHPGW_IMAGES_DIR;
-		$phpgw_info['server']['images_filedir']   = PHPGW_IMAGES_FILEDIR;
-		$phpgw_info['server']['app_root']         = PHPGW_APP_ROOT;
-		$phpgw_info['server']['app_inc']          = PHPGW_APP_INC;
-		$phpgw_info['server']['app_tpl']          = PHPGW_APP_TPL;
-		$phpgw_info['server']['app_images']       = PHPGW_IMAGES;
-		$phpgw_info['server']['app_images_dir']   = PHPGW_IMAGES_DIR;
-		/* END LEGACY SUPPORT!!!*/
-
 		/********* This sets the user variables *********/
 		$phpgw_info['user']['private_dir'] = $phpgw_info['server']['files_dir']
 											. '/users/'.$phpgw_info['user']['userid'];
diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php
index a66bfd5eac..ce5b00ed4c 100644
--- a/phpgwapi/templates/justweb/navbar.inc.php
+++ b/phpgwapi/templates/justweb/navbar.inc.php
@@ -15,8 +15,7 @@
   {
      global $phpgw_info, $phpgw, $PHP_SELF;
 
-     $tpl = new Template($phpgw_info["server"]["template_dir"]);
-     $tpl->set_unknowns("remove");
+		$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 
      $tpl->set_file(array("navbar" => "navbar.tpl"));
 
@@ -88,29 +87,26 @@
         $tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd));
      } */
 
-     // If the application has a header include, we now include it
-     if ($phpgw_info["flags"]["noheader"] && ! $phpgw_info["flags"]["noappheader"]) {
+		$tpl->pfp('out','navbar');
+		$phpgw->common->hook('after_navbar');
+		return;
+	}
 
-     }
-	$tpl->pfp('out','navbar');
-	$phpgw->common->hook('after_navbar');
-	return;
-  }
+	function parse_navbar_end()
+	{
+		global $phpgw_info, $phpgw;
+		$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 
-  function parse_navbar_end()
-  {
-    global $phpgw_info, $phpgw;
-    $tpl = new Template($phpgw_info["server"]["template_dir"]);
-    $tpl->set_unknowns("remove");
-  
-    $tpl->set_file(array("footer" => "footer.tpl"));
-    $tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/justweb/images");
-    $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
-    $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
-    $tpl->set_var("user_info",$phpgw->common->display_fullname() . " - "
-		. lang($phpgw->common->show_date(time(),"l")) . " "
-		. lang($phpgw->common->show_date(time(),"F")) . " "     
-		. $phpgw->common->show_date(time(),"d, Y"));
-	$phpgw->common->hook('navbar_end');
-    echo $tpl->finish($tpl->parse("out","footer"));
-  }
+		$tpl->set_file(array(
+			'footer' => 'footer.tpl'
+		));
+		$tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/justweb/images');
+		$tpl->set_var('table_bg_color',$phpgw_info['theme']['navbar_bg']);
+		$tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
+		$tpl->set_var('user_info',$phpgw->common->display_fullname() . " - "
+			. lang($phpgw->common->show_date(time(),'l')) . " "
+			. lang($phpgw->common->show_date(time(),'F')) . " "     
+			. $phpgw->common->show_date(time(),'d, Y'));
+		$phpgw->common->hook('navbar_end');
+		echo $tpl->pfp('out','footer');
+	}
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
index 96afda7d83..811409e6db 100644
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ b/phpgwapi/templates/verdilak/navbar.inc.php
@@ -15,7 +15,7 @@
 	{
 		global $phpgw_info, $phpgw, $PHP_SELF;
 
-		$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
+		$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
 
 		$tpl->set_file(array(
 			'navbar' => 'navbar.tpl'
@@ -125,7 +125,7 @@
 	function parse_navbar_end()
 	{
 		global $phpgw_info, $phpgw;
-		$tpl = createobject('phpgwapi.Template',$phpgw_info['server']['template_dir']);
+		$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
   
 		$tpl->set_file(array(
 			'footer' => 'footer.tpl'