Changeset 28237 for extensions/LCAS/branch/2.3/main.inc.php

Timestamp:

Apr 20, 2014, 11:04:39 AM (10 years ago)

Author:

LucMorizur

Message:

Version 2.3.1: fix bug:3044 thanks to svn:27296 and svn:27322

File:

• extensions/LCAS/branch/2.3/main.inc.php (modified) (3 diffs)

extensions/LCAS/branch/2.3/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: LCAS
-Version: 2.3.0
+Version: 2.3.1
 Description: Allow to disable login/register name to be sensible to the case/accents
 Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=513
@@ -51 +51 @@
 // Define prefilter to add tooltips on register page
 add_event_handler('init', 'LCAS_InitPage');
- 
+
+// For page password.php, modifies $POST['username_or_email'] with registered
+// username, if this username is found in the DB with current rules of LCAS.
+add_event_handler('loc_begin_password', 'LCAS_InitPage');
+
 function LCAS_InitPage()
 {
   global $template, $conf, $lang;
 
-  $conf_LCAS= unserialize($conf['LoginCaseAccentsSensitivity']);
+  $conf_LCAS = unserialize($conf['LoginCaseAccentsSensitivity']);
   
   // Set $conf['insensitive_case_logon'] to false, as LCAS takes completely
   // in charge everything concerning the case and the accents in the login
   if ($conf_LCAS[0] != '0') $conf['insensitive_case_logon'] = false;
- 
-  /* User identification */
-  if (script_basename() == 'identification')
-  {
-    if (isset($_POST['username']) and isset($conf_LCAS[0]))
-    {
-      $new_username = LCAS_SearchCaseUsername($_POST['username'],$conf_LCAS[0]);
-      $_POST['username'] = $new_username == '' ? $_POST['username'] : $new_username;
-    }
+
+  $p = '';
+
+  switch (script_basename()) {
+
+    case 'register':
+      $template->assign(array(
+        'LCAS_username_tooltip' => $lang['LCAS_tooltip_username_register'][intval($conf_LCAS[0])],
+        'LCAS_password_tooltip' => $lang['LCAS_tooltip_password_register'],
+      ));
+      $template->set_prefilter('register', 'LCAS_add_tooltips_prefilter_register');
+    break;
+
+    case 'identification':
+      $p = 'username';
+      $template->assign(array(
+        'LCAS_username_tooltip' => $lang['LCAS_tooltip_username_register'][intval($conf_LCAS[0])],
+        'LCAS_password_tooltip' => $lang['LCAS_tooltip_password_register'],
+      ));
+      $template->set_prefilter('identification', 'LCAS_add_tooltips_prefilter_identification');
+    break;
+
+    case 'password':
+      $p = 'username_or_email';
+      $template->assign(array(
+        'LCAS_username_tooltip' => $lang['LCAS_tooltip_username_register'][intval($conf_LCAS[0])],
+      ));
+      $template->set_prefilter('password', 'LCAS_add_tooltips_prefilter_password');
+    break;
+
+    default: return false;
   }
-  
-  // Add tooltips on register page
-  if (script_basename() == 'register') {
-    $template->assign(array(
-      'LCAS_username_tooltip' => $lang['LCAS_tooltip_username_register'][intval($conf_LCAS[0])],
-      'LCAS_password_tooltip' => $lang['LCAS_tooltip_password_register'],
-    ));
-    $template->set_prefilter('register', 'LCAS_add_tooltips_prefilter_register');
+
+  if (($p != '') and isset($_POST[$p]) and isset($conf_LCAS[0])) {
+    $new_username = LCAS_SearchCaseUsername($_POST[$p],$conf_LCAS[0]);
+    $_POST[$p] = $new_username == '' ? $_POST[$p] : $new_username;
   }
+}
+
+function LCAS_add_tooltips_prefilter_password($content, &$smarty) {
+  $search = '<label>
+      {\'Username or email\'';
+  $replacement = '<label title="{$LCAS_username_tooltip}">
+      {\'Username or email\'';
+  $content = str_replace($search, $replacement, $content);
+  $search = 'name="username_or_email"';
+  $replacement = 'name="username_or_email" title="{$LCAS_username_tooltip}"';
+  $content = str_replace($search, $replacement, $content);
+  return $content;
 }
 
@@ -100 +134 @@
   $search = 'name="password_conf"';
   $replacement = 'name="password_conf" title="{$LCAS_password_tooltip}"';
+  $content = str_replace($search, $replacement, $content);
+  return $content;
+}
+
+function LCAS_add_tooltips_prefilter_identification($content, &$smarty) {
+  $search = 'for="username"';
+  $replacement = 'for="username" title="{$LCAS_username_tooltip}"';
+  $content = str_replace($search, $replacement, $content);
+  $search = 'name="username"';
+  $replacement = 'name="username" title="{$LCAS_username_tooltip}"';
+  $content = str_replace($search, $replacement, $content);
+  $search = 'for="password"';
+  $replacement = 'for="password" title="{$LCAS_password_tooltip}"';
+  $content = str_replace($search, $replacement, $content);
+  $search = 'name="password"';
+  $replacement = 'name="password" title="{$LCAS_password_tooltip}"';
   $content = str_replace($search, $replacement, $content);
   return $content;