Moved errorlvl to debug section

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6264 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/setup/class_setupStep_Config1.inc b/setup/class_setupStep_Config1.inc
index 8d4cf4f969e7e4ad43987f6af7b1937aa3278505..f5f0c5a56fa4f17ef870f158b994b6ff26c9c929 100644 (file)
--- a/setup/class_setupStep_Config1.inc
+++ b/setup/class_setupStep_Config1.inc
@@ -37,7 +37,6 @@ class Step_Config1 extends setup_step
 
   var $encryption = "crypt";
   var $theme      = "default"; 
-  var $errorlvl   = FALSE;
 
   var $include_personal_title = FALSE;
 
@@ -55,7 +54,7 @@ class Step_Config1 extends setup_step
 
   var $crypt_methods  = array();
 
-  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","errorlvl","krbsasl",
+  var $attributes = array("peopleou","groupou","peopledn","uidbase","encryption","theme","krbsasl",
                           "base_hook","base_hook_active","account_expiration","strict","include_personal_title");
 
   function Step_Config1()

diff --git a/setup/class_setupStep_Config3.inc b/setup/class_setupStep_Config3.inc
index ab31a3f3f3e2c72bf006c2069d0b7a0922eda0ea..88828512d533612881bc5d391477174575abbc40 100644 (file)
--- a/setup/class_setupStep_Config3.inc
+++ b/setup/class_setupStep_Config3.inc
@@ -23,6 +23,9 @@
 class Step_Config3 extends setup_step
 {
   var $header_image= "images/ldapserver.png";
+
+  var $errorlvl   = FALSE;
+
   var $optional = array(
               "strict_units" => false,
               "forceglobals" => true,
@@ -51,6 +54,7 @@ class Step_Config3 extends setup_step
 
               "noprimarygroup"  => FALSE);
 
+  var $attributes = array("errorlvl");
 
   function Step_Config3()
   {

diff --git a/setup/setup_config1.tpl b/setup/setup_config1.tpl
index 2f59baca0ae67f4cd9f7c64dc94a86e31e08f56c..c6072ccfb82a1336810cc6d9e7d6f63432143c82 100644 (file)
--- a/setup/setup_config1.tpl
+++ b/setup/setup_config1.tpl
@@ -11,16 +11,6 @@
             </select>
         </div>
     </div>
-    <div class='step4_container'>
-        <div class='step4_name'>
-            {t}Show PHP errors{/t}
-        </div>
-        <div class='step4_value'>
-            <select name="errorlvl" size="1" title="">
-                       {html_options options=$bool selected=$errorlvl}
-            </select>
-        </div>
-    </div>
 
     <p><b>{t}People and group storage{/t}</b></p>
     <div class='step4_container'>

diff --git a/setup/setup_config3.tpl b/setup/setup_config3.tpl
index 96364a75e2e723cb1317ec109f925685c0a6c18d..5a878fedf5163be95f09bcc6c06b512980294f35 100644 (file)
--- a/setup/setup_config3.tpl
+++ b/setup/setup_config3.tpl
@@ -171,6 +171,19 @@
     </div>
 
     <p><b>{t}Debugging{/t}</b></p>
+       
+    <div class='step4_container'>
+        <div class='step4_name'>
+            {t}Show PHP errors{/t}
+        </div>
+        <div class='step4_value'>
+            <select name="errorlvl" size="1" title="">
+            {html_options options=$bool selected=$errorlvl}
+            </select>
+        </div>
+    </div>
+
+
     <div class='step4_container'>
         <div class='step4_name'>
             {t}Maximum LDAP query time{/t}