index 4b7baf12c56de24d68ed1ae6fbc06a129915d058..254d4de495331c461a21e074b416a36c172e433e 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
/* Save start time */
$start = microtime();
+// Will be used in the "stats" plugin later, to be able calculate the elapsed render time.
+$overallRenderTimer = microtime(TRUE);
+
/* Basic setup, remove eventually registered sessions */
require_once ("../include/php_setup.inc");
require_once ("functions.inc");
session::global_set('runtime_cache',array());
session::set('limit_exceeded',FALSE);
+// Count number of page reloads
+if(!session::is_set('clicks')){
+ session::set('clicks', 0);
+}
+$clicks = session::get('clicks');
+$clicks ++ ;
+session::set('clicks', $clicks);
+
+
pathNavigator::clear();
if ($_SERVER["REQUEST_METHOD"] == "POST"){
/* check if we are using account expiration */
$smarty->assign("hideMenus", FALSE);
-if ($config->get_cfg_value("core","handleExpiredAccounts") == "true"){
+if ($config->boolValueIsTrue("core","handleExpiredAccounts")){
$expired= ldap_expired_account($config, $ui->dn, $ui->username);
if ($expired == POSIX_WARN_ABOUT_EXPIRATION && !session::is_set('POSIX_WARN_ABOUT_EXPIRATION__DONE')){
$smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
}
+
+$loggedin = sprintf(_("You're logged in as %s"),
+ "<span>".$ui->cn." [".$ui->username."] / ".$config->current['NAME']."</span> ");
if($ui->ignore_acl_for_current_user()){
- $smarty->assign ("loggedin", "<font color='red'>"._("ACLs are disabled")."</font> ".sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
-}else{
- $smarty->assign ("loggedin", sprintf(_("You're logged in as %s"), "<span>".$ui->cn." [".$ui->username."]</span>"));
+ $loggedin = "<font color='red'>"._("ACLs are disabled")."</font> ".$loggedin;
}
+
+$smarty->assign ("loggedin", $loggedin);
$smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
$smarty->assign ("go_base", get_template_path('images/dtree.png'));
$smarty->assign ("go_home", get_template_path('images/gohome.png'));
require ("$plugin_dir/main.inc");
} else {
msg_dialog::display(
- _("Plugin"),
+ _("Plug-in"),
sprintf(_("FATAL: Cannot find any plugin definitions for plugin %s!"), bold($plug)),
FATAL_ERROR_DIALOG);
exit();