Fixed problem with zend.ze1_compatibility_mode set to "on" and PHP5

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

diff --git a/Changelog b/Changelog
index f76fd4bc694f238ead4cf6b6133dc9d99d5bc172..299bbdc7c4059e1e8da500a4e6b9e193af9acf04 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,10 @@
 GOsa2 changelog
 ===============
 
+* gosa 2.5.11
+  - Add workaround for failing is_php4() when using PHP5
+    with "zend.ze1_compatibility_mode" set to "On"
+
 * gosa 2.5.10
   - Included hook to make use of dynamic uid-bases
   - Included vacation date range specification
@@ -12,6 +16,7 @@ GOsa2 changelog
   - Enabled 9 digits for gid-/uidNumbers
   - Fixed acl's for saving printers
   - Fixed saving of disabled samba acl's
+  - Added support for rfc2307bis compliant groups
 
 * gosa 2.5.9
   - Fixed ldap tls connections when schema check was being used

diff --git a/html/index.php b/html/index.php
index b920dd7e4c04177ee5f68364e855f74f20685397..f7c0fb0793a25287eef528ee2b2cd2a5366b4e0d 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -281,6 +281,11 @@ if ($_SERVER["REQUEST_METHOD"] == "POST" && isset($_POST['login'])){
       $config->make_idepartments();
       $_SESSION['config']= $config;
 
+      /* Take care about zend.ze1_compatiblity_mode */
+      if (ini_get("zend.ze1_compatibility_mode") != 0){
+        $_SESSION['PHP4COMPATIBLE']= TRUE;
+      }
+
       /* are we using accountexpiration */
       if((isset($config->data['MAIN']['ACCOUNT_EXPIRATION'])) && 
           preg_match('/true/i', $config->data['MAIN']['ACCOUNT_EXPIRATION'])){

diff --git a/include/class_userinfo.inc b/include/class_userinfo.inc
index 99e7286100c5a094b0399fefbe7b8e12b2ad8a43..77003f9e706d8bfeb1571e87f51aba54d3808492 100644 (file)
--- a/include/class_userinfo.inc
+++ b/include/class_userinfo.inc
@@ -84,7 +84,6 @@ class userinfo
         $this->subtreeACL[$base][]= $attrs["gosaSubtreeACL"][$i];
       }
     }
-
   }
 
 }

diff --git a/include/functions.inc b/include/functions.inc
index c9f00989294efb80663b36bea02a57c0ed54e306..04a9d91d17c62e1d00e9bda858609ab91db87b57 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -2152,6 +2152,9 @@ function is_department_name_reserved($name,$base)
 
 function is_php4()
 {
+  if (isset($_SESSION['PHP4COMPATIBLE'])){
+    return true;
+  }
   return (preg_match('/^4/', phpversion()));
 }
 

diff --git a/plugins/admin/applications/class_applicationParameters.inc b/plugins/admin/applications/class_applicationParameters.inc
index bc0714460c022792dec8a02be14ccd7646ea428f..c21919f95655912cdb1ebe5f4001641b66a65905 100644 (file)
--- a/plugins/admin/applications/class_applicationParameters.inc
+++ b/plugins/admin/applications/class_applicationParameters.inc
@@ -10,7 +10,7 @@ class applicationParameters extends plugin
   var $CopyPasteVars = array("option_name","option_value");
   var $attributes= array("gosaApplicationParameter");
   var $objectclasses= array();
-var $ui;
+  var $ui;
 
   function applicationParameters ($config, $dn= NULL, $parent= NULL)
   {