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

Timestamp:

Jan 13, 2011, 2:58:32 AM (13 years ago)

Author:

LucMorizur

Message:

Properely hook (normally :-/ ...) all cases between LCAS options and $confinsensitive_case_logon , at login as well as at register (normally :-/ ...)

File:

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

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

@@ -33 +33 @@
  * @return : string, or array of strings, modified as stated
 */
-function LCAS_change_case($Username, $Option)
+function LCAS_change_case($Username, $Opt, $At_login=true)
 {
   global $conf;
-
-  // Exits immediately without changing the parameter, if the configuration
-  // is set on "case sensitive and accent sensitive".
-  if (!isset($Option) or
-    $Option != 0 and
-    $Option != 1 and
-    $Option != 2 and
-    $Option != 3
-  ) return $Username;
+  
+  if ($Opt == '0' and !isset($conf['LCAS_replacement_set'][0]))
+   return $Username;
+  $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;
+    }
+  }
   
   include(LCAS_PATH.'include/LCAS_replacement_set.inc.php');
@@ -320 +351 @@
 
 /*
+ * 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;
+
+}
+
+
+/*
  * str_from_var3($var)
  * returns a string easing array var informations displaying in Piwigo :