X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=68941ebfa48a6f871031e715c21cbd71b539fd88;hb=7dc3c7182b1bc782815ead845b9178d809e1229c;hp=c1c504d5255e3573db4091ef8fbc2a46635147bf;hpb=7bea995f818b70008536189c66f3d2c016ea50d3;p=gosa.git
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index c1c504d52..68941ebfa 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -1,21 +1,23 @@
ip){
exit;
}
$config= session::get('config');
+$config->check_config_version();
$config->check_and_reload();
/* Enable compressed output */
-if (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED'])){
+if (isset($config->data['MAIN']['COMPRESSED']) && preg_match('/^(true|on)$/i', $config->data['MAIN']['COMPRESSED']) && !isset($_GET['no_output_compression'])){
ob_start("ob_gzhandler");
}
@@ -85,7 +88,7 @@ if(session::get('_LAST_PAGE_REQUEST') == ""){
* kill session
*/
if($request_time > $max_life){
- session_unset();
+ session::destroy();
new log("security","login","",array(),"main.php called without session - logging out") ;
header ("Location: logout.php");
exit;
@@ -114,7 +117,7 @@ if(!session::is_set('Last_init_lang')){
/* If last language != current force navi reload */
$lang= get_browser_language();
-if(session::get('Last_init_lang',$lang)){
+if(session::get('Last_init_lang') != $lang){
$reload_navigation = true;
}
@@ -134,7 +137,7 @@ $GLOBALS['t_gettext_message_dir'] = $BASE_DIR.'/locale/';
/* Set the text domain as 'messages' */
$domain = 'messages';
-bindtextdomain($domain, "$BASE_DIR/locale");
+bindtextdomain($domain, LOCALE_DIR);
textdomain($domain);
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, $lang, "Setting language to");
@@ -144,10 +147,17 @@ if (!session::is_set('plist')){
$class_list= get_declared_classes();
foreach ($class_mapping as $class => $path){
if (!in_array($class, $class_list)){
+ if (is_readable("$BASE_DIR/$path")){
require_once("$BASE_DIR/$path");
+ } else {
+ msg_dialog::display(_("Fatal error"),
+ sprintf(_("Cannot locate file '%s' - please run '%s' to fix this"),
+ "$BASE_DIR/$path", "update-gosa"), FATAL_ERROR_DIALOG);
+ exit;
+ }
}
}
-
+
session::set('plist', new pluglist($config, $ui));
/* Load ocMapping into userinfo */
@@ -156,13 +166,16 @@ if (!session::is_set('plist')){
session::set('ui',$ui);
}
$plist= session::get('plist');
-
/* Check for register globals */
if (isset($global_check) && $config->data['MAIN']['FORCEGLOBALS'] == 'true'){
- echo _("FATAL: Register globals is on. GOsa will refuse to login unless this is fixed by an administrator.");
+ msg_dialog::display(
+ _("PHP configuration"),
+ _("FATAL: Register globals is on. GOsa will refuse to login unless this is fixed by an administrator."),
+ FATAL_ERROR_DIALOG);
+
new log("security","login","",array(),"Register globals is on. For security reasons, this should be turned off.") ;
- session_destroy ();
- exit ();
+ session::destroy ();
+ exit;
}
/* Check Plugin variable */
@@ -188,7 +201,7 @@ if (isset($_GET['plug'])){
}
/* Check if we need to delete a lock */
-if ($old_plugin_dir != $plugin_dir){
+if ($old_plugin_dir != $plugin_dir && $old_plugin_dir != ""){
if (is_file("$old_plugin_dir/main.inc")){
$remove_lock= true;
require_once ("$old_plugin_dir/main.inc");
@@ -202,7 +215,7 @@ eval_sizelimit();
/* Check for memory */
if (function_exists("memory_get_usage")){
if (memory_get_usage() > (to_byte(ini_get('memory_limit')) - 2048000 )){
- print_red(_("Warning: memory is getting low - please increase the memory_limit!"));
+ msg_dialog::display(_("Configuration error"), _("Running out of memory!"), WARNING_DIALOG);
}
}
@@ -275,11 +288,15 @@ if (session::get('js')==FALSE){
$smarty->assign("help_method"," onclick=\"return popup('helpviewer.php$plug','GOsa help');\"");
}
-$smarty->assign ("username", $ui->username);
+if($ui->ignore_acl_for_current_user()){
+ $smarty->assign ("username", ""._("User ACL checks disabled")." ".$ui->username);
+}else{
+ $smarty->assign ("username", $ui->username);
+}
$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'));
-$smarty->assign ("go_out", get_template_path('images/stop.png'));
+$smarty->assign ("go_out", get_template_path('images/logout.png'));
$smarty->assign ("go_top", get_template_path('images/go_top.png'));
$smarty->assign ("go_corner", get_template_path('images/go_corner.png'));
$smarty->assign ("go_left", get_template_path('images/go_left.png'));
@@ -287,7 +304,7 @@ $smarty->assign ("go_help", get_template_path('images/help.png'));
/* reload navigation if language changed*/
if($reload_navigation){
- $plist->menu="";;
+ $plist->menu="";
}
$plist->gen_headlines();
$plist->gen_menu();
@@ -311,7 +328,7 @@ if ($_SERVER["REQUEST_METHOD"] == "POST"){
$_POST[$name] = $value;
}
}
- sess_del ('dn');
+ session::un_set ('dn');
}
@@ -341,7 +358,7 @@ if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
if ($expired == 2){
new log("security","gosa","",array(),"password for user \"$ui->username\" is about to expire") ;
- print_red(_("Your password is about to expire, please change your password"));
+ msg_dialog::display(_("Password change"), _("Your password is about to expire, please change your password!"), INFO_DIALOG);
}
}
@@ -349,19 +366,15 @@ if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) &&
if (is_file("$plugin_dir/main.inc")){
require_once ("$plugin_dir/main.inc");
} else {
- echo sprintf(_("FATAL: Can't find any plugin definitions for plugin '%s'!"), $plug);
+ msg_dialog::display(
+ _("Plugin"),
+ sprintf(_("FATAL: Cannot find any plugin definitions for plugin '%s'!"), $plug),
+ FATAL_ERROR_DIALOG);
exit();
}
/* Print_out last ErrorMessage repeated string. */
-if(isset($_GET['add'])){
-msg_dialog::display("Error" ,"Kann datei nicht schreiben, bla",ERROR_DIALOG);
-msg_dialog::display("Warning" ,"Kann datei nicht schreiben, bla",WARNING_DIALOG);
-msg_dialog::display("Info" ,"Kann datei nicht schreiben, bla",INFO_DIALOG);
-msg_dialog::display("Confirm" ,"Kann datei nicht schreiben, bla",CONFIRM_DIALOG);
-}
-
$smarty->assign("msg_dialogs", msg_dialog::get_dialogs());
$smarty->assign("contents", $display);