Changeset 6776


Ignore:
Timestamp:
Aug 18, 2010, 10:56:53 PM (14 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.5

Location:
extensions/NBC_UserAdvManager/branches/2.15
Files:
14 added
22 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.15/ConfirmMail.php

    r5634 r6776  
    1414load_language('plugin.lang', UAM_PATH);
    1515
    16 /**
    17  * set in ./language/en_UK.iso-8859-1/local.lang.php (maybe to create)
    18  * for example for clear theme:
    19   $lang['Theme: clear'] = 'This is the clear theme based on yoga template. '.
    20   ' A standard template/theme of PhpWebgallery.';
    21  *
    22  * Don't forget php tags !!!
    23  *
    24  * Another way is to code it thru the theme itself in ./themeconf.inc.php
    25  */
    26 
    2716$title= l10n('confirm_mail_page_title');
    2817$page['body_id'] = 'theAboutPage';
     
    3120@include(PHPWG_ROOT_PATH.'template/'.$user['template'].
    3221  '/theme/'.$user['theme'].'/themeconf.inc.php');
     22
    3323
    3424if (isset($_GET['key']))
  • extensions/NBC_UserAdvManager/branches/2.15/admin/UAM_admin.php

    r6253 r6776  
    2828$UAM_Password_Test_Score = 0;
    2929$UAM_Exclusionlist_Error = false;
    30 
    3130
    3231// +-----------------------------------------------------------------------+
     
    102101  case 'global':
    103102
    104         if (isset($_POST['submit']) and !is_adviser() and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_No_Casse']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']))
     103        if (isset($_POST['submit']) and !is_adviser() and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_No_Comment_Anonymous']) 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']))
    105104  {
    106105
    107106/* General configuration settings */
    108                 $_POST['UAM_MailInfo_Text'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text']));
     107                $_POST['UAM_MailInfo_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_MailInfo_Text'])));
    109108   
    110                 $_POST['UAM_ConfirmMail_Text'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Text']));
    111 
    112     $_POST['UAM_GhostTracker_ReminderText'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GhostTracker_ReminderText']));
     109                $_POST['UAM_ConfirmMail_Text'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Text'])));
     110
     111    $_POST['UAM_GhostTracker_ReminderText'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_GhostTracker_ReminderText'])));
    113112
    114113
     
    119118      $UAM_Exclusionlist_Error = true;
    120119    }
    121                
     120
    122121                $newconf_UAM = array(
    123122      $_POST['UAM_Mail_Info'],
    124       $_POST['UAM_No_Casse'],
    125123      $_POST['UAM_Confirm_Mail'],
    126124      (isset($_POST['UAM_No_Confirm_Group'])?$_POST['UAM_No_Confirm_Group']:''),
     
    142140      $_POST['UAM_GhostTracker_ReminderText'],
    143141      $_POST['UAM_Add_LastVisit_Column'],
    144       $_POST['UAM_Admin_ConfMail']);
     142      $_POST['UAM_Admin_ConfMail'],
     143      $_POST['UAM_RedirToProfile']);
    145144
    146145    $conf['UserAdvManager'] = serialize($newconf_UAM);
     
    155154                pwg_query($query);
    156155
    157 
    158156/* Email confirmation settings */
    159     $_POST['UAM_ConfirmMail_ReMail_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt1']));
    160 
    161     $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2']));
     157    $_POST['UAM_ConfirmMail_ReMail_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt1'])));
     158
     159    $_POST['UAM_ConfirmMail_ReMail_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_ReMail_Txt2'])));
    162160   
    163     $_POST['UAM_ConfirmMail_Custom_Txt1'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt1']));
     161    $_POST['UAM_ConfirmMail_Custom_Txt1'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt1'])));
    164162   
    165     $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2']));
    166 
    167 
     163    $_POST['UAM_ConfirmMail_Custom_Txt2'] = str_replace('\"', '"', str_replace("\'", "'", str_replace("\\\\", "\\", $_POST['UAM_ConfirmMail_Custom_Txt2'])));
     164   
    168165          $newconf_UAM_ConfirmMail = array (
    169166      $_POST['UAM_ConfirmMail_TimeOut'],
     
    220217    $groups[$row['id']] = $row['name'];
    221218/* configuration value for unvalidated users */
     219    if (isset($conf_UAM[2]) and $conf_UAM[2] == $row['id'])
     220    {
     221                $No_Valid = $row['id'];
     222                }
     223/* configuration value for validated users */
    222224    if (isset($conf_UAM[3]) and $conf_UAM[3] == $row['id'])
    223     {
    224                 $No_Valid = $row['id'];
    225                 }
    226 /* configuration value for validated users */
    227     if (isset($conf_UAM[4]) and $conf_UAM[4] == $row['id'])
    228225                {
    229226                $Valid = $row['id'];
     
    257254  {
    258255          $status_options[$status] = l10n('user_status_'.$status);
    259           if (isset($conf_UAM[9]) and $conf_UAM[9] == $status)
     256          if (isset($conf_UAM[8]) and $conf_UAM[8] == $status)
    260257          {
    261258            $No_Valid_Status = $status;
     
    276273  {
    277274          $status_options[$status] = l10n('user_status_'.$status);
    278           if (isset($conf_UAM[5]) and $conf_UAM[5] == $status)
     275          if (isset($conf_UAM[4]) and $conf_UAM[4] == $status)
    279276                {
    280277                  $Valid_Status = $status;
     
    305302                'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
    306303                'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,
    307                 'UAM_MAILINFO_TEXT'              => $conf_UAM[10],
    308                 'UAM_NO_CASSE_TRUE'              => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
    309                 'UAM_NO_CASSE_FALSE'             => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
    310                 'UAM_USERNAME_CHAR_TRUE'         => $conf_UAM[7]=='true' ?  'checked="checked"' : '' ,
    311                 'UAM_USERNAME_CHAR_FALSE'        => $conf_UAM[7]=='false' ?  'checked="checked"' : '' ,
    312                 'UAM_USERNAME_CHAR_LIST'         => $conf_UAM[8],
    313                 'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[2]=='true' ?  'checked="checked"' : '' ,
    314                 'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[2]=='false' ?  'checked="checked"' : '' ,
    315                 'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[11],
    316                 'UAM_No_Confirm_Group'           => $conf_UAM[3],
    317                 'UAM_Validated_Group'            => $conf_UAM[4],
    318                 'UAM_No_Confirm_Status'          => $conf_UAM[9],
    319                 'UAM_Validated_Status'           => $conf_UAM[5],
    320                 'UAM_NO_COMMENT_ANO_TRUE'        => $conf_UAM[6]=='true' ?  'checked="checked"' : '' ,
    321                 'UAM_NO_COMMENT_ANO_FALSE'       => $conf_UAM[6]=='false' ?  'checked="checked"' : '' ,
    322                 'UAM_MAILEXCLUSION_TRUE'         => $conf_UAM[12]=='true' ?  'checked="checked"' : '' ,
    323                 'UAM_MAILEXCLUSION_FALSE'        => $conf_UAM[12]=='false' ?  'checked="checked"' : '' ,
    324                 'UAM_MAILEXCLUSION_LIST'         => $conf_UAM[13],
    325                 'UAM_PASSWORDENF_TRUE'           => $conf_UAM[14]=='true' ?  'checked="checked"' : '' ,
    326                 'UAM_PASSWORDENF_FALSE'          => $conf_UAM[14]=='false' ?  'checked="checked"' : '' ,
    327                 'UAM_PASSWORD_SCORE'             => $conf_UAM[15],
    328     'UAM_ADMINPASSWENF_TRUE'         => $conf_UAM[16]=='true' ?  'checked="checked"' : '' ,
    329                 'UAM_ADMINPASSWENF_FALSE'        => $conf_UAM[16]=='false' ?  'checked="checked"' : '' ,
    330     'UAM_GHOSTRACKER_TRUE'           => $conf_UAM[17]=='true' ?  'checked="checked"' : '' ,
    331                 'UAM_GHOSTRACKER_FALSE'          => $conf_UAM[17]=='false' ?  'checked="checked"' : '' ,
    332     'UAM_GHOSTRACKER_DAYLIMIT'       => $conf_UAM[18],
    333     'UAM_GHOSTRACKER_REMINDERTEXT'   => $conf_UAM[19],
    334     'UAM_ADDLASTVISIT_TRUE'          => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
    335     'UAM_ADDLASTVISIT_FALSE'         => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
    336     'UAM_ADMINCONFMAIL_TRUE'         => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
    337     'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
     304                'UAM_MAILINFO_TEXT'              => $conf_UAM[9],
     305                'UAM_USERNAME_CHAR_TRUE'         => $conf_UAM[6]=='true' ?  'checked="checked"' : '' ,
     306                'UAM_USERNAME_CHAR_FALSE'        => $conf_UAM[6]=='false' ?  'checked="checked"' : '' ,
     307                'UAM_USERNAME_CHAR_LIST'         => $conf_UAM[7],
     308                'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
     309                'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
     310    'UAM_CONFIRM_MAIL_LOCAL'         => $conf_UAM[1]=='local' ?  'checked="checked"' : '' ,
     311                'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[10],
     312                'UAM_No_Confirm_Group'           => $conf_UAM[2],
     313                'UAM_Validated_Group'            => $conf_UAM[3],
     314                'UAM_No_Confirm_Status'          => $conf_UAM[8],
     315                'UAM_Validated_Status'           => $conf_UAM[4],
     316                'UAM_NO_COMMENT_ANO_TRUE'        => $conf_UAM[5]=='true' ?  'checked="checked"' : '' ,
     317                'UAM_NO_COMMENT_ANO_FALSE'       => $conf_UAM[5]=='false' ?  'checked="checked"' : '' ,
     318                'UAM_MAILEXCLUSION_TRUE'         => $conf_UAM[11]=='true' ?  'checked="checked"' : '' ,
     319                'UAM_MAILEXCLUSION_FALSE'        => $conf_UAM[11]=='false' ?  'checked="checked"' : '' ,
     320                'UAM_MAILEXCLUSION_LIST'         => $conf_UAM[12],
     321                'UAM_PASSWORDENF_TRUE'           => $conf_UAM[13]=='true' ?  'checked="checked"' : '' ,
     322                'UAM_PASSWORDENF_FALSE'          => $conf_UAM[13]=='false' ?  'checked="checked"' : '' ,
     323                'UAM_PASSWORD_SCORE'             => $conf_UAM[14],
     324    'UAM_ADMINPASSWENF_TRUE'         => $conf_UAM[15]=='true' ?  'checked="checked"' : '' ,
     325                'UAM_ADMINPASSWENF_FALSE'        => $conf_UAM[15]=='false' ?  'checked="checked"' : '' ,
     326    'UAM_GHOSTRACKER_TRUE'           => $conf_UAM[16]=='true' ?  'checked="checked"' : '' ,
     327                'UAM_GHOSTRACKER_FALSE'          => $conf_UAM[16]=='false' ?  'checked="checked"' : '' ,
     328    'UAM_GHOSTRACKER_DAYLIMIT'       => $conf_UAM[17],
     329    'UAM_GHOSTRACKER_REMINDERTEXT'   => $conf_UAM[18],
     330    'UAM_ADDLASTVISIT_TRUE'          => $conf_UAM[19]=='true' ?  'checked="checked"' : '' ,
     331    'UAM_ADDLASTVISIT_FALSE'         => $conf_UAM[19]=='false' ?  'checked="checked"' : '' ,
     332    'UAM_ADMINCONFMAIL_TRUE'         => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
     333    'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
     334    'UAM_REDIRTOPROFILE_TRUE'        => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
     335    'UAM_REDIRTOPROFILE_FALSE'       => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
    338336                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
    339337    'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,
     
    355353               
    356354/* username insensible a la casse */
    357     if (isset($conf_UAM[3]) and $conf_UAM[3] == 'true')
     355    if (isset($conf_UAM[2]) and $conf_UAM[2] == 'true')
    358356          {
    359357                        $query = "
     
    379377               
    380378/* Username without forbidden keys */
    381     if ( isset($conf_UAM[7]) and $conf_UAM[7] == 'true' )
     379    if ( isset($conf_UAM[6]) and $conf_UAM[6] == 'true' )
    382380          {
    383381                        $query = "
     
    398396               
    399397/* Email without forbidden domain */
    400     if ( isset($conf_UAM[12]) and $conf_UAM[12] == 'true' )
     398    if ( isset($conf_UAM[11]) and $conf_UAM[11] == 'true' )
    401399          {
    402400                        $query = "
     
    409407                  while($row = pwg_db_fetch_assoc($result))
    410408                  {
    411                           $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
     409                          $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[12]);
    412410                          for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
    413411                          {
     
    467465  $conf_UAM = unserialize($conf['UserAdvManager']);
    468466 
    469   if (isset($conf_UAM[20]) and $conf_UAM[20]=='true')
     467  if (isset($conf_UAM[19]) and $conf_UAM[19]=='true')
    470468  {
    471469// +-----------------------------------------------------------------------+
     
    495493// |                           Template Init                               |
    496494// +-----------------------------------------------------------------------+
    497                 $base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
     495                /*$base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
    498496
    499497    if (isset($_GET['start']) and is_numeric($_GET['start']))
     
    504502    {
    505503      $start = 0;
    506     }
     504    }*/
    507505
    508506// +-----------------------------------------------------------------------+
     
    510508// +-----------------------------------------------------------------------+
    511509
    512 $url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
     510/*$url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
    513511
    514512$navbar = create_navigation_bar(
     
    519517  );
    520518
    521 $template->assign('navbar', $navbar);
     519$template->assign('navbar', $navbar);*/
    522520
    523521// +-----------------------------------------------------------------------+
     
    528526    foreach ($page['filtered_users'] as $num => $local_user)
    529527    {
    530 /* simulate LIMIT $start, $conf['users_page'] */
    531                         if ($num < $start)
     528// simulate LIMIT $start, $conf['users_page']
     529                        /*if ($num < $start)
    532530      {
    533531        continue;
     
    536534      {
    537535        break;
    538       }
     536      }*/
    539537
    540538      $visible_user_list[] = $local_user;
     
    555553      $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
    556554     
    557       if (isset($conf_UAM[17]) and $conf_UAM[17]=='true' and $conf_UAM[18] <> '')
     555      if (isset($conf_UAM[16]) and $conf_UAM[16]=='true' and $conf_UAM[17] <> '')
    558556      {
    559         if ($deltadays <= ($conf_UAM[18]/2))
     557        if ($deltadays <= ($conf_UAM[17]/2))
    560558        {
    561559          $display = 'green';
    562560        }
    563561       
    564         if (($deltadays > ($conf_UAM[18]/2)) and ($deltadays < $conf_UAM[18]))
     562        if (($deltadays > ($conf_UAM[17]/2)) and ($deltadays < $conf_UAM[17]))
    565563        {
    566564          $display = 'orange';
    567565        }
    568566       
    569         if ($deltadays >= $conf_UAM[18])
     567        if ($deltadays >= $conf_UAM[17])
    570568        {
    571569          $display = 'red';
     
    629627  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    630628       
    631   if (isset($conf_UAM[2]) and $conf_UAM[2]=='true' and ((isset($conf_UAM[3]) and $conf_UAM[3] <> '-1') or (isset($conf_UAM[9]) and $conf_UAM[9] <> '-1')) and isset($conf_UAM_ConfirmMail[0]) and $conf_UAM_ConfirmMail[0]=='true')
    632   {
     629  if (isset($conf_UAM[1]) and ($conf_UAM[1]=='true' or $conf_UAM[1]=='local') and ((isset($conf_UAM[2]) and $conf_UAM[2] <> '-1') or (isset($conf_UAM[8]) and $conf_UAM[8] <> '-1')))
     630  {   
    633631// +-----------------------------------------------------------------------+
    634632// |                           initialization                              |
     
    10091007// |                           Template Init                               |
    10101008// +-----------------------------------------------------------------------+
    1011                 $base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
     1009                /*$base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
    10121010
    10131011    if (isset($_GET['start']) and is_numeric($_GET['start']))
     
    10181016    {
    10191017      $start = 0;
    1020     }
     1018    }*/
    10211019
    10221020/* Hide radio-button if not allow to assign adviser */
     
    10301028// +-----------------------------------------------------------------------+
    10311029
    1032 $url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
     1030/*$url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
    10331031
    10341032$navbar = create_navigation_bar(
     
    10391037  );
    10401038
    1041 $template->assign('navbar', $navbar);
     1039$template->assign('navbar', $navbar);*/
    10421040
    10431041// +-----------------------------------------------------------------------+
     
    10521050    {
    10531051/* simulate LIMIT $start, $conf['users_page'] */
    1054                         if ($num < $start)
     1052                        /*if ($num < $start)
    10551053      {
    10561054        continue;
     
    10591057      {
    10601058        break;
    1061       }
     1059      }*/
    10621060
    10631061      $visible_user_list[] = $local_user;
     
    11151113
    11161114                        $expiration = expiration($local_user['id']);
    1117 
     1115     
    11181116                $template->append(
    11191117                'users',
     
    11381136                                )
    11391137                        );
    1140                 }
     1138                }   
     1139
     1140    // Check if validation of register is made by admin or visitor
     1141    // If visitor, $Confirm_Local is used to mask useless buttons
     1142    $Confirm_Local = "";
     1143   
     1144    if ($conf_UAM[1] == 'local')
     1145    {
     1146      $Confirm_Local = $conf_UAM[1];
     1147    }
     1148    else
     1149    {
     1150      $Confirm_Local = "";
     1151    }
     1152   
    11411153    /* Plugin version inserted */
    11421154    $template->assign(
    11431155      array(
     1156        'CONFIRM_LOCAL'=> $Confirm_Local,
    11441157        'UAM_VERSION'  => $version,
    11451158        'UAM_PATH'     => UAM_PATH,
     
    11811194  $conf_UAM = unserialize($conf['UserAdvManager']);
    11821195       
    1183   if (isset($conf_UAM[17]) and $conf_UAM[17]=='true')
     1196  if (isset($conf_UAM[16]) and $conf_UAM[16]=='true')
    11841197  {
    11851198// +-----------------------------------------------------------------------+
     
    14431456// |                           Template Init                               |
    14441457// +-----------------------------------------------------------------------+
    1445                 $base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
     1458                /*$base_url = PHPWG_ROOT_PATH.'admin.php?page=user_list';
    14461459
    14471460    if (isset($_GET['start']) and is_numeric($_GET['start']))
     
    14521465    {
    14531466      $start = 0;
    1454     }
     1467    }*/
    14551468
    14561469/* Hide radio-button if not allow to assign adviser */
     
    14641477// +-----------------------------------------------------------------------+
    14651478
    1466 $url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
     1479/*$url = PHPWG_ROOT_PATH.'admin.php'.get_query_string_diff(array('start'));
    14671480
    14681481$navbar = create_navigation_bar(
     
    14731486  );
    14741487
    1475 $template->assign('navbar', $navbar);
     1488$template->assign('navbar', $navbar);*/
    14761489
    14771490// +-----------------------------------------------------------------------+
     
    14831496    {
    14841497/* simulate LIMIT $start, $conf['users_page'] */
    1485                         if ($num < $start)
     1498                        /*if ($num < $start)
    14861499      {
    14871500        continue;
     
    14901503      {
    14911504        break;
    1492       }
     1505      }*/
    14931506
    14941507      $visible_user_list[] = $local_user;
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/ghosttracker.tpl

    r5593 r6776  
    11{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    22{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    35
    46{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
     
    1315  {rdelim});
    1416{rdelim});
     17
     18$(document).ready(function()
     19    {ldelim}
     20      $("#sorting")
     21      .tablesorter({ldelim}sortList:[[3,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
     22      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
     23    {rdelim}
     24);
    1525</script>
    1626
     
    3242  <fieldset>
    3343    <legend class="cluetip" title="{'UAM_gtTitle'|translate}|{'UAM_gtTitle_d'|translate}">{'GhostTracker_Title'|@translate}</legend>
    34       {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
    35         <table class="table2" width="97%" summary="">
     44        <table id="sorting" class="table2" width="97%" summary="">
    3645          <thead>
    3746            <tr class="throw">
    38               <td>&nbsp;</td>
    39               <td>{'Username'|@translate}</td>
    40               <td>{'Email address'|@translate}</td>
    41               <td>{'LastVisit_Date'|@translate}</td>
    42               <td>{'Reminder'|@translate}</td>
     47              <th>&nbsp;</th>
     48              <th>{'Username'|@translate}</th>
     49              <th>{'Email address'|@translate}</th>
     50              <th>{'LastVisit_Date'|@translate}</th>
     51              <th>{'Reminder'|@translate}</th>
    4352            </tr>
    4453          </thead>
    45 
     54          <tbody>
    4655          {foreach from=$users item=user name=users_loop}
    4756            <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
     
    6170            </tr>
    6271          {/foreach}
     72        </tbody>
    6373        </table>
    64 
    65         {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
     74<div id="pager" class="pager">
     75        <form>
     76                <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
     77                <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
     78                <input type="text" class="pagedisplay">
     79                <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
     80                <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
     81                <select class="pagesize">
     82                        <option  value="10">10</option>
     83                        <option selected="selected" value="20">20</option>
     84                        <option value="30">30</option>
     85                        <option value="40">40</option>
     86                </select>
     87        </form>
     88</div>
    6689        <br>
    67          
    6890<p>
    6991  {'target'|@translate}
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/global.tpl

    r5763 r6776  
    6969      <fieldset>
    7070        <ul>
    71           <li>
    72             <label class="cluetip" title="{'UAM_casenTitle'|translate}|{'UAM_casenTitle_d'|translate}">
    73               {'UAM_No_Casse'|@translate}
    74             </label>
    75           <br><br>
    76             <input type="radio" value="false" {$UAM_NO_CASSE_FALSE} name="UAM_No_Casse">
    77               {'UAM_No_Casse_false'|@translate}<br>
    78             <input type="radio" value="true" {$UAM_NO_CASSE_TRUE} name="UAM_No_Casse">
    79               {'UAM_No_Casse_true'|@translate}<br><br>
    80           </li>
    81      
    8271          <li>
    8372            <label class="cluetip" title="{'UAM_carexcTitle'|translate}|{'UAM_carexcTitle_d'|translate}">
     
    226215              {'UAM_Confirm_Mail_false'|@translate}<br>
    227216            <input type="radio" value="true" {$UAM_CONFIRM_MAIL_TRUE} name="UAM_Confirm_Mail">
    228               {'UAM_Confirm_Mail_true'|@translate}
     217              {'UAM_Confirm_Mail_true'|@translate}<br>
     218            <input type="radio" value="local" {$UAM_CONFIRM_MAIL_LOCAL} name="UAM_Confirm_Mail">
     219              {'UAM_Confirm_Mail_local'|@translate}
    229220            <br><br>
    230221                </li>
     
    506497            <input type="radio" value="false" {$UAM_NO_COMMENT_ANO_FALSE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_false'|@translate}<br>
    507498            <input type="radio" value="true" {$UAM_NO_COMMENT_ANO_TRUE} name="UAM_No_Comment_Anonymous">{'UAM_No_Comment_Anonymous_true'|@translate}<br><br>
     499          </li>
     500
     501          <li><label class="cluetip" title="{'UAM_RedirTitle'|translate}|{'UAM_RedirTitle_d'|translate}">{'UAM_RedirToProfile'|@translate}</label><br><br>
     502            <input type="radio" value="false" {$UAM_REDIRTOPROFILE_FALSE} name="UAM_RedirToProfile">{'UAM_RedirToProfile_false'|@translate}<br>
     503            <input type="radio" value="true" {$UAM_REDIRTOPROFILE_TRUE} name="UAM_RedirToProfile">{'UAM_RedirToProfile_true'|@translate}<br><br>
    508504          </li>
    509505        </ul>
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/uam.css

    r5593 r6776  
    6060  padding:0 15px 15px;
    6161}
     62
     63tr.throw
     64{
     65cursor:pointer;
     66text-align:center;
     67}
     68
     69th.header
     70{
     71background-image:url("./icon/bg.png");
     72background-position:right center;
     73background-repeat:no-repeat;
     74cursor:pointer;
     75}
     76
     77th.headerSortDown
     78{
     79background-image:url("./icon/desc.png");
     80}
     81
     82th.headerSortUp
     83{
     84background-image:url("./icon/asc.png");
     85}
     86
     87.pager{
     88  text-align:center;
     89}
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/userlist.tpl

    r5593 r6776  
    11{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    22{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
     5
    36
    47{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
     
    1316  {rdelim});
    1417{rdelim});
     18
     19$(document).ready(function()
     20    {ldelim}
     21      $("#sorting")
     22      .tablesorter({ldelim}sortList:[[3,0]]{rdelim})
     23      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
     24    {rdelim}
     25);
    1526</script>
     27
    1628
    1729<div class="titrePage">
     
    2335        <legend class="cluetip" title="{'UAM_userlistTitle'|translate}|{'UAM_userlistTitle_d'|translate}">{'UserList_Title'|@translate}</legend>
    2436
    25     {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
    26       <table class="table2" width="97%" summary="">
     37      <table id="sorting" class="table2" width="97%" summary="">
    2738                        <thead>
    2839                        <tr class="throw">
    29                         <td>{'Username'|@translate}</td>
    30                         <td>{'Email address'|@translate}</td>
    31             <td>{'LastVisit_Date'|@translate}</td>
    32             <td>{'Nb_Days'|@translate}</td>
     40                        <th>{'Username'|@translate}</th>
     41                        <th>{'Email address'|@translate}</th>
     42            <th>{'LastVisit_Date'|@translate}</th>
     43            <th>{'Nb_Days'|@translate}</th>
    3344                        </tr>
    3445                        </thead>
    35 
     46        <tbody>
    3647        {foreach from=$users item=user name=users_loop}
    3748          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
     
    5364          </tr>
    5465        {/foreach}
     66        </tbody>
    5567      </table>
    56 
    57       {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
     68<div id="pager" class="pager">
     69        <form>
     70                <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
     71                <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
     72                <input type="text" class="pagedisplay">
     73                <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
     74                <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
     75                <select class="pagesize">
     76                        <option  value="10">10</option>
     77                        <option selected="selected" value="20">20</option>
     78                        <option value="30">30</option>
     79                        <option value="40">40</option>
     80                </select>
     81        </form>
     82</div>
    5883        <br>
    5984  </fieldset>
  • extensions/NBC_UserAdvManager/branches/2.15/admin/template/usermanager.tpl

    r5593 r6776  
    11{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    22{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
     3{known_script id="jquery.tablesorter" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
     4{known_script id="jquery.tablesorter.pager" src=$UAM_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
    35
    46{html_head}<link rel="stylesheet" type="text/css" href="{$UAM_PATH}admin/template/uam.css">{/html_head}
     
    1315  {rdelim});
    1416{rdelim});
     17
     18$(document).ready(function()
     19    {ldelim}
     20      $("#sorting")
     21      .tablesorter({ldelim}sortList:[[5,1]], headers: {ldelim} 0: {ldelim} sorter: false {rdelim}{rdelim}{rdelim})
     22      .tablesorterPager({ldelim}container: $("#pager"), positionFixed: false, size: 20, totalPages: 0{rdelim});
     23    {rdelim}
     24);
    1525</script>
    1626
     
    2232  <fieldset>
    2333        <legend class="cluetip" title="{'UAM_usermanTitle'|translate}|{'UAM_usermanTitle_d'|translate}">{'UserManager_Title'|@translate}</legend>
    24 
    25     {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
    26       <table class="table2" width="97%" summary="">
     34      <table id="sorting" class="table2" width="97%" summary="">
    2735                  <thead>
    2836                        <tr class="throw">
    29                         <td>&nbsp;</td>
    30                         <td>{'Username'|@translate}</td>
    31                         <td>{'User status'|@translate}</td>
    32                         <td>{'Email address'|@translate}</td>
    33                         <td>{'Groups'|@translate}</td>
    34                         <td>{'Registration_Date'|@translate}</td>
    35             <td>{'Reminder'|@translate}</td>
     37                        <th>&nbsp;</td>
     38                        <th>&nbsp;{'Username'|@translate}&nbsp;&nbsp;</th>
     39                        <th>&nbsp;{'User status'|@translate}&nbsp;&nbsp;</th>
     40                        <th>&nbsp;{'Email address'|@translate}&nbsp;&nbsp;</th>
     41                        <th>&nbsp;{'Groups'|@translate}&nbsp;&nbsp;</th>
     42                        <th>&nbsp;{'Registration_Date'|@translate}&nbsp;&nbsp;</th>
     43          {if $CONFIRM_LOCAL == ""}
     44            <th>&nbsp;{'Reminder'|@translate}&nbsp;&nbsp;</th>
     45          {/if}
    3646                        </tr>
    3747                        </thead>
    38 
     48        <tbody>
    3949        {foreach from=$users item=user name=users_loop}
    4050          <tr class="{if $smarty.foreach.users_loop.index is odd}row1{else}row2{/if}">
     
    4555            <td>{$user.GROUPS}</td>
    4656            <td {if $user.EXPIRATION == True}style="color:red;text-align:center;"{else}style="color:lime;text-align:center;"{/if}>{$user.REGISTRATION}</td>
     57          {if $CONFIRM_LOCAL == ""}
    4758            <td style="text-align:center;">{$user.REMINDER}</td>
     59          {/if}
    4860            {foreach from=$user.plugin_columns item=data}
    4961              <td>{$data}</td>
     
    5163          </tr>
    5264        {/foreach}
     65      </tbody>
    5366      </table>
    54 
    55       {if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
     67{if !empty($users)}
     68<div id="pager" class="pager">
     69        <form>
     70                <img src="{$UAM_PATH}admin/template/icon/first.png" class="first">
     71                <img src="{$UAM_PATH}admin/template/icon/prev.png" class="prev">
     72                <input type="text" class="pagedisplay">
     73                <img src="{$UAM_PATH}admin/template/icon/next.png" class="next">
     74                <img src="{$UAM_PATH}admin/template/icon/last.png" class="last">
     75                <select class="pagesize">
     76                        <option  value="10">10</option>
     77                        <option selected="selected" value="20">20</option>
     78                        <option value="30">30</option>
     79                        <option value="40">40</option>
     80                </select>
     81        </form>
     82</div>
     83{/if}
    5684        <br>
    5785
     
    6391
    6492<p>
     93{if $CONFIRM_LOCAL == "local"}
     94  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
     95  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     96{else}
    6597  <input class="submit" type="submit" value="{'Delete_selected'|@translate}" name="Del_Selected">
    6698  <input class="submit" type="submit" value="{'Mail_without_key'|@translate}" name="Mail_Without_Key">
    6799  <input class="submit" type="submit" value="{'Mail_with_key'|@translate}" name="Mail_With_Key">
    68100  <input class="submit" type="submit" value="{'Force_Validation'|@translate}" name="Force_Validation">
     101{/if}
    69102</p>
    70103  </fieldset>
  • extensions/NBC_UserAdvManager/branches/2.15/changelog.txt.php

    r6256 r6776  
    174174            Bug 1655 fixed - Navigation bar is usefull again
    175175           
    176 -- 2.15.3 : Quick update to fix a database upgrade issue
     176-- 2.15.3 : Quick update to fix a database upgrade issue
     177
     178-- 2.15.4 : Bug 1310 fixed - UAM tables are now sortable
     179            Bug 1656 fixed - New register validation mode: Manual validation by admin
     180            Bug 1687 fixed - Login case sensitivity is no more used in this plugin because already set in Piwigo's core
     181            Bug 1727 partially fixed - New option to redirect users to profile page after their first login only.
     182              Known problem: The redirection doesn't work after registration and after confirmation page (if ConfirmMail is enabled)
     183                             The redirection applies to already registered users including admins, webmaster and generic status.
     184            Bug 1789 fixed - Escaping double quotes in text fields
     185            Bug 1790 fixed - Validation tracking tab is set when correct options are set
     186            Bug 1795 fixed - Fixes rules using email information and/or email of validation
    177187*/
    178188?>
  • extensions/NBC_UserAdvManager/branches/2.15/include/functions.inc.php

    r5634 r6776  
    4545      $password = $password <> '' ? $password : l10n('UAM_empty_pwd');
    4646     
    47       if (isset($conf_UAM[10]) and $conf_UAM[10] <> '')
     47      if (isset($conf_UAM[9]) and $conf_UAM[9] <> '')
    4848      {
    4949        if (function_exists('get_user_language_desc'))
    5050        {
    51           $infos1_perso = get_user_language_desc($conf_UAM[10])."\n\n";
     51          $infos1_perso = get_user_language_desc($conf_UAM[9])."\n\n";
    5252        }
    53         else $infos1_perso = l10n($conf_UAM[10])."\n\n";
     53        else $infos1_perso = l10n($conf_UAM[9])."\n\n";
    5454      }
    5555     
     
    8181
    8282
    83   if ( isset($conf_UAM[2]) and $conf_UAM[2] == 'true' and $confirm)
     83  if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' and $confirm)
    8484  {
    8585    $infos2 = array
     
    8989    );
    9090
    91     if (isset($conf_UAM[11]) and $conf_UAM[11] <> '')
     91    if (isset($conf_UAM[10]) and $conf_UAM[10] <> '')
    9292    {
    9393      if (function_exists('get_user_language_desc'))
    9494      {
    95         $infos2_perso = get_user_language_desc($conf_UAM[11])."\n\n";
     95        $infos2_perso = get_user_language_desc($conf_UAM[10])."\n\n";
    9696      }
    97       else $infos2_perso = l10n($conf_UAM[11])."\n\n";
     97      else $infos2_perso = l10n($conf_UAM[10])."\n\n";
    9898    }
    9999  }
     
    275275  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('Ghost_reminder_of_%s', $username));     
    276276
    277   if (isset($conf_UAM[19]) and $conf_UAM[19] <> '' and isset($conf_UAM[17]) and $conf_UAM[17] == 'true')
     277  if (isset($conf_UAM[18]) and $conf_UAM[18] <> '' and isset($conf_UAM[16]) and $conf_UAM[16] == 'true')
    278278  {
    279279    if (function_exists('get_user_language_desc'))
    280280    {
    281       $infos1 = get_user_language_desc($conf_UAM[19])."\n\n";
     281      $infos1 = get_user_language_desc($conf_UAM[18])."\n\n";
    282282    }
    283283    else
    284284    {
    285       $infos1 = l10n($conf_UAM[19])."\n\n";
     285      $infos1 = l10n($conf_UAM[18])."\n\n";
    286286    }
    287287
     
    359359WHERE user_id = '".$user_id."'
    360360  AND (
     361    group_id = '".$conf_UAM[2]."'
     362  OR
    361363    group_id = '".$conf_UAM[3]."'
    362   OR
    363     group_id = '".$conf_UAM[4]."'
    364364  )
    365365;";
    366366    pwg_query($query);
    367367
    368     if (!is_admin() and $conf_UAM[9] <> -1)
     368    if (!is_admin() and $conf_UAM[8] <> -1)
    369369    {
    370370      $query = "
    371371UPDATE ".USER_INFOS_TABLE."
    372 SET status = '".$conf_UAM[9]."'
     372SET status = '".$conf_UAM[8]."'
    373373WHERE user_id = '".$user_id."'
    374374;";
     
    376376    }
    377377
    378     if ( $conf_UAM[3] <> -1 )
     378    if ( $conf_UAM[2] <> -1 )
    379379    {
    380380      $query = "
     
    382382  (user_id, group_id)
    383383VALUES
    384   ('".$user_id."', '".$conf_UAM[3]."')
     384  ('".$user_id."', '".$conf_UAM[2]."')
    385385;";
    386386      pwg_query($query);
     
    388388   
    389389    return get_absolute_root_url().UAM_PATH.'ConfirmMail.php?key='.$Confirm_Mail_ID;
     390  }
     391}
     392
     393
     394/* Function called from main.inc.php to set group to new users if manual validation is set */
     395function setgroup($user_id)
     396{
     397  global $conf;
     398 
     399  $conf_UAM = unserialize($conf['UserAdvManager']);
     400
     401  $query = "
     402DELETE FROM ".USER_GROUP_TABLE."
     403WHERE user_id = '".$user_id."'
     404  AND (
     405    group_id = '".$conf_UAM[2]."'
     406  OR
     407    group_id = '".$conf_UAM[3]."'
     408  )
     409;";
     410  pwg_query($query);
     411
     412  if (!is_admin() and $conf_UAM[8] <> -1)
     413  {
     414    $query = "
     415UPDATE ".USER_INFOS_TABLE."
     416SET status = '".$conf_UAM[8]."'
     417WHERE user_id = '".$user_id."'
     418;";
     419    pwg_query($query);
     420  }
     421
     422  if ( $conf_UAM[2] <> -1 )
     423  {
     424    $query = "
     425INSERT INTO ".USER_GROUP_TABLE."
     426  (user_id, group_id)
     427VALUES
     428  ('".$user_id."', '".$conf_UAM[2]."')
     429;";
     430    pwg_query($query);
    390431  }
    391432}
     
    457498  pwg_query($query);
    458499}
     500
     501
     502/* Function called from main.inc.php - Triggered on user deletion */
     503function DeleteRedir($user_id)
     504{
     505  $tab = array();
     506
     507  $query = "
     508SELECT value
     509FROM ".CONFIG_TABLE."
     510WHERE param = 'UserAdvManager_Redir'
     511;";
     512
     513  $tab = pwg_db_fetch_row(pwg_query($query));
     514 
     515  $values = explode(',', $tab[0]);
     516
     517  unset($values[array_search($user_id, $values)]);
     518     
     519  $query = "
     520UPDATE ".CONFIG_TABLE."
     521SET value = \"".implode(',', $values)."\"
     522WHERE param = 'UserAdvManager_Redir';";
     523
     524  pwg_query($query);
     525}
     526
    459527
    460528/* Function called from ConfirmMail.php to verify validation key used by user according time limit */
     
    525593                                                pwg_query($query);
    526594     
    527                                                 if ($conf_UAM[3] <> -1) // Delete user from unvalidated users group
     595                                                if ($conf_UAM[2] <> -1) // Delete user from unvalidated users group
    528596                                                {
    529597                                                        $query = "
    530598DELETE FROM ".USER_GROUP_TABLE."
    531599WHERE user_id = '".$data['user_id']."'
    532   AND group_id = '".$conf_UAM[3]."'
     600  AND group_id = '".$conf_UAM[2]."'
    533601;";
    534602                                                        pwg_query($query);
    535603                                                }
    536604           
    537                                                 if ($conf_UAM[4] <> -1) // Add user to validated users group
     605                                                if ($conf_UAM[3] <> -1) // Add user to validated users group
    538606                                                {
    539607                                                        $query = "
     
    541609  (user_id, group_id)
    542610VALUES
    543   ('".$data['user_id']."', '".$conf_UAM[4]."')
     611  ('".$data['user_id']."', '".$conf_UAM[3]."')
    544612;";
    545613                                                        pwg_query($query);
    546614                                                }
    547615
    548                                                 if (($conf_UAM[5] <> -1 or isset($data['status']))) // Change user's status
     616                                                if (($conf_UAM[4] <> -1 or isset($data['status']))) // Change user's status
    549617                                                {
    550618                                                        $query = "
    551619UPDATE ".USER_INFOS_TABLE."
    552 SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[5])."'
     620SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
    553621WHERE user_id = '".$data['user_id']."'
    554622;";
     
    577645                                        pwg_query($query);
    578646     
     647                                        if ($conf_UAM[2] <> -1)
     648                                        {
     649                                                $query = "
     650DELETE FROM ".USER_GROUP_TABLE."
     651WHERE user_id = '".$data['user_id']."'
     652AND group_id = '".$conf_UAM[2]."'
     653;";
     654                                                pwg_query($query);
     655                                        }
     656   
    579657                                        if ($conf_UAM[3] <> -1)
    580658                                        {
     
    585663;";
    586664                                                pwg_query($query);
    587                                         }
    588    
    589                                         if ($conf_UAM[4] <> -1)
    590                                         {
    591                                                 $query = "
    592 DELETE FROM ".USER_GROUP_TABLE."
    593 WHERE user_id = '".$data['user_id']."'
    594 AND group_id = '".$conf_UAM[4]."'
    595 ;";
    596                                                 pwg_query($query);
    597665
    598666                                                $query = "
     
    600668  (user_id, group_id)
    601669VALUES
    602   ('".$data['user_id']."', '".$conf_UAM[4]."')
     670  ('".$data['user_id']."', '".$conf_UAM[3]."')
    603671;";
    604672                                                pwg_query($query);
    605673                                        }
    606674
    607                                         if (($conf_UAM[5] <> -1 or isset($data['status'])))
     675                                        if (($conf_UAM[4] <> -1 or isset($data['status'])))
    608676                                        {
    609677                                                $query = "
    610678UPDATE ".USER_INFOS_TABLE."
    611 SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[5])."'
     679SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
    612680WHERE user_id = '".$data['user_id']."'
    613681;";
     
    662730                        pwg_query($query);
    663731             
     732                        if ($conf_UAM[2] <> -1)
     733                        {
     734                                $query = "
     735DELETE FROM ".USER_GROUP_TABLE."
     736WHERE user_id = '".$data['user_id']."'
     737  AND group_id = '".$conf_UAM[2]."'
     738;";
     739                                pwg_query($query);
     740                        }
     741 
    664742                        if ($conf_UAM[3] <> -1)
    665743                        {
     
    668746WHERE user_id = '".$data['user_id']."'
    669747  AND group_id = '".$conf_UAM[3]."'
    670 ;";
    671                                 pwg_query($query);
    672                         }
    673  
    674                         if ($conf_UAM[4] <> -1)
    675                         {
    676                                 $query = "
    677 DELETE FROM ".USER_GROUP_TABLE."
    678 WHERE user_id = '".$data['user_id']."'
    679   AND group_id = '".$conf_UAM[4]."'
    680748                                ;";
    681749                                pwg_query($query);
     
    685753  (user_id, group_id)
    686754VALUES
    687   ('".$data['user_id']."', '".$conf_UAM[4]."')
     755  ('".$data['user_id']."', '".$conf_UAM[3]."')
    688756;";
    689757                                pwg_query($query);
    690758                        }
    691759
    692                         if (($conf_UAM[5] <> -1 or isset($data['status'])))
     760                        if (($conf_UAM[4] <> -1 or isset($data['status'])))
    693761                        {
    694762                                $query = "
    695763UPDATE ".USER_INFOS_TABLE."
    696 SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[5])."'
     764SET status = '".(isset($data['status']) ? $data['status'] : $conf_UAM[4])."'
    697765WHERE user_id = '".$data['user_id']."'
    698766;";
     
    706774}
    707775
    708 /* Function called from main.inc.php - Get username case insensitive */
    709 function NotSensibleSearchUsername($username)
    710 {
    711   global $conf;
    712  
    713   if (isset($username))
    714   {
    715     $query = "
    716 SELECT ".$conf['user_fields']['username']."
    717 FROM ".USERS_TABLE."
    718 WHERE LOWER(".stripslashes($conf['user_fields']['username']).") = '".strtolower($username)."'
    719 ;";
    720     $users = pwg_db_num_rows(pwg_query($query));
    721     if ($users > 0)
    722     {
    723       return true;
    724     }
    725     else
    726     {
    727       return false;
    728     }
    729   }
    730 }
    731 
    732776
    733777/* Function called from main.inc.php - Check if username matches forbidden caracters */
     
    738782  $conf_UAM = unserialize($conf['UserAdvManager']);
    739783
    740   if (isset($login) and isset($conf_UAM[8]) and $conf_UAM[8] <> '')
    741   {
    742     $conf_CharExclusion = preg_split("/,/",$conf_UAM[8]);
     784  if (isset($login) and isset($conf_UAM[7]) and $conf_UAM[7] <> '')
     785  {
     786    $conf_CharExclusion = preg_split("/,/",$conf_UAM[7]);
    743787    for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++)
    744788    {
     
    765809  $conf_UAM = unserialize($conf['UserAdvManager']);
    766810 
    767         if (isset($email) and isset($conf_UAM[13]) and $conf_UAM[13] <> '')
     811        if (isset($email) and isset($conf_UAM[12]) and $conf_UAM[12] <> '')
    768812        {
    769813                //$ncsemail = strtolower($email);
    770                 $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[13]);
     814                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[12]);
    771815                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
    772816                {
     
    816860  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")';
    817861
    818         if ($conf_UAM[3] <> '-1' and $conf_UAM[9] == '-1')
     862        if ($conf_UAM[2] <> '-1' and $conf_UAM[8] == '-1')
    819863  {
    820864    $query.= '
    821   AND ug.group_id = '.$conf_UAM[3];
    822   }
    823   if ($conf_UAM[3] == '-1' and $conf_UAM[9] <> '-1')
     865  AND ug.group_id = '.$conf_UAM[2];
     866  }
     867  if ($conf_UAM[2] == '-1' and $conf_UAM[8] <> '-1')
    824868  {
    825869    $query.= '
    826   AND ui.status = \''.$conf_UAM[9]."'";
    827   }
    828   if ($conf_UAM[3] <> '-1' and $conf_UAM[9] <> '-1')
     870  AND ui.status = \''.$conf_UAM[8]."'";
     871  }
     872  if ($conf_UAM[2] <> '-1' and $conf_UAM[8] <> '-1')
    829873  {
    830874    $query.= '
    831   AND ug.group_id = \''.$conf_UAM[3]."'";
     875  AND ug.group_id = \''.$conf_UAM[2]."'";
    832876  }
    833877  $query.= '
    834 ORDER BY id ASC
     878ORDER BY ui.registration_date ASC
    835879;';
    836880
     
    896940  INNER JOIN '.USER_LASTVISIT_TABLE.' AS lv
    897941    ON u.'.$conf['user_fields']['id'].' = lv.user_id
    898 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[18].'")
    899 ORDER BY id ASC;';
     942WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[17].'")
     943ORDER BY lv.lastvisit ASC;';
    900944
    901945        $result = pwg_query($query);
     
    937981    ON u.'.$conf['user_fields']['id'].' = ug.user_id
    938982WHERE u.'.$conf['user_fields']['id'].' >= 3
    939 ORDER BY lastvisit DESC
     983ORDER BY ug.lastvisit DESC
    940984;';
    941985
     
    10021046                else
    10031047                {
    1004                         return True;
     1048                        return true;
    10051049                }
    10061050        }
     
    11681212  }
    11691213}
     1214
     1215
     1216// check_consult - Thx to LucMorizur
     1217// checks if a user id is registered as having already
     1218// visited his profile.php page.
     1219// @uid        : the user id
     1220// @user_idsOK : (returned) array of all users ids having already visited
     1221//               their profile.php pages
     1222//
     1223// @returns    : true or false whether the users has already visited his
     1224//               profile.php page or not
     1225function check_consult($uid, &$user_idsOK)
     1226{
     1227  $t = array();
     1228  $v = false;
     1229 
     1230  $query = "
     1231SELECT value
     1232FROM ".CONFIG_TABLE."
     1233WHERE param = 'UserAdvManager_Redir'
     1234;";
     1235 
     1236  if ($v = (($t = pwg_db_fetch_row(pwg_query($query))) !== false))
     1237  {
     1238    $user_idsOK = explode(',', $t[0]);
     1239    $v = (in_array($uid, $user_idsOK));
     1240  }
     1241  return $v;
     1242}
    11701243?>
  • extensions/NBC_UserAdvManager/branches/2.15/include/upgradedb.inc.php

    r6256 r6776  
    204204
    205205                pwg_query($query);
     206   
     207    upgrade_2153_2154();
     208}
     209
     210/* upgrade from branch 2.15.3 to 2.15.4 */
     211/* ************************************ */
     212function upgrade_2153_2154()
     213{
     214  global $conf;
     215
     216/* Upgrading options */
     217  $query = '
     218SELECT value
     219  FROM '.CONFIG_TABLE.'
     220WHERE param = "UserAdvManager"
     221;';
     222
     223  $result = pwg_query($query);
     224  $conf_UAM = pwg_db_fetch_assoc($result);
     225   
     226  $Newconf_UAM = unserialize($conf_UAM['value']);
     227 
     228  $Newconf_UAM[0] = $Newconf_UAM[0];
     229  $Newconf_UAM[1] = $Newconf_UAM[2];
     230  $Newconf_UAM[2] = $Newconf_UAM[3];
     231  $Newconf_UAM[3] = $Newconf_UAM[4];
     232  $Newconf_UAM[4] = $Newconf_UAM[5];
     233  $Newconf_UAM[5] = $Newconf_UAM[6];
     234  $Newconf_UAM[6] = $Newconf_UAM[7];
     235  $Newconf_UAM[7] = $Newconf_UAM[8];
     236  $Newconf_UAM[8] = $Newconf_UAM[9];
     237  $Newconf_UAM[9] = $Newconf_UAM[10];
     238  $Newconf_UAM[10] = $Newconf_UAM[11];
     239  $Newconf_UAM[11] = $Newconf_UAM[12];
     240  $Newconf_UAM[12] = $Newconf_UAM[13];
     241  $Newconf_UAM[13] = $Newconf_UAM[14];
     242  $Newconf_UAM[14] = $Newconf_UAM[15];
     243  $Newconf_UAM[15] = $Newconf_UAM[16];
     244  $Newconf_UAM[16] = $Newconf_UAM[17];
     245  $Newconf_UAM[17] = $Newconf_UAM[18];
     246  $Newconf_UAM[18] = $Newconf_UAM[19];
     247  $Newconf_UAM[19] = $Newconf_UAM[20];
     248  $Newconf_UAM[20] = $Newconf_UAM[21];
     249  $Newconf_UAM[21] = 'false';
     250 
     251  $update_conf = serialize($Newconf_UAM);
     252   
     253  $query = '
     254      UPDATE '.CONFIG_TABLE.'
     255                        SET value="'.addslashes($update_conf).'"
     256                        WHERE param="UserAdvManager"
     257                        LIMIT 1
     258                ;';
     259
     260        pwg_query($query);
     261
     262  $query = '
     263INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
     264VALUES ("UserAdvManager_Redir","0","UAM Redirections")
     265  ;';
     266 
     267  pwg_query($query);
    206268}
    207269?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/de_DE/help/plugin.lang.php

    r6253 r6776  
    33
    44$lang['UAM_restricTitle'] = 'Einschränkungen für Registrierungen';
    5 $lang['UAM_restricTitle_d'] = '
    6 - Groß-und Kleinschreibung<br>
    7 - Charaktere Ausgrenzung<br>
    8 - Passwort Durchsetzung<br>
    9 - E-Mail-Domänen Ausgrenzung<br>
    10 ...
    11 ';
    125$lang['UAM_confirmTitle'] = 'Bestätigungen und Validierungen der Registrierung';
    136$lang['UAM_confirmTitle_d'] = '
     
    5346Um mehrere Sprachen zu benutzen, können Sie die Extended description Plugin-Tags verwenden, wenn er aktiv ist.<br><br>
    5447<b style=&quot;color: red;&quot;>Text &Auml;nderung ist nur verf&uuml;gbar, wenn die &quot;Informations-E-Mail&quot; aktiviert ist.</b>';
    55 $lang['UAM_confirmmailTitle'] = 'Die Bestätigung der Anmeldung';
    56 $lang['UAM_confirmmailTitle_d'] = 'Diese Option ermöglicht es einem Benutzer benötigen, um ihre Registrierung durch Klick auf einen Link zu validieren erhielt in eine E-Mail geschickt zum Zeitpunkt der Anmeldung.<br><br>
    57 Die E-Mail ist eine anpassbare Teil komponiert, um eine kleine Begr&uuml;&szlig;ung Einf&uuml;hrung und einem festen Teil mit den Aktivierungs-Link, die von einem zuf&auml;lligen Schl&uuml;ssel, die m&ouml;glicherweise durch die &quot;Tracking Validierungen regenerieren&quot; Registerkarte erzeugt wird.<br><br>
    58 Diese Option ist in der Regel mit der automatischen Zuordnung der Gruppe und / oder Satzung verwendet. Zum Beispiel, ein Benutzer, der nicht validiert ihre Eintragung in eine bestimmte Gruppe von Nutzern eingestellt werden (mit oder ohne Einschr&auml;nkungen auf der Galerie), w&auml;hrend ein Benutzer, der seine Registrierung best&auml;tigt wird in einem &quot;normalen&quot; Gruppe eingestellt werden.';
    5948$lang['UAM_confirmtxtTitle'] = 'Anpassen der E-Mail-Bestätigung';
    6049$lang['UAM_confirmtxtTitle_d'] = 'Geben Sie den einleitenden Text, den Sie in der E-Mail-Bestätigung der Anmeldung erscheinen.<br><br>
     
    9988$lang['UAM_userlistTitle'] = 'Tracking Benutzer';
    10089$lang['UAM_usermanTitle'] = 'Tracking Validierungen';
    101 $lang['UAM_usermanTitle_d'] = 'Wenn die Begrenzung der Frist für die Anmeldung aktiviert ist, finden Sie weiter unten die Liste der Benutzer, deren Validierung Eintragung erwartet wird, <b style=&quot;text-decoration: underline;&quot;>ob oder nicht</b> sind sie in der Zeit zu validieren.<br><br>
    102 Das Datum der Eintragung wird in grün angezeigt, wenn der Benutzer unter dem betreffenden Frist wird auf seine Registrierung zu bestätigen. In diesem Fall ist die Validierung Schlüssel noch gültig ist, und wir können eine E-Mail mit oder ohne eine neue Validierung Schlüssel zu schicken.<br><br>
    103 Wenn das Datum der Eintragung erscheint in Rot, die Validierung abgelaufen. In diesem Fall müssen Sie eine E-Mail mit der Regeneration der Validierung Schlüssel senden, wenn Sie dem Benutzer die Möglichkeit, ihre Anmeldung bestätigen möchten.<br><br>
    104 In allen Fällen ist es möglich, manuell die Validierung Kraft.<br><br>
    105 In dieser Ansicht können Sie:
    106 <br><br>
    107 - Löschen Sie manuell Konten <b>(Handbuch Drain)</b>
    108 <br>
    109 - Generieren Sie per E-Mail-Erinnerung <b>ohne</b> erzeugt einen neuen Schlüssel. Warnung: Senden Sie eine E-Mail-Erinnerung für die angestrebten Besucher. Diese Funktion kann nicht zurückgesetzt dem Zeitpunkt der Eintragung des angestrebten Besucher und das Zeitlimit ist weiterhin gültig.
    110 <br>
    111 - Generieren Sie per E-Mail-Erinnerung <b>mit</b> erzeugt einen neuen Schlüssel. Warnung: Senden Sie eine E-Mail-Erinnerung für die angestrebten Besucher. Diese Funktion setzt auch den Zeitpunkt der Eintragung des angestrebten Besucher, die die Frist für die Validierung erweitern entspricht.
    112 <br>
    113 - Senden einer Registrierung erwartet Validierung von Hand, auch wenn das Ablaufdatum überschritten ist <b>(zwingen Validierung)</b>.';
    11490$lang['UAM_gtTitle'] = 'Geist Besucher-Management';
    115 $lang['UAM_gtTitle_d'] = 'Als Ghost Tracker aktiviert ist und initialisiert wurde, finden Sie weiter unten die Liste der registrierten Besucher, die sich seit x Tagen zur&uuml;ckgegeben haben. &quot;x&quot; ist die Anzahl der Tage konfiguriert in der General-Setup. Dar&uuml;ber hinaus finden Sie eine Spalte angibt, ob eine E-Mail-Erinnerung hat, um die angestrebten Besucher gesendet wurde. So k&ouml;nnen Sie auf einen Blick sehen und zu behandeln Besucher, die nicht wegen der Erinnerung genommen haben.<br><br>In dieser Ansicht können Sie:
    116 <br><br>
    117 - Löschen Sie manuell Konten <b>(Handbuch Drain)</b>
    118 <br>
    119 - Generieren Sie per E-Mail-Erinnerung <b>mit dem Zurücksetzen der letzte Besuch date</b>. Dies erlaubt es, einen Platzhalter, um die angestrebten Besucher geben. Wenn der Besucher bereits eine Mahnung erhalten haben, durch nichts daran gehindert, eine neue Mail, die wieder zurückgesetzt werden, in der Tat übel, dem letzten Tag besuchen.';
    12091
    12192
     
    12697Durch die Deaktivierung dieser Option (Standard), nur die E-Mail-Informationen gesendet werden (wenn &quot;Informations-E-Mail an Benutzer&quot; aktiviert ist).';
    12798// --------- End: New or revised $lang ---- from version 2.14.0
    128 
    129 
    130 // --------- Starting below: New or revised $lang ---- from version 2.14.1
    131 $lang['UAM_userlistTitle_d'] = 'Diese Seite gibt es zur Information an den Administrator. Es zeigt eine Liste von allen Nutzern auf der Galerie zeigt das Datum und die Anzahl der Tage seit dem letzten Besuch registriert. Die Liste ist in aufsteigender Reihenfolge der Anzahl der Tage sortiert.
    132 <br><br>
    133 <b><u>Erst wenn der Geist Tracker aktiv ist</u></b>, wird die Anzahl der Tage ohne einen Besuch wie der folgende Farbcode nach dem Maximum in der Geist Tracker Optionen:
    134 <br>
    135 - <b style=&quot;color: lime;&quot;>Grün</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:lime;&quot;><u>weniger als 50%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker.<br>
    136 - <b style=&quot;color: orange;&quot;>Orange</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:orange;&quot;><u>zwischen 50% und 99%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker.<br>
    137 - <b style=&quot;color: red;&quot;>Rot</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:red;&quot;><u>f&uuml;r mehr als 100%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker. <b><u>In diesem Fall muss der Benutzer sich auch in der Geist-Tracker-Tabelle.</u></b><br>
    138 <br>
    139 Beispiel:
    140 <br>
    141 Die Höchstdauer von Geist Tracker ist so konfiguriert, dass 100 Tage.
    142 <br>
    143 Ein Benutzer wird in grün angezeigt, wenn er die Galerie für weniger als 50 Tagen besucht haben, in orange, wenn sein letzter Besuch stattgefunden hat zwischen 50 und 99 Tage und rot für 100 Tage und mehr.
    144 <br><br>
    145 <b>HINWEIS</b> : Die Liste wird nicht angezeigt, die nicht validiert ihrer Registrierung (falls die M&ouml;glichkeit der Validierung der Registrierung aktiviert ist). Diese Benutzer werden dann in besonderer Weise in der &quot;Tracking Validierungen verwaltet&quot; aus.';
    146 // --------- End: New or revised $lang ---- from version 2.14.1
    14799
    148100
     
    166118<b style=&quot;color: red;&quot;>Warnung: Diese Option hat keine Auswirkungen auf den Benutzernamen erstellt vor ihrer Aktivierung.</b>';
    167119// --------- End: New or revised $lang ---- from version 2.15.2
     120
     121
     122// --------- Starting below: New or revised $lang ---- from version 2.15.4
     123$lang['UAM_restricTitle_d'] = '
     124- Charaktere Ausgrenzung<br>
     125- Passwort Durchsetzung<br>
     126- E-Mail-Domänen Ausgrenzung<br>
     127...
     128';
     129$lang['UAM_userlistTitle_d'] = 'Diese Seite gibt es zur Information an den Administrator. Es zeigt eine Liste von allen Nutzern auf der Galerie zeigt das Datum und die Anzahl der Tage seit dem letzten Besuch registriert. Die Liste ist in aufsteigender Reihenfolge der Anzahl der Tage sortiert.
     130<br><br>
     131<b><u>Erst wenn der Geist Tracker aktiv ist</u></b>, wird die Anzahl der Tage ohne einen Besuch wie der folgende Farbcode nach dem Maximum in der Geist Tracker Optionen:
     132<br>
     133- <b style=&quot;color: lime;&quot;>Grün</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:lime;&quot;><u>weniger als 50%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker.<br>
     134- <b style=&quot;color: orange;&quot;>Orange</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:orange;&quot;><u>zwischen 50% und 99%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker.<br>
     135- <b style=&quot;color: red;&quot;>Rot</b> : Wenn der Benutzer hat die Galerie <b style=&quot;color:red;&quot;><u>f&uuml;r mehr als 100%</u></b> besucht der angegebene H&ouml;chstzahl in der Geist-Tracker. <b><u>In diesem Fall muss der Benutzer sich auch in der Geist-Tracker-Tabelle.</u></b><br>
     136<br>
     137Beispiel:
     138<br>
     139Die Höchstdauer von Geist Tracker ist so konfiguriert, dass 100 Tage.
     140<br>
     141Ein Benutzer wird in grün angezeigt, wenn er die Galerie für weniger als 50 Tagen besucht haben, in orange, wenn sein letzter Besuch stattgefunden hat zwischen 50 und 99 Tage und rot für 100 Tage und mehr.
     142<br><br>
     143<b>HINWEIS</b>: Die Liste wird nicht angezeigt, die nicht validiert ihrer Registrierung (falls die M&ouml;glichkeit der Validierung der Registrierung aktiviert ist). Diese Benutzer werden dann in besonderer Weise in der &quot;Tracking Validierungen verwaltet&quot; aus.
     144<br><br>
     145<b>Die Sortierung der Tabelle Function</b>: Sie können die Daten mit einem Klick auf die Spaltenüberschriften angezeigt. Halten Sie SHIFT-Taste, um Art bis zu 4 gleichzeitige maximale Spalten.';
     146$lang['UAM_usermanTitle_d'] = 'Wenn die Begrenzung der Frist für die Anmeldung aktiviert ist, finden Sie weiter unten die Liste der Benutzer, deren Validierung Eintragung erwartet wird, <b style=&quot;text-decoration: underline;&quot;>ob oder nicht</b> sind sie in der Zeit zu validieren.<br><br>
     147Das Datum der Eintragung wird in grün angezeigt, wenn der Benutzer unter dem betreffenden Frist wird auf seine Registrierung zu bestätigen. In diesem Fall ist die Validierung Schlüssel noch gültig ist, und wir können eine E-Mail mit oder ohne eine neue Validierung Schlüssel zu schicken.<br><br>
     148Wenn das Datum der Eintragung erscheint in Rot, die Validierung abgelaufen. In diesem Fall müssen Sie eine E-Mail mit der Regeneration der Validierung Schlüssel senden, wenn Sie dem Benutzer die Möglichkeit, ihre Anmeldung bestätigen möchten.<br><br>
     149In allen Fällen ist es möglich, manuell die Validierung Kraft.<br><br>
     150In dieser Ansicht können Sie:
     151<br><br>
     152- Löschen Sie manuell Konten <b>(Handbuch Drain)</b>
     153<br>
     154- Generieren Sie per E-Mail-Erinnerung <b>ohne</b> erzeugt einen neuen Schlüssel. Warnung: Senden Sie eine E-Mail-Erinnerung für die angestrebten Besucher. Diese Funktion kann nicht zurückgesetzt dem Zeitpunkt der Eintragung des angestrebten Besucher und das Zeitlimit ist weiterhin gültig.
     155<br>
     156- Generieren Sie per E-Mail-Erinnerung <b>mit</b> erzeugt einen neuen Schlüssel. Warnung: Senden Sie eine E-Mail-Erinnerung für die angestrebten Besucher. Diese Funktion setzt auch den Zeitpunkt der Eintragung des angestrebten Besucher, die die Frist für die Validierung erweitern entspricht.
     157<br>
     158- Senden einer Registrierung erwartet Validierung von Hand, auch wenn das Ablaufdatum überschritten ist <b>(zwingen Validierung)</b>.
     159<br><br>
     160<b>Die Sortierung der Tabelle Function</b> : Sie können die Daten mit einem Klick auf die Spaltenüberschriften angezeigt. Halten Sie SHIFT-Taste, um Art bis zu 4 gleichzeitige maximale Spalten.';
     161$lang['UAM_gtTitle_d'] = 'Als Ghost Tracker aktiviert ist und initialisiert wurde, finden Sie weiter unten die Liste der registrierten Besucher, die sich seit x Tagen zur&uuml;ckgegeben haben. &quot;x&quot; ist die Anzahl der Tage konfiguriert in der General-Setup. Dar&uuml;ber hinaus finden Sie eine Spalte angibt, ob eine E-Mail-Erinnerung hat, um die angestrebten Besucher gesendet wurde. So k&ouml;nnen Sie auf einen Blick sehen und zu behandeln Besucher, die nicht wegen der Erinnerung genommen haben.<br><br>In dieser Ansicht können Sie:
     162<br><br>
     163- Löschen Sie manuell Konten <b>(Handbuch Drain)</b>
     164<br>
     165- Generieren Sie per E-Mail-Erinnerung <b>mit dem Zurücksetzen der letzte Besuch date</b>. Dies erlaubt es, einen Platzhalter, um die angestrebten Besucher geben. Wenn der Besucher bereits eine Mahnung erhalten haben, durch nichts daran gehindert, eine neue Mail, die wieder zurückgesetzt werden, in der Tat übel, dem letzten Tag besuchen.
     166<br><br>
     167<b>Die Sortierung der Tabelle Function</b> : Sie können die Daten mit einem Klick auf die Spaltenüberschriften angezeigt. Halten Sie SHIFT-Taste, um Art bis zu 4 gleichzeitige maximale Spalten.';
     168$lang['UAM_confirmmailTitle'] = 'Die Bestätigung der Anmeldung';
     169/*TODO*/$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
     170In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking validations&quot; tab.<br><br>
     171<br><br>
     172In second case, <b><u>there is no validation key send by email!</u></b>. Visitors have to wait until an administrator validate them himself in &quot;Validation tracking&quot; tab. It\s recommanded to activate the Piwigo\'s option &quot;Email admins when a new user registers&quot; (see in Piwigo\'s configuration options) and to use the &quot;Information email to user&quot; to warn new registers to wait on their account activation.
     173<br>
     174<b style=&quot;color: red;&quot;>NB: Options &quot;Deadline for registration validation limited&quot; and &quot;Remind unvalidated users  &quot; have to be set to off when admin\'s manual validation is enabled.</b>
     175<br><br>
     176Diese Option ist in der Regel mit der automatischen Zuordnung der Gruppe und / oder Satzung verwendet. Zum Beispiel, ein Benutzer, der nicht validiert ihre Eintragung in eine bestimmte Gruppe von Nutzern eingestellt werden (mit oder ohne Einschr&auml;nkungen auf der Galerie), w&auml;hrend ein Benutzer, der seine Registrierung best&auml;tigt wird in einem &quot;normalen&quot; Gruppe eingestellt werden.';
     177$lang['UAM_RedirTitle'] = 'Umleitung auf &quot;Benutzerdaten&quot; Seite';
     178$lang['UAM_RedirTitle_d'] = 'Diese Option automatisch umleiten ein registrierter Benutzer zum sein Benutzerdaten Seite nur bei seinem ersten Anschluss an die Galerie.<br><br>
     179Bitte beachten Sie: Diese Funktion gilt für alle bereits registrierten Nutzern einschließlich derjenigen mit &quot;admin&quot;, &quot;Webmaster&quot; oder &quot;Generic&quot; Status.';
     180// --------- End: New or revised $lang ---- from version 2.15.4
    168181?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/de_DE/plugin.lang.php

    r5763 r6776  
    3030$lang['Err_audit_advise'] = '<b>Sie müssen Korrekturen an mit neuen Regeln die Sie aktiviert haben, nachzukommen durchzuführen.<br>Verwenden Sie ein Datenbank-Management-Dienstprogramm, um Benutzer-Accounts direkt in der Tabelle richtig ###_USERS';
    3131$lang['UAM_Empty Author'] = 'Der Autor Feld müssen ausgefüllt werden um einen Kommentar zu schicken.';
    32 if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
    33         $lang['reg_err_login5'] = 'Benutzername bereits vorhanden, WARNUNG Name ist Groß-und Kleinschreibung.';
     32$lang['reg_err_login5'] = 'Benutzername bereits vorhanden, WARNUNG Name ist Groß-und Kleinschreibung.';
    3433$lang['reg_err_login6'] = 'Benutzername muss nicht die folgenden Zeichen übereinstimmen: ';
    3534$lang['reg_err_login7'] = 'Ihre E-Mail-Anbieter für die Registrierung ist verboten. Gebannten E-Mail-Anbieter sind: ';
     
    5756$lang['Mail_without_key'] = 'Erinnerung ohne Schlüssel';
    5857$lang['Mail_with_key'] = 'Erinnerung mit Schlüssel';
    59 $lang['Force_Validation'] = 'gezwungen Validierung';
    6058
    6159
     
    144142$lang['UAM_MailInfo_Text'] = ' Anpassen der Informationen per E-Mail:';
    145143$lang['UAM_Confirm_Mail'] = 'Bestätigung der Anmeldung:';
    146 $lang['UAM_Confirm_Mail_true'] = ' Aktivieren';
    147144$lang['UAM_Confirm_Mail_false'] = ' Deaktivieren (Standard)';
    148145$lang['UAM_ConfirmMail_Text'] = ' Anpassen der E-Mail-Bestätigung';
     
    265262Ebenfalls erhältlich, das Projekt Bugtracker: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
    266263// --------- End: New or revised $lang ---- from version 2.15.1
     264
     265
     266// --------- Starting below: New or revised $lang ---- from version 2.15.4
     267$lang['Force_Validation'] = 'Handbuch Validierung';
     268$lang['UAM_Confirm_Mail_true'] = ' Aktivieren - Validation von Benutzer';
     269$lang['UAM_Confirm_Mail_local'] = ' Aktivieren - Validation von admin (keine Validierung Key gesendet)';
     270$lang['UAM_RedirToProfile'] = 'Umleitung auf "Benutzerdaten" Seite';
     271$lang['UAM_RedirToProfile_false'] = ' Deaktivieren (Standard)';
     272$lang['UAM_RedirToProfile_true'] = ' Aktivieren';
     273// --------- End: New or revised $lang ---- from version 2.15.4
    267274?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/help/plugin.lang.php

    r6253 r6776  
    33
    44$lang['UAM_restricTitle'] = 'Restrictions for registrations';
    5 $lang['UAM_restricTitle_d'] = '
    6 - Case sensitivity<br>
    7 - Characters exclusion<br>
    8 - Password enforcement<br>
    9 - Email domains exclusion<br>
    10 ...
    11 ';
    125$lang['UAM_confirmTitle'] = 'Confirmations and validations of registration';
    136$lang['UAM_confirmTitle_d'] = '
     
    5346To use multiple languages, you can use the Extended description plugin\'s tags if it is active.<br><br>
    5447<b style=&quot;color: red;&quot;>Text modifying is available only if the &quot;Information email&quot; is enabled.</b>';
    55 $lang['UAM_confirmmailTitle'] = 'Confirmation of registration';
    56 $lang['UAM_confirmmailTitle_d'] = 'This option allows to require a user to validate their registration by clicking on a link received in an email sent at the time of registration.<br><br>
    57 The e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking validations&quot; tab.<br><br>
    58 This option is generally used with the automatic assignment of group and/or statutes. For example, a user who has not validated their registration will be set in a specific group of users (with or without restrictions on the gallery) while a user who validated his registration shall be set in a &quot;normal&quot; group.';
    5948$lang['UAM_confirmtxtTitle'] = 'Customizing the confirmation email';
    6049$lang['UAM_confirmtxtTitle_d'] = 'Enter the introductory text that you want to appear in the email confirmation of registration.<br><br>
     
    9988$lang['UAM_userlistTitle'] = 'Tracking users';
    10089$lang['UAM_usermanTitle'] = 'Tracking validations';
    101 $lang['UAM_usermanTitle_d'] = 'When limiting the deadline for registration is enabled, you will find below the list of users whose validation registration is expected, <b style=&quot;text-decoration: underline;&quot;>whether or not</b> they are in time to validate.<br><br>
    102 The registration date is displayed in green when the user concerned is below the time limit to validate his registration. In this case, the validation key is still valid and we can send an email with or without a new validation key.<br><br>
    103 When the registration date appears in red, the validation period has expired. In this case, you must send an email with regeneration of validation key if you want to enable the user to validate their registration.<br><br>
    104 In all cases, it is possible to manually force the validation.<br><br>
    105 In this view, you can:
    106 <br><br>
    107 - Manually delete accounts <b>(manual drain)</b>
    108 <br>
    109 - Generate email reminder <b>without</b> generating a new key. Warning: Send an email reminder to targeted visitors. This function does not reset the date of registration of targeted visitors and the timeout is still valid.
    110 <br>
    111 - Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.
    112 <br>
    113 - Submit a registration awaiting validation manually even if the expiry date has passed <b>(forcing validation)</b>.';
    11490$lang['UAM_gtTitle'] = 'Ghost visitors management';
    115 $lang['UAM_gtTitle_d'] = 'When Ghost Tracker is enabled and initialized, you will find below the list of registered visitors who have not returned since x days. &quot;x&quot; is the number of days configured in the General Setup tab. In addition, you will find a column indicating whether an email reminder has been sent to targeted visitors. So, you can see at a glance and treat visitors who have not taken account of the reminder.<br><br>In this view, you can:
    116 <br><br>
    117 - Manually delete accounts <b>(manual drain)</b>
    118 <br>
    119 - Generate email reminder <b>with resetting the last visit date</b>. This allows to give a wildcard to targeted visitors. If the visitor has already received a reminder, nothing prevents to resent a new mail which will reset again, in fact, the last visit date.';
    12091
    12192
     
    12697By disabling this option (default), only the email information is sent (if &quot;Information email to user&quot; is enabled).';
    12798// --------- End: New or revised $lang ---- from version 2.14.0
    128 
    129 
    130 // --------- Starting below: New or revised $lang ---- from version 2.14.1
    131 $lang['UAM_userlistTitle_d'] = 'This page is for information to the administrator. It displays a list of all users registered on the gallery showing the date and number of days since their last visit. The list is sorted in ascending order of number of days.
    132 <br><br>
    133 <b><u>Only when the Ghost Tracker is active</u></b>, the number of days without a visit appears as the following color code, according to the maximum set in the Ghost Tracker options:
    134 <br>
    135 - <b style=&quot;color: lime;&quot;>Green</b> : When the user has visited the gallery <b style=&quot;color: lime;&quot;><u>less than 50%</u></b> of the maximum indicated in the Ghost Tracker.<br>
    136 - <b style=&quot;color: orange;&quot;>Orange</b> : When the user has visited the gallery <b style=&quot;color: orange;&quot;><u> between 50% and 99% </u></b> of the maximum indicated in the Ghost Tracker.<br>
    137 - <b style=&quot;color: red;&quot;>Red</b> : When the user has visited the gallery <b style=&quot;color: red;&quot;><u>for more than 100%</u></b> of the maximum indicated in the Ghost Tracker. <b><u>In this case, the user must also appear in the Ghost Tracker table.</u></b><br>
    138 <br>
    139 Example :
    140 <br>
    141 The maximum period of Ghost Tracker is configured to 100 days.
    142 <br>
    143 A user will appear in green if he visited the gallery for less than 50 days, in orange if his last visit took place between 50 and 99 days and red for 100 days and above.
    144 <br><br>
    145 <b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
    146 // --------- End: New or revised $lang ---- from version 2.14.1
    14799
    148100
     
    166118<b style=&quot;color: red;&quot;>Warning: This option has no effect on the user names created prior to its activation.</b>';
    167119// --------- End: New or revised $lang ---- from version 2.15.2
     120
     121// --------- Starting below: New or revised $lang ---- from version 2.15.4
     122$lang['UAM_restricTitle_d'] = '
     123- Characters exclusion<br>
     124- Password enforcement<br>
     125- Email domains exclusion<br>
     126...
     127';
     128$lang['UAM_userlistTitle_d'] = 'This page is for information to the administrator. It displays a list of all users registered on the gallery showing the date and number of days since their last visit. The list is sorted in ascending order of number of days.
     129<br><br>
     130<b><u>Only when the Ghost Tracker is active</u></b>, the number of days without a visit appears as the following color code, according to the maximum set in the Ghost Tracker options:
     131<br>
     132- <b style=&quot;color: lime;&quot;>Green</b> : When the user has visited the gallery <b style=&quot;color: lime;&quot;><u>less than 50%</u></b> of the maximum indicated in the Ghost Tracker.<br>
     133- <b style=&quot;color: orange;&quot;>Orange</b> : When the user has visited the gallery <b style=&quot;color: orange;&quot;><u> between 50% and 99% </u></b> of the maximum indicated in the Ghost Tracker.<br>
     134- <b style=&quot;color: red;&quot;>Red</b> : When the user has visited the gallery <b style=&quot;color: red;&quot;><u>for more than 100%</u></b> of the maximum indicated in the Ghost Tracker. <b><u>In this case, the user must also appear in the Ghost Tracker table.</u></b><br>
     135<br>
     136Example :
     137<br>
     138The maximum period of Ghost Tracker is configured to 100 days.
     139<br>
     140A user will appear in green if he visited the gallery for less than 50 days, in orange if his last visit took place between 50 and 99 days and red for 100 days and above.
     141<br><br>
     142<b>NOTE</b>: The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.
     143<br><br>
     144<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     145$lang['UAM_usermanTitle_d'] = 'When limiting the deadline for registration is enabled, you will find below the list of users whose validation registration is expected, <b style=&quot;text-decoration: underline;&quot;>whether or not</b> they are in time to validate.<br><br>
     146The registration date is displayed in green when the user concerned is below the time limit to validate his registration. In this case, the validation key is still valid and we can send an email with or without a new validation key.<br><br>
     147When the registration date appears in red, the validation period has expired. In this case, you must send an email with regeneration of validation key if you want to enable the user to validate their registration.<br><br>
     148In all cases, it is possible to manually force the validation.<br><br>
     149In this view, you can:
     150<br><br>
     151- Manually delete accounts <b>(manual drain)</b>
     152<br>
     153- Generate email reminder <b>without</b> generating a new key. Warning: Send an email reminder to targeted visitors. This function does not reset the date of registration of targeted visitors and the timeout is still valid.
     154<br>
     155- Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.
     156<br>
     157- Submit a registration awaiting validation manually even if the expiry date has passed <b>(forcing validation)</b>.
     158<br><br>
     159<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     160$lang['UAM_gtTitle_d'] = 'When Ghost Tracker is enabled and initialized, you will find below the list of registered visitors who have not returned since x days. &quot;x&quot; is the number of days configured in the General Setup tab. In addition, you will find a column indicating whether an email reminder has been sent to targeted visitors. So, you can see at a glance and treat visitors who have not taken account of the reminder.<br><br>In this view, you can:
     161<br><br>
     162- Manually delete accounts <b>(manual drain)</b>
     163<br>
     164- Generate email reminder <b>with resetting the last visit date</b>. This allows to give a wildcard to targeted visitors. If the visitor has already received a reminder, nothing prevents to resent a new mail which will reset again, in fact, the last visit date.
     165<br><br>
     166<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     167$lang['UAM_confirmmailTitle'] = 'Confirmation of registration';
     168$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
     169In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking validations&quot; tab.<br><br>
     170Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet &quot;Suivi des validations&quot;), et une partie personnalisable par un texte d\'accueil.
     171<br><br>
     172In second case, <b><u>there is no validation key send by email!</u></b>. Visitors have to wait until an administrator validate them himself in &quot;Validation tracking&quot; tab. It\s recommanded to activate the Piwigo\'s option &quot;Email admins when a new user registers&quot; (see in Piwigo\'s configuration options) and to use the &quot;Information email to user&quot; to warn new registers to wait on their account activation.
     173<br>
     174<b style=&quot;color: red;&quot;>NB: Options &quot;Deadline for registration validation limited&quot; and &quot;Remind unvalidated users  &quot; have to be set to off when admin\'s manual validation is enabled.</b>
     175<br><br>
     176This option is generally used with the automatic assignment of group and/or statutes. For example, a user who has not validated their registration will be set in a specific group of users (with or without restrictions on the gallery) while a user who validated his registration shall be set in a &quot;normal&quot; group.';
     177$lang['UAM_RedirTitle'] = 'Redirect to &quot;Customization&quot; page';
     178$lang['UAM_RedirTitle_d'] = 'This option automatically redirect a registered user to his customization page only at his first connection to the gallery.<br><br>
     179Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
     180// --------- End: New or revised $lang ---- from version 2.15.4
    168181?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/en_UK/plugin.lang.php

    r5763 r6776  
    2929$lang['Err_audit_advise'] = '<b>you have to perform corrections to comply with new rules that you have activated.<br>Use a database management utility to correct user accounts directly in the table ###_USERS';
    3030$lang['UAM_Empty Author'] = 'The author field have to be filled to send a comment.';
    31 if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
    32         $lang['reg_err_login5'] = 'Username already exist, WARNING name is case insensitive (Shift = Tiny).';
     31$lang['reg_err_login5'] = 'Username already exist, WARNING name is case insensitive (Shift = Tiny).';
    3332$lang['reg_err_login6'] = 'Username does not have to match the following characters: ';
    3433$lang['reg_err_login7'] = 'Your email provider is banned for registration. Banned email providers are: ';
     
    5655$lang['Mail_without_key'] = 'Reminder without key';
    5756$lang['Mail_with_key'] = 'Reminder with key';
    58 $lang['Force_Validation'] = 'Forced validation';
    5957
    6058
     
    141139$lang['UAM_MailInfo_Text'] = ' Customizing the information email:';
    142140$lang['UAM_Confirm_Mail'] = 'Confirmation of registration:';
    143 $lang['UAM_Confirm_Mail_true'] = ' Enable';
    144141$lang['UAM_Confirm_Mail_false'] = ' Disable (default)';
    145142$lang['UAM_ConfirmMail_Text'] = ' Customizing the confirmation email:';
     
    262259Also available, the project\'s bugtracker: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
    263260// --------- End: New or revised $lang ---- from version 2.15.1
     261
     262
     263// --------- Starting below: New or revised $lang ---- from version 2.15.4
     264$lang['Force_Validation'] = 'Manual validation';
     265$lang['UAM_Confirm_Mail_true'] = ' Enable - Validation by user';
     266$lang['UAM_Confirm_Mail_local'] = ' Enable - Validation by admin (no validation key sent)';
     267$lang['UAM_RedirToProfile'] = 'Redirect to "Customization" page';
     268$lang['UAM_RedirToProfile_false'] = ' Disable (default)';
     269$lang['UAM_RedirToProfile_true'] = ' Enable';
     270// --------- End: New or revised $lang ---- from version 2.15.4
    264271?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/es_ES/help/plugin.lang.php

    r6253 r6776  
    33
    44$lang['UAM_restricTitle'] = 'Restricciones para el registro';
    5 $lang['UAM_restricTitle_d'] = '
    6 - Entre mayúsculas y minúsculas<br>
    7 - Excluyendo los caracteres<br>
    8 - Ejecución Contraseña<br>
    9 - Exclusión de dominios de correo electrónico<br>
    10 ...
    11 ';
    125$lang['UAM_confirmTitle'] = 'Confirmaciones y validaciones de registro';
    136$lang['UAM_confirmTitle_d'] = '
     
    5346Para utilizar varios idiomas, puede utilizar las etiquetas para el plugin Extended description si está activo.<br><br>
    5447<b style=&quot;color: red;&quot;>Texto de la modificaci&oacute;n s&oacute;lo est&aacute; disponible si est&aacute; activado el &quot;correo electr&oacute;nico de la informaci&oacute;n&quot;.</b>';
    55 $lang['UAM_confirmmailTitle'] = 'Confirmación de registro';
    56 $lang['UAM_confirmmailTitle_d'] = 'Esta opción permite exigir a un usuario validar su registro haciendo clic en un enlace recibido en un correo electrónico enviado en el momento de la inscripción.<br><br>
    57 El correo electr&oacute;nico se compone de una parte personalizable para introducir una nota de bienvenida y una parte fija que contiene el enlace de activaci&oacute;n que se genera a partir de una clave aleatoria que posiblemente puede regenerar a trav&eacute;s de &quot;Seguimiento de las Validaciones&quot;<br><br>
    58 Esta opci&oacute;n se utiliza generalmente con la asignaci&oacute;n autom&aacute;tica de grupo y / o estatutos. Por ejemplo, un usuario que no ha validado su registro se encuentra en un grupo espec&iacute;fico de usuarios (con o sin restricciones a la galer&iacute;a) mientras que un usuario que haya validado su registro se encuentra en un &quot;normal&quot; del grupo.';
    5948$lang['UAM_confirmtxtTitle'] = 'Personalización del mensaje recordatorio';
    6049$lang['UAM_confirmtxtTitle_d'] = 'Introduzca el texto de introducción que desea que aparezca en el correo electrónico de confirmación de registro.<br><br>
     
    9988$lang['UAM_userlistTitle'] = 'Seguimiento de los usuarios';
    10089$lang['UAM_usermanTitle'] = 'Seguimiento de las Validaciones';
    101 $lang['UAM_usermanTitle_d'] = 'Cuando el limite de plazo de inscripción está habilitado, podrá encontrar más adelante la lista de usuarios cuya validación de registro esta en espera, <b style=&quot;text-decoration: underline;&quot;>si o no</b> que están en el tiempo para validar.<br><br>
    102 La fecha de registro se muestra en verde cuando el usuario en cuestión está por debajo del límite de tiempo para validar su inscripción. En este caso, la clave de validación es todavía válida y que puede enviar un correo electrónico con o sin una clave de validación nueva.<br><br>
    103 Cuando la fecha de registro aparece en rojo, el período de validación ha caducado. En este caso, debe enviar un correo electrónico con la regeneración de la clave de validación si desea que el usuario pueda validar su inscripción.<br><br>
    104 En todos los casos, es posible forzar manualmente la validación.<br><br>
    105 En esta vista, puede:
    106 <br><br>
    107 - Eliminar manualmente las cuentas de <b>(drenaje manual)</b>
    108 <br>
    109 - Generar recordatorio por correo electrónico <b>sin</b> generar una nueva clave. Advertencia: Enviar un recordatorio por correo electrónico dirigido a los visitantes. Esta función no restaura la fecha de registro de visitantes apuntado y el tiempo de espera sigue siendo válido.
    110 <br>- Generar recordatorio por correo electrónico <b>con</b> generar una nueva clave. Advertencia: Enviar un recordatorio por correo electrónico dirigido a los visitantes. Esta función también restablece la fecha de registro de visitantes y específicos, que equivale a prorrogar el plazo para la validación.
    111 <br>
    112 - Presentar una solicitud de registro en espera de validación manual, aunque la fecha de caducidad ha pasado <b>(forzando la validación)</b>.';
    11390$lang['UAM_gtTitle'] = 'Gestión de los usuarios fantasmas';
    114 $lang['UAM_gtTitle_d'] = 'Cuando el Tracker Ghost est&aacute; habilitado y se inicializa, se encuentra por debajo de la lista de visitantes registrados que no han regresado desde los x d&iacute;as. &quot;x&quot; es el n&uacute;mero de d&iacute;as configurado en la pesta&ntilde;a Configuraci&oacute;n general. Adem&aacute;s, usted encontrar&aacute; una columna que indica si un recordatorio por correo electr&oacute;nico ha sido enviado a los visitantes espec&iacute;ficos. As&iacute;, se puede ver a simple vista y tratar a los visitantes que no han tenido en cuenta el recordatorio.<br><br>
    115 En esta vista, puede:
    116 <br><br>
    117 - Elimine manualmente las cuentas de <b>(drenaje manual)</b>
    118 <br>
    119 - Generar recordatorio por correo electrónico <b>con el cambio de la fecha de última visita</b>. Esto permite dar un comodín a los visitantes específicos. Si el visitante ya ha recibido un recordatorio, nada impide a enviar un nuevo correo que se restablecerá la fecha de la última visita.';
    12091
    12192
     
    12697Al deshabilitar esta opci&oacute;n (por defecto), s&oacute;lo el coreo de informaci&oacute;n  se env&iacute;a (si &quot;Informaci&oacute;n por correo electr&oacute;nico para el usuario&quot; est&aacute; activado).';
    12798// --------- End: New or revised $lang ---- from version 2.14.0
    128 
    129 
    130 // --------- Starting below: New or revised $lang ---- from version 2.14.1
    131 $lang['UAM_userlistTitle_d'] = 'Esta p&aacute;gina es para informaci&oacute;n al administrador. Se muestra una lista de todos los usuarios registrados en la galer&iacute;a que indique la fecha y el n&uacute;mero de d&iacute;as transcurridos desde su &uacute;ltima visita. La lista est&aacute; ordenada por orden ascendente del n&uacute;mero de d&iacute;as.
    132 <br><br>
    133 <b><u>S&oacute;lo cuando el Ghost Tracker est&aacute; activo</u></b>, el n&uacute;mero de d&iacute;as sin visita aparece con el c&oacute;digo de color siguientes, seg&uacute;n el plazo m&aacute;ximo establecido en las opciones de Ghost Tracker:
    134 <br>
    135 - <b style=&quot;color: lime;&quot;>Verde</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: lime;&quot;><u>menos del 50%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker.<br>
    136 - <b style=&quot;color: orange;&quot;>Naranja</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: orange;&quot;><u>entre 50% y 99%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker.<br>
    137 - <b style=&quot;color: red;&quot;>Rojo</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: red;&quot;><u>por más de 100%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker. <b><u>En este caso, el usuario tambi&eacute;n debe aparecer en el cuadro Ghost Tracker.</u></b><br>
    138 <br>
    139 Ejemplo :
    140 <br>
    141 El per&iacute;odo m&aacute;ximo de Ghost Tracker est&aacute; configurado para 100 d&iacute;as.
    142 <br>
    143 Un usuario aparecer&aacute; en verde si visit&oacute; la galer&iacute;a hace menos de 50 d&iacute;as, en naranja si su &uacute;ltima visita tuvo lugar entre el 50 y 99 d&iacute;as y el rojo durante 100 d&iacute;as o m&aacute;s.
    144 <br><br>
    145 <b>NOTA</b> : La lista no muestra que no han validado su registro (si la opci&oacute;n de validar el registro est&aacute; activado). Estos usuarios estan administrados despu&eacute;s de una manera particular en la pestaña &quot;Seguimiento de las Validaciones&quot;.';
    146 // --------- End: New or revised $lang ---- from version 2.14.1
    14799
    148100
     
    166118<b style=&quot;color: red;&quot;>Warning: This option has no effect on the user names created prior to its activation.</b>';
    167119// --------- End: New or revised $lang ---- from version 2.15.2
     120
     121
     122// --------- Starting below: New or revised $lang ---- from version 2.15.4
     123$lang['UAM_restricTitle_d'] = '
     124- Excluyendo los caracteres<br>
     125- Ejecución Contraseña<br>
     126- Exclusión de dominios de correo electrónico<br>
     127...
     128';
     129$lang['UAM_userlistTitle_d'] = 'Esta p&aacute;gina es para informaci&oacute;n al administrador. Se muestra una lista de todos los usuarios registrados en la galer&iacute;a que indique la fecha y el n&uacute;mero de d&iacute;as transcurridos desde su &uacute;ltima visita. La lista est&aacute; ordenada por orden ascendente del n&uacute;mero de d&iacute;as.
     130<br><br>
     131<b><u>S&oacute;lo cuando el Ghost Tracker est&aacute; activo</u></b>, el n&uacute;mero de d&iacute;as sin visita aparece con el c&oacute;digo de color siguientes, seg&uacute;n el plazo m&aacute;ximo establecido en las opciones de Ghost Tracker:
     132<br>
     133- <b style=&quot;color: lime;&quot;>Verde</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: lime;&quot;><u>menos del 50%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker.<br>
     134- <b style=&quot;color: orange;&quot;>Naranja</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: orange;&quot;><u>entre 50% y 99%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker.<br>
     135- <b style=&quot;color: red;&quot;>Rojo</b> : Cuando el usuario ha visitado la galer&iacute;a de <b style=&quot;color: red;&quot;><u>por más de 100%</u></b> del plazo m&aacute;ximo indicado en el Ghost Tracker. <b><u>En este caso, el usuario tambi&eacute;n debe aparecer en el cuadro Ghost Tracker.</u></b><br>
     136<br>
     137Ejemplo :
     138<br>
     139El per&iacute;odo m&aacute;ximo de Ghost Tracker est&aacute; configurado para 100 d&iacute;as.
     140<br>
     141Un usuario aparecer&aacute; en verde si visit&oacute; la galer&iacute;a hace menos de 50 d&iacute;as, en naranja si su &uacute;ltima visita tuvo lugar entre el 50 y 99 d&iacute;as y el rojo durante 100 d&iacute;as o m&aacute;s.
     142<br><br>
     143<b>NOTA</b>: La lista no muestra que no han validado su registro (si la opci&oacute;n de validar el registro est&aacute; activado). Estos usuarios estan administrados despu&eacute;s de una manera particular en la pestaña &quot;Seguimiento de las Validaciones&quot;.
     144<br><br>
     145<b>Funciones Clasificación de la tabla</b>: Puede ordenar los datos mostrados, haga clic en los encabezados de columna. Sostenga la tecla SHIFT para ordenar hasta 4 columnas máxima simultánea.';
     146$lang['UAM_usermanTitle_d'] = 'Cuando el limite de plazo de inscripción está habilitado, podrá encontrar más adelante la lista de usuarios cuya validación de registro esta en espera, <b style=&quot;text-decoration: underline;&quot;>si o no</b> que están en el tiempo para validar.<br><br>
     147La fecha de registro se muestra en verde cuando el usuario en cuestión está por debajo del límite de tiempo para validar su inscripción. En este caso, la clave de validación es todavía válida y que puede enviar un correo electrónico con o sin una clave de validación nueva.<br><br>
     148Cuando la fecha de registro aparece en rojo, el período de validación ha caducado. En este caso, debe enviar un correo electrónico con la regeneración de la clave de validación si desea que el usuario pueda validar su inscripción.<br><br>
     149En todos los casos, es posible forzar manualmente la validación.<br><br>
     150En esta vista, puede:
     151<br><br>
     152- Eliminar manualmente las cuentas de <b>(drenaje manual)</b>
     153<br>
     154- Generar recordatorio por correo electrónico <b>sin</b> generar una nueva clave. Advertencia: Enviar un recordatorio por correo electrónico dirigido a los visitantes. Esta función no restaura la fecha de registro de visitantes apuntado y el tiempo de espera sigue siendo válido.
     155<br>- Generar recordatorio por correo electrónico <b>con</b> generar una nueva clave. Advertencia: Enviar un recordatorio por correo electrónico dirigido a los visitantes. Esta función también restablece la fecha de registro de visitantes y específicos, que equivale a prorrogar el plazo para la validación.
     156<br>
     157- Presentar una solicitud de registro en espera de validación manual, aunque la fecha de caducidad ha pasado <b>(forzando la validación)</b>.
     158<br><br>
     159<b>Funciones Clasificación de la tabla</b>: Puede ordenar los datos mostrados, haga clic en los encabezados de columna. Sostenga la tecla SHIFT para ordenar hasta 4 columnas máxima simultánea.';
     160$lang['UAM_gtTitle_d'] = 'Cuando el Tracker Ghost est&aacute; habilitado y se inicializa, se encuentra por debajo de la lista de visitantes registrados que no han regresado desde los x d&iacute;as. &quot;x&quot; es el n&uacute;mero de d&iacute;as configurado en la pesta&ntilde;a Configuraci&oacute;n general. Adem&aacute;s, usted encontrar&aacute; una columna que indica si un recordatorio por correo electr&oacute;nico ha sido enviado a los visitantes espec&iacute;ficos. As&iacute;, se puede ver a simple vista y tratar a los visitantes que no han tenido en cuenta el recordatorio.<br><br>
     161En esta vista, puede:
     162<br><br>
     163- Elimine manualmente las cuentas de <b>(drenaje manual)</b>
     164<br>
     165- Generar recordatorio por correo electrónico <b>con el cambio de la fecha de última visita</b>. Esto permite dar un comodín a los visitantes específicos. Si el visitante ya ha recibido un recordatorio, nada impide a enviar un nuevo correo que se restablecerá la fecha de la última visita.
     166<br><br>
     167<b>Funciones Clasificación de la tabla</b>: Puede ordenar los datos mostrados, haga clic en los encabezados de columna. Sostenga la tecla SHIFT para ordenar hasta 4 columnas máxima simultánea.';
     168$lang['UAM_confirmmailTitle'] = 'Confirmación de registro';
     169/*TODO*/$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
     170In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking validations&quot; tab.<br><br>
     171Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet &quot;Suivi des validations&quot;), et une partie personnalisable par un texte d\'accueil.
     172<br><br>
     173In second case, <b><u>there is no validation key send by email!</u></b>. Visitors have to wait until an administrator validate them himself in &quot;Validation tracking&quot; tab. It\s recommanded to activate the Piwigo\'s option &quot;Email admins when a new user registers&quot; (see in Piwigo\'s configuration options) and to use the &quot;Information email to user&quot; to warn new registers to wait on their account activation.
     174<br>
     175<b style=&quot;color: red;&quot;>NB: Options &quot;Deadline for registration validation limited&quot; and &quot;Remind unvalidated users  &quot; have to be set to off when admin\'s manual validation is enabled.</b>
     176<br><br>
     177Esta opci&oacute;n se utiliza generalmente con la asignaci&oacute;n autom&aacute;tica de grupo y / o estatutos. Por ejemplo, un usuario que no ha validado su registro se encuentra en un grupo espec&iacute;fico de usuarios (con o sin restricciones a la galer&iacute;a) mientras que un usuario que haya validado su registro se encuentra en un &quot;normal&quot; del grupo.';
     178$lang['UAM_RedirTitle'] = 'Redirigir a la página de &quot;personalizaci&oacute;n&quot;';
     179$lang['UAM_RedirTitle_d'] = 'Esta opción se redireccionan automáticamente un usuario registrado para su página de personalización sólo en su primera conexión a la galería.<br><br>
     180Atención: Esta característica se aplica a todos los usuarios ya registrados, incluidos aquellos con estados &quot;admin&quot;, &quot;webmaster&quot; o &quot;generic&quot;.';
     181// --------- End: New or revised $lang ---- from version 2.15.4
    168182?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/es_ES/plugin.lang.php

    r6253 r6776  
    3030$lang['Err_audit_advise'] = '<b>Usted tiene que realizar correcciones para cumplir con las nuevas normas que ha activado.<br>Use una herramienta de gestión de base de datos para corregir las cuentas de usuario directamente en la tabla ###_USERS';
    3131$lang['UAM_Empty Author'] = 'El campo de autor tienen que ser llenados para enviar un comentario.';
    32 if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
    33         $lang['reg_err_login5'] = 'Este nombre de usuario ya existe,  ADVERTENCIA se distinguen las mayúsculas (Shift = pequeño).';
     32$lang['reg_err_login5'] = 'Este nombre de usuario ya existe,  ADVERTENCIA se distinguen las mayúsculas (Shift = pequeño).';
    3433$lang['reg_err_login6'] = 'El nombre de usuario no puede coincidir con los siguientes caracteres: ';
    3534$lang['reg_err_login7'] = 'Su proveedor de correo electrónico está prohibido para el registro. Proveedores de correo electrónico en veda son: ';
     
    5756$lang['Mail_without_key'] = 'Aviso sin clave';
    5857$lang['Mail_with_key'] = 'Aviso con clave';
    59 $lang['Force_Validation'] = 'Validación forzada';
    6058
    6159
     
    142140$lang['UAM_MailInfo_Text'] = ' Personalización del correo electrónico de información:';
    143141$lang['UAM_Confirm_Mail'] = 'Confirmación de registro:';
    144 $lang['UAM_Confirm_Mail_true'] = ' Activar';
    145142$lang['UAM_Confirm_Mail_false'] = ' Desactivar (por defecto)';
    146143$lang['UAM_ConfirmMail_Text'] = ' Personalización del correo electrónico de confirmación:';
     
    264261También está disponible, el bugtracker del proyecto: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
    265262// --------- End: New or revised $lang ---- from version 2.15.1
     263
     264
     265// --------- Starting below: New or revised $lang ---- from version 2.15.4
     266$lang['Force_Validation'] = 'Validación manual';
     267$lang['UAM_Confirm_Mail_true'] = ' Activar - La validación por el usuario';
     268$lang['UAM_Confirm_Mail_local'] = ' Activar - La validación por el administrador (sin clave de validación enviado)';
     269$lang['UAM_RedirToProfile'] = 'Redirigir a la página de "personalización"';
     270$lang['UAM_RedirToProfile_false'] = ' Desactivar (por defecto)';
     271$lang['UAM_RedirToProfile_true'] = ' Activar';
     272// --------- End: New or revised $lang ---- from version 2.15.4
    266273?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/fr_FR/help/plugin.lang.php

    r6253 r6776  
    33
    44$lang['UAM_restricTitle'] = 'Restriction des inscriptions';
    5 $lang['UAM_restricTitle_d'] = '
    6 - Sensibilité à la casse<br>
    7 - Exclusion de caractères dans les noms d\'utilisateurs<br>
    8 - Renforcement des mots de passe<br>
    9 - Exclusion des domaines de messagerie<br>
    10 ...
    11 ';
    125$lang['UAM_confirmTitle'] = 'Confirmation et validation des inscriptions';
    136$lang['UAM_confirmTitle_d'] = '
     
    5245Pour une utilisation multi-langues, vous pouvez utiliser les balises [lang] du plugin Extended Description si celui-ci est actif.<br><br>
    5346<b style=&quot;color: red;&quot;>La modification du texte n\'est possible QUE si l\'option &quot;Email d\'information&quot; est activée.</b>';
    54 $lang['UAM_confirmmailTitle'] = 'Confirmation d\'inscription';
    55 $lang['UAM_confirmmailTitle_d'] = 'Cette option permet d\'obliger un utilisateur à valider son inscription en cliquant sur un lien reçu dans un email envoyé dès son enregistrement sur la galerie.<br><br>
    56 Le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet &quot;Suivi des validations&quot;), et une partie personnalisable par un texte d\'accueil.
    57 <br><br>
    58 Cette option est généralement utilisée avec  l\'attribution automatique de groupe et/ou de statuts. Selon qu\'il a validé ou non son inscription, il est en effet possible d\'affecter à l\'utilisateur un groupe différent, avec plus ou moins de restrictions d\'accès à la galerie.';
    5947$lang['UAM_confirmtxtTitle'] = 'Personnalisation de l\'email de confirmation';
    6048$lang['UAM_confirmtxtTitle_d'] = 'Saisissez ici le texte d\'introduction qui apparaîtra dans l\'email de confirmation d\'inscription.<br><br>
     
    10088$lang['UAM_userlistTitle'] = 'Suivi des utilisateurs inscrits';
    10189$lang['UAM_usermanTitle'] = 'Suivi des validations';
    102 $lang['UAM_usermanTitle_d'] = 'Lorsque la limitation du délai d\'inscription est activée, vous trouverez ci-dessous la liste des utilisateurs en attente de validation d\'inscription <b style=&quot;text-decoration: underline;&quot;>qu\'ils soient ou pas</b> dans les délais pour la valider.<br><br>La date d\'enregistrement s\'affiche en vert lorsque l\'utilisateur concerné est en dessous du temps limite pour valider son inscription. Dans ce cas, la clé de validation est toujours valide et on pourra envoyer un email avec ou sans régénération de clé.<br><br>Lorsque la date d\'enregistrement s\'affiche en rouge, le délai de validation est expiré. Dans ce cas, on enverra obligatoirement un email avec régénération de clé si on veut permettre à cet utilisateur de pouvoir valider son inscription.<br><br>Dans tous les cas, il est possible de forcer manuellement la validation.<br><br>Dans cette vue, vous pouvez :
    103 <br><br>
    104 - Supprimer manuellement les comptes <b>(purge manuelle)</b>
    105 <br>
    106 - Générer l\'email de rappel <b>sans génération</b> d\'une nouvelle clef. Rappel : Cette fonction ne réinitialise pas la date d\'inscription du visiteur ciblé et le délai d\'expiration est toujours d\'actualité.
    107 <br>
    108 - Générer l\'email de rappel <b>avec génération</b> d\'une nouvelle clef. Rappel : Cette fonction réinitialise également la date d\'inscription du visiteur ciblé ce qui équivaut à prolonger le délai de validation.
    109 <br>
    110 - Valider manuellement une inscription en attente de validation même si la date d\'expiration est révolue <b>(forçage de la validation)</b>.';
    11190$lang['UAM_gtTitle'] = 'Gestion des visiteurs fantômes';
    112 $lang['UAM_gtTitle_d'] = 'Lorsque la gestion des visiteurs fantômes est activée et initialisée, vous trouverez ci-dessous la liste des visiteurs inscrits sur votre galerie et qui ne sont pas revenus depuis x jours. &quot;x&quot; étant le nombre de jours paramétrés dans l\'onglet de configuration générale. De plus, vous trouverez une colonne précisant si un mail de rappel a déjà été envoyé aux visiteurs ciblés, vous permettant de visualiser d\'un coup d\'oeil et traiter les visiteurs qui n\'auraient pas tenu compte du rappel.<br><br>Dans cette vue, vous pouvez :
    113 <br><br>
    114 - Supprimer manuellement les comptes <b>(purge manuelle)</b>
    115 <br>
    116 - Générer l\'email de rappel <b>avec réinitialisation de la date de dernière visite</b>. Ce qui permet de donner un &quot;joker&quot; au visiteur ciblé. Si le visiteur a déjà bénéficié d\'un mail de rappel, rien n\'empêche de renvoyer un nouveau mail qui réinitialisera, de fait, la date de dernière visite.';
    11791
    11892
     
    12397En désactivant cette option (mode par défaut), seul l\'email d\'information est envoyé (si la fonction &quot;Email d\'information &agrave; l\'utilisateur&quot; est activée).';
    12498// --------- End: New or revised $lang ---- from version 2.14.0
    125 
    126 
    127 // --------- Starting below: New or revised $lang ---- from version 2.14.1
    128 $lang['UAM_userlistTitle_d'] = 'Cette page est à titre d\'information pour l\'administrateur. Elle affiche la liste de tous les utilisateurs inscrits sur la galerie en faisant apparaitre la date et le nombre de jours depuis leur dernière visite. La liste est triée dans l\'ordre croissant du nombre de jours.
    129 <br><br>
    130 <b><u>Uniquement lorsque le Ghost Tracker est actif</u></b>, le nombre de jours sans visite s\'affiche selon le code couleur suivant, en fonction du délai maximum paramétré dans les options du Ghost Tracker :
    131 <br>
    132 - <b style=&quot;color: lime;&quot;>En vert</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: lime;&quot;><u>depuis moins de 50%</u></b> du délai maximum renseigné dans le Ghost Tracker.<br>
    133 - <b style=&quot;color: orange;&quot;>En orange</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: orange;&quot;><u>entre 50% et 99%</u></b> du délai maximum renseigné dans le Ghost Tracker.<br>
    134 - <b style=&quot;color: red;&quot;>En rouge</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: red;&quot;><u>depuis 100% et plus</u></b> du délai maximum renseigné dans le Ghost Tracker. <b><u>Dans ce cas, l\'utilisateur doit également apparaitre dans le tableau du Ghost Tracker.</u></b><br>
    135 <br>
    136 Exemple :
    137 <br>
    138 Le délai maximum du Ghost Tracker est configuré à 100 jours.
    139 <br>
    140 Un utilisateur apparaitra en vert s\'il a visité la galerie depuis moins de 50 jours, en orange si sa dernière visite s\'est déroulée entre 50 et 99 jours et en rouge à 100 jours et au-delà.
    141 <br><br>
    142 <b>A NOTER</b> : La liste n\'affiche pas les inscrits qui n\'auraient pas validé leur inscription (si l\'option de validation de l\'inscription est activée). Ces utilisateurs sont alors gérés de manière particulière dans l\'onglet &quot;Suivi des validations&quot;.';
    143 // --------- End: New or revised $lang ---- from version 2.14.1
    14499
    145100
     
    163118<b style=&quot;color: red;&quot;>Attention : Cette option est sans effet sur les noms d\'utilisateurs créés préalablement à son activation.</b>';
    164119// --------- End: New or revised $lang ---- from version 2.15.2
     120
     121
     122// --------- Starting below: New or revised $lang ---- from version 2.15.4
     123$lang['UAM_restricTitle_d'] = '
     124- Exclusion de caractères dans les noms d\'utilisateurs<br>
     125- Renforcement des mots de passe<br>
     126- Exclusion des domaines de messagerie<br>
     127...
     128';
     129$lang['UAM_userlistTitle_d'] = 'Cette page est à titre d\'information pour l\'administrateur. Elle affiche la liste de tous les utilisateurs inscrits sur la galerie en faisant apparaitre la date et le nombre de jours depuis leur dernière visite. La liste est triée dans l\'ordre croissant du nombre de jours.
     130<br><br>
     131<b><u>Uniquement lorsque le Ghost Tracker est actif</u></b>, le nombre de jours sans visite s\'affiche selon le code couleur suivant, en fonction du délai maximum paramétré dans les options du Ghost Tracker :
     132<br>
     133- <b style=&quot;color: lime;&quot;>En vert</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: lime;&quot;><u>depuis moins de 50%</u></b> du délai maximum renseigné dans le Ghost Tracker.<br>
     134- <b style=&quot;color: orange;&quot;>En orange</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: orange;&quot;><u>entre 50% et 99%</u></b> du délai maximum renseigné dans le Ghost Tracker.<br>
     135- <b style=&quot;color: red;&quot;>En rouge</b> : Lorsque l\'utilisateur a visité la galerie <b style=&quot;color: red;&quot;><u>depuis 100% et plus</u></b> du délai maximum renseigné dans le Ghost Tracker. <b><u>Dans ce cas, l\'utilisateur doit également apparaitre dans le tableau du Ghost Tracker.</u></b><br>
     136<br>
     137Exemple:
     138<br>
     139Le délai maximum du Ghost Tracker est configuré à 100 jours.
     140<br>
     141Un utilisateur apparaitra en vert s\'il a visité la galerie depuis moins de 50 jours, en orange si sa dernière visite s\'est déroulée entre 50 et 99 jours et en rouge à 100 jours et au-delà.
     142<br><br>
     143<b>A NOTER</b>: La liste n\'affiche pas les inscrits qui n\'auraient pas validé leur inscription (si l\'option de validation de l\'inscription est activée). Ces utilisateurs sont alors gérés de manière particulière dans l\'onglet &quot;Suivi des validations&quot;.
     144<br><br>
     145<b>Fonction de tri du tableau</b>: Vous pouvez trier les données affichées en cliquant sur les entêtes de colonnes. L\'utilisation de la touche MAJ ou SHIFT permet de trier sur 1 à 4 colonnes simultanées maximum.';
     146$lang['UAM_usermanTitle_d'] = 'Lorsque la limitation du délai d\'inscription est activée, vous trouverez ci-dessous la liste des utilisateurs en attente de validation d\'inscription <b style=&quot;text-decoration: underline;&quot;>qu\'ils soient ou pas</b> dans les délais pour la valider.<br><br>La date d\'enregistrement s\'affiche en vert lorsque l\'utilisateur concerné est en dessous du temps limite pour valider son inscription. Dans ce cas, la clé de validation est toujours valide et on pourra envoyer un email avec ou sans régénération de clé.<br><br>Lorsque la date d\'enregistrement s\'affiche en rouge, le délai de validation est expiré. Dans ce cas, on enverra obligatoirement un email avec régénération de clé si on veut permettre à cet utilisateur de pouvoir valider son inscription.<br><br>Dans tous les cas, il est possible de forcer manuellement la validation.<br><br>Dans cette vue, vous pouvez :
     147<br><br>
     148- Supprimer manuellement les comptes <b>(purge manuelle)</b>
     149<br>
     150- Générer l\'email de rappel <b>sans génération</b> d\'une nouvelle clef. Rappel : Cette fonction ne réinitialise pas la date d\'inscription du visiteur ciblé et le délai d\'expiration est toujours d\'actualité.
     151<br>
     152- Générer l\'email de rappel <b>avec génération</b> d\'une nouvelle clef. Rappel : Cette fonction réinitialise également la date d\'inscription du visiteur ciblé ce qui équivaut à prolonger le délai de validation.
     153<br>
     154- Valider manuellement une inscription en attente de validation même si la date d\'expiration est révolue <b>(forçage de la validation)</b>.
     155<br><br>
     156<b>Fonction de tri du tableau</b>: Vous pouvez trier les données affichées en cliquant sur les entêtes de colonnes. L\'utilisation de la touche MAJ ou SHIFT permet de trier sur 1 à 4 colonnes simultanées maximum.';
     157$lang['UAM_gtTitle_d'] = 'Lorsque la gestion des visiteurs fantômes est activée et initialisée, vous trouverez ci-dessous la liste des visiteurs inscrits sur votre galerie et qui ne sont pas revenus depuis x jours. &quot;x&quot; étant le nombre de jours paramétrés dans l\'onglet de configuration générale. De plus, vous trouverez une colonne précisant si un mail de rappel a déjà été envoyé aux visiteurs ciblés, vous permettant de visualiser d\'un coup d\'oeil et traiter les visiteurs qui n\'auraient pas tenu compte du rappel.<br><br>Dans cette vue, vous pouvez :
     158<br><br>
     159- Supprimer manuellement les comptes <b>(purge manuelle)</b>
     160<br>
     161- Générer l\'email de rappel <b>avec réinitialisation de la date de dernière visite</b>. Ce qui permet de donner un &quot;joker&quot; au visiteur ciblé. Si le visiteur a déjà bénéficié d\'un mail de rappel, rien n\'empêche de renvoyer un nouveau mail qui réinitialisera, de fait, la date de dernière visite.
     162<br><br>
     163<b>Fonction de tri du tableau</b>: Vous pouvez trier les données affichées en cliquant sur les entêtes de colonnes. L\'utilisation de la touche MAJ ou SHIFT permet de trier sur 1 à 4 colonnes simultanées maximum.';
     164$lang['UAM_confirmmailTitle'] = 'Confirmation d\'inscription';
     165$lang['UAM_confirmmailTitle_d'] = 'Cette option permet soit à un utilisateur de valider son inscription en cliquant sur un lien reçu dans un email envoyé dès son enregistrement sur la galerie soit à l\'administrateur d\'activer manuellement les inscriptions.<br><br>
     166Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet &quot;Suivi des validations&quot;), et une partie personnalisable par un texte d\'accueil.
     167<br><br>
     168Dans le second cas, <b><u>il n\'y a pas d\'envoi de clé de validation par email</u></b>. Les visiteurs doivent patienter que l\'administrateur valide lui même leur inscription via l\'onglet &quot;Suivi des validations&quot;. Il est conseillé d\'activer la notification des administrateurs lors des inscriptions (voir la configuration des options de Piwigo) et d\'utiliser la fonction &quot;Email d\'information à l\'utilisateur&quot; pour avertir les nouveaux inscrits de la nécessité de patienter avant activation de leur compte.
     169<br>
     170<b style=&quot;color: red;&quot;>NB: Les options &quot;Limitation du délai de validation d\'inscription&quot; et &quot;Mail de rappel aux inscrits non validés&quot; doivent être désactivées lorsque la validation manuelle est active.</b>
     171<br><br>
     172Cette option est généralement utilisée avec  l\'attribution automatique de groupe et/ou de statut. Selon qu\'il a validé ou non son inscription, il est en effet possible d\'affecter à l\'utilisateur un groupe différent, avec plus ou moins de restrictions d\'accès à la galerie.';
     173$lang['UAM_RedirTitle'] = 'Redirection vers la page &quot;Personnalisation&quot;';
     174$lang['UAM_RedirTitle_d'] = 'Cette option permet de rediriger automatiquement un utilisateur inscrit vers sa page de personnalisation uniquement lors de sa première connexion à la galerie.<br><br>
     175A savoir: Cette fonction s\'applique également à tous les utilisateurs déjà inscrits, y compris ceux disposant du status &quot;admin&quot;, &quot;webmaster&quot; ou &quot;generique&quot;.';
     176// --------- End: New or revised $lang ---- from version 2.15.4
    165177?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/fr_FR/plugin.lang.php

    r5763 r6776  
    2929$lang['Err_audit_advise'] = '<b>Vous avez des corrections a faire pour respecter les nouvelles règles que vous avez activées.<br>Utilisez un utilitaire de gestion de base de données pour corriger les comptes utilisateurs directement dans la table ###_USERS si nécessaire.</b><br><br>';
    3030$lang['UAM_Empty Author'] = 'Le champs auteur doit être rempli pour enregistrer un commentaire.';
    31 if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
    32         $lang['reg_err_login5'] = 'ce nom utilisateur est déjà pris, ATTENTION le nom est insensible à la casse (Majuscule = Minuscule).';
     31$lang['reg_err_login5'] = 'ce nom utilisateur est déjà pris, ATTENTION le nom est insensible à la casse (Majuscule = Minuscule).';
    3332$lang['reg_err_login6'] = 'le nom utilisateur ne doit pas contenir les caractère suivants : ';
    3433$lang['reg_err_login7'] = 'L\'adresse email est issue d\'un prestataire interdit. Les prestataires d\'adresses email interdits à l\'inscription sont : ';
     
    5655$lang['Mail_without_key'] = 'Rappel sans clé';
    5756$lang['Mail_with_key'] = 'Rappel avec clé';
    58 $lang['Force_Validation'] = 'Validation forcée';
    5957
    6058
     
    142140$lang['UAM_MailInfo_Text'] = ' Texte d\'accueil personnalisé:';
    143141$lang['UAM_Confirm_Mail'] = 'Confirmation d\'inscription:';
    144 $lang['UAM_Confirm_Mail_true'] = ' Activer';
    145142$lang['UAM_Confirm_Mail_false'] = ' Désactiver (valeur par défaut)';
    146143$lang['UAM_ConfirmMail_Text'] = ' Texte d\'accueil personnalisé:';
     
    261258Egalement disponible, le bugtracker du projet: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
    262259// --------- End: New or revised $lang ---- from version 2.15.1
     260
     261
     262// --------- Starting below: New or revised $lang ---- from version 2.15.4
     263$lang['Force_Validation'] = 'Validation manuelle';
     264$lang['UAM_Confirm_Mail_true'] = ' Activer - Validation par le visiteur';
     265$lang['UAM_Confirm_Mail_local'] = ' Activer - Validation par l\'administrateur (pas d\'envoi de clé de validation)';
     266$lang['UAM_RedirToProfile'] = 'Redirection vers la page "Personnalisation"';
     267$lang['UAM_RedirToProfile_false'] = ' Désactiver (valeur par défaut)';
     268$lang['UAM_RedirToProfile_true'] = ' Activer';
     269// --------- End: New or revised $lang ---- from version 2.15.4
    263270?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/it_IT/help/plugin.lang.php

    r6253 r6776  
    33
    44$lang['UAM_restricTitle'] = 'Restrizioni per le iscrizzioni';
    5 $lang['UAM_restricTitle_d'] = '
    6 - Sensibilità maiuscole/minuscole<br>
    7 - Caratteri vietati nei nomi degli utenti<br>
    8 - Rafforzare il livello di sicurezza delle password<br>
    9 - Esclusione dei domini d\'Email<br>
    10 ...
    11 ';
    125$lang['UAM_confirmTitle'] = 'Confirmazzione e validazione delle iscrizzioni';
    136$lang['UAM_confirmTitle_d'] = '
     
    5346Per utilizzare più lingue, è possibile utilizzare i tag del plugin Extended Description, se esso è attivo.<br><br>
    5447<b style=&quot;color: red;&quot;>Modifica del testo &egrave; disponibile solo se &quot;E-mail informazioni per l\'utente&quot; &egrave; attivata.</b>';
    55 $lang['UAM_confirmmailTitle'] = 'Conferma della registrazione';
    56 $lang['UAM_confirmmailTitle_d'] = 'Questa opzione permette di richiedere all\'utente di convalidare la registrazione cliccando su un link ricevuto in una email inviata al momento della registrazione.<br><br>
    57 L\'e-mail &egrave; composto da una parte personalizzabile di introdurre una piccola nota di benvenuto e una parte fissa contenente il link di attivazione che viene generato da una chiave casuale che pu&ograve; eventualmente rigenerare attraverso la &quot;Tracciamento convalide&quot; tab.<br><br>
    58 Questa opzione &egrave; generalmente utilizzato con l\'assegnazione automatica di gruppo e / o statuto. Ad esempio, un utente che non ha convalidato la loro registrazione sar&agrave; ambientato in un gruppo specifico di utenti (con o senza le restrizioni alla galleria), mentre un utente che ha convalidato la sua registrazione &egrave; fissato in un &quot;normale&quot; del gruppo.';
    5948/* TODO */$lang['UAM_confirmtxtTitle'] = 'Customizing the confirmation email';
    6049/* TODO */$lang['UAM_confirmtxtTitle_d'] = 'Enter the introductory text that you want to appear in the email confirmation of registration.<br><br>
     
    9988/* TODO */$lang['UAM_userlistTitle'] = 'Tracking users';
    10089/* TODO */$lang['UAM_usermanTitle'] = 'Tracking validations';
    101 /* TODO */$lang['UAM_usermanTitle_d'] = 'When limiting the deadline for registration is enabled, you will find below the list of users whose validation registration is expected, <b style=&quot;text-decoration: underline;&quot;>whether or not</b> they are in time to validate.<br><br>
    102 The registration date is displayed in green when the user concerned is below the time limit to validate his registration. In this case, the validation key is still valid and we can send an email with or without a new validation key.<br><br>
    103 When the registration date appears in red, the validation period has expired. In this case, you must send an email with regeneration of validation key if you want to enable the user to validate their registration.<br><br>
    104 In all cases, it is possible to manually force the validation.<br><br>
    105 In this view, you can:
    106 <br><br>
    107 - Manually delete accounts <b>(manual drain)</b>
    108 <br>
    109 - Generate email reminder <b>without</b> generating a new key. Warning: Send an email reminder to targeted visitors. This function does not reset the date of registration of targeted visitors and the timeout is still valid.
    110 <br>
    111 - Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.
    112 <br>
    113 - Submit a registration awaiting validation manually even if the expiry date has passed <b>(forcing validation)</b>.';
    11490/* TODO */$lang['UAM_gtTitle'] = 'Ghost visitors management';
    115 /* TODO */$lang['UAM_gtTitle_d'] = 'When Ghost Tracker is enabled and initialized, you will find below the list of registered visitors who have not returned since x days. &quot;x&quot; is the number of days configured in the General Setup tab. In addition, you will find a column indicating whether an email reminder has been sent to targeted visitors. So, you can see at a glance and treat visitors who have not taken account of the reminder.<br><br>In this view, you can:
    116 <br><br>
    117 - Manually delete accounts <b>(manual drain)</b>
    118 <br>
    119 - Generate email reminder <b>with resetting the last visit date</b>. This allows to give a wildcard to targeted visitors. If the visitor has already received a reminder, nothing prevents to resent a new mail which will reset again, in fact, the last visit date.';
    12091
    12192
     
    12697Disabilitando questa opzione ((predefinito)), solo le informazioni e-mail viene inviata (se &quot;E-mail informazioni per l\'utente&quot; &egrave; abilitato).';
    12798// --------- End: New or revised $lang ---- from version 2.14.0
    128 
    129 
    130 
    131 // --------- Starting below: New or revised $lang ---- from version 2.14.1
    132 /* TODO */$lang['UAM_userlistTitle_d'] = 'This page is for information to the administrator. It displays a list of all users registered on the gallery showing the date and number of days since their last visit. The list is sorted in ascending order of number of days.
    133 <br><br>
    134 <b><u>Only when the Ghost Tracker is active</u></b>, the number of days without a visit appears as the following color code, according to the maximum set in the Ghost Tracker options:
    135 <br>
    136 - <b style=&quot;color: lime;&quot;>Green</b> : When the user has visited the gallery <b style=&quot;color: lime;&quot;><u>less than 50%</u></b> of the maximum indicated in the Ghost Tracker.<br>
    137 - <b style=&quot;color: orange;&quot;>Orange</b> : When the user has visited the gallery <b style=&quot;color: orange;&quot;><u> between 50% and 99% </u></b> of the maximum indicated in the Ghost Tracker.<br>
    138 - <b style=&quot;color: red;&quot;>Red</b> : When the user has visited the gallery <b style=&quot;color: red;&quot;><u>for more than 100%</u></b> of the maximum indicated in the Ghost Tracker. <b><u>In this case, the user must also appear in the Ghost Tracker table.</u></b><br>
    139 <br>
    140 Example :
    141 <br>
    142 The maximum period of Ghost Tracker is configured to 100 days.
    143 <br>
    144 A user will appear in green if he visited the gallery for less than 50 days, in orange if his last visit took place between 50 and 99 days and red for 100 days and above.
    145 <br><br>
    146 <b>NOTE</b> : The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.';
    147 // --------- End: New or revised $lang ---- from version 2.14.1
    14899
    149100
     
    167118<b style=&quot;color: red&quot;>Attenzione: questa opzione non ha alcun effetto sui pseudo creati prima della sua attivazione.</b>';
    168119// --------- End: New or revised $lang ---- from version 2.15.2
     120
     121
     122// --------- Starting below: New or revised $lang ---- from version 2.15.4
     123$lang['UAM_restricTitle_d'] = '
     124- Caratteri vietati nei nomi degli utenti<br>
     125- Rafforzare il livello di sicurezza delle password<br>
     126- Esclusione dei domini d\'Email<br>
     127...
     128';
     129/* TODO */$lang['UAM_userlistTitle_d'] = 'This page is for information to the administrator. It displays a list of all users registered on the gallery showing the date and number of days since their last visit. The list is sorted in ascending order of number of days.
     130<br><br>
     131<b><u>Only when the Ghost Tracker is active</u></b>, the number of days without a visit appears as the following color code, according to the maximum set in the Ghost Tracker options:
     132<br>
     133- <b style=&quot;color: lime;&quot;>Green</b> : When the user has visited the gallery <b style=&quot;color: lime;&quot;><u>less than 50%</u></b> of the maximum indicated in the Ghost Tracker.<br>
     134- <b style=&quot;color: orange;&quot;>Orange</b> : When the user has visited the gallery <b style=&quot;color: orange;&quot;><u> between 50% and 99% </u></b> of the maximum indicated in the Ghost Tracker.<br>
     135- <b style=&quot;color: red;&quot;>Red</b> : When the user has visited the gallery <b style=&quot;color: red;&quot;><u>for more than 100%</u></b> of the maximum indicated in the Ghost Tracker. <b><u>In this case, the user must also appear in the Ghost Tracker table.</u></b><br>
     136<br>
     137Example :
     138<br>
     139The maximum period of Ghost Tracker is configured to 100 days.
     140<br>
     141A user will appear in green if he visited the gallery for less than 50 days, in orange if his last visit took place between 50 and 99 days and red for 100 days and above.
     142<br><br>
     143<b>NOTE</b>: The list does not display who have not validated their registration (if the option of validating the registration is activated). These users are then managed in a special way in the &quot;Tracking validations&quot; tab.
     144<br><br>
     145<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     146/* TODO */$lang['UAM_usermanTitle_d'] = 'When limiting the deadline for registration is enabled, you will find below the list of users whose validation registration is expected, <b style=&quot;text-decoration: underline;&quot;>whether or not</b> they are in time to validate.<br><br>
     147The registration date is displayed in green when the user concerned is below the time limit to validate his registration. In this case, the validation key is still valid and we can send an email with or without a new validation key.<br><br>
     148When the registration date appears in red, the validation period has expired. In this case, you must send an email with regeneration of validation key if you want to enable the user to validate their registration.<br><br>
     149In all cases, it is possible to manually force the validation.<br><br>
     150In this view, you can:
     151<br><br>
     152- Manually delete accounts <b>(manual drain)</b>
     153<br>
     154- Generate email reminder <b>without</b> generating a new key. Warning: Send an email reminder to targeted visitors. This function does not reset the date of registration of targeted visitors and the timeout is still valid.
     155<br>
     156- Generate email reminder <b>with</b> generating a new key. Warning : Send an email reminder to targeted visitors. This function also resets the date of registration of targeted visitors which equates to extend the deadline for validation.
     157<br>
     158- Submit a registration awaiting validation manually even if the expiry date has passed <b>(forcing validation)</b>.
     159<br><br>
     160<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     161/* TODO */$lang['UAM_gtTitle_d'] = 'When Ghost Tracker is enabled and initialized, you will find below the list of registered visitors who have not returned since x days. &quot;x&quot; is the number of days configured in the General Setup tab. In addition, you will find a column indicating whether an email reminder has been sent to targeted visitors. So, you can see at a glance and treat visitors who have not taken account of the reminder.<br><br>In this view, you can:
     162<br><br>
     163- Manually delete accounts <b>(manual drain)</b>
     164<br>
     165- Generate email reminder <b>with resetting the last visit date</b>. This allows to give a wildcard to targeted visitors. If the visitor has already received a reminder, nothing prevents to resent a new mail which will reset again, in fact, the last visit date.
     166<br><br>
     167<b>Table Sorting Function</b>: You can sort the data displayed by clicking on the column headers. Hold the SHIFT key to sort up to 4 simultaneous columns.';
     168$lang['UAM_confirmmailTitle'] = 'Conferma della registrazione';
     169/*TODO*/$lang['UAM_confirmmailTitle_d'] = 'This option allows a user to either confirm registration by clicking on a link received in an email sent upon registration or the administrator to manually activate the registration.<br><br>
     170In first case, the e-mail is composed of a customizable part to introduce a little welcome note and a fixed part containing the activation link that is generated from a random key that can possibly regenerate through the &quot;Tracking validations&quot; tab.<br><br>
     171Dans le premier cas, le message envoyé comprend une partie fixe, avec le lien d\'activation généré à partir d\'une clef aléatoire (cette clé peut éventuellement être régénérée via l\'onglet &quot;Suivi des validations&quot;), et une partie personnalisable par un texte d\'accueil.
     172<br><br>
     173Questa opzione &egrave; generalmente utilizzato con l\'assegnazione automatica di gruppo e / o statuto. Ad esempio, un utente che non ha convalidato la loro registrazione sar&agrave; ambientato in un gruppo specifico di utenti (con o senza le restrizioni alla galleria), mentre un utente che ha convalidato la sua registrazione &egrave; fissato in un &quot;normale&quot; del gruppo.';
     174/*TODO*/$lang['UAM_RedirTitle'] = 'Redirect to &quot;Customization&quot; page';
     175/*TODO*/$lang['UAM_RedirTitle_d'] = 'This option automatically redirect a registered user to his customization page only at his first connection to the gallery.<br><br>
     176Please note: This feature applies to all already registered users including those with &quot;admin&quot;, &quot;webmaster&quot; or &quot;generic&quot; status.';
     177// --------- End: New or revised $lang ---- from version 2.15.4
    169178?>
  • extensions/NBC_UserAdvManager/branches/2.15/language/it_IT/plugin.lang.php

    r5763 r6776  
    3030$lang['Err_audit_advise'] = '<b>Dovete eseguire delle correzioni per rispettare le nuove impostazzioni che avete attivato.<br> Utilizzare un programma per la gestione della base dati per correggere i conti utente direttamente nella tabella ###_USERS';
    3131$lang['UAM_Empty Author'] = 'Il campo autore deve essere riempito per potere inviare un commento.';
    32 if ( isset($conf_UAM[1]) and $conf_UAM[1] == 'true' )
    33         $lang['reg_err_login5'] = 'Nome utente esiste già. Attenzione : il campo è insensibile alle maiuscole/minuscole.';
     32$lang['reg_err_login5'] = 'Nome utente esiste già. Attenzione : il campo è insensibile alle maiuscole/minuscole.';
    3433$lang['reg_err_login6'] = 'Nome utente non deve contenere in caratteri seguenti: ';
    3534$lang['reg_err_login7'] = 'Il tuo provider di posta usa dominio d\'Email proibito. I domini preibiti sono i seguenti: ';
     
    5756$lang['Mail_without_key'] = 'Email di rilancio senza chiave';
    5857$lang['Mail_with_key'] = 'Email di rilancio con chiave';
    59 $lang['Force_Validation'] = 'Convalida forzata';
    6058
    6159
     
    142140$lang['UAM_MailInfo_Text'] = ' Personalizzare il testo dell\'Email:';
    143141$lang['UAM_Confirm_Mail'] = 'Conferma dell\'iscrizione:';
    144 $lang['UAM_Confirm_Mail_true'] = ' Attivare';
    145142$lang['UAM_Confirm_Mail_false'] = ' Disattivare (di default)';
    146143$lang['UAM_ConfirmMail_Text'] = ' Personalizzare il testo dell\'Email di conferma:';
     
    264261Disponibile anche, il bugtracker del progetto: <a href="http://piwigo.org/bugs/" onclick="window.open(this.href);return false;">http://piwigo.org/bugs/</a>';
    265262// --------- End: New or revised $lang ---- from version 2.15.1
     263
     264
     265// --------- Starting below: New or revised $lang ---- from version 2.15.4
     266/*TODO*/$lang['Force_Validation'] = 'Manual validation';
     267/*TODO*/$lang['UAM_Confirm_Mail_true'] = ' Enable - Validation by user';
     268/*TODO*/$lang['UAM_Confirm_Mail_local'] = ' Enable - Validation by admin (no validation key sent)';
     269/*TODO*/$lang['UAM_RedirToProfile'] = 'Redirect to "Customization" page';
     270$lang['UAM_RedirToProfile_false'] = ' Disattivare (di default)';
     271$lang['UAM_RedirToProfile_true'] = ' Attivare';
     272// --------- End: New or revised $lang ---- from version 2.15.4
    266273?>
  • extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

    r6256 r6776  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.15.3
     4Version: 2.15.4
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216
     
    1313/*
    1414 ***** TODO List *****
    15 ++ Adding ASC and DESC ordering for user's lists tables (Ghost Tracker, UserList and Unvalidated) ?
    16 
    1715++ No validation needed for admins users comments (new trigger needed in comments.php ?)
    1816
     
    8078  if (!is_admin() and !is_a_guest())
    8179  {
    82     if ((isset($conf_UAM[17]) and $conf_UAM[17] == 'true') or (isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
     80    if ((isset($conf_UAM[16]) and $conf_UAM[16] == 'true') or (isset($conf_UAM[19]) and $conf_UAM[19] == 'true'))
    8381    {
    8482
     
    128126  $conf_UAM = unserialize($conf['UserAdvManager']);
    129127 
    130   /* Sending registration confirmation by email */
    131   if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') or (isset($conf_UAM[2]) and $conf_UAM[2] == 'true'))
    132   {
    133     if (is_admin() and isset($conf_UAM[21]) and $conf_UAM[21] == 'true')
    134     {
    135     $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    136     SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
    137     }
    138     elseif (is_admin() and isset($conf_UAM[21]) and $conf_UAM[21] == 'false')
    139     {
     128  if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
     129  {
     130    /* This is to send an information email and set user to "waiting" group or status until admin validation */
    140131    $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    141132    SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
     133    setgroup($register_user['id']);// Set to "waiting" group or status until admin validation
     134  }
     135  elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'false') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
     136  {
     137    /* This is to set user to "wainting" group or status until admin validation */
     138    setgroup($register_user['id']);// Set to "waiting" group or status until admin validation
     139  }
     140  elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'false'))
     141  {
     142    /* This is to send an information email without validation key */
     143    $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     144    SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
     145  }
     146  /* Sending registration confirmation by email */
     147  elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'true'))
     148  {
     149    if (is_admin() and isset($conf_UAM[20]) and $conf_UAM[20] == 'true')
     150    {
     151      $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     152      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
     153    }
     154    elseif (is_admin() and isset($conf_UAM[20]) and $conf_UAM[20] == 'false')
     155    {
     156      $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     157      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
    142158    }
    143159    elseif (!is_admin())
    144160    {
    145     $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    146     SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
     161      $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     162      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
    147163    }
    148164  }
     
    159175  /* Cleanup for LastVisit table */
    160176  DeleteLastVisit($user_id);
     177  /* Cleanup Redirection settings */
     178  DeleteRedir($user_id);
    161179}
    162180
     
    253271
    254272  /* Password enforcement control */
    255   if (isset($conf_UAM[14]) and $conf_UAM[14] == 'true' and !empty($conf_UAM[15]))
     273  if (isset($conf_UAM[13]) and $conf_UAM[13] == 'true' and !empty($conf_UAM[14]))
    256274  {
    257275    if (!empty($user['password']) and !is_admin())
     
    259277      $PasswordCheck = testpassword($user['password']);
    260278 
    261       if ($PasswordCheck < $conf_UAM[15])
     279      if ($PasswordCheck < $conf_UAM[14])
    262280      {
    263281        $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
    264         return($lang['reg_err_pass'] = l10n_args($message).$conf_UAM[15]);
    265       }
    266     }
    267     else if (!empty($user['password']) and is_admin() and isset($conf_UAM[16]) and $conf_UAM[16] == 'true')
     282        return($lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14]);
     283      }
     284    }
     285    else if (!empty($user['password']) and is_admin() and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
    268286    {
    269287      $PasswordCheck = testpassword($user['password']);
    270288 
    271       if ($PasswordCheck < $conf_UAM[15])
     289      if ($PasswordCheck < $conf_UAM[14])
    272290      {
    273291        $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
    274         return($lang['reg_err_pass'] = l10n_args($message).$conf_UAM[15]);
    275       }
    276     }
    277   }
    278 
    279   /* Username non case sensitive */
    280   if (isset($conf_UAM[1]) and $conf_UAM[1] == 'true' and NotSensibleSearchUsername($_POST['login']))
    281   {
    282     return($lang['reg_err_login5'] = l10n('reg_err_login5'));
     292        return($lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14]);
     293      }
     294    }
    283295  }
    284296
    285297  /* Username without forbidden keys */
    286   if (isset($conf_UAM[7]) and $conf_UAM[7] == 'true' and !empty($_POST['login']) and ValidateUsername($_POST['login']) and !is_admin())
     298  if (isset($conf_UAM[6]) and $conf_UAM[6] == 'true' and !empty($_POST['login']) and ValidateUsername($_POST['login']) and !is_admin())
    287299  {
    288300    $_POST['login'] = '';
    289     return($lang['reg_err_login1'] = l10n('reg_err_login6')."'".$conf_UAM[8]."'");
     301    return($lang['reg_err_login1'] = l10n('reg_err_login6')."'".$conf_UAM[7]."'");
    290302  }
    291303
    292304  /* Email without forbidden domains */
    293   if (isset($conf_UAM[12]) and $conf_UAM[12] == 'true' and !empty($_POST['mail_address']) and ValidateEmailProvider($_POST['mail_address']) and !is_admin())
     305  if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['mail_address']) and ValidateEmailProvider($_POST['mail_address']) and !is_admin())
    294306  {
    295307    $_POST['mail_address'] = '';
    296     return($lang['reg_err_login1'] = l10n('reg_err_login7')."'".$conf_UAM[13]."'");
     308    return($lang['reg_err_login1'] = l10n('reg_err_login7')."'".$conf_UAM[12]."'");
    297309  }
    298310}
     
    309321    $conf_UAM = unserialize($conf['UserAdvManager']);
    310322
     323    if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
     324    {
     325      $user_idsOK = array();
     326      if (!check_consult($user['id'], $user_idsOK))
     327      {
     328        $user_idsOK[] = $user['id'];
     329       
     330        $query = "
     331          UPDATE ".CONFIG_TABLE."
     332          SET value = \"".implode(',', $user_idsOK)."\"
     333          WHERE param = 'UserAdvManager_Redir';";
     334         
     335        pwg_query($query);
     336      }
     337    }
     338
    311339    if (isset($_POST['validate']) and !is_admin())
    312340    {
    313341      /* Email without forbidden domains */
    314       if (isset($conf_UAM[12]) and $conf_UAM[12] == 'true' and !empty($_POST['mail_address']))
     342      if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['mail_address']))
    315343      {
    316344        if (ValidateEmailProvider($_POST['mail_address']))
    317345        {
    318           $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[13]."'");
     346          $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[12]."'");
    319347          unset($_POST['validate']);
    320348        }
     
    328356       
    329357        /* Password enforcement control */
    330         if (isset($conf_UAM[14]) and $conf_UAM[14] == 'true' and !empty($conf_UAM[15]))
     358        if (isset($conf_UAM[13]) and $conf_UAM[13] == 'true' and !empty($conf_UAM[14]))
    331359        {
    332360          $PasswordCheck = testpassword($_POST['use_new_pwd']);
    333361         
    334           if ($PasswordCheck < $conf_UAM[15])
     362          if ($PasswordCheck < $conf_UAM[14])
    335363          {
    336364            $message = get_l10n_args('reg_err_login4_%s', $PasswordCheck);
    337             $template->append('errors', l10n_args($message).$conf_UAM[15]);
     365            $template->append('errors', l10n_args($message).$conf_UAM[14]);
    338366            unset($_POST['use_new_pwd']);
    339367            unset($_POST['validate']);
     
    343371     
    344372      /* Sending registration confirmation by email */
    345       if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') or (isset($conf_UAM[2]) and $conf_UAM[2] == 'true'))
     373      if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') or (isset($conf_UAM[1]) and $conf_UAM[1] == 'true') or (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
    346374      {
    347375        $confirm_mail_need = false;
     
    356384         
    357385          list($current_email) = pwg_db_fetch_row(pwg_query($query));
    358      
    359           if ($_POST['mail_address'] != $current_email and ( isset($conf_UAM[2]) and $conf_UAM[2] == 'true'))
     386
     387          /* This is to send a new validation key */
     388          if ($_POST['mail_address'] != $current_email and (isset($conf_UAM[1]) and $conf_UAM[1] == 'true'))
    360389       
    361390            $confirm_mail_need = true;
     391
     392          /* This is to set the user to "waiting" group or status until admin validation */
     393          if ($_POST['mail_address'] != $current_email and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
     394       
     395            setgroup($register_user['id']);// Set to "waiting" group or status until admin validation
     396            $confirm_mail_need = false;
    362397        }
    363398       
     
    380415
    381416
     417// RedirectToProfile - Thx to LucMorizur
     418// redirects a visitor (not generic (forbidden) neither admin) to his
     419// profile.php page
     420//
     421// no variable, no return
     422add_event_handler('login_success', 'RedirectToProfile');
     423
     424function RedirectToProfile()
     425{
     426  global $conf, $user;
     427 
     428  $conf_UAM = unserialize($conf['UserAdvManager']);
     429
     430  if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
     431  {
     432    $user_idsOK = array();
     433    if (!check_consult($user['id'], $user_idsOK))
     434      redirect(PHPWG_ROOT_PATH.'profile.php');
     435  }
     436}
     437
     438
    382439add_event_handler('init', 'UAM_InitPage');
    383440/* *** Important ! This is necessary to make email exclusion work in admin's users management panel *** */
     
    395452    {
    396453      /* Email without forbidden domains */
    397       if (isset($conf_UAM[12]) and $conf_UAM[12] == 'true' and !empty($_POST['email']) and ValidateEmailProvider($_POST['email']))
    398       {
    399         $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[13]."'");
     454      if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['email']) and ValidateEmailProvider($_POST['email']))
     455      {
     456        $template->append('errors', l10n('reg_err_login7')."'".$conf_UAM[12]."'");
    400457        unset($_POST['submit_add']);
    401458      }
     
    415472
    416473/* User creation OR update */
    417   if (isset($conf_UAM[6]) and $conf_UAM[6] == 'true' and $conf['comments_forall'] == 'true' and $comm['author'] == 'guest')
     474  if (isset($conf_UAM[5]) and $conf_UAM[5] == 'true' and $conf['comments_forall'] == 'true' and $comm['author'] == 'guest')
    418475  {
    419476    $comment_action = 'reject';
  • extensions/NBC_UserAdvManager/branches/2.15/maintain.inc.php

    r6256 r6776  
    1818        global $conf;
    1919       
    20   $default1 = array('false','false','false',-1,-1,-1,'false','false','',-1,'','','false','','false',100,'false','false',10,'Hello.
     20  $default1 = array('false','false',-1,-1,-1,'false','false','',-1,'','','false','','false',100,'false','false',10,'Hello.
    2121       
    2222This is a reminder because a very long time passed since your last visit on our gallery. If you do not want anymore to use your access account, please let us know by replying to this email. Your account will be deleted.
     
    4848INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
    4949VALUES ("UserAdvManager_ConfirmMail","'.addslashes(serialize($default2)).'","UAM ConfirmMail parameters")
     50  ;';
     51  pwg_query($q);
     52 
     53  $q = '
     54INSERT INTO '.CONFIG_TABLE.' (param, value, comment)
     55VALUES ("UserAdvManager_Redir","0","UAM Redirections")
    5056  ;';
    5157  pwg_query($q);
     
    160166  }
    161167
    162 /* Check if old version is > 2.15 */
    163 /* ****************************** */
    164 // In preparation of next releases
    165 /*   $query = '
     168/* Old version is > 2.15 */
     169/* ********************* */
     170        $query = '
    166171SELECT param
    167172  FROM '.CONFIG_TABLE.'
    168 WHERE param LIKE "UserAdvManager%"
     173WHERE param = "UserAdvManager_Redir"
    169174;';
    170175  $count = pwg_db_num_rows(pwg_query($query));
    171176 
    172   if ($count == 2)
    173   {
    174     upgrade_2151_2152();
    175   }
    176 */
     177  if ($count == 0)
     178  {
     179    upgrade_2153_2154();
     180  }
     181
    177182load_conf_from_db('param like \'UserAdvManager\\_%\'');
    178183}
Note: See TracChangeset for help on using the changeset viewer.