added error lvl select to setup.

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index a45dbb93f603ff334f34c0761b95f865bdb77715..095569d1f34f6a6b394aa3160133cf48f478e6f1 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -163,7 +163,7 @@
                pwminlen="6"
                forceglobals="false"
                smbhash='{SMBHASH}'
-               displayerros="false">
+               displayerros="{errorlvl}">
 
                <location name="{LOCATIONNAME}"
                        uidbase="1000"

diff --git a/ihtml/themes/default/setup_step4.tpl b/ihtml/themes/default/setup_step4.tpl
index 5341f743559c34597fa39855b2c1b797e95f0411..53de727ec46f016c83e061ba4965cdb2f748929d 100644 (file)
--- a/ihtml/themes/default/setup_step4.tpl
+++ b/ihtml/themes/default/setup_step4.tpl
@@ -94,6 +94,21 @@
  </tr>
 </table>
 
+<p class="seperator">&nbsp;</p>
+
+<p>
+ {t}GOsa may cause PHP interpreter errors, particularly in case of Beta versions. In some cases it would be helpfull to enable the error reporting. (But it could be a security risk)  {/t}
+</p>
+<table summary="">
+ <tr>
+  <td>{t}Display PHP errors{/t}</td>
+  <td>
+     <select name="errorlvl" size="1" title="">
+        <option value="true">{t}true{/t}</option>
+        <option value="false">{t}false{/t}</option>
+     </select>
+ </tr>
+</table>
 <p class="plugbottom">
  <input type="hidden" name="next" value="5">
  <input type='submit' name='back' value='{t}Back{/t}'> 

diff --git a/include/functions_setup.inc b/include/functions_setup.inc
index 50b96f2b603c11dc1f5a2e90a57cf3b3dd82a1af..d769c898c4b97b14a02582a453855a939926acb2 100644 (file)
--- a/include/functions_setup.inc
+++ b/include/functions_setup.inc
@@ -473,6 +473,7 @@ function parse_contrib_conf()
   $replacements['{GOVERNMENTMODE}']= "false"; 
   $replacements['{kolabAccount}']  = "";
   $replacements['{servKolab}']     = "";
+  $replacements['{errorlvl}']     = $ldapconf['errorlvl'];
 
   /* This array contains all preg_replace syntax to delete all unused plugins
      THE kEY MUST BE THE CLASSNAME so we can check it with $ldapconf['classes'] */
@@ -727,7 +728,7 @@ function show_setup_page4($withoutput = true)
   $arr_crypts= array();
   $temp      = "";
   $checkvars = array("location", "admin", "password", "peopleou", "base",
-      "peopledn", "arr_crypts", "mail", "uidbase");
+      "peopledn", "arr_crypts", "mail", "uidbase","errorlvl");
 
   if(!isset($_SESSION['ldapconf']['arr_cryptkeys'])) {
     require_once("class_password-methods.inc");