Updated get_ou()

[gosa.git] / gosa-plugins / ldapmanager / addons / ldapmanager / class_exportxls.inc

diff --git a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
index 4a563d09c211397fffac45483f66e00f03cb793a..14b734ac9d795915053af6bf49fa87052535a57a 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
@@ -67,7 +67,7 @@ class xlsexport extends plugin
 
     // Set values for optionlist in form
     $bases      = array();
-    $acl_bases  = $this->ui->get_module_departments("all");
+    $acl_bases  = $this->ui->get_module_departments("ldapmanager");
     foreach($this->config->idepartments as $base_dn => $name){
       if(in_array_ics($base_dn,$acl_bases)){
         $bases[$base_dn] = $name;
@@ -76,19 +76,14 @@ class xlsexport extends plugin
     $smarty->assign("deplist", $bases);
     $smarty->assign("choicelist",array( get_people_ou()             =>"users" ,
                                         get_groups_ou()             =>"groups" ,
-                                        get_ou('systemsou')         =>"computers",
-                                        get_ou('serverou')          =>"servers",
+                                        get_ou("systemManagement", "systemRDN")         =>"computers",
+                                        get_ou("servgeneric", "serverRDN")          =>"servers",
                                         "dc=addressbook,"           =>"addressbook"));
 
     // Get the LDAP link, to generate the Export
     $ldap = $this->config->get_ldap_link();
 
-    if ($this->config->current['GOVERNMENTMODE'] == 'true'){
-      $smarty->assign ("govmode", "true");
-    } else {
-      $smarty->assign ("govmode", "false");
-    }
-
+    $smarty->assign ("govmode", $this->config->get_cfg_value("core","honourIvbbAttributes"));
     $smarty->assign("LDIFError",FALSE);
 
     if(isset($dn))
@@ -102,13 +97,13 @@ class xlsexport extends plugin
     /* check alcs for given dn */
     $acls ="";
     if(isset($dn)){
-      $acls = $this->ui->get_permissions($dn,"all/all");
+      $acls = $this->ui->get_permissions($dn,"ldapmanager/ldif");
     }
  
     if(!preg_match("/r/",$acls) && (isset($_POST['sfrmgetsingle']) || isset($_POST['sfrmgetfull']) || isset($_POST['sfrmgetivbb']))){
 
       /* Show error msg */      
-      msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to export '%s'!"),@LDAP::fix($dn)), ERROR_DIALOG);
+      msg_dialog::display(_("Permission error"), sprintf(_("You have no permission to export %s!"), bold(LDAP::fix($dn))), ERROR_DIALOG);
 
       /* Show main page */
       $smarty->assign("LDIFError",TRUE);