Changeset 2032


Ignore:
Timestamp:
Jun 11, 2007, 12:01:18 AM (17 years ago)
Author:
rub
Message:

Resolved issue 0000489: Mail address obligatory

Location:
trunk
Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/configuration.php

    r2021 r2032  
    5050
    5151$main_checkboxes = array(
     52    'allow_user_registration',
     53    'obligatory_user_mail_address',
    5254    'rate',
    5355    'rate_anonymous',
    5456    'email_admin_on_new_user',
    55     'allow_user_registration',
    5657    'email_admin_on_picture_uploaded',
    5758   );

  • trunk/include/functions_user.inc.php

    r2029 r2032  
    3232function validate_mail_address( $mail_address )
    3333{
    34   global $lang;
    35 
    36   if ( $mail_address == '' )
     34  global $lang, $conf;
     35
     36  if (empty($mail_address) and
     37      !($conf['obligatory_user_mail_address'] and in_array(script_basename(), array('register', 'profile'))))
    3738  {
    3839    return '';

  • trunk/install/config.sql

    r1926 r2032  
    2424INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_comment_validation','false','Send an email to the administrators when a comment requires validation');
    2525INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('email_admin_on_picture_uploaded','false','Send an email to the administrators when a picture is uploaded');
     26INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('obligatory_user_mail_address','false','Mail address is obligatory for users');

  • trunk/language/en_UK.iso-8859-1/admin.lang.php

    r2024 r2032  
    617617$lang['Guest cannot be deleted'] = 'Guest cannot be deleted';
    618618$lang['Default user cannot be deleted'] = 'Default user cannot be deleted';
     619$lang['obligatory_user_mail_address'] = 'Mail address is obligatory for all users';
    619620?>

  • trunk/language/en_UK.iso-8859-1/help/configuration.html

    r1901 r2032  
    2525  gallery.</li>
    2626
     27  <li><strong>Allow user registration</strong>: Registration is free for all.</li>
     28
     29  <li><strong>Mail address is obligatory for all users</strong>: Mail address will checked on registration or profile update except if the action is done on administration part.</li>
     30
    2731  <li><strong>Rating</strong>: Picture rating feature is enabled.</li>
    2832
    … …  
    3135
    3236  <li><strong>Email admins when a new user registers</strong>: Administrators will be received mail for each registration.</li>
    33 
    34   <li><strong>Allow user registration</strong>: Registration is free for all.</li>
    3537
    3638  <li><strong>Email adminis when a picture is uploaded</strong>: Administrators will be received mail for each picture uploaded by a user.</li>

  • trunk/language/fr_FR.iso-8859-1/admin.lang.php

    r2024 r2032  
    618618$lang['Guest cannot be deleted'] = 'L\'invité ne peut pas être supprimé';
    619619$lang['Default user cannot be deleted'] = 'L\'utilisateur par défaut ne peut pas être supprimé';
     620$lang['obligatory_user_mail_address'] = 'L\'adresse mail est obligatoire pour tous les utilisateurs';
    620621?>

  • trunk/language/fr_FR.iso-8859-1/help/configuration.html

    r1901 r2032  
    2525galerie.</li>
    2626
     27  <li><strong>Permettre l'enregistrement des utilisateurs</strong>: L'inscription est libre pour tous.</li>
     28
     29  <li><strong>L'adresse mail est obligatoire pour tous les utilisateurs</strong>: L'adresse mail sera vérifié lors des inscriptions ou de la mise à jour des profils sauf si l'action est effectuée dans la partie administration.</li>
     30
    2731  <li><strong>Notation</strong>: La notation des photos est possible.</li>
    2832
    … …  
    3135
    3236  <li><strong>Notifier les administrateurs lors de l'inscription d'un utilisateur</strong>: Les administrateurs recevront un courriel à chaque inscription.</li>
    33 
    34   <li><strong>Permettre l'enregistrement des utilisateurs</strong>: L'inscription est libre pour tous.</li>
    3537
    3638  <li><strong>Notifier les administrateurs quand une image est téléchargée</strong>: Les administrateurs recevront un courriel à chaque image mis à disposition par un utilisateur.</li>

  • trunk/plugins

    • Property svn:ignore

      •  

        old new  
        55look_like_gbo
        66secureImages
         7my_phpwebheader
         8personal

  • trunk/template/yoga/admin/configuration.tpl

    r1926 r2032  
    4444<fieldset id="mainConfCheck">
    4545  <ul>
     46    <li>
     47      <label for="allow_user_registration">
     48        <span class="property">{lang:Allow user registration}</span>
     49        <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
     50      </label>
     51    </li>
     52
     53    <li>
     54      <label for="obligatory_user_mail_address">
     55        <span class="property">{lang:obligatory_user_mail_address}</span>
     56        <input type="checkbox" name="obligatory_user_mail_address" id="obligatory_user_mail_address" {main.OBLIGATORY_USER_MAIL_ADDRESS} />
     57      </label>
     58    </li>
    4659
    4760    <li>
    … …  
    5366      <span class="property">{lang:Rating by guests}</span>
    5467      <input type="checkbox" name="rate_anonymous" {main.RATE_ANONYMOUS} />
    55     </li>
    56 
    57     <li>
    58       <label for="allow_user_registration">
    59         <span class="property">{lang:Allow user registration}</span>
    60         <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {main.ALLOW_USER_REGISTRATION} />
    61       </label>
    6268    </li>
    6369
Note: See TracChangeset for help on using the changeset viewer.