Changeset 9158 for extensions/LCAS/trunk/include/functions.inc.php

Timestamp:

Feb 10, 2011, 9:31:02 PM (13 years ago)

Author:

LucMorizur

Message:

LCAS takes completely care for case sensitivity: $confinsensitive_case_logon set to false by LCAS

File:

• extensions/LCAS/trunk/include/functions.inc.php (modified) (5 diffs)

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

@@ -33 +33 @@
  * @return : string modified as stated
 */
-function LCAS_change_case($Username, $Opt, $At_login=true)
+function LCAS_change_case($Username, $Opt)
 {
   global $conf;
@@ -39 +39 @@
   if ($Opt == '0' and !isset($conf['LCAS_replacement_set'][0]))
    return $Username;
+  if ($Opt == '0') return $Username; // to be removed once rule 0 is done
   $Option = intval($Opt);
-  if (!isset($Opt) or ($Option < 0) or ($Option > 7)) return $Username;
-  if ($Option > 3) {
-    // Management of bad setting of $conf['insensitive_case_logon']
-    switch ($Opt) {
-      case '4':
-        // LCAS set to case insensitive, but $conf['insensitive_case_logon']
-        // is false : exit immediately, LCAS actually inactive
-        return $Username;
-      break;
-      case '5':
-        // LCAS set to case and accents insensitive, but
-        // $conf['insensitive_case_logon'] is false : only accents are
-        // insensitive
-        $Option = 2;
-      break;
-      case '6':
-        // LCAS set to accents only insensitive, but
-        // $conf['insensitive_case_logon'] is true : if check is done at
-        // login, LCAS cares for both case and accents insensitivity, but
-        // using strtolower() as does Piwigo at register; in case the check is
-        // done at register, Piwigo cares for the case, thus LCAS cares only
-        // for the accents.
-        $Option = 2; 
-        if ($At_login) $Username = strtolower($Username);
-      break;
-      case '7':
-        // LCAS set to personal, but $conf['insensitive_case_logon'] is true :
-        // if check is done at login, LCAS cares for both case and personal
-        // insensitivity, but using strtolower() as does Piwigo at register;
-        // in case the check is done at register, Piwigo cares for the case,
-        // thus LCAS cares only for the personal setting.
-        $Option = 0;
-        if ($At_login) $Username = strtolower($Username);
-      break;
-    }
-  }
+  if (!isset($Opt) or ($Option < 0) or ($Option > 3)) return $Username;
   
   include(LCAS_PATH.'include/LCAS_replacement_set.inc.php');
 
-  // Builds an array of characters that must be replaced
+  // Build an array of characters that must be replaced
   // $rep_char is the replacement character ; $char_rep_arr is an array of 
   // characters which have to be replaced. ie :
@@ -320 +286 @@
  * 
  */
-function LCAS_SearchCaseUsername($username, $rule, $At_login=true)
+function LCAS_SearchCaseUsername($username, $rule)
 {
   global $conf;
 
-  $username_c = LCAS_change_case($username, $rule, $At_login);
+  $username_c = LCAS_change_case($username, $rule);
 
   if (isset($username))
@@ -336 +302 @@
     while ($r = pwg_db_fetch_assoc($q))
      $LCAS_users[$r['username']] =
-      LCAS_change_case($r['username'], $rule, $At_login);
+      LCAS_change_case($r['username'], $rule);
      // $LCAS_users is now an associative table where the key is the account
      // as registered in the DB, and the value is this same account,
@@ -349 +315 @@
      return $users_found[0];
   }
-}
-
-
-/*
- * LCAS_final_case($var)
- * return the value of the case in which is the gallery, regarding
- * case and accents sensitivity
- *
- * @param $var
- *   the inital proposal from the webmaster
- * @return
- *   string being an image of the case and accents sensitivity
- */
-function LCAS_final_case($var) {
-
-  global $conf;
-  
-  if (isset($conf['insensitive_case_logon']) and $conf['insensitive_case_logon'] == true)
-  {
-    // Uncomfortable status if $conf['insensitive_case_logon'] is true and
-    // case insensitivity is not set in LCAS
-    if ($var == '2') return '6';
-    elseif  ($var == '0') return '7';
-  }
-  else
-  {
-    // Uncomfortable status if $conf['insensitive_case_logon'] is false and
-    // case insensitivity is set in LCAS
-    if ($var == '1') return '4';
-    elseif  ($var == '3') return '5';
-  }
-  
-  return $var;
-
 }