Added 1/2 FAI inactive Fixes

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

diff --git a/include/functions.inc b/include/functions.inc
index b1deb986ec57f75b944bff664fe34e9233818f49..2cc2e8cf35697805698481b76cbeaa208e96684e 100644 (file)
--- a/include/functions.inc
+++ b/include/functions.inc
@@ -462,6 +462,7 @@ function ldap_expired_account($config, $userdn, $username)
 function add_lock ($object, $user)
 {
   global $config;
+  echo "ADDING.. -> ".$object."<br>";
 
   /* Just a sanity check... */
   if ($object == "" || $user == ""){
@@ -502,6 +503,13 @@ function del_lock ($object)
 {
   global $config;
 
+  if(isset($_POST['delete_lock'])){
+    echo "REMOVING -> ".$object."<br>";
+  }else{
+    echo "SKIP REMOVING -> ".$object."<br>";
+    return;
+  }
+
   /* Sanity check */
   if ($object == ""){
     return;

diff --git a/plugins/admin/fai/class_faiSummaryTab.inc b/plugins/admin/fai/class_faiSummaryTab.inc
index ed3c20418d27478c4a9e72cb41e6f2d48ab111de..034f8cefe107b388f1f5a2a2cb6ee0acc628486e 100644 (file)
--- a/plugins/admin/fai/class_faiSummaryTab.inc
+++ b/plugins/admin/fai/class_faiSummaryTab.inc
@@ -168,6 +168,14 @@ class faiSummaryTab extends plugin{
   /* This function calls all nescessary functions to generate the fai class summary tree */
   function execute() 
   {
+
+    /* Skip this if fai is deactivated */
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    if(empty($tmp)){
+      $str = "<h2>"._("You can't use this plugin until FAI is activated.")."</h2>";
+      return $str;
+    }    
+
     /* Check if we must (re)init the this tab */
     if(!$this->InitCalled){
       $this->init();

diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc
index 0fab284e7b081b5c8183c32804f0a3a1ec9702a6..42f7655820a504507eed31903a9a6fa7ab124b54 100644 (file)
--- a/plugins/admin/groups/class_groupManagement.inc
+++ b/plugins/admin/groups/class_groupManagement.inc
@@ -453,8 +453,14 @@ class groupManagement extends plugin
       Search for the prepared filter 
      ********************/
    
+    /* Attributes to search for */    
+    $attrs = array("cn", "description", "gidNumber", "objectClass");
+ 
     /* If subsearch is activated search for subobjects too */
-    $attrs = array("cn", "description", "gidNumber", "objectClass","FAIrelease");
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    if(!empty($tmp)){
+      $attrs [] = "FAIrelease";
+    }
 
     if ($SubSearch){
       $res= get_list($filter, "groups", $base, $attrs, GL_SIZELIMIT| GL_SUBSEARCH);

diff --git a/plugins/admin/systems/class_servRepository.inc b/plugins/admin/systems/class_servRepository.inc
index 7d7cedd6ff2b4a8943369059577884643851127d..c84d4976cbcc87837e4ed55f8b1dbe28f689f7d6 100644 (file)
--- a/plugins/admin/systems/class_servRepository.inc
+++ b/plugins/admin/systems/class_servRepository.inc
@@ -27,11 +27,20 @@ class servrepository extends goService
   var $DisplayName           = "";
   var $StatusFlag            = "";
 
+  var $fai_activated          = FALSE;
 
   function servrepository ($config, $dn= NULL, $parent= NULL)
   {
     plugin::plugin ($config, $dn, $parent);
 
+    /* Skip this if fai is deactivated */
+    $tmp = search_config($this->config->data,"faiManagement","CLASS");
+    if(!empty($tmp)){
+      $this->fai_activated = TRUE;    
+    }else{
+      return;
+    }
+
     $this->DisplayName = _("Repository service");
 
     $this->repositories = array();
@@ -81,6 +90,11 @@ class servrepository extends goService
     /* Call parent execute */
     plugin::execute();
 
+    if(!$this->fai_activated){
+      $str = "<h2>"._("You can't use this plugin until FAI is activated.")."</h2>";
+      return $str;
+    }
+
     /* Fill templating stuff */
     $smarty= get_smarty();
     $smarty->assign("is_createable",$this->acl_is_createable());
@@ -294,6 +308,8 @@ class servrepository extends goService
   /* Save to LDAP */
   function save()
   {
+    if(!$this->fai_activated) return;
+
     plugin::save();
 
     $arr = array();