holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Small fixes for the automatic inclusion of the ui<app>.header() and ui<app>.footer().

Browse Source
This commit is contained in:
skeeter 2001-07-28 14:21:32 +00:00
parent cba81b9086
commit e73a82a001
6 changed files with 222 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.common.inc.php
View File

@ -872,7 +872,7 @@
function phpgw_footer() function phpgw_footer()
{ {
global $phpgw, $phpgw_info, $HTMLCOMPLIANT, $menuaction; global $phpgw, $phpgw_info, $HTMLCOMPLIANT, $menuaction, $obj;
if (!isset($phpgw_info['flags']['nofooter']) || !$phpgw_info['flags']['nofooter']) if (!isset($phpgw_info['flags']['nofooter']) || !$phpgw_info['flags']['nofooter'])
{ {

18
phpgwapi/inc/footer.inc.php
View File

@ -42,10 +42,10 @@
{ {
if ($menuaction) if ($menuaction)
{ {
list($app,$class,$method) = explode('.',$menuaction); // list($app,$class,$method) = explode('.',$menuaction);
if ($app && $class && $method) // if ($app && $class && $method)
{ // {
$obj = CreateObject(sprintf('%s.%s',$app,$class)); // $obj = CreateObject(sprintf('%s.%s',$app,$class));
if (is_array($obj->public_functions) && $obj->public_functions['footer']) if (is_array($obj->public_functions) && $obj->public_functions['footer'])
{ {
eval("\$obj->footer();"); eval("\$obj->footer();");
@ -54,11 +54,11 @@
{ {
include(PHPGW_APP_INC . '/footer.inc.php'); include(PHPGW_APP_INC . '/footer.inc.php');
} }
} // }
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php')) // elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{ // {
include(PHPGW_APP_INC . '/footer.inc.php'); // include(PHPGW_APP_INC . '/footer.inc.php');
} // }
} }
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php')) elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{ {

203
phpgwapi/templates/default/navbar.inc.php
View File

@ -13,115 +13,134 @@
function parse_navbar($force = False) function parse_navbar($force = False)
{ {
global $phpgw_info, $phpgw, $menuaction; global $phpgw_info, $phpgw, $menuaction, $obj;
$tpl = createobject("phpgwapi.Template",PHPGW_TEMPLATE_DIR); $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns("remove"); $tpl->set_unknowns('remove');
$tpl->set_file(array("navbar" => "navbar.tpl", $tpl->set_file(
"navbar_app" => "navbar_app.tpl" array(
)); 'navbar' => 'navbar.tpl',
'navbar_app' => 'navbar_app.tpl'
)
);
$tpl->set_var("navbar_color",$phpgw_info["theme"]["navbar_bg"]); $tpl->set_var('navbar_color',$phpgw_info['theme']['navbar_bg']);
if ($phpgw_info["flags"]["navbar_target"]) { if ($phpgw_info['flags']['navbar_target'])
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"'; {
} $target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
$i = 1; $i = 1;
while ($app = each($phpgw_info["navbar"])) { while ($app = each($phpgw_info['navbar']))
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") { {
$tabs[$i]["label"] = lang($app[1]["title"]); if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'text')
$tabs[$i]["link"] = $app[1]["url"]; {
if (ereg($phpgw_info["navbar"][$app[0]],$PHP_SELF)) { $tabs[$i]['label'] = lang($app[1]['title']);
$selected = $i; $tabs[$i]['link'] = $app[1]['url'];
} if (ereg($phpgw_info['navbar'][$app[0]],$PHP_SELF))
$i++; {
} else { $selected = $i;
$title = '<img src="' . $app[1]["icon"] . '" alt="' . lang($app[1]["title"]) . '" title="' }
. lang($app[1]["title"]) . '" border="0">'; $i++;
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") { }
$title .= "<br>" . lang($app[1]["title"]); else
$tpl->set_var("width","7%"); {
} else { $title = '<img src="' . $app[1]['icon'] . '" alt="' . lang($app[1]['title']) . '" title="'
$tpl->set_var("width","3%"); . lang($app[1]['title']) . '" border="0">';
} if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
{
$title .= "<br>" . lang($app[1]['title']);
$tpl->set_var('width','7%');
}
else
{
$tpl->set_var('width','3%');
}
$tpl->set_var("value",'<a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>'); $tpl->set_var('value','<a href="' . $app[1]['url'] . '"' . $target . '>' . $title . '</a>');
$tpl->set_var("align","center"); $tpl->set_var('align','center');
$tpl->parse("applications","navbar_app",True); $tpl->parse('applications','navbar_app',True);
} }
} }
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") { if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'text')
$tpl->set_var("navbar_color",$phpgw_info["theme"]["bg_color"]); {
$tpl->set_var("align","right"); $tpl->set_var('navbar_color',$phpgw_info['theme']['bg_color']);
$tpl->set_var("value",$phpgw->common->create_tabs($tabs,$selected,-1)); $tpl->set_var('align','right');
$tpl->parse("applications","navbar_app",True); $tpl->set_var('value',$phpgw->common->create_tabs($tabs,$selected,-1));
} $tpl->parse('applications','navbar_app',True);
}
if ($phpgw_info["server"]["showpoweredbyon"] == "top") { if ($phpgw_info['server']['showpoweredbyon'] == 'top')
$tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"])); {
} $tpl->set_var('powered_by',lang('Powered by phpGroupWare version x',$phpgw_info['server']['versions']['phpgwapi']));
if (isset($phpgw_info["navbar"]["admin"]) && isset($phpgw_info["user"]["preferences"]["common"]["show_currentusers"])) { }
$db = $phpgw->db; if (isset($phpgw_info['navbar']['admin']) && isset($phpgw_info['user']['preferences']['common']['show_currentusers']))
$db->query("select count(*) from phpgw_sessions where session_flags != 'A'"); {
$db->next_record(); $db = $phpgw->db;
$tpl->set_var("current_users",'<a href="' . $phpgw->link('/admin/currentusers.php') . '">&nbsp;' $db->query("select count(*) from phpgw_sessions where session_flags != 'A'");
. lang("Current users") . ': ' . $db->f(0) . '</a>'); $db->next_record();
} $tpl->set_var('current_users','<a href="' . $phpgw->link('/admin/currentusers.php') . '">&nbsp;'
$tpl->set_var("user_info",$phpgw->common->display_fullname() . " - " . lang('Current users') . ': ' . $db->f(0) . '</a>');
. lang($phpgw->common->show_date(time(),"l")) . " " }
. lang($phpgw->common->show_date(time(),"F")) . " " $tpl->set_var('user_info',$phpgw->common->display_fullname() . " - "
. $phpgw->common->show_date(time(),"d, Y")); . lang($phpgw->common->show_date(time(),"l")) . " "
. lang($phpgw->common->show_date(time(),"F")) . " "
. $phpgw->common->show_date(time(),"d, Y"));
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
// to get rid of duplicate code. // to get rid of duplicate code.
if ($phpgw_info["user"]["lastpasswd_change"] == 0) { if ($phpgw_info['user']['lastpasswd_change'] == 0)
$api_messages = lang("You are required to change your password during your first login") {
. '<br> Click this image on the navbar: <img src="' $api_messages = lang('You are required to change your password during your first login')
. $phpgw->common->image('preferences','navbar.gif').'">'; . '<br> Click this image on the navbar: <img src="'
} else if ($phpgw_info["user"]["lastpasswd_change"] < time() - (86400*30)) { . $phpgw->common->image('preferences','navbar.gif').'">';
$api_messages = lang("it has been more then x days since you changed your password",30); }
} elseif ($phpgw_info['user']['lastpasswd_change'] < time() - (86400*30))
{
$api_messages = lang('it has been more then x days since you changed your password',30);
}
// This is gonna change // This is gonna change
if (isset($cd)) { if (isset($cd))
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd)); {
} $tpl->set_var('messages',$api_messages . '<br>' . checkcode($cd));
}
$tpl->pfp('out','navbar'); $tpl->pfp('out','navbar');
// If the application has a header include, we now include it // If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction) if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{ {
list($app,$class,$method) = explode('.',$menuaction); if (is_array($obj->public_functions) && $obj->public_functions['header'])
if ($app && $class && $method)
{ {
$obj = CreateObject(sprintf('%s.%s',$app,$class)); eval("\$obj->header();");
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
} }
} }
$phpgw->common->hook('after_navbar'); $phpgw->common->hook('after_navbar');
return; return;
} }
function parse_navbar_end() function parse_navbar_end()
{ {
global $phpgw_info, $phpgw; global $phpgw_info, $phpgw;
if ($phpgw_info["server"]["showpoweredbyon"] == "bottom") { if ($phpgw_info['server']['showpoweredbyon'] == 'bottom')
$msg = "<P><P>\n" . lang("Powered by phpGroupWare version x", $phpgw_info["server"]["versions"]["phpgwapi"]); {
$msg = "<P><P>\n" . lang('Powered by phpGroupWare version x', $phpgw_info['server']['versions']['phpgwapi']);
$tpl = createobject("phpgwapi.Template",PHPGW_TEMPLATE_DIR); $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns("remove"); $tpl->set_unknowns('remove');
$tpl->set_file(array("footer" => "footer.tpl")); $tpl->set_file(
$tpl->set_var("table_bg_color",$phpgw_info["theme"]["navbar_bg"]); array(
$tpl->set_var("msg",$msg); 'footer' => 'footer.tpl'
$tpl->set_var("version",$phpgw_info["server"]["versions"]["phpgwapi"]); )
);
$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']);
$phpgw->common->hook('navbar_end'); $phpgw->common->hook('navbar_end');
$tpl->pfp("out","footer"); $tpl->pfp('out','footer');
} }
} }

11
phpgwapi/templates/idsociety/navbar.inc.php
View File

@ -13,7 +13,7 @@
function parse_navbar($force = False) function parse_navbar($force = False)
{ {
global $phpgw_info, $phpgw, $menuaction; global $phpgw_info, $phpgw, $menuaction, $obj;
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove'); $tpl->set_unknowns('remove');
@ -139,14 +139,9 @@
// If the application has a header include, we now include it // If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction) if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{ {
list($app,$class,$method) = explode('.',$menuaction); if (is_array($obj->public_functions) && $obj->public_functions['header'])
if ($app && $class && $method)
{ {
$obj = CreateObject(sprintf('%s.%s',$app,$class)); eval("\$obj->header();");
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
} }
} }
$phpgw->common->hook('after_navbar'); $phpgw->common->hook('after_navbar');

168
phpgwapi/templates/justweb/navbar.inc.php
View File

@ -11,94 +11,116 @@
/* $Id$ */ /* $Id$ */
function parse_navbar($force = False) function parse_navbar($force = False)
{ {
global $phpgw_info, $phpgw, $PHP_SELF, $menuaction; global $phpgw_info, $phpgw, $PHP_SELF, $menuaction, $obj;
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_file(array("navbar" => "navbar.tpl")); $tpl->set_file(
array(
'navbar' => 'navbar.tpl'
)
);
$tpl->set_var("img_root",$phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/justweb/images"); $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('table_bg_color',$phpgw_info['theme']['navbar_bg']);
if ($phpgw_info["flags"]["navbar_target"]) { if ($phpgw_info['flags']['navbar_target'])
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"'; {
} $target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
while ($app = each($phpgw_info["navbar"])) { while ($app = each($phpgw_info['navbar']))
if ($app[1]["title"] != "Home" && $app[1]["title"] != "preferences" && ! ereg("About",$app[1]["title"]) && $app[1]["title"] != "Logout") { {
$title = '<img src="' . $app[1]["icon"] . '" alt="' . lang($app[1]["title"]) . '" title="' if ($app[1]['title'] != "Home" && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
. lang($app[1]["title"]) . '" border="0">'; {
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") { $title = '<img src="' . $app[1]['icon'] . '" alt="' . lang($app[1]['title']) . '" title="'
$title .= "<br>" . lang($app[1]["title"]); . lang($app[1]['title']) . '" border="0">';
} if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
$applications .= '<br><a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>'; {
} $title .= '<br>' . lang($app[1]['title']);
} }
$tpl->set_var("applications",$applications); $applications .= '<br><a href="' . $app[1]['url'] . '"' . $target . '>' . $title . '</a>';
}
}
$tpl->set_var('applications',$applications);
$tpl->set_var("home_link",$phpgw_info["navbar"]["home"]["url"]); $tpl->set_var('home_link',$phpgw_info['navbar']['home']['url']);
$tpl->set_var("preferences_link",$phpgw_info["navbar"]["preferences"]["url"]); $tpl->set_var('preferences_link',$phpgw_info['navbar']['preferences']['url']);
$tpl->set_var("logout_link",$phpgw_info["navbar"]["logout"]["url"]); $tpl->set_var('logout_link',$phpgw_info['navbar']['logout']['url']);
$tpl->set_var("help_link",$phpgw_info["navbar"]["about"]["url"]); $tpl->set_var('help_link',$phpgw_info['navbar']['about']['url']);
$ir = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/justweb/images"; if ($phpgw_info['flags']['currentapp'] == 'home')
if (ereg($phpgw_info["server"]["webserver_url"] . "/index.php",$PHP_SELF)) { {
$tpl->set_var("welcome_img",$ir . "/welcome-red.gif"); $tpl->set_var('welcome_img',PHPGW_IMAGES_DIR . '/welcome-red.gif');
} else { }
$tpl->set_var("welcome_img",$ir . "/welcome-grey.gif"); else
} {
$tpl->set_var('welcome_img',PHPGW_IMAGES_DIR . '/welcome-grey.gif');
}
if (ereg("preferences",$PHP_SELF)) { if ($phpgw_info['flags']['currentapp'] == 'preferences')
$tpl->set_var("preferences_img",$ir . "/preferences-red.gif"); {
} else { $tpl->set_var('preferences_img',PHPGW_IMAGES_DIR . '/preferences-red.gif');
$tpl->set_var("preferences_img",$ir . "/preferences-grey.gif"); }
} else
$tpl->set_var("logout_img",$ir . "/logout-grey.gif"); {
$tpl->set_var('preferences_img',PHPGW_IMAGES_DIR . '/preferences-grey.gif');
}
/* if ($phpgw_info["server"]["showpoweredbyon"] == "top") { $tpl->set_var('logout_img',PHPGW_IMAGES_DIR . '/logout-grey.gif');
$tpl->set_var("powered_by",lang("Powered by phpGroupWare version x",$phpgw_info["server"]["versions"]["phpgwapi"]));
}
if (isset($phpgw_info["navbar"]["admin"]) && isset($phpgw_info["user"]["preferences"]["common"]["show_currentusers"])) {
$db = $phpgw->db;
$db->query("select count(*) from phpgw_sessions");
$db->next_record();
$tpl->set_var("current_users",'<a href="' . $phpgw->link("/admin/currentusers.php") . '">&nbsp;'
. lang("Current users") . ': ' . $db->f(0) . '</a>');
} */
$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"));
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file /*
// to get rid of duplicate code. if ($phpgw_info['server']['showpoweredbyon'] == 'top')
/* if ($phpgw_info["user"]["lastpasswd_change"] == 0) { {
$api_messages = lang("You are required to change your password during your first login") $tpl->set_var('powered_by',lang('Powered by phpGroupWare version x',$phpgw_info['server']['versions']['phpgwapi']));
. '<br> Click this image on the navbar: <img src="' }
. $phpgw->common->image('preferences','navbar.gif').'">'; if (isset($phpgw_info['navbar']['admin']) && isset($phpgw_info['user']['preferences']['common']['show_currentusers']))
} else if ($phpgw_info["user"]["lastpasswd_change"] < time() - (86400*30)) { {
$api_messages = lang("it has been more then x days since you changed your password",30); $db = $phpgw->db;
} $db->query("select count(*) from phpgw_sessions");
$db->next_record();
$tpl->set_var('current_users','<a href="' . $phpgw->link('/admin/currentusers.php') . '">&nbsp;'
. lang('Current users') . ': ' . $db->f(0) . '</a>');
}
*/
$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"));
// This is gonna change /*
if (isset($cd)) { * Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd)); * to get rid of duplicate code.
} */ */
/*
if ($phpgw_info['user']['lastpasswd_change'] == 0)
{
$api_messages = lang('You are required to change your password during your first login')
. '<br> Click this image on the navbar: <img src="'
. $phpgw->common->image('preferences','navbar.gif').'">';
}
elseif ($phpgw_info['user']['lastpasswd_change'] < time() - (86400*30))
{
$api_messages = lang('it has been more then x days since you changed your password',30);
}
// This is gonna change
if (isset($cd))
{
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd));
}
*/
$tpl->pfp('out','navbar'); $tpl->pfp('out','navbar');
// If the application has a header include, we now include it // If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction) if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{ {
list($app,$class,$method) = explode('.',$menuaction); if (is_array($obj->public_functions) && $obj->public_functions['header'])
if ($app && $class && $method)
{ {
$obj = CreateObject(sprintf('%s.%s',$app,$class)); eval("\$obj->header();");
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
} }
} }
$phpgw->common->hook('after_navbar'); $phpgw->common->hook('after_navbar');
@ -116,9 +138,9 @@
$tpl->set_var('img_root',$phpgw_info['server']['webserver_url'] . '/phpgwapi/templates/justweb/images'); $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('table_bg_color',$phpgw_info['theme']['navbar_bg']);
$tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']); $tpl->set_var('version',$phpgw_info['server']['versions']['phpgwapi']);
$tpl->set_var('user_info',$phpgw->common->display_fullname() . " - " $tpl->set_var('user_info',$phpgw->common->display_fullname() . ' - '
. lang($phpgw->common->show_date(time(),'l')) . " " . lang($phpgw->common->show_date(time(),'l')) . ' '
. lang($phpgw->common->show_date(time(),'F')) . " " . lang($phpgw->common->show_date(time(),'F')) . ' '
. $phpgw->common->show_date(time(),'d, Y')); . $phpgw->common->show_date(time(),'d, Y'));
$phpgw->common->hook('navbar_end'); $phpgw->common->hook('navbar_end');
echo $tpl->pfp('out','footer'); echo $tpl->pfp('out','footer');

11
phpgwapi/templates/verdilak/navbar.inc.php
View File

@ -13,7 +13,7 @@
function parse_navbar($force = False) function parse_navbar($force = False)
{ {
global $phpgw_info, $phpgw, $PHP_SELF, $menuaction; global $phpgw_info, $phpgw, $PHP_SELF, $menuaction, $obj;
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR); $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
@ -121,14 +121,9 @@
// If the application has a header include, we now include it // If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction) if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{ {
list($app,$class,$method) = explode('.',$menuaction); if (is_array($obj->public_functions) && $obj->public_functions['header'])
if ($app && $class && $method)
{ {
$obj = CreateObject(sprintf('%s.%s',$app,$class)); eval("\$obj->header();");
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
} }
} }
$phpgw->common->hook('after_navbar'); $phpgw->common->hook('after_navbar');