Use Directory interface for search idle accounts

ltb-project · Aug 23, 2024 · 86de562 · 86de562
1 parent 0c4ce50
commit 86de562
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 20 deletions.
diff --git a/htdocs/index.php b/htdocs/index.php
@@ -81,6 +81,7 @@
   case "activedirectory":
     $attributes_map = array_merge($attributes_map, $activedirectory_attributes_map);
     $directory = new \Ltb\Directory\ActiveDirectory();
+    $ldap_lastauth_attribute = "lastLogon";
   break;
 }
 

diff --git a/htdocs/searchidle.php b/htdocs/searchidle.php
@@ -7,35 +7,30 @@
 require __DIR__ . '/../vendor/autoload.php';
 require_once("../lib/date.inc.php");
 
-
-
 # Compute idle date
 $dateIdle = new DateTime();
 date_sub( $dateIdle, new DateInterval('P'.$idledays.'D') );
-$dateIdleLdap = string2ldapDate( $dateIdle->format('d/m/Y') );
+$dateIdleLdap = $directory->getLdapDate($dateIdle);
 
 # Search filter
 $ldap_filter = "(&".$ldap_user_filter."(|(!(".$ldap_lastauth_attribute."=*))(".$ldap_lastauth_attribute."<=".$dateIdleLdap.")))";
 
-# Search attributes
-$attributes = array();
+[$ldap,$result,$nb_entries,$entries,$size_limit_reached] = $ldapInstance->search($ldap_filter, array(), $attributes_map, $search_result_title, $search_result_sortby, $search_result_items, $ldap_scope);
 
-[$ldap,$result,$nb_entries,$entries,$size_limit_reached]=$ldapInstance->search($ldap_filter, $attributes, $attributes_map, $search_result_title, $search_result_sortby, $search_result_items, $ldap_scope);
-
-if ( ! empty($entries) )
+if ( !empty($entries) )
 {
-                $smarty->assign("page_title", "idleaccountstitle");
-                $smarty->assign("nb_entries", $nb_entries);
-                $smarty->assign("entries", $entries);
-                $smarty->assign("size_limit_reached", $size_limit_reached);
-
-                $columns = $search_result_items;
-                if (! in_array($search_result_title, $columns)) array_unshift($columns, $search_result_title);
-                $smarty->assign("listing_columns", $columns);
-                $smarty->assign("listing_linkto",  isset($search_result_linkto) ? $search_result_linkto : array($search_result_title));
-                $smarty->assign("listing_sortby",  array_search($search_result_sortby, $columns));
-                $smarty->assign("show_undef", $search_result_show_undefined);
-                $smarty->assign("truncate_value_after", $search_result_truncate_value_after);
+    $smarty->assign("page_title", "idleaccountstitle");
+    $smarty->assign("nb_entries", $nb_entries);
+    $smarty->assign("entries", $entries);
+    $smarty->assign("size_limit_reached", $size_limit_reached);
+
+    $columns = $search_result_items;
+    if (! in_array($search_result_title, $columns)) array_unshift($columns, $search_result_title);
+    $smarty->assign("listing_columns", $columns);
+    $smarty->assign("listing_linkto",  isset($search_result_linkto) ? $search_result_linkto : array($search_result_title));
+    $smarty->assign("listing_sortby",  array_search($search_result_sortby, $columns));
+    $smarty->assign("show_undef", $search_result_show_undefined);
+    $smarty->assign("truncate_value_after", $search_result_truncate_value_after);
 }
 
 ?>