diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php index 776edaeca8..700cf7d030 100644 --- a/phpgwapi/inc/class.common.inc.php +++ b/phpgwapi/inc/class.common.inc.php @@ -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']) { diff --git a/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php index 3e1c68c88b..e5089bd43f 100644 --- a/phpgwapi/inc/footer.inc.php +++ b/phpgwapi/inc/footer.inc.php @@ -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')) { diff --git a/phpgwapi/templates/default/navbar.inc.php b/phpgwapi/templates/default/navbar.inc.php index ec815435a4..dab1411b9a 100644 --- a/phpgwapi/templates/default/navbar.inc.php +++ b/phpgwapi/templates/default/navbar.inc.php @@ -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 = '' . lang($app[1]['; - if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") { - $title .= "
" . 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 = '' . lang($app[1]['title']) . ''; + if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'icons_and_text') + { + $title .= "
" . lang($app[1]['title']); + $tpl->set_var('width','7%'); + } + else + { + $tpl->set_var('width','3%'); + } - $tpl->set_var("value",'' . $title . ''); - $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','' . $title . ''); + $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",' ' - . lang("Current users") . ': ' . $db->f(0) . ''); - } - $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',' ' + . lang('Current users') . ': ' . $db->f(0) . ''); + } + $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") - . '
Click this image on the navbar: '; - } 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') + . '
Click this image on the navbar: '; + } + 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 . "
" . checkcode($cd)); - } + // This is gonna change + if (isset($cd)) + { + $tpl->set_var('messages',$api_messages . '
' . 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 = "

\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 = "

\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'); + } + } diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php index 86d39f35f6..fbe67d61a6 100644 --- a/phpgwapi/templates/idsociety/navbar.inc.php +++ b/phpgwapi/templates/idsociety/navbar.inc.php @@ -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'); diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php index 5d79d7359e..29bc7c901b 100644 --- a/phpgwapi/templates/justweb/navbar.inc.php +++ b/phpgwapi/templates/justweb/navbar.inc.php @@ -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 = '' . lang($app[1]['; - if ($phpgw_info["user"]["preferences"]["common"]["navbar_format"] == "icons_and_text") { - $title .= "
" . lang($app[1]["title"]); - } - $applications .= '
' . $title . ''; - } - } - $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 = '' . lang($app[1]['title']) . ''; + if ($phpgw_info['user']['preferences']['common']['navbar_format'] == 'icons_and_text') + { + $title .= '
' . lang($app[1]['title']); + } + $applications .= '
' . $title . ''; + } + } + $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",' ' - . lang("Current users") . ': ' . $db->f(0) . ''); - } */ - $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',' ' + . lang('Current users') . ': ' . $db->f(0) . ''); + } +*/ + $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") - . '
Click this image on the navbar: '; - } 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') + . '
Click this image on the navbar: '; + } + 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 . "
" . checkcode($cd)); - } */ + // This is gonna change + if (isset($cd)) + { + $tpl->set_var("messages",$api_messages . "
" . 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'); diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php index a6ed080f68..f659ef05f6 100644 --- a/phpgwapi/templates/verdilak/navbar.inc.php +++ b/phpgwapi/templates/verdilak/navbar.inc.php @@ -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');