[Phpslash-commit] CVS: phpslash-ft/class functions.inc,1.86,1.87
Brought to you by:
joestewart,
nhruby
|
From: Joe S. <joe...@us...> - 2002-01-05 20:45:47
|
Update of /cvsroot/phpslash/phpslash-ft/class
In directory usw-pr-cvs1:/tmp/cvs-serv13831/phpslash-ft/class
Modified Files:
functions.inc
Log Message:
bugfix - disable TopicBar and NavBar in getHeader and getFooter OK
Index: functions.inc
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/class/functions.inc,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
*** functions.inc 2001/12/19 20:00:41 1.86
--- functions.inc 2002/01/05 20:45:44 1.87
***************
*** 423,428 ****
$action_url = "$_PSL[rooturl]/search.php3";
! $topicbar = new TopicBar;
! $navbar = new NavBar;
$templ->set_var(array(
--- 423,439 ----
$action_url = "$_PSL[rooturl]/search.php3";
! if ($_PSL[module][TopicBar]) {
! $topicbar = new TopicBar;
! $topicbarcontent = $topicbar->getTopicBar();
! } else {
! $topicbarcontent = "";
! }
!
! if ($_PSL[module][NavBar]) {
! $navbar = new NavBar;
! $navbarcontent = $navbar->getNavBar($navbar_ary[tpl],$navbar_ary[menu_ary]);
! } else {
! $navbarcontent = "";
! }
$templ->set_var(array(
***************
*** 436,441 ****
SITETITLE => $title,
SEARCH_ACTION_URL => $action_url,
! NAVBAR => $navbar->getNavBar($navbar_ary[tpl],$navbar_ary[menu_ary]),
! TOPICBAR => $topicbar->getTopicBar(),
BLOCKS_COLUMN => $allblocks,
SKIN => $_PSL[skin]
--- 447,452 ----
SITETITLE => $title,
SEARCH_ACTION_URL => $action_url,
! NAVBAR => $navbarcontent, // Could be empty if NavBar is not required
! TOPICBAR => $topicbarcontent, // Could be empty if TopicBar is not required
BLOCKS_COLUMN => $allblocks,
SKIN => $_PSL[skin]
***************
*** 471,476 ****
global $_PSL;
! $navbar = new NavBar;
!
/* Templates */
$default_template = "slashFoot.tpl";
--- 482,492 ----
global $_PSL;
! if ($_PSL[module][NavBar]) {
! $navbar = new NavBar;
! $navbarcontent = $navbar->getNavBar("navbarFooter");
! } else {
! $navbarcontent = "";
! }
!
/* Templates */
$default_template = "slashFoot.tpl";
***************
*** 498,502 ****
$templ->set_var(array(
BASEURL => $_PSL[rooturl],
! NAVBAR => $navbar->getNavBar("navbarFooter")
));
--- 514,518 ----
$templ->set_var(array(
BASEURL => $_PSL[rooturl],
! NAVBAR => $navbarcontent
));
|