From: hickert Date: Wed, 14 Feb 2007 04:48:51 +0000 (+0000) Subject: Some setup changes X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a58c29b1df54d41c39dce03b49e8a6cb4d3a2ffc;p=gosa.git Some setup changes git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5719 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/themes/default/style.css b/html/themes/default/style.css index daafeaf68..d9bc643b3 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -1035,6 +1035,7 @@ li.step4_name, div.step4_name { overflow: hidden; width:200px; height:2.0em; + background-color: #DDDDDD; } li.step4_value, div.step4_value { @@ -1061,6 +1062,7 @@ ul.step4_container, div.step4_container { width:680px; height:2.0em; margin-top:2px; + overflow: hidden; margin-left:2px; margin-right:2px; float:left; diff --git a/setup/class_setupStep6.inc b/setup/class_setupStep6.inc index eedb588da..f7e0d54ec 100644 --- a/setup/class_setupStep6.inc +++ b/setup/class_setupStep6.inc @@ -70,6 +70,8 @@ class setup_step_6 extends setup_step $smarty = get_smarty(); $smarty->assign("generic_settings",$this->generic_settings); $smarty->assign("samba_settings",$this->samba_settings); + $smarty->assign("warnings" ,$this->check()); + $smarty->assign("warnings_cnt" ,count($this->check())); $smarty->assign("bool",array(FALSE => _("No"), TRUE => _("Yes"))); foreach($this->attributes as $attr){ $smarty->assign($attr,$this->$attr); @@ -134,9 +136,24 @@ class setup_step_6 extends setup_step } } + + $tmp = $this->check(); + if(count($tmp) == 0){ + $this->is_completed = TRUE; + }else{ + $this->is_completed = FALSE; + } } - /* Attributes that are interesting for configuration generation */ + + function check() + { + $message = array(); + return($message); + } + + + /* Attributes that are interesting for configuration generation */ function get_attributes() { $tmp = setup_step::get_attributes(); diff --git a/setup/class_setupStep7.inc b/setup/class_setupStep7.inc index e5dd8e5a7..5bf0f6d3f 100644 --- a/setup/class_setupStep7.inc +++ b/setup/class_setupStep7.inc @@ -22,19 +22,23 @@ class setup_step_7 extends setup_step { - var $attributes = array(); + var $checks = array(); + var $schema_readable = FALSE; + var $attributes = array(); function setup_step_7() { - $this->s_title = _("GOsa settings 1/2"); - $this->s_title_long = _("GOsa generic settings, page 1/2"); - $this->s_info = _("This dialog allows you to setup GOsa behaviour"); + $this->s_title = _("Ldap schema check"); + $this->s_title_long = _("Ldap schema check"); + $this->s_info = _("This dialog checks your ldap schema setup"); } function execute() { $smarty = get_smarty(); + $smarty->assign("schema_readable",$this->schema_readable); + $smarty->assign("checks",$this->checks); return($smarty -> fetch (get_template_path("../setup/setup_step7.tpl"))); } @@ -50,6 +54,80 @@ class setup_step_7 extends setup_step } } } + + + function check_schema() + { + $messages= array(); + + $checks["gosaObject"]["VERSION"] = "2.4"; + $checks["gosaObject"]["FILE"] = "gosa+samba3.schema/gosa.schema"; + $checks["gosaObject"]["CLASS"] = array("gosaObject"); + $checks["gosaObject"]["STATUS"] = FALSE; + $checks["gosaObject"]["MUST"] = FALSE; + $checks["gosaObject"]["MSG"] = ""; // The error message to display + $checks["gosaObject"]["INFO"] = _("GOsa object is used to store acls."); + + $checks["gosaAccount"]["VERSION"] = "2.4"; + $checks["gosaAccount"]["FILE"] = "gosa+samba3.schema/gosa.schema"; + $checks["gosaAccount"]["CLASS"] = array("gosaAccount"); + $checks["gosaAccount"]["STATUS"] = FALSE; + $checks["gosaAccount"]["MUST"] = TRUE; + $checks["gosaAccount"]["MSG"] = ""; // The error message to display + $checks["gosaAccount"]["INFO"] = _("Used to store account specific informations."); + + $checks["gosaLockEntry"]["VERSION"] = "2.4"; + $checks["gosaLockEntry"]["FILE"] = "gosa+samba3.schema/gosa.schema"; + $checks["gosaLockEntry"]["CLASS"] = array("gosaLockEntry"); + $checks["gosaLockEntry"]["STATUS"] = FALSE; + $checks["gosaLockEntry"]["MUST"] = TRUE; + $checks["gosaLockEntry"]["MSG"] = ""; // The error message to display + $checks["gosaLockEntry"]["INFO"] = _("Used to lock currently edited entries to avoid multiple changes at the same time."); + + $checks["gosaLockEntry"]["VERSION"] = "2.4"; + $checks["gosaLockEntry"]["FILE"] = "gosa+samba3.schema/gosa.schema"; + $checks["gosaLockEntry"]["CLASS"] = array("gosaLockEntry"); + $checks["gosaLockEntry"]["STATUS"] = FALSE; + $checks["gosaLockEntry"]["MUST"] = TRUE; + $checks["gosaLockEntry"]["MSG"] = ""; // The error message to display + $checks["gosaLockEntry"]["INFO"] = _("Used to lock currently edited entries to avoid multiple changes at the same time."); + + /* asdfasdf */ + + + $checks= array( + "gosaObject" => array("version" => "2.4"), + "gosaAccount" => array("version" => "2.4"), + "gosaLockEntry" => array("version" => "2.4"), + "gosaCacheEntry" => array("version" => "2.4"), + "gosaDepartment" => array("version" => "2.4"), + + "goFaxAccount" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), + "goFaxSBlock" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), + "goFaxRBlock" => array("version" => "1.0.4", "class" => "gofaxAccount","file" => "gofax.schema"), + + "gosaUserTemplate" => array("version" => "2.4", "class" => "posixAccount","file" => "nis.schema"), + "gosaMailAccount" => array("version" => "2.4", "class" => "mailAccount","file" => "gosa+samba3.schema"), + "gosaProxyAccount" => array("version" => "2.4", "class" => "proxyAccount","file" => "gosa+samba3.schema"), + "gosaApplication" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"), + "gosaApplicationGroup" => array("version" => "2.4", "class" => "appgroup","file" => "gosa.schema"), + + "GOhard" => array("version" => "2.5", "class" => "terminals","file" => "goto.schema"), + "gotoTerminal" => array("version" => "2.5", "class" => "terminals","file" => "goto.schema"), + "goServer" => array("version" => "2.4","class" => "server","file" => "goserver.schema"), + "goTerminalServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goShareServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goNtpServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goSyslogServer" => array("version" => "2.4", "class" => "terminals","file" => "goto.schema"), + "goLdapServer" => array("version" => "2.4"), + "goCupsServer" => array("version" => "2.4", "class" => array("posixAccount", "terminals"),), + "goImapServer" => array("version" => "2.4", "class" => array("mailAccount", "mailgroup"),"file" => "gosa+samba3.schema"), + "goKrbServer" => array("version" => "2.4"), + "goFaxServer" => array("version" => "2.4", "class" => "gofaxAccount","file" => "gofax.schema"), + ); + + } + } // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/setup/setup_step6.tpl b/setup/setup_step6.tpl index da7c051c4..734e0c00e 100644 --- a/setup/setup_step6.tpl +++ b/setup/setup_step6.tpl @@ -1,4 +1,12 @@ +{if $warnings_cnt} +Errors: +{foreach from=$warnings item=val key=key} +
+ {$val} +{/foreach} +{/if} +

{t}Samba settings{/t} diff --git a/setup/setup_step7.tpl b/setup/setup_step7.tpl index 7b9d2d7c6..fa5166e8f 100644 --- a/setup/setup_step7.tpl +++ b/setup/setup_step7.tpl @@ -1,22 +1,17 @@

- {t}GOsa settings{/t} + {t}Schema check{/t}
- + If schema is not readable allow disable
- {t}GOsa theme{/t} +
-
- {t}Infos in FAQ{/t}  -