Added default winstation ou to avoid errors if not set in config.

[gosa.git] / gosa-core / include / class_config.inc

diff --git a/gosa-core/include/class_config.inc b/gosa-core/include/class_config.inc
index db862c0f887929ba03f86b9105f767b07d44d86f..8d839877c5eec731614953a4f46417164195eea7 100644 (file)
--- a/gosa-core/include/class_config.inc
+++ b/gosa-core/include/class_config.inc
@@ -70,6 +70,22 @@ class config  {
   
   function check_and_reload()
   {
+    global $ui;
+
+    /* Check if class_location.inc has changed, this is the case 
+        if we have installed or removed plugins. 
+     */
+    if(session::is_set("class_location.inc:timestamp")){
+      $tmp = stat("../include/class_location.inc");
+      if($tmp['mtime'] != session::get("class_location.inc:timestamp")){
+        session::un_set("plist");
+      }
+    }
+    $tmp = stat("../include/class_location.inc");
+    session::set("class_location.inc:timestamp",$tmp['mtime']);
+
+
+
     if($this->filename != "" && filemtime($this->filename) != $this->last_modified){
 
       $this->config_found= FALSE;
@@ -400,6 +416,7 @@ class config  {
         
         $this->data['SERVERS']['IMAP'][$imap_server]= 
             array( 
+            "server_dn"   => $attrs['dn'],
             "connect"     => $imap_connect,
             "admin"       => $imap_admin,
             "password"    => $pwd,
@@ -616,11 +633,41 @@ class config  {
     $result['/']= $this->current['BASE'];
     $this->tdepartments= array();
 
+    /* Get all department types from department Management, to be able detect the department type.
+        -It is possible that differnty department types have the same name, 
+         in this case we have to mark the department name to be able to differentiate.
+          (e.g l=Name  or   o=Name)
+     */    
+    $types = departmentManagement::get_support_departments();
+    
+    /* Create a list of attributes to fetch */
+    $ldap_values = array("objectClass","gosaUnitTag");
+    $filter = "";
+    foreach($types as $type){
+      $ldap_values[] = $type['ATTR'];
+      $filter .= "(objectClass=".$type['OC'].")";
+    }
+    $filter = "(&(objectClass=gosaDepartment)(|".$filter."))";
+
     /* Get list of department objects */
     $ldap= $this->get_ldap_link();
     $ldap->cd ($this->current['BASE']);
-    $ldap->search ("(objectClass=gosaDepartment)", array("ou", "objectClass", "gosaUnitTag"));
+    $ldap->search ($filter, $ldap_values);
     while ($attrs= $ldap->fetch()){
+
+      /* Detect department type */
+      $type_data = array();
+      foreach($types as $t => $data){
+        if(in_array($data['OC'],$attrs['objectClass'])){
+          $type_data = $data;
+          break;    
+        }
+      }
+
+      /* Unknown department type -> skip 
+       */
+      if(!count($type_data)) continue;
+
       $dn= $ldap->getDN();
       $this->tdepartments[$dn]= "";
 
@@ -640,9 +687,11 @@ class config  {
         continue;
       }
 
+      $c_dn = convert_department_dn($dn)." (".$type_data['ATTR'].")";
+
       /* Only assign non-root departments */
       if ($dn != $result['/']){
-        $result[convert_department_dn($dn)]= $dn;
+        $result[$c_dn]= $dn;
       }
     }
 
@@ -672,49 +721,48 @@ class config  {
         }
       }
 
-      /* remove base from dn */
-      $val2 = str_replace($base,"",$val);
-
-      /* Get every single ou */
-      $str = preg_replace("/ou=/","|ou=",$val2);       
-      $elements = array_reverse(split("\|",$str));             
-
-      /* Save last array position */
-      $last = &$arr;
-
-      /* Get array depth  */
-      $cnt = count($elements);
+      /* Split dn into single department pieces.
+       */
+      $elements = array_reverse(split(",",preg_replace("/".normalizePreg($base)."$/","",$val)));               
 
       /* Add last ou element of current dn to our array */
+      $last = &$arr;
       foreach($elements as $key => $ele){
 
-        /* skip enpty */
+        /* skip empty */
         if(empty($ele)) continue;
 
         /* Extract department name */          
-        $elestr = preg_replace("/^ou=/","", $ele);
-        $elestr = preg_replace("/,$/","",$elestr);     
+        $elestr = trim(preg_replace("/^[^=]*+=/","", $ele),",");
+        $nameA  = trim(preg_replace("/=.*$/","", $ele),",");
+        if($nameA != "ou"){
+          $nameA = " (".$nameA.")";
+        }else{
+          $nameA = "";
+        }
+    
 
         /* Add to array */     
-        if($key == ($cnt-2)){
-          $last[$elestr]['ENTRY'] = $val;
+        if($key == (count($elements)-1)){
+          $last[$elestr.$nameA]['ENTRY'] = $val;
         }
 
         /* Set next array appending position */
-        $last = &$last[$elestr]['SUB'];
+        $last = &$last[$elestr.$nameA]['SUB'];
       }
     }
 
+
     /* Add base entry */
     $ret["/"]["ENTRY"]         = $base;
     $ret["/"]["SUB"]   = $arr;
-
     $this->idepartments= $this->generateDepartmentArray($ret,-1,$max_size);
   }
 
 
   /* Creates display friendly output from make_idepartments */
-  function generateDepartmentArray($arr,$depth = -1,$max_size){
+  function generateDepartmentArray($arr,$depth = -1,$max_size)
+  {
     $ret = array();
     $depth ++;
 
@@ -729,7 +777,7 @@ class config  {
       }
 
       /* Fix name, if it contains a replace tag */
-      $name= @LDAP::fix($name);
+      $name= preg_replace('/\\\\,/', ',', @LDAP::fix($name));
 
       /* Check if current name is too long, then cut it */
       if(mb_strlen($name, 'UTF-8')> $max_size){
@@ -795,18 +843,27 @@ class config  {
   {
     global $config;
     $return = array();
+    $ui = get_userinfo();
     $base = $config->current['BASE'];
     $res= get_sub_list("(&(objectClass=goShareServer)(goExportEntry=*))", "server",
-          get_ou("serverou"), $base,array("goExportEntry","cn"),GL_NONE);
+          get_ou("serverou"), $base,array("goExportEntry","cn"),GL_NONE | GL_NO_ACL_CHECK);
 
     foreach($res as $entry){
+        
+        $acl = $ui->get_permissions($entry['dn'],"server/goShareServer","");
         if(isset($entry['goExportEntry']['count'])){
           unset($entry['goExportEntry']['count']);
         }
         foreach($entry['goExportEntry'] as $share){
           $a_share = split("\|",$share);
           $sharename = $a_share[0];
-          $return[$entry['cn'][0]."|".$sharename] = $entry['cn'][0]." [".$sharename."]";
+          $data= array();
+          $data['NAME']   = $sharename;
+          $data['ACL']    = $acl;
+          $data['SERVER'] = $entry['cn']['0'];
+          $data['SHARE']  = $sharename;
+          $data['DISPLAY']= $entry['cn'][0]." [".$sharename."]";
+          $return[$entry['cn'][0]."|".$sharename] = $data;
         }
     }
     return($return);