replaced plugbottom by pluin-actions

[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..8af43592e145263a08c06208c9c9eb2eae5448c2 100644 (file)
--- a/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
+++ b/gosa-plugins/ldapmanager/addons/ldapmanager/class_exportxls.inc
@@ -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('systemRDN')         =>"computers",
+                                        get_ou('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("honourIvbbAttributes"));
     $smarty->assign("LDIFError",FALSE);
 
     if(isset($dn))
@@ -108,7 +103,7 @@ class xlsexport extends plugin
     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'!"),LDAP::fix($dn)), ERROR_DIALOG);
 
       /* Show main page */
       $smarty->assign("LDIFError",TRUE);