From 82c5aac5de6f6de7643eeff63c533c189a4bcf41 Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Sat, 6 Jan 2001 09:20:33 +0000
Subject: [PATCH] corrected new navbar_end function

---
 phpgwapi/inc/footer.inc.php                | 10 +---------
 phpgwapi/templates/default/footer.tpl      | 21 +--------------------
 phpgwapi/templates/default/navbar.inc.php  | 19 +++++++++++++++++++
 phpgwapi/templates/verdilak/navbar.inc.php | 13 +++++++++++++
 4 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php
index 3801c4a9b2..db1624e7c0 100644
--- a/phpgwapi/inc/footer.inc.php
+++ b/phpgwapi/inc/footer.inc.php
@@ -28,15 +28,7 @@
     include($phpgw_info["server"]["app_inc"]."/footer.inc.php");
   }
 
-  $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/verdilak/images");
-  $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
-  $tpl->set_var("showpoweredbyon",$phpgw_info["server"]["showpoweredbyon"]);
-  $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
-  echo $tpl->finish($tpl->parse("out","footer"));
+  parse_navbar_end();
   $phpgw->db->disconnect();
   
 ?>
diff --git a/phpgwapi/templates/default/footer.tpl b/phpgwapi/templates/default/footer.tpl
index 6dbed987ab..cbafdc3aef 100644
--- a/phpgwapi/templates/default/footer.tpl
+++ b/phpgwapi/templates/default/footer.tpl
@@ -2,28 +2,9 @@
 <P>
 <table border="0" cellspacing="0" cellpading="0" width="100%" bgcolor="{table_bg_color}">
   <TR>
-    <TD>
-      <P><P>Powered by <a href=http://www.phpgroupware.org>phpGroupWare</a> version {version}<br>
-    </TD>
+    <TD align="center">{msg}<br></TD>
   </TR>
 </Table>
 
-<!---
-// If we can figure out how to do this, then we will use it. until then I am leaving it here, out of the way.
-/*
-  if ($phpgw_info["server"]["showpoweredbyon"] == "bottom" && $phpgw_info["server"]["showpoweredbyon"] != "top") {
-     echo "<P>\n";
-     echo "<Table Width=100% Border=0 CellPadding=0 CellSpacing=0 BGColor=".$phpgw_info["theme"]["navbar_bg"].">\n";
-     echo " <TR><TD>";
-     echo "<P><P>\n" . lang("Powered by phpGroupWare version x",
-							$phpgw_info["server"]["versions"]["phpgwapi"]) . "<br>\n";
-     echo "</TD>";
-     if ($phpgw_info["flags"]["parent_page"])
-       echo "<td align=\"right\"><a href=\"".$phpgw->link($phpgw_info["flags"]["parent_page"])."\">".lang("up")."</a></td>";
-     echo "</TR>\n</Table>\n";
-  }
-*/
---->
-
 <!-- END footer -->
 
diff --git a/phpgwapi/templates/default/navbar.inc.php b/phpgwapi/templates/default/navbar.inc.php
index 00dcc7e36a..80ee56d34d 100644
--- a/phpgwapi/templates/default/navbar.inc.php
+++ b/phpgwapi/templates/default/navbar.inc.php
@@ -79,3 +79,22 @@
      }
      return $tpl->finish($tpl->parse("out","navbar"));
   }
+
+  function parse_navbar_end()
+  {
+    global $phpgw_info, $phpgw;
+    if ($phpgw_info["server"]["showpoweredbyon"] == "bottom") {
+       $msg = "<P><P>\n" . lang("Powered by phpGroupWare version x", $phpgw_info["server"]["versions"]["phpgwapi"]);
+    }
+
+    $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/verdilak/images");
+    $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
+    $tpl->set_var("msg",$msg);
+    $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
+    echo $tpl->finish($tpl->parse("out","footer"));
+
+  }
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
index cf3cbf49b5..72fbfedf28 100644
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ b/phpgwapi/templates/verdilak/navbar.inc.php
@@ -81,3 +81,16 @@
      }
      return $tpl->finish($tpl->parse("out","navbar"));
   }
+
+  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/verdilak/images");
+    $tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
+    $tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]);
+    echo $tpl->finish($tpl->parse("out","footer"));
+  }