Changeset 833

Timestamp:

03/19/10 03:05:10 (14 years ago)

Author:

nanardon

Message:

• don't hardcode department list, make code smaller

File:

• LATMOS-Accounts/bin/la-web-directory (modified) (4 diffs)

LATMOS-Accounts/bin/la-web-directory

@@ -62 +62 @@
 =cut
 
-# On recherche les departements en plus de l'attribut "department"
-#   en scrutant l'ensemble des groupes de l'utilisateur
-
-sub tous_les_depts {
-    my ($ouser) = @_;
-    my $groupes = join(" ",$ouser->get_attributes('memberOf'));
-    my $dept = $ouser->get_attributes('department');
-    my $res = $dept;
-    my @depts = ('admg', 'tilde', 'manip', 'heppi', 'impec', 'shti', 'space', 'tact', 'ester');
-
-    if ($dept) {
-            foreach my $g (@depts) {
-                if (($g ne $dept)&&($groupes =~ m/$g/)) {
-                        $res .= " $g";
-                }
-        }
-    }
-
-    return $res;
-}
 
 my $LA = LATMOS::Accounts->new($config, noacl => 1);
@@ -90 +70 @@
 my %users;
 my $now = strftime('%Y/%m/%d', gmtime);
+my @depts = $labase->search_objects('group', 'sutype=dpmt');
 
 foreach my $user (sort $labase->search_objects('user',
@@ -106 +87 @@
     my $contrat = $ouser->get_attributes('contratType');
     if ($company){
-            if (($company ne "LATMOS")&&($contrat ne "heberges")) {
-                next;
+        if (($company ne "LATMOS")&&($contrat ne "heberges")) {
+            next;
         }
-            if ($company eq "Novimet") {
-                next;
+        if ($company eq "Novimet") {
+            next;
         }
     } else {
-            if ((!$contrat)||($contrat ne "heberges")) {
-                next;
+        if ((!$contrat)||($contrat ne "heberges")) {
+            next;
         }
     }
@@ -130 +111 @@
     }
 
-# Si c'est un heberge, on place departement a "EXT"
+    # Si c'est un heberge, on place departement a "EXT"
 
     my $department;
 
     if ($contrat eq "heberges") {
-            $department = "EXT";
+        $department = "EXT";
     } else {
-            $department = tous_les_depts($ouser);
+        # On recherche les departements en plus de l'attribut "department"
+        # en scrutant l'ensemble des groupes de l'utilisateur
+        my @userdepts;
+        foreach my $gr ($ouser->get_attributes('memberOf')) {
+            grep { $_ eq $gr } (@depts) and push(@userdepts, $gr);
+        } 
+        $department = join(' ', @userdepts);
     }