extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 17:14:44 +01:00
Code Issues 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()
{
global $phpgw, $phpgw_info, $HTMLCOMPLIANT, $menuaction;
global $phpgw, $phpgw_info, $HTMLCOMPLIANT, $menuaction, $obj;
if (!isset($phpgw_info['flags']['nofooter']) || !$phpgw_info['flags']['nofooter'])
{

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

@ -42,10 +42,10 @@
{
if ($menuaction)
{
list($app,$class,$method) = explode('.',$menuaction);
if ($app && $class && $method)
{
$obj = CreateObject(sprintf('%s.%s',$app,$class));
// list($app,$class,$method) = explode('.',$menuaction);
// if ($app && $class && $method)
// {
// $obj = CreateObject(sprintf('%s.%s',$app,$class));
if (is_array($obj->public_functions) && $obj->public_functions['footer'])
{
eval("\$obj->footer();");
@ -54,11 +54,11 @@
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
}
elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
{
include(PHPGW_APP_INC . '/footer.inc.php');
}
// }
// elseif(file_exists(PHPGW_APP_INC.'/footer.inc.php'))
// {
// include(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)
{
global $phpgw_info, $phpgw, $menuaction;
global $phpgw_info, $phpgw, $menuaction, $obj;
$tpl = createobject("phpgwapi.Template",PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns("remove");
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$tpl->set_file(array("navbar" => "navbar.tpl",
"navbar_app" => "navbar_app.tpl"
));
$tpl->set_file(
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"]) {
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
}
if ($phpgw_info['flags']['navbar_target'])
{
$target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
$i = 1;
while ($app = each($phpgw_info["navbar"])) {
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "text") {
$tabs[$i]["label"] = lang($app[1]["title"]);
$tabs[$i]["link"] = $app[1]["url"];
if (ereg($phpgw_info["navbar"][$app[0]],$PHP_SELF)) {
$selected = $i;
}
$i++;
} else {
$title = '<img src="' . $app[1]["icon"] . '" alt="' . lang($app[1]["title"]) . '" title="'
. 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%");
}
$i = 1;
while ($app = each($phpgw_info['navbar']))
{
if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'text')
{
$tabs[$i]['label'] = lang($app[1]['title']);
$tabs[$i]['link'] = $app[1]['url'];
if (ereg($phpgw_info['navbar'][$app[0]],$PHP_SELF))
{
$selected = $i;
}
$i++;
}
else
{
$title = '<img src="' . $app[1]['icon'] . '" alt="' . lang($app[1]['title']) . '" title="'
. 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("align","center");
$tpl->parse("applications","navbar_app",True);
}
}
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("value",$phpgw->common->create_tabs($tabs,$selected,-1));
$tpl->parse("applications","navbar_app",True);
}
$tpl->set_var('value','<a href="' . $app[1]['url'] . '"' . $target . '>' . $title . '</a>');
$tpl->set_var('align','center');
$tpl->parse('applications','navbar_app',True);
}
}
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('value',$phpgw->common->create_tabs($tabs,$selected,-1));
$tpl->parse('applications','navbar_app',True);
}
if ($phpgw_info["server"]["showpoweredbyon"] == "top") {
$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 where session_flags != 'A'");
$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"));
if ($phpgw_info['server']['showpoweredbyon'] == 'top')
{
$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 where session_flags != 'A'");
$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["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').'">';
} 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);
}
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
// 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));
}
// 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 (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{
list($app,$class,$method) = explode('.',$menuaction);
if ($app && $class && $method)
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
$obj = CreateObject(sprintf('%s.%s',$app,$class));
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
eval("\$obj->header();");
}
}
$phpgw->common->hook('after_navbar');
return;
}
$phpgw->common->hook('after_navbar');
return;
}
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"]);
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 = createobject("phpgwapi.Template",PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns("remove");
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$tpl->set_file(array("footer" => "footer.tpl"));
$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"]);
$tpl->set_file(
array(
'footer' => 'footer.tpl'
)
);
$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');
$tpl->pfp("out","footer");
}
}
$phpgw->common->hook('navbar_end');
$tpl->pfp('out','footer');
}
}

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

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

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

@ -11,94 +11,116 @@
/* $Id$ */
function parse_navbar($force = False)
{
global $phpgw_info, $phpgw, $PHP_SELF, $menuaction;
function parse_navbar($force = False)
{
global $phpgw_info, $phpgw, $PHP_SELF, $menuaction, $obj;
$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("table_bg_color",$phpgw_info["theme"]["navbar_bg"]);
$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']);
if ($phpgw_info["flags"]["navbar_target"]) {
$target = ' target="' . $phpgw_info["flags"]["navbar_target"] . '"';
}
if ($phpgw_info['flags']['navbar_target'])
{
$target = ' target="' . $phpgw_info['flags']['navbar_target'] . '"';
}
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="'
. lang($app[1]["title"]) . '" border="0">';
if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") {
$title .= "<br>" . lang($app[1]["title"]);
}
$applications .= '<br><a href="' . $app[1]["url"] . '"' . $target . '>' . $title . '</a>';
}
}
$tpl->set_var("applications",$applications);
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="'
. lang($app[1]['title']) . '" border="0">';
if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
{
$title .= '<br>' . lang($app[1]['title']);
}
$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("preferences_link",$phpgw_info["navbar"]["preferences"]["url"]);
$tpl->set_var("logout_link",$phpgw_info["navbar"]["logout"]["url"]);
$tpl->set_var("help_link",$phpgw_info["navbar"]["about"]["url"]);
$tpl->set_var('home_link',$phpgw_info['navbar']['home']['url']);
$tpl->set_var('preferences_link',$phpgw_info['navbar']['preferences']['url']);
$tpl->set_var('logout_link',$phpgw_info['navbar']['logout']['url']);
$tpl->set_var('help_link',$phpgw_info['navbar']['about']['url']);
$ir = $phpgw_info["server"]["webserver_url"] . "/phpgwapi/templates/justweb/images";
if (ereg($phpgw_info["server"]["webserver_url"] . "/index.php",$PHP_SELF)) {
$tpl->set_var("welcome_img",$ir . "/welcome-red.gif");
} else {
$tpl->set_var("welcome_img",$ir . "/welcome-grey.gif");
}
if ($phpgw_info['flags']['currentapp'] == 'home')
{
$tpl->set_var('welcome_img',PHPGW_IMAGES_DIR . '/welcome-red.gif');
}
else
{
$tpl->set_var('welcome_img',PHPGW_IMAGES_DIR . '/welcome-grey.gif');
}
if (ereg("preferences",$PHP_SELF)) {
$tpl->set_var("preferences_img",$ir . "/preferences-red.gif");
} else {
$tpl->set_var("preferences_img",$ir . "/preferences-grey.gif");
}
$tpl->set_var("logout_img",$ir . "/logout-grey.gif");
if ($phpgw_info['flags']['currentapp'] == 'preferences')
{
$tpl->set_var('preferences_img',PHPGW_IMAGES_DIR . '/preferences-red.gif');
}
else
{
$tpl->set_var('preferences_img',PHPGW_IMAGES_DIR . '/preferences-grey.gif');
}
$tpl->set_var('logout_img',PHPGW_IMAGES_DIR . '/logout-grey.gif');
/* if ($phpgw_info["server"]["showpoweredbyon"] == "top") {
$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"));
/*
if ($phpgw_info['server']['showpoweredbyon'] == 'top')
{
$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["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').'">';
} 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);
}
/*
* Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
* 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));
} */
// This is gonna change
if (isset($cd))
{
$tpl->set_var("messages",$api_messages . "<br>" . checkcode($cd));
}
*/
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{
list($app,$class,$method) = explode('.',$menuaction);
if ($app && $class && $method)
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
$obj = CreateObject(sprintf('%s.%s',$app,$class));
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
eval("\$obj->header();");
}
}
$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('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')) . " "
$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');

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

@ -13,7 +13,7 @@
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);
@ -121,14 +121,9 @@
// If the application has a header include, we now include it
if (!@$phpgw_info['flags']['noappheader'] && $menuaction)
{
list($app,$class,$method) = explode('.',$menuaction);
if ($app && $class && $method)
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
$obj = CreateObject(sprintf('%s.%s',$app,$class));
if (is_array($obj->public_functions) && $obj->public_functions['header'])
{
eval("\$obj->header();");
}
eval("\$obj->header();");
}
}
$phpgw->common->hook('after_navbar');