Changeset 8143

Timestamp:

Dec 15, 2010, 3:01:14 AM (13 years ago)

Author:

Whiler

Message:

Parameters labels weren't good... (opposite from what we are expecting) - fixed
Second tab only show users who are duplicated with the chosen options

Location:

extensions/LCAS/trunk

Files:

• admin/LCAS_admin.php (modified) (2 diffs)
• include/functions.inc.php (modified) (3 diffs)
• language/fr_FR/plugin.lang.php (modified) (1 diff)

extensions/LCAS/trunk/admin/LCAS_admin.php

@@ -194 +194 @@
 // +-----------------------------------------------------------------------+
 
-                $page['all_users'] = LCAS_get_user_list();
+                if ($conf_LCAS[0]=='true' && $conf_LCAS[1]=='true')
+                        $lcas_rule = 2;
+                else if ($conf_LCAS[0]=='true')
+                        $lcas_rule = 1;
+                else if ($conf_LCAS[1]=='true')
+                        $lcas_rule = 3;
+                else
+                        $lcas_rule = 0;
+                
+                $page['all_users'] = LCAS_get_user_list($lcas_rule);
 
 // +-----------------------------------------------------------------------+
@@ -256 +265 @@
         array(
                 'ID'          => $local_user['id'],
-                'USERNAME'    => stripslashes($local_user['username'].' | '.LCAS_change_case($local_user['username'], 1).' | '.LCAS_change_case($local_user['username'], 2).' | '.LCAS_change_case($local_user['username'], 3)),
+                'USERNAME'    => stripslashes($local_user['username'].' | '.$local_user['transformed']),
                                         'EMAIL'       => get_email_address_as_display_text($local_user['email']),
           'LASTVISIT'   => $lcas_UpdateUser,

extensions/LCAS/trunk/include/functions.inc.php

@@ -807 +807 @@
 }
 
+// Fonctionnel mais optimisable
+function LCAS_GetDuplicates($source) {
+        $users      = array();
+        $duplicates = array();
+        
+        // Liste des utilisateurs uniques
+        foreach($source as $user) {
+                if (isset($users[$user['transformed']])) {
+                        $users[$user['transformed']] += 1;
+                }
+                else {
+                        $users[$user['transformed']] = 1;
+                }
+        }
+        
+        // On récupère les doublons
+        foreach($source as $user) {
+                if ($users[$user['transformed']] > 1) {
+                        array_push($duplicates, $user);
+                }
+        }
+        
+        return $duplicates;
+}
+
 /* Function called from UserAdvManager.php - Get all users to display the number of days since their last visit */
-function LCAS_get_user_list()
+function LCAS_get_user_list($rule)
 {
         global $conf, $page;
@@ -820 +845 @@
                 u.'.$conf['user_fields']['email'].' AS email
 FROM '.USERS_TABLE.' AS u
-WHERE u.'.$conf['user_fields']['id'].' >= 3
 ;';
 
@@ -828 +852 @@
   {
         $user = $row;
-    $user['groups'] = array();
-
+        $user['transformed'] = LCAS_change_case($user['username'], $rule); 
     array_push($users, $user);
         }
 
-        /* add group lists */
-  $user_ids = array();
-  foreach ($users as $i => $user)
-  {
-        $user_ids[$i] = $user['id'];
-        }
-
-        return $users;
+        return LCAS_GetDuplicates($users);
 }
 

extensions/LCAS/trunk/language/fr_FR/plugin.lang.php

@@ -11 +11 @@
 
 $lang['LCAS_Mail_Info'] = 'Sensibilité à la casse :';
-$lang['LCAS_Mail_Info_true'] = ' Activer';
-$lang['LCAS_Mail_Info_false'] = ' Désactiver (valeur par défaut)';
+$lang['LCAS_Mail_Info_true'] = ' Désactiver';
+$lang['LCAS_Mail_Info_false'] = ' Activer (valeur par défaut)';
 
 $lang['LCAS_Confirm_Mail'] = 'Sensibilité aux accents :';
-$lang['LCAS_Confirm_Mail_false'] = ' Désactiver (valeur par défaut)';
-$lang['LCAS_Confirm_Mail_true'] = ' Activer';
+$lang['LCAS_Confirm_Mail_false'] = ' Activer (valeur par défaut)';
+$lang['LCAS_Confirm_Mail_true'] = ' Désactiver';