X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fhtml%2Fmain.php;h=2e415ce94f7824770209cc9dbca94c979a7c2641;hb=07e3fef6d8486276130c0ad8d603aad189244587;hp=dcdd935ad2344ec3a2fd51c79fe2b68300e9d365;hpb=25b9a20b76b5f11d48d97fa586c6eba9adfd9019;p=gosa.git
diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index dcdd935ad..2e415ce94 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");
}
@@ -132,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");
@@ -142,15 +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 {
- echo sprintf(_("Fatal error: cannot locate file '%s' - please run '%s' to fix this"), "$BASE_DIR/$path", "update-gosa");
- exit;
- }
+ 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 */
@@ -159,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 ();
+ exit;
}
/* Check Plugin variable */
@@ -174,7 +184,7 @@ if (session::is_set('plugin_dir')){
} else {
$old_plugin_dir= "";
}
-if (isset($_GET['plug'])){
+if (isset($_GET['plug']) && $plist->plugin_access_allowed($_GET['plug'])){
$plug= validate($_GET['plug']);
$plugin_dir= $plist->get_path($plug);
session::set('plugin_dir',$plugin_dir);
@@ -191,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");
@@ -205,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 )){
- msg_dialog::display(_("Configuration warning"), _("Running out of memory!"), WARNING_DIALOG);
+ msg_dialog::display(_("Configuration error"), _("Running out of memory!"), WARNING_DIALOG);
}
}
@@ -278,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'));
@@ -344,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") ;
- msg_dialog::display(_("Password reminder"), _("Your password is about to expire, please change your password!"), INFO_DIALOG);
+ msg_dialog::display(_("Password change"), _("Your password is about to expire, please change your password!"), INFO_DIALOG);
}
}
@@ -352,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);