Updated device naming

[gosa.git] / gosa-plugins / ldapmanager / html / getxls.php

diff --git a/gosa-plugins/ldapmanager/html/getxls.php b/gosa-plugins/ldapmanager/html/getxls.php
index 433aa5a987eda52410122908e067b1343de07c82..f7aef13397f80a49276500038fcbce376b860974 100644 (file)
--- a/gosa-plugins/ldapmanager/html/getxls.php
+++ b/gosa-plugins/ldapmanager/html/getxls.php
@@ -152,7 +152,7 @@ function dump_ldap ($mode= 0)
      /* SYSTEMS 
         Get all systems from th $dn
         and put them into the xls work sheet */
-     case get_ou('systemRDN'): 
+     case get_ou("systemManagement", "systemRDN"): 
 
        $name_section=_("Servers");
        $computers= $ldap->gen_xls($dn,"(&(objectClass=*)(cn=*))",array("cn","description","uid"));
@@ -183,7 +183,7 @@ function dump_ldap ($mode= 0)
      /* SYSTEMS 
        Get all systems from th $dn
        and put them into the xls work sheet */
-     case get_ou('serverRDN'): $servers= $ldap->gen_xls($dn,"(objectClass=*)",array("cn"));
+     case get_ou("servgeneric", "serverRDN"): $servers= $ldap->gen_xls($dn,"(objectClass=*)",array("cn"));
        $intitul=array(_("Server name").":");
 
        //name of the xls file
@@ -230,14 +230,14 @@ function dump_ldap ($mode= 0)
                         _("State").":",_("Function").":");
 
        //name of the xls file
-       $name_section=_("Adressbook");
+       $name_section=_("Address book");
 
        $worksheet = $workbook->addworksheet(_("Servers"));
        $worksheet->set_column('A:B', 51);
 
        //count number of entries
        $address_nbr=count($address);
-       $worksheet->write('A1',sprintf(_("Adressbook of %s on %s"),$n, $date),$title_title);
+       $worksheet->write('A1',sprintf(_("Address book of %s on %s"),$n, $date),$title_title);
        $r=3;
        for($i=1;$i<$address_nbr;$i++)
        {
@@ -288,7 +288,7 @@ function dump_ldap ($mode= 0)
     $computers= $ldap->gen_xls("ou=computers,".$dn,"(objectClass=*)",array("cn","description","uid"));
     $computers_intitul=array(_("Description").":",_("UID").":");
     //data about servers
-    $servers= $ldap->gen_xls(get_ou('serverRDN').$dn,"(objectClass=*)",array("cn"));
+    $servers= $ldap->gen_xls(get_ou("servgeneric", "serverRDN").$dn,"(objectClass=*)",array("cn"));
     $servers_intitul=array(_("Name").":");
     //data about addressbook
     $address= $ldap->gen_xls("dc=addressbook,".$dn,"(objectClass=*)",
@@ -311,7 +311,7 @@ function dump_ldap ($mode= 0)
     $worksheet2 = $workbook->addworksheet(_("Groups"));
     $worksheet3 = $workbook->addworksheet(_("Servers"));
     $worksheet4 =$workbook->addworksheet(_("Computers"));
-    $worksheet5 = $workbook->addworksheet(_("Adressbook"));
+    $worksheet5 = $workbook->addworksheet(_("Address book"));
 
     $worksheet->set_column('A:B', 51);
     $worksheet2->set_column('A:B', 51);
@@ -413,7 +413,7 @@ function dump_ldap ($mode= 0)
 
     //count number of entries
     $address_nbr=count($address);
-    $worksheet5->write('A1',sprintf(_("Adressbook of %s on %s"),$dn, $date),$title_title);
+    $worksheet5->write('A1',sprintf(_("Address book of %s on %s"),$dn, $date),$title_title);
 
     $r=3;
     for($i=1;$i<$address_nbr;$i++)
@@ -445,21 +445,6 @@ function dump_ldap ($mode= 0)
   }
   elseif($mode == 4){ // IVBB LDIF Export
     $dn =  base64_decode($_GET['dn']);
-    /*$display= $ldap->gen_ldif($dn,"(objectClass=ivbbentry)",array(
-      "GouvernmentOrganizationalUnit","houseIdentifier","vocation",
-      "ivbbLastDeliveryCollective","gouvernmentOrganizationalPersonLocality",
-      "gouvernmentOrganizationalUnitDescription","gouvernmentOrganizationalUnitSubjectArea",
-      "functionalTitle","role","certificateSerialNumber","userCertificate","publicVisible",
-      "telephoneNumber","seeAlso","description","title","x121Address","registeredAddress",
-      "destinationIndicator","preferredDeliveryMethod","telexNumber","teletexTerminalIdentifier",
-      "telephoneNumber","internationaliSDNNumber","facsimileTelephoneNumber","street",
-      "postOfficeBox","postalCode","postalAddress","physicalDeliveryOfficeName","ou",
-      "st","l","audio","businessCategory","carLicense","departmentNumber","displayName",
-      "employeeNumber","employeeType","givenName","homePhone","homePostalAddress",
-      "initials","jpegPhoto","labeledURI","mail","manager","mobile","o","pager","photo",
-      "roomNumber","secretary","userCertificate","x500uniqueIdentifier","preferredLanguage",
-      "userSMIMECertificate","userPKCS12"));*/
-
     echo $display;
   }
 }
@@ -480,15 +465,17 @@ if (!session::is_set('ui')){
 $ui     = session::get('ui');
 $config = session::get('config');
 
-
 /* Check ACL's */
 $dn ="";
 if(isset($_GET['n'])){
-  $dn =  base64_decode($_GET['n']);
+  $dn = base64_decode($_GET['n']);
+  $acl_dn = base64_decode($_GET['d']).base64_decode($_GET['n']);
 }elseif(isset($_GET['dn'])){
-  $dn =  base64_decode($_GET['dn']);
+  $dn = base64_decode($_GET['dn']);
+  $acl_dn = base64_decode($_GET['dn']);
 }
-$acl = $ui->get_permissions($dn,"ldapmanager/xlsexport");
+
+$acl = $ui->get_permissions($acl_dn,"ldapmanager/ldif");
 if(!preg_match("/r/",$acl)){
        msg_dialog::display(_("Permission error"),_("You have no permission to do LDAP exports!"),FATAL_ERROR_DIALOG);
   exit();