Changeset 25774 for extensions/LCAS/trunk/main.inc.php

Timestamp:

Dec 1, 2013, 11:01:27 PM (10 years ago)

Author:

LucMorizur

Message:

Compatibility with Piwigo version 2.6

File:

• extensions/LCAS/trunk/main.inc.php (modified) (4 diffs)

extensions/LCAS/trunk/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: LCAS
-Version: 2.2.3
+Version: 2.2.4
 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
@@ -80 +80 @@
     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;
+      $new_username = LCAS_SearchCaseUsername($_POST['username'],$conf_LCAS[0]);
+      $_POST['username'] = $new_username == '' ? $_POST['username'] : $new_username;
     }
   }
   
-  // Add tooltips on register and identification page
-  $sb = script_basename(); $fn = '';
-  if ($sb == 'register' or $sb == 'identification')
-   $fn = ($sb == 'register') ?
-    'LCAS_add_tooltips_prefilter_register' :
-    'LCAS_add_tooltips_prefilter_identification';
-  if ($fn != '') {
+  // 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'],
+      'LCAS_username_tooltip' => $lang['LCAS_tooltip_username_register'][intval($conf_LCAS[0])],
+      'LCAS_password_tooltip' => $lang['LCAS_tooltip_password_register'],
     ));
-    $template->set_prefilter($sb, $fn);
+    $template->set_prefilter('register', 'LCAS_add_tooltips_prefilter_register');
   }
 }
@@ -126 +117 @@
 }
 
-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;
-}
-
 // Check users registration
 // Returns error
@@ -157 +132 @@
    $NewPostLogin = LCAS_SearchCaseUsername($_POST['login'], $conf_LCAS[0]);
   
-  if (isset($NewPostLogin) and get_userid($NewPostLogin) and (intval($conf_LCAS[0]) != 0))
+  if (isset($NewPostLogin) and get_userid($NewPostLogin))
    $errors[] = $lang['LCAS_error'][intval($conf_LCAS[0])];