Changeset 3935

Timestamp:

Sep 28, 2009, 9:22:59 PM (15 years ago)

Author:

Eric

Message:

[Bug 1041] Switchable double/single password input with text or password type in admin using new $conf

Location:

trunk

Files:

• admin/template/goto/user_list.tpl (modified) (1 diff)
• admin/user_list.php (modified) (3 diffs)
• include/config_default.inc.php (modified) (1 diff)

trunk/admin/template/goto/user_list.tpl

@@ -8 +8 @@
     <legend>{'Add a user'|@translate}</legend>
     <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20"></label>
-    <label>{'Password'|@translate} <input type="password" name="password"></label>
-    <label>{'Confirm Password'|@translate} <input type="password" name="password_conf" id="password_conf"></label>
-    <label>{'Email address'|@translate} <input type="text" name="email"></label>
+    {if $Double_Password}
+                <label>{'Password'|@translate} <input type="password" name="password"></label>
+                <label>{'Confirm Password'|@translate} <input type="password" name="password_conf" id="password_conf"></label>
+                {else}
+                <label>{'Password'|@translate} <input type="text" name="password"></label>
+                {/if}
+                <label>{'Email address'|@translate} <input type="text" name="email"></label>
     <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></label>
   </fieldset>

trunk/admin/user_list.php

@@ -184 +184 @@
 // +-----------------------------------------------------------------------+
 
-if (isset($_POST['submit_add']))
-{
-        if(empty($_POST['password']))
+// Check for config_default var - If True : Using double password type else single password type
+// This feature is discussed on Piwigo's english forum
+if ($conf['double_password_type_in_admin'] == true)
+{
+        if (isset($_POST['submit_add']))
         {
-                array_push($page['errors'], l10n('Password is missing'));
-        }
-        else if(empty($_POST['password_conf']))
-        {
-                array_push($page['errors'], l10n('Password confirmation is missing'));
-        }
-        else if(empty($_POST['email']))
-        {
-                array_push($page['errors'], l10n('Email address is missing'));
-        }
-        else if ($_POST['password'] != $_POST['password_conf'])
-        {
-                array_push($page['errors'], l10n('Password confirmation error'));
-        }
-        else
-        {
+                if(empty($_POST['password']))
+                {
+                        array_push($page['errors'], l10n('Password is missing'));
+                }
+                else if(empty($_POST['password_conf']))
+                {
+                        array_push($page['errors'], l10n('Password confirmation is missing'));
+                }
+                else if(empty($_POST['email']))
+                {
+                        array_push($page['errors'], l10n('Email address is missing'));
+                }
+                else if ($_POST['password'] != $_POST['password_conf'])
+                {
+                        array_push($page['errors'], l10n('Password confirmation error'));
+                }
+                else
+                {
                 $page['errors'] = register_user(
                 $_POST['login'], $_POST['password'], $_POST['email'], false);
 
-                if (count($page['errors']) == 0)
+                        if (count($page['errors']) == 0)
                 {
                 array_push(
@@ -217 +221 @@
                 );
                 }
+                }
         }
+}
+else if ($conf['double_password_type_in_admin'] == false)
+{
+        if (isset($_POST['submit_add']))
+        {
+        $page['errors'] = register_user(
+        $_POST['login'], $_POST['password'], $_POST['email'], false);
+
+        if (count($page['errors']) == 0)
+        {
+        array_push(
+        $page['infos'],
+        sprintf(
+                l10n('user "%s" added'),
+                $_POST['login']
+                )
+        );
+        }
+  }
 }
 
@@ -504 +528 @@
 {
   $template->assign('adviser', true);
+}
+
+// Display or Hide double password type
+if ($conf['double_password_type_in_admin'])
+{
+  $template->assign('Double_Password', true);
 }
 

trunk/include/config_default.inc.php

@@ -317 +317 @@
 // Define default method to use ('http' or 'html' in order to do redirect)
 $conf['default_redirect_method'] = 'http';
+
+// Define using double password type in admin's users management panel
+$conf['double_password_type_in_admin'] = false;
 
 // +-----------------------------------------------------------------------+