From 247ad716e35706b7da553949bfed7cce39a0032d Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 18 May 2010 16:01:02 +0000
Subject: [PATCH] Added new flag ignoreLdapProperties which ignores settings
 made in the property editor.

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18536 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/contrib/gosa.conf                |  5 ++++-
 gosa-core/include/class_configRegistry.inc | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf
index 62c53a6e8..1b600d1c0 100644
--- a/gosa-core/contrib/gosa.conf
+++ b/gosa-core/contrib/gosa.conf
@@ -350,7 +350,10 @@
        the gosa.conf(5) manual page.
 
   -->
-  <main default="{$cv.location}">
+  <!-- If you broke your setup using the propertyEditor, then set 'ignoreLdapProperties' to true. -->
+  <main default="{$cv.location}"
+        ignoreLdapProperties="false"
+    >
 
     <!-- Location definition -->
     <location name="{$cv.location}"
diff --git a/gosa-core/include/class_configRegistry.inc b/gosa-core/include/class_configRegistry.inc
index f5b51d861..192330579 100644
--- a/gosa-core/include/class_configRegistry.inc
+++ b/gosa-core/include/class_configRegistry.inc
@@ -10,6 +10,9 @@ class configRegistry{
 
     public $status = 'none';
 
+    // Excludes property values defined in ldap 
+    public $ignoreLdapProperties = FALSE;
+
     function __construct($config)
     {
         $this->config = &$config;
@@ -76,8 +79,15 @@ class configRegistry{
             }
         }
 
+        // Skip searching for LDAP defined properties if 'ignoreLdapProperties' is set to 'true'
+        //  in the config. 
+        if(isset($this->fileStoredProperties['core'][strtolower('ignoreLdapProperties')]) && 
+            preg_match("/(true|on)/i", $this->fileStoredProperties['core'][strtolower('ignoreLdapProperties')])){
+            $this->ignoreLdapProperties = TRUE;
+        }
+
         // Search for all config flags defined in the LDAP - BUT only if we ARE logged in. 
-        if(!empty($this->config->current['CONFIG'])){
+        if(!$this->ignoreLdapProperties && !empty($this->config->current['CONFIG'])){
             $ldap = $this->config->get_ldap_link();
             $ldap->cd($this->config->current['CONFIG']);
             $ldap->search('(&(objectClass=gosaConfig)(gosaSetting=*))', array('cn','gosaSetting'));
-- 
2.30.2