Changeset 12661


Ignore:
Timestamp:
Nov 27, 2011, 4:27:10 PM (9 years ago)
Author:
Eric
Message:

Bug 2456 fixed - New feature : Avoid user connexion to the gallery until there has been no validation of registration. Users are redirected to a customizable content page.

Location:
extensions/UserAdvManager/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/admin/UAM_admin.php

    r12314 r12661  
    7878$height = '300px';
    7979$areas = array();
    80 array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2','UAM_GTAutoDelText','UAM_USRAutoDelText');
     80array_push( $areas,'UAM_ConfirmMail_Custom_Txt1','UAM_ConfirmMail_Custom_Txt2','UAM_GTAutoDelText','UAM_USRAutoDelText','UAM_CustomRejectConnexion_Text');
    8181
    8282if (function_exists('set_fckeditor_instance'))
     
    109109  case 'global':
    110110
    111         if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']) and isset($_POST['UAM_PwdReset']))
     111        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']) and isset($_POST['UAM_PwdReset']) and isset($_POST['UAM_RejectConnexion']))
    112112  {
    113113
     
    129129
    130130    $_POST['UAM_USRAutoDelText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GTAutoDelText'])));
     131
     132    $_POST['UAM_CustomRejectConnexion_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_CustomRejectConnexion_Text'])));
    131133
    132134    // Check if CR-LF exist at begining and end of mail exclusion list - If yes, removes them
     
    200202      (isset($_POST['UAM_Downgrade_Level'])?$_POST['UAM_Downgrade_Level']:''),
    201203      $_POST['UAM_PwdReset'],
     204      $_POST['UAM_RejectConnexion'],
     205      $_POST['UAM_CustomRejectConnexion_Text'],
    202206      );
    203207
     
    593597    'UAM_PWDRESET_TRUE'              => $conf_UAM[38]=='true' ?  'checked="checked"' : '' ,
    594598    'UAM_PWDRESET_FALSE'             => $conf_UAM[38]=='false' ?  'checked="checked"' : '' ,
     599    'UAM_REJECTCONNECT_TRUE'         => $conf_UAM[39]=='true' ?  'checked="checked"' : '' ,
     600    'UAM_REJECTCONNECT_FALSE'        => $conf_UAM[39]=='false' ?  'checked="checked"' : '' ,
     601    'UAM_REJECTCONNECT_TEXT'         => $conf_UAM[40],
    595602                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
    596603    'UAM_ERROR_REPORTS1'             => $UAM_Exclusionlist_Error,
  • extensions/UserAdvManager/trunk/admin/template/global.tpl

    r12275 r12661  
    329329
    330330          <fieldset>
     331          <div class="uam_new">
     332            <ul>
     333              <p class="new_in_version">{'UAM_NewFeature'|@translate}</p>
     334                    <li>
     335                <label class="cluetip" title="{'UAM_RejectConnexion'|translate}|{'UAM_RejectConnexion_d'|translate}">
     336                  {'UAM_RejectConnexion'|@translate}
     337                </label>
     338            <br><br>
     339                <input type="radio" value="false" {$UAM_REJECTCONNECT_FALSE} name="UAM_RejectConnexion">
     340                  {'UAM_Disable'|@translate}
     341            <br>
     342                <input type="radio" value="true" {$UAM_REJECTCONNECT_TRUE} name="UAM_RejectConnexion">
     343                  {'UAM_Enable'|@translate}
     344            <br><br>
     345              </li>
     346            {if $UAM_REJECTLOGIN_FALSE}
     347              <div class="uam_hide">
     348            {/if}
     349              <li>
     350                <label class="cluetip" title="{'UAM_RejectConnexion_Custom_Txt'|translate}|{'UAM_RejectConnexion_Custom_Txt_d'|translate}">
     351                  {'UAM_RejectConnexion_Custom_Txt'|@translate}
     352                </label>
     353            <br><br>
     354                <textarea class="uam_textfields" name="UAM_CustomRejectConnexion_Text" id="UAM_CustomRejectConnexion_Text" rows="10" {$TAG_INPUT_ENABLED}>{$UAM_REJECTCONNECT_TEXT}</textarea>
     355            <br><br>
     356              </li>
     357            {if 'FCK_PATH'|@defined}
     358              <div style="text-align:right;">
     359                <a href="#" onClick="toogleEditor('UAM_CustomRejectConnexion_Text'); return false;">FCK Editor On/Off</a>
     360              </div>
     361            {/if}
     362            {if $UAM_REJECTLOGIN_FALSE}
     363              </div>
     364            {/if}
     365            </ul>
     366          </div>
     367
     368          <br>
     369
    331370          <ul>
    332371            <div id="uam_notice">{'UAM_Confirm_grpstat_notice'|@translate}</div>
  • extensions/UserAdvManager/trunk/admin/template/uam.css

    r10359 r12661  
    1515{
    1616  display: none;
     17}
     18
     19div.uam_new
     20{
     21  background-color: #8EBF44;
     22}
     23
     24p.new_in_version
     25{
     26  text-align: center;
     27  text-transform: capitalize;
     28  text-decoration: underline;
     29  font-weight: bold;
     30  color: yellow;
    1731}
    1832
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r12314 r12661  
    274274-- 2.30.1 : Bug 2455 fixed - Exclusion of specific users (généric and admins users) for password reset function.
    275275            Bug 2451 fixed - Unable to handle Sql errors but control of backup file validity have been enforced.
     276
     277-- 2.30.2 : Bug 2456 fixed - New feature : Avoid user connexion to the gallery until there has been no validation of registration. Users are redirected to a customizable page.
    276278*/
    277279?>
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r12314 r12661  
    380380  global $conf, $user;
    381381 
     382  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     383 
    382384  $conf_UAM = unserialize($conf['UserAdvManager']);
    383385 
     
    396398  }
    397399
    398   // Performing redirection to profile page on first login
    399   // -----------------------------------------------------
    400   if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
    401   {
    402     $query ='
     400  // Avoid login into public galleries until registration confirmation is done
     401  if ((isset($conf_UAM[39]) and $conf_UAM[39] == 'false') or ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and UAM_UsrReg_Verif($user['id'])))
     402  {
     403    // Performing redirection to profile page on first login
     404    // -----------------------------------------------------
     405    if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
     406    {
     407      $query ='
    403408SELECT user_id, status
    404409FROM '.USER_INFOS_TABLE.'
    405410WHERE user_id = '.$user['id'].'
    406411;';
    407     $data = pwg_db_fetch_assoc(pwg_query($query));
    408 
    409     if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
    410     {
    411       $user_idsOK = array();
    412       if (!UAM_check_profile($user['id'], $user_idsOK))
    413         redirect(PHPWG_ROOT_PATH.'profile.php');
    414     }
    415   }
    416 
    417   // Performing redirection to profile page for password reset
    418   // ---------------------------------------------------------
    419   if ((isset($conf_UAM[38]) and $conf_UAM[38] == 'true'))
    420   {
    421     $query ='
     412      $data = pwg_db_fetch_assoc(pwg_query($query));
     413
     414      if ($data['status'] <> "admin" and $data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
     415      {
     416        $user_idsOK = array();
     417        if (!UAM_check_profile($user['id'], $user_idsOK))
     418          redirect(PHPWG_ROOT_PATH.'profile.php');
     419      }
     420    }
     421
     422    // Performing redirection to profile page for password reset
     423    // ---------------------------------------------------------
     424    if ((isset($conf_UAM[38]) and $conf_UAM[38] == 'true'))
     425    {
     426      $query ='
    422427SELECT user_id, status
    423428FROM '.USER_INFOS_TABLE.'
    424429WHERE user_id = '.$user['id'].'
    425430;';
    426     $data = pwg_db_fetch_assoc(pwg_query($query));
    427 
    428     if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
    429     {
    430       if (UAM_check_pwgreset($user['id']))
    431       {
    432         redirect(PHPWG_ROOT_PATH.'profile.php');
     431      $data = pwg_db_fetch_assoc(pwg_query($query));
     432
     433      if ($data['status'] <> "webmaster" and $data['status'] <> "generic") // Exclusion of specific accounts
     434      {
     435        if (UAM_check_pwgreset($user['id']))
     436        {
     437          redirect(PHPWG_ROOT_PATH.'profile.php');
     438        }
    433439      }
    434440    }
     441  }
     442  elseif ((isset($conf_UAM[39]) and $conf_UAM[39] == 'true') and !UAM_UsrReg_Verif($user['id']))
     443  {
     444    // Logged-in user cleanup, session destruction and redirected to custom page
     445    // -------------------------------------------------------------------------
     446    invalidate_user_cache();
     447    logout_user();
     448    redirect(UAM_PATH.'rejected.php');
    435449  }
    436450}
     
    20732087
    20742088/**
    2075  * Function called from main.inc.php - Check if username matches forbidden caracters
     2089 * Function called from functions.inc.php - Check if username matches forbidden caracters
    20762090 *
    20772091 * @param : User login
     
    25662580
    25672581/**
    2568  * Function called from maintain.inc.php - to check if database upgrade is needed
    2569  *
    2570  * @param : table name
    2571  *
    2572  * @return : boolean
    2573  *
    2574  */
    2575 function table_exist($table)
    2576 {
    2577   $query = 'DESC '.$table.';';
    2578   return (bool)($res=pwg_query($query));
    2579 }
    2580 
    2581 
    2582 /**
    2583  * Function called from UAM_admin.php and main.inc.php to get the plugin version and name
    2584  *
    2585  * @param : plugin directory
    2586  *
    2587  * @return : plugin's version and name
    2588  *
    2589  */
    2590 function PluginInfos($dir)
    2591 {
    2592   $path = $dir;
    2593 
    2594   $plg_data = implode( '', file($path.'main.inc.php') );
    2595   if ( preg_match("|Plugin Name: (.*)|", $plg_data, $val) )
    2596   {
    2597     $plugin['name'] = trim( $val[1] );
    2598   }
    2599   if (preg_match("|Version: (.*)|", $plg_data, $val))
    2600   {
    2601     $plugin['version'] = trim($val[1]);
    2602   }
    2603   if ( preg_match("|Plugin URI: (.*)|", $plg_data, $val) )
    2604   {
    2605     $plugin['uri'] = trim($val[1]);
    2606   }
    2607   if ($desc = load_language('description.txt', $path.'/', array('return' => true)))
    2608   {
    2609     $plugin['description'] = trim($desc);
    2610   }
    2611   elseif ( preg_match("|Description: (.*)|", $plg_data, $val) )
    2612   {
    2613     $plugin['description'] = trim($val[1]);
    2614   }
    2615   if ( preg_match("|Author: (.*)|", $plg_data, $val) )
    2616   {
    2617     $plugin['author'] = trim($val[1]);
    2618   }
    2619   if ( preg_match("|Author URI: (.*)|", $plg_data, $val) )
    2620   {
    2621     $plugin['author uri'] = trim($val[1]);
    2622   }
    2623   if (!empty($plugin['uri']) and strpos($plugin['uri'] , 'extension_view.php?eid='))
    2624   {
    2625     list( , $extension) = explode('extension_view.php?eid=', $plugin['uri']);
    2626     if (is_numeric($extension)) $plugin['extension'] = $extension;
    2627   }
    2628 // IMPORTANT SECURITY !
    2629 // --------------------
    2630   $plugin = array_map('htmlspecialchars', $plugin);
    2631 
    2632   return $plugin ;
    2633 }
    2634 
    2635 
    2636 /**
    2637  * Delete obsolete files on plugin upgrade
    2638  * Obsolete files are listed in file obsolete.list
    2639  *
    2640  */
    2641 function clean_obsolete_files()
    2642 {
    2643   if (file_exists(UAM_PATH.'obsolete.list')
    2644     and $old_files = file(UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)
    2645     and !empty($old_files))
    2646   {
    2647     array_push($old_files, 'obsolete.list');
    2648     foreach($old_files as $old_file)
    2649     {
    2650       $path = UAM_PATH.$old_file;
    2651       if (is_file($path))
    2652       {
    2653         @unlink($path);
    2654       }
    2655       elseif (is_dir($path))
    2656       {
    2657         @rmdir($path);
    2658       }
    2659     }
    2660   }
    2661 }
    2662 
    2663 
    2664 /**
    26652582 * UAM_check_profile - Thx to LucMorizur
    26662583 * checks if a user id is registered as having already
    2667  * visited his profile.php page.
     2584 * visited his profile page.
    26682585 *
    26692586 * @uid        : the user id
     
    26992616 * UAM_check_pwdreset
    27002617 * checks if a user id is registered as having already
    2701  * changed their password.
     2618 * changed his password.
    27022619 *
    27032620 * @uid        : the user id
     
    27222639  else return false;
    27232640}
     2641
     2642
     2643/**
     2644 * UAM_UsrReg_Verif
     2645 * Check if the user who logged-in have validate his registration
     2646 *
     2647 * @returns : True if validation is OK else False
     2648 */
     2649function UAM_UsrReg_Verif($user_id)
     2650{
     2651  global $conf;
     2652
     2653        // Get UAM configuration
     2654  // ---------------------
     2655  $conf_UAM = unserialize($conf['UserAdvManager']);
     2656
     2657  $query = '
     2658SELECT group_id
     2659  FROM '.USER_GROUP_TABLE.'
     2660WHERE user_id = '.$user_id.'
     2661  AND group_id = '.$conf_UAM[2].'
     2662;';
     2663
     2664  $count = pwg_db_num_rows(pwg_query($query));
     2665 
     2666  if ($count == 0)
     2667  {
     2668    return true; // User is not in a "Waiting" group
     2669  }
     2670  else
     2671  {
     2672    return false; // User is still in a "Waiting" group
     2673  }
     2674}
     2675
    27242676
    27252677/**
     
    30172969
    30182970
     2971/**
     2972 * Delete obsolete files on plugin upgrade
     2973 * Obsolete files are listed in file obsolete.list
     2974 *
     2975 */
     2976function clean_obsolete_files()
     2977{
     2978  if (file_exists(UAM_PATH.'obsolete.list')
     2979    and $old_files = file(UAM_PATH.'obsolete.list', FILE_IGNORE_NEW_LINES)
     2980    and !empty($old_files))
     2981  {
     2982    array_push($old_files, 'obsolete.list');
     2983    foreach($old_files as $old_file)
     2984    {
     2985      $path = UAM_PATH.$old_file;
     2986      if (is_file($path))
     2987      {
     2988        @unlink($path);
     2989      }
     2990      elseif (is_dir($path))
     2991      {
     2992        @rmdir($path);
     2993      }
     2994    }
     2995  }
     2996}
     2997
     2998
     2999/**
     3000 * Function called from maintain.inc.php - to check if database upgrade is needed
     3001 *
     3002 * @param : table name
     3003 *
     3004 * @return : boolean
     3005 *
     3006 */
     3007function table_exist($table)
     3008{
     3009  $query = 'DESC '.$table.';';
     3010  return (bool)($res=pwg_query($query));
     3011}
     3012
     3013
     3014/**
     3015 * Function called from UAM_admin.php and main.inc.php to get the plugin version and name
     3016 *
     3017 * @param : plugin directory
     3018 *
     3019 * @return : plugin's version and name
     3020 *
     3021 */
     3022function PluginInfos($dir)
     3023{
     3024  $path = $dir;
     3025
     3026  $plg_data = implode( '', file($path.'main.inc.php') );
     3027  if ( preg_match("|Plugin Name: (.*)|", $plg_data, $val) )
     3028  {
     3029    $plugin['name'] = trim( $val[1] );
     3030  }
     3031  if (preg_match("|Version: (.*)|", $plg_data, $val))
     3032  {
     3033    $plugin['version'] = trim($val[1]);
     3034  }
     3035  if ( preg_match("|Plugin URI: (.*)|", $plg_data, $val) )
     3036  {
     3037    $plugin['uri'] = trim($val[1]);
     3038  }
     3039  if ($desc = load_language('description.txt', $path.'/', array('return' => true)))
     3040  {
     3041    $plugin['description'] = trim($desc);
     3042  }
     3043  elseif ( preg_match("|Description: (.*)|", $plg_data, $val) )
     3044  {
     3045    $plugin['description'] = trim($val[1]);
     3046  }
     3047  if ( preg_match("|Author: (.*)|", $plg_data, $val) )
     3048  {
     3049    $plugin['author'] = trim($val[1]);
     3050  }
     3051  if ( preg_match("|Author URI: (.*)|", $plg_data, $val) )
     3052  {
     3053    $plugin['author uri'] = trim($val[1]);
     3054  }
     3055  if (!empty($plugin['uri']) and strpos($plugin['uri'] , 'extension_view.php?eid='))
     3056  {
     3057    list( , $extension) = explode('extension_view.php?eid=', $plugin['uri']);
     3058    if (is_numeric($extension)) $plugin['extension'] = $extension;
     3059  }
     3060// IMPORTANT SECURITY !
     3061// --------------------
     3062  $plugin = array_map('htmlspecialchars', $plugin);
     3063
     3064  return $plugin ;
     3065}
     3066
    30193067
    30203068/**
  • extensions/UserAdvManager/trunk/include/upgradedb.inc.php

    r12271 r12661  
    559559  }
    560560}
     561
     562
     563/* upgrade from 2.30.x to 2.30.2 */
     564/* ***************************** */
     565function upgrade_2300_2302()
     566{
     567  global $conf;
     568 
     569  load_language('plugin.lang', UAM_PATH);
     570
     571  // Upgrading options
     572  // -----------------
     573  $query = '
     574SELECT value
     575  FROM '.CONFIG_TABLE.'
     576WHERE param = "UserAdvManager"
     577;';
     578
     579  $result = pwg_query($query);
     580  $conf_UAM = pwg_db_fetch_assoc($result);
     581   
     582  $Newconf_UAM = unserialize($conf_UAM['value']);
     583 
     584  $Newconf_UAM[39] = 'false';
     585  $Newconf_UAM[40] = l10n('UAM_Default_RejectConnexion_Txt');
     586
     587  $update_conf = serialize($Newconf_UAM);
     588
     589  conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
     590}
    561591?>
  • extensions/UserAdvManager/trunk/language/en_UK/help.lang.php

    r12314 r12661  
    343343<b style=&quot;color: red;&quot;>Warning: After the restore, it is necessary to reload the administration page of the plugin to see the restored settings!</b>';
    344344// --------- End: New or revised $lang ---- from version 2.30.0
     345
     346
     347// --------- Starting below: New or revised $lang ---- from version 2.30.2
     348$lang['UAM_RejectConnexion_d'] = 'If activated, new registered users who have not validate their registration won\'t be able to connect to the gallery. They will be redirected to a special page to inform them of this state.<br><br>
     349<b style=&quot;color: red;&quot;>Warning - This feature works only in conjunction with validation groups! See below to set the groups as required.</b>';
     350$lang['UAM_RejectConnexion_Custom_Txt_d'] = 'Customize here your explanation text for inform unvalidated users that they won\'t be able to connect the gallery until they have validate their registration.
     351<br><br>
     352This field is compatible with the FCK Editor and, for multi-languages, you can use the [lang] tags of the Extended description plugin if it\'s active.';
     353// --------- End: New or revised $lang ---- from version 2.30.2
    345354?>
  • extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r12314 r12661  
    407407$lang['UAM_Bad_version_backup'] = 'The version of the backup file does not match the version of the plugin! The restoration was not performed.';
    408408// --------- End: New or revised $lang ---- from version 2.30.1
     409
     410// --------- Starting below: New or revised $lang ---- from version 2.30.2
     411$lang['UAM_NewFeature'] = 'New feature !';
     412$lang['UAM_RejectConnexion'] = 'Reject user\'s connexion until registration is validated';
     413$lang['UAM_RejectConnexion_Custom_Txt'] = 'Customize rejection text';
     414$lang['UAM_Default_RejectConnexion_Txt'] = 'Sorry, you don\'t have validate your registration yet, so you can\'t connect the gallery now. Please check your email box. You should find an email sent by the gallery, containing a link to perform your validation. If not, please contact the webmaster.';
     415$lang['UAM_Reject_Page_Title'] = 'Connexion not allowed !';
     416// --------- End: New or revised $lang ---- from version 2.30.2
    409417?>
  • extensions/UserAdvManager/trunk/language/fr_FR/help.lang.php

    r12314 r12661  
    339339<b style=&quot;color: red;&quot;>Attention : Après la restauration, il est nécessaire de recharger la page d\'administration du plugin pour voir les paramètres restaurés !</b>';
    340340// --------- End: New or revised $lang ---- from version 2.30.0
     341
     342
     343// --------- Starting below: New or revised $lang ---- from version 2.30.2
     344$lang['UAM_RejectConnexion_d'] = 'Si activée, les nouveaux inscrits qui n\'ont pas validé leur inscription ne pourront pas se connecter à la galerie. Ils seront redirigés vers une page spéciale pour les informer de cet état.<br><br>
     345<b style=&quot;color: red;&quot;>Attention - Cette option fonctionne uniquement avec les groupes de validation ! Référez-vous ci-dessous pour affecter les paramètres de groupes requis.</b>';
     346$lang['UAM_RejectConnexion_Custom_Txt_d'] = 'Personnalisez ici votre message d\'explication informant les utilisateurs non validés qu\'ils ne pourront pas se connecter à la galerie tant qu\'ils n\'auront pas validé leur inscription.
     347<br><br>
     348Ce champ est compatible avec l\'extension FCK Editor et, pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.';
     349// --------- End: New or revised $lang ---- from version 2.30.2
    341350?>
  • extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r12314 r12661  
    404404$lang['UAM_Bad_version_backup'] = 'La version du fichier de sauvegarde ne correspond pas à la version du plugin ! La restauration n\'a pas été réalisée.';
    405405// --------- End: New or revised $lang ---- from version 2.30.1
     406
     407
     408// --------- Starting below: New or revised $lang ---- from version 2.30.2
     409$lang['UAM_NewFeature'] = 'Nouvelle option !';
     410$lang['UAM_RejectConnexion'] = 'Rejeter les connexions des utilisateurs non validés';
     411$lang['UAM_RejectConnexion_Custom_Txt'] = 'Personnaliser le texte de la page de rejet de la connexion';
     412$lang['UAM_Default_RejectConnexion_Txt'] = 'Désolé, vous n\'avez pas encore validé votre inscription et vous ne pouvez pas vous connecter maintenant. Merci de vérifier votre boite aux lettres. Vous devriez y trouver un message comportant un lien pour valider votre inscription. Si ce n\'est pas le cas, merci de contacter l\'administrateur de la galerie.';
     413$lang['UAM_Reject_Page_Title'] = 'Connexion refusée !';
     414// --------- End: New or revised $lang ---- from version 2.30.2
    406415?>
  • extensions/UserAdvManager/trunk/main.inc.php

    r12550 r12661  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.30.1
     4Version: 2.30.2
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
  • extensions/UserAdvManager/trunk/maintain.inc.php

    r12271 r12661  
    6464  $defaultUAM[37] = '-1';                                     // UAM_DOWNGRADE_LEVEL
    6565  $defaultUAM[38] = 'false';                                  // UAM_PWDRESET_TRUE/FALSE
     66  $defaultUAM[39] = 'false';                                  // UAM_REJECTCONNECT_TRUE/FALSE
     67  $defaultUAM[40] = l10n('UAM_Default_RejectConnexion_Txt');  // UAM_REJECTCONNECT_TEXT
    6668 
    6769  // Default specific parameters for UserAdvManager ConfirmMail conf
     
    357359      upgrade_2208_2300();
    358360    }
     361
     362    if (version_compare($conf['UserAdvManager_Version'], '2.30.2') < 0)
     363    {
     364    /* upgrade from version 2.30.x to 2.30.2 */
     365    /* ************************************* */
     366      upgrade_2300_2302();
     367    }
    359368  }
    360369
Note: See TracChangeset for help on using the changeset viewer.