X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fsetup%2Fclass_setupStep_Finish.inc;h=5fe91f8cee2418c980e7772fc9ed76189991bf80;hb=9b10111d38b0589067bb74136863655b770a0ca2;hp=3898c55c5bf4c50135207eb68a0b65aa5c3953e5;hpb=7f7f21906eb6121c29823abbf96461733d642509;p=gosa.git diff --git a/gosa-core/setup/class_setupStep_Finish.inc b/gosa-core/setup/class_setupStep_Finish.inc index 3898c55c5..5fe91f8ce 100644 --- a/gosa-core/setup/class_setupStep_Finish.inc +++ b/gosa-core/setup/class_setupStep_Finish.inc @@ -24,7 +24,7 @@ class Step_Finish extends setup_step { var $gosa_conf_contrib = "/gosa.conf"; var $cfg_file_written = FALSE; - var $header_image= 'images/ldapserver.png'; + var $header_image = "images/setup/server.png"; function Step_Finish() { @@ -43,7 +43,8 @@ class Step_Finish extends setup_step function get_conf_data() { $smarty = get_smarty(); - $smarty->assign("cv",$this->parent->captured_values); + $smarty->assign("cv",xmlentities($this->parent->captured_values)); + $smarty->assign("config_checksum", md5(file_get_contents(CONFIG_TEMPLATE_DIR.$this->gosa_conf_contrib))); $str = $smarty->fetch(CONFIG_TEMPLATE_DIR.$this->gosa_conf_contrib); return($str); } @@ -54,8 +55,7 @@ class Step_Finish extends setup_step $info= posix_getgrgid(posix_getgid()); $webgroup = $info['name']; - - + /* Check if there is currently an active gosa.conf */ $exists = file_exists(CONFIG_DIR."/".CONFIG_FILE); @@ -65,7 +65,7 @@ class Step_Finish extends setup_step * - Permisssion are set correctly */ if(isset($_POST['next']) && $exists && !$this->is_world_readable(CONFIG_DIR."/".CONFIG_FILE)){ - session_destroy(); + session::destroy(); header("Location: index.php"); exit(); } @@ -97,7 +97,7 @@ class Step_Finish extends setup_step $err_msg= ""; if($exists && $this->is_world_readable(CONFIG_DIR."/".CONFIG_FILE)){ - $err_msg = _("Your configuration file is currently world readable. Please updated the file permissions!"); + $err_msg = _("Your configuration file is currently world readable. Please update the file permissions!"); }elseif(!$exists){ $err_msg = _("The configuration is currently not readable or it does not exists."); }