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 daafeaf68ab98c09412e6605ff658745a84835f7..d9bc643b387a1b0bf1d7c0d93ca62c5e8773a30a 100644 (file)
--- 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 eedb588da6d6f497679c00cae572effc74a8db6c..f7e0d54ec1e1078f6d25087dbbadcec7071a6eb6 100644 (file)
--- 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 e5dd8e5a77fea05d7a4499a54dba7680ec587b3e..5bf0f6d3f6dc88a4eda05d43848342f383332795 100644 (file)
--- 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 da7c051c41b5b618f178c014dd9319d5706c6288..734e0c00e6cf8966a8563264ba30ca6fc26a4cb9 100644 (file)
--- a/setup/setup_step6.tpl
+++ b/setup/setup_step6.tpl
@@ -1,4 +1,12 @@
 
+{if $warnings_cnt}
+<b><font style='color:red' >Errors:</font></b>
+{foreach from=$warnings item=val key=key}
+       <br>
+       <font style='color:red' >{$val}</font>
+{/foreach}
+{/if}
+
     <div style='float:left; width:600px;'>
                <br>
                <b>{t}Samba settings{/t}</b>

diff --git a/setup/setup_step7.tpl b/setup/setup_step7.tpl
index 7b9d2d7c683165ef782e328b3cb08e4c42d6aa6e..fa5166e8ffe8a746ef047b214d3af529a4ea7110 100644 (file)
--- a/setup/setup_step7.tpl
+++ b/setup/setup_step7.tpl
@@ -1,22 +1,17 @@
 
     <div style='float:left; width:600px;'>
                <br>
-               <b>{t}GOsa settings{/t}</b>
+               <b>{t}Schema check{/t}</b>
        </div>
-
+               If schema is not readable allow disable
     <div class='step4_container'>
         <div class='step4_name'>
-            {t}GOsa theme{/t}
+
         </div>
         <div class='step4_value'>
-            <select name="theme">
-                {html_options options=$themes selected=$theme}
-            </select>
         </div>
 
         <div class='step4_status'>
-            {t}Infos in FAQ{/t}&nbsp;
-            <img class='center' src='images/info_small.png' title='{t}Please read the FAQ for more informations{/t}'>
         </div>
     </div>