Changeset 3751 for trunk/admin


Ignore:
Timestamp:
Aug 18, 2009, 10:51:39 PM (15 years ago)
Author:
Eric
Message:

Bug 1041 fixed : manual user adding in admin's user management panel

  • Double password type fields
  • Add controls of the filling fields
  • Alert text added in language pack - EN, FR, DE and ES are OK. IT have to be fixed.
  • Subsidiary fix : Small grammatical error in FR/common.lang.php
Location:
trunk/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/template/goto/user_list.tpl

    r3283 r3751  
     1{* $Id: user_list.tpl 2578 2008-09-24 00:51:40Z rvelices $ *}
    12<div class="titrePage">
    23  <h2>{'title_liste_users'|@translate}</h2>
    … …  
    67  <fieldset>
    78    <legend>{'Add a user'|@translate}</legend>
    8     <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20"></label>
    9     <label>{'Password'|@translate} <input type="text" name="password"></label>
    10     <label>{'Email address'|@translate} <input type="text" name="email"></label>
    11     <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED}></label>
     9    <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20" /></label>
     10    <label>{'Password'|@translate} <input type="password" name="password" /></label>
     11    <label>{'Confirm Password'|@translate} <input type="password" name="password_conf" id="password_conf" /></label>
     12    <label>{'Email address'|@translate} <input type="text" name="email" /></label>
     13    <label>&nbsp; <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} /></label>
    1214  </fieldset>
    1315</form>
    … …  
    1618<fieldset>
    1719  <legend>{'Filter'|@translate}</legend>
    18   <input type="hidden" name="page" value="user_list">
    19 
    20   <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}"></label>
     20  <input type="hidden" name="page" value="user_list" />
     21
     22  <label>{'Username'|@translate} <input type="text" name="username" value="{$F_USERNAME}" /></label>
    2123
    2224  <label>
    … …  
    4244  <label>
    4345  &nbsp;
    44   <input class="submit" type="submit" value="{'Submit'|@translate}">
     46  <input class="submit" type="submit" value="{'Submit'|@translate}" />
    4547  </label>
    4648
    … …  
    7173  {foreach from=$users item=user name=users_loop}
    7274  <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
    73     <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}"></td>
     75    <td><input type="checkbox" name="selection[]" value="{$user.ID}" {$user.CHECKED} id="selection-{$user.ID}" /></td>
    7476    <td><label for="selection-{$user.ID}">{$user.USERNAME}</label></td>
    7577    <td>{$user.STATUS}</td>
    … …  
    8183    {/foreach}
    8284    <td style="text-align:center;">
    83       <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}"></a>
    84       <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}"></a>
     85      <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a>
     86      <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.admin_icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a>
    8587      {foreach from=$user.plugin_actions item=data}
    8688      {$data}
    … …  
    9193</table>
    9294
    93 {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
     95<div class="navigationBar">{$NAVBAR}</div>
    9496
    9597{* delete the selected users ? *}
    9698<fieldset>
    9799  <legend>{'Deletions'|@translate}</legend>
    98   <label><input type="checkbox" name="confirm_deletion" value="1"> {'confirm'|@translate}</label>
    99   <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}>
     100  <label><input type="checkbox" name="confirm_deletion" value="1" /> {'confirm'|@translate}</label>
     101  <input class="submit" type="submit" value="{'Delete selected users'|@translate}" name="delete" {$TAG_INPUT_ENABLED}/>
    100102</fieldset>
    101103
    … …  
    107109      <td>{'Status'|@translate}</td>
    108110      <td>
    109         <label><input type="radio" name="status_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    110         <label><input type="radio" name="status_action" value="set" id="status_action_set"> {'set to'|@translate}</label>
     111        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     112        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {'set to'|@translate}</label>
    111113        <select onchange="document.getElementById('status_action_set').checked = true;" name="status" size="1">
    112114          {html_options options=$pref_status_options selected=$pref_status_selected}
    … …  
    119121      <td>{'adviser'|@translate}</td>
    120122      <td>
    121         <label><input type="radio" name="adviser" value="leave" checked="checked"> {'leave'|@translate}</label>
     123        <label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label>
    122124        / {'set to'|@translate}
    123         <label><input type="radio" name="adviser" value="true">{'Yes'|@translate}</label>
    124         <label><input type="radio" name="adviser" value="false">{'No'|@translate}</label>
     125        <label><input type="radio" name="adviser" value="true"  />{'Yes'|@translate}</label>
     126        <label><input type="radio" name="adviser" value="false" />{'No'|@translate}</label>
    125127      </td>
    126128    </tr>
    … …  
    163165      <td>{'enabled_high'|@translate}</td>
    164166      <td>
    165         <label><input type="radio" name="enabled_high" value="leave" checked="checked"> {'leave'|@translate}</label>
     167        <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label>
    166168        / {'set to'|@translate}
    167         <label><input type="radio" name="enabled_high" value="true">{'Yes'|@translate}</label>
    168         <label><input type="radio" name="enabled_high" value="false">{'No'|@translate}</label>
     169        <label><input type="radio" name="enabled_high" value="true"  />{'Yes'|@translate}</label>
     170        <label><input type="radio" name="enabled_high" value="false" />{'No'|@translate}</label>
    169171      </td>
    170172    </tr>
    … …  
    173175                <td>{'Privacy level'|@translate}</td>
    174176                <td>
    175                         <label><input type="radio" name="level_action" value="leave" checked="checked">{'leave'|@translate}</label>
    176                         <label><input type="radio" name="level_action" value="set" id="level_action_set">{'set to'|@translate}</label>
     177                        <label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label>
     178                        <label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label>
    177179                        <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
    178180                          {html_options options=$level_options selected=$level_selected}
    … …  
    194196    <td>{'nb_image_per_row'|@translate}</td>
    195197    <td>
    196       <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    197       <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"> {'set to'|@translate}</label>
     198      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     199      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"  /> {'set to'|@translate}</label>
    198200      <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
    199              size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}">
     201             size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}" />
    200202    </td>
    201203  </tr>
    … …  
    204206    <td>{'nb_row_per_page'|@translate}</td>
    205207    <td>
    206       <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    207       <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set"> {'set to'|@translate}</label>
     208      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     209      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {'set to'|@translate}</label>
    208210      <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
    209              size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}">
     211             size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}" />
    210212    <td>
    211213  </tr>
    … …  
    214216    <td>{'theme'|@translate}</td>
    215217    <td>
    216       <label><input type="radio" name="template_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    217       <label><input type="radio" name="template_action" value="set" id="template_action_set"> {'set to'|@translate}</label>
     218      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     219      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {'set to'|@translate}</label>
    218220      <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1">
    219221        {html_options values=$template_options output=$template_options selected=$template_selected}
    … …  
    225227    <td>{'language'|@translate}</td>
    226228    <td>
    227       <label><input type="radio" name="language_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    228       <label><input type="radio" name="language_action" value="set" id="language_action_set"> {'set to'|@translate}</label>
     229      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     230      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {'set to'|@translate}</label>
    229231      <select onchange="document.getElementById('language_action_set').checked = true;" name="language" size="1">
    230232        {html_options options=$language_options selected=$language_selected}
    … …  
    236238    <td>{'recent_period'|@translate}</td>
    237239    <td>
    238       <label><input type="radio" name="recent_period_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    239       <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"> {'set to'|@translate}</label>
     240      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     241      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"  /> {'set to'|@translate}</label>
    240242      <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
    241              type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}">
     243             type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}" />
    242244    </td>
    243245  </tr>
    … …  
    246248    <td>{'auto_expand'|@translate}</td>
    247249    <td>
    248       <label><input type="radio" name="expand" value="leave" checked="checked"> {'leave'|@translate}</label>
     250      <label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label>
    249251      / {'set to'|@translate}
    250       <label><input type="radio" name="expand" value="true">{'Yes'|@translate}</label>
    251       <label><input type="radio" name="expand" value="false">{'No'|@translate}</label>
     252      <label><input type="radio" name="expand" value="true"  />{'Yes'|@translate}</label>
     253      <label><input type="radio" name="expand" value="false" />{'No'|@translate}</label>
    252254    </td>
    253255  </tr>
    … …  
    256258    <td>{'show_nb_comments'|@translate}</td>
    257259    <td>
    258       <label><input type="radio" name="show_nb_comments" value="leave" checked="checked"> {'leave'|@translate}</label>
     260      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label>
    259261      / {'set to'|@translate}
    260       <label><input type="radio" name="show_nb_comments" value="true">{'Yes'|@translate}</label>
    261       <label><input type="radio" name="show_nb_comments" value="false">{'No'|@translate}</label>
     262      <label><input type="radio" name="show_nb_comments" value="true" />{'Yes'|@translate}</label>
     263      <label><input type="radio" name="show_nb_comments" value="false" />{'No'|@translate}</label>
    262264    </td>
    263265  </tr>
    … …  
    266268    <td>{'show_nb_hits'|@translate}</td>
    267269    <td>
    268       <label><input type="radio" name="show_nb_hits" value="leave" checked="checked"> {'leave'|@translate}</label>
     270      <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label>
    269271      / {'set to'|@translate}
    270       <label><input type="radio" name="show_nb_hits" value="true">{'Yes'|@translate}</label>
    271       <label><input type="radio" name="show_nb_hits" value="false">{'No'|@translate}</label>
     272      <label><input type="radio" name="show_nb_hits" value="true" />{'Yes'|@translate}</label>
     273      <label><input type="radio" name="show_nb_hits" value="false" />{'No'|@translate}</label>
    272274    </td>
    273275  </tr>
    … …  
    276278    <td>{'maxwidth'|@translate}</td>
    277279    <td>
    278       <label><input type="radio" name="maxwidth_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    279       <label><input type="radio" name="maxwidth_action" value="unset"> {'unset'|@translate}</label>
    280       <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set"> {'set to'|@translate}</label>
     280      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     281      <label><input type="radio" name="maxwidth_action" value="unset" /> {'unset'|@translate}</label>
     282      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {'set to'|@translate}</label>
    281283      <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
    282              type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}">
     284             type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}" />
    283285    </td>
    284286  </tr>
    … …  
    288290    <td>{'maxheight'|@translate}</td>
    289291    <td>
    290       <label><input type="radio" name="maxheight_action" value="leave" checked="checked"> {'leave'|@translate}</label>
    291       <label><input type="radio" name="maxheight_action" value="unset"> {'unset'|@translate}</label>
    292       <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set"> {'set to'|@translate}</label>
     292      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
     293      <label><input type="radio" name="maxheight_action" value="unset" /> {'unset'|@translate}</label>
     294      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {'set to'|@translate}</label>
    293295      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
    294              type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}">
     296             type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}" />
    295297    </td>
    296298  </tr>
    … …  
    303305<p>
    304306  {'target'|@translate}
    305   <label><input type="radio" name="target" value="all"> {'all'|@translate}</label>
    306   <label><input type="radio" name="target" value="selection" checked="checked"> {'selection'|@translate}</label>
     307  <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label>
     308  <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label>
    307309</p>
    308310
    309311<p>
    310   <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED}>
    311   <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset">
     312  <input class="submit" type="submit" value="{'Submit'|@translate}" name="pref_submit" {$TAG_INPUT_ENABLED} />
     313  <input class="submit" type="reset" value="{'Reset'|@translate}" name="pref_reset" />
    312314</p>
    313315

  • trunk/admin/user_list.php

    r3282 r3751  
    186186if (isset($_POST['submit_add']))
    187187{
    188   $page['errors'] = register_user(
    189     $_POST['login'], $_POST['password'], $_POST['email'], false);
    190 
    191   if (count($page['errors']) == 0)
    192   {
    193     array_push(
    194       $page['infos'],
    195       sprintf(
    196         l10n('user "%s" added'),
    197         $_POST['login']
    198         )
    199       );
    200   }
     188        if(empty($_POST['password']))
     189        {
     190                array_push($page['errors'], l10n('Password is missing'));
     191        }
     192        else if(empty($_POST['password_conf']))
     193        {
     194                array_push($page['errors'], l10n('Password confirmation is missing'));
     195        }
     196        else if(empty($_POST['email']))
     197        {
     198                array_push($page['errors'], l10n('Email address is missing'));
     199        }
     200        else if ($_POST['password'] != $_POST['password_conf'])
     201        {
     202                array_push($page['errors'], l10n('Password confirmation error'));
     203        }
     204        else
     205        {
     206                $page['errors'] = register_user(
     207                $_POST['login'], $_POST['password'], $_POST['email'], false);
     208
     209                if (count($page['errors']) == 0)
     210                {
     211                array_push(
     212                        $page['infos'],
     213                        sprintf(
     214                                l10n('user "%s" added'),
     215                                $_POST['login']
     216                        )
     217                );
     218                }
     219        }
    201220}
    202221
    … …  
    590609  );
    591610
    592 $template->assign('navbar', $navbar);
     611$template->assign('NAVBAR', $navbar);
    593612
    594613// +-----------------------------------------------------------------------+
    … …  
    659678      'USERNAME' => $local_user['username']
    660679        .($local_user['id'] == $conf['guest_id']
    661           ? '<br>['.l10n('is_the_guest').']' : '')
     680          ? '<BR />['.l10n('is_the_guest').']' : '')
    662681        .($local_user['id'] == $conf['default_user_id']
    663           ? '<br>['.l10n('is_the_default').']' : ''),
     682          ? '<BR />['.l10n('is_the_default').']' : ''),
    664683      'STATUS' => l10n('user_status_'.
    665684        $local_user['status']).(($local_user['adviser'] == 'true')
    666         ? '<br>['.l10n('adviser').']' : ''),
     685        ? '<BR />['.l10n('adviser').']' : ''),
    667686      'EMAIL' => get_email_address_as_display_text($local_user['email']),
    668687      'GROUPS' => $groups_string,
Note: See TracChangeset for help on using the changeset viewer.