Changeset 11018


Ignore:
Timestamp:
May 23, 2011, 7:05:01 PM (13 years ago)
Author:
Eric
Message:

Remove all options related to comments because they are processed in new "Comments Access Manager" plugin.
New version 2.20.8 hard coded for publication.

Location:
extensions/UserAdvManager/trunk
Files:
21 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/GT_del_account.php

    r9924 r11018  
    2121$conf_UAM = unserialize($conf['UserAdvManager']);
    2222
    23 if (isset($conf_UAM[24]) and $conf_UAM[24] <> '')
     23if (isset($conf_UAM[23]) and $conf_UAM[23] <> '')
    2424{
    2525  // Management of Extension flags ([mygallery], [myurl]) - [username] flag can't be used here
     
    3131  if (function_exists('get_user_language_desc'))
    3232  {
    33     $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24]));
     33    $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[23]));
    3434  }
    35   else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[24]));
     35  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[23]));
    3636}
    3737   
  • extensions/UserAdvManager/trunk/USR_del_account.php

    r9924 r11018  
    2121$conf_UAM = unserialize($conf['UserAdvManager']);
    2222
    23 if (isset($conf_UAM[32]) and $conf_UAM[32] <> '')
     23if (isset($conf_UAM[31]) and $conf_UAM[31] <> '')
    2424{
    2525  // Management of Extension flags ([mygallery], [myurl]) - [username] flag can't be used here
     
    3131  if (function_exists('get_user_language_desc'))
    3232  {
    33     $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[32]));
     33    $custom_text = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[31]));
    3434  }
    35   else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[32]));
     35  else $custom_text = l10n(preg_replace($patterns, $replacements, $conf_UAM[31]));
    3636}
    3737   
  • extensions/UserAdvManager/trunk/admin/UAM_admin.php

    r10976 r11018  
    106106  case 'global':
    107107
    108         if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_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']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']) and isset($_POST['UAM_GroupComm']))
     108        if (isset($_POST['submit']) and isset($_POST['UAM_Mail_Info']) and isset($_POST['UAM_Username_Char']) and isset($_POST['UAM_Confirm_Mail']) and isset($_POST['UAM_Password_Enforced']) and isset($_POST['UAM_AdminPassword_Enforced']) and isset($_POST['UAM_GhostUser_Tracker']) and isset($_POST['UAM_Admin_ConfMail']) and isset($_POST['UAM_RedirToProfile']) and isset($_POST['UAM_GTAuto']) and isset($_POST['UAM_GTAutoMail']) and isset($_POST['UAM_CustomPasswRetr']) and isset($_POST['UAM_USRAuto']) and isset($_POST['UAM_USRAutoMail']) and isset($_POST['UAM_Stuffs']) and isset($_POST['UAM_HidePassw']))
    109109  {
    110110
     
    149149      (isset($_POST['UAM_Validated_Group'])?$_POST['UAM_Validated_Group']:''),
    150150      (isset($_POST['UAM_Validated_Status'])?$_POST['UAM_Validated_Status']:''),
    151       $_POST['UAM_No_Comment_Anonymous'],
    152151      $_POST['UAM_Username_Char'],
    153152      $_POST['UAM_Username_List'],
     
    180179      $_POST['UAM_Stuffs'],
    181180      $_POST['UAM_HidePassw'],
    182       $_POST['UAM_GroupComm'],
    183       (isset($_POST['UAM_AllowComm_Group'])?$_POST['UAM_AllowComm_Group']:''),
    184181      );
    185182
     
    245242  $Valid = -1;
    246243  $Downgrade = -1;
    247   $AllowComm = -1;
    248244       
    249245  //Check groups list in database
     
    270266                }
    271267    //configuration value for downgrade users
    272     if (isset($conf_UAM[26]) and $conf_UAM[26] == $row['id'])
     268    if (isset($conf_UAM[25]) and $conf_UAM[25] == $row['id'])
    273269                {
    274270                $Downgrade = $row['id'];
    275                 }
    276     //configuration value for users group allowed to post comments
    277     if (isset($conf_UAM[37]) and $conf_UAM[37] == $row['id'])
    278                 {
    279                 $AllowComm = $row['id'];
    280271                }
    281272  }
     
    305296                        )
    306297        );
    307   //Template initialization for allowed group for comments
    308   $template->assign(
    309     'AllowComm_Group',
    310                 array(
    311       'group_options'=> $groups,
    312       'group_selected' => $AllowComm
    313                         )
    314         );
    315298       
    316299  //Status setting for unvalidated, validated users and downgrade status
     
    324307  {
    325308          $status_options[$status] = l10n('user_status_'.$status);
    326           if (isset($conf_UAM[8]) and $conf_UAM[8] == $status)
     309          if (isset($conf_UAM[7]) and $conf_UAM[7] == $status)
    327310          {
    328311            $No_Valid_Status = $status;
     
    362345  {
    363346          $status_options[$status] = l10n('user_status_'.$status);
    364           if (isset($conf_UAM[27]) and $conf_UAM[27] == $status)
     347          if (isset($conf_UAM[26]) and $conf_UAM[26] == $status)
    365348                {
    366349                  $Downgrade_Status = $status;
     
    398381                'UAM_MAIL_INFO_TRUE'             => $conf_UAM[0]=='true' ?  'checked="checked"' : '' ,
    399382                'UAM_MAIL_INFO_FALSE'            => $conf_UAM[0]=='false' ?  'checked="checked"' : '' ,
    400                 'UAM_MAILINFO_TEXT'              => $conf_UAM[9],
    401                 'UAM_USERNAME_CHAR_TRUE'         => $conf_UAM[6]=='true' ?  'checked="checked"' : '' ,
    402                 'UAM_USERNAME_CHAR_FALSE'        => $conf_UAM[6]=='false' ?  'checked="checked"' : '' ,
    403                 'UAM_USERNAME_CHAR_LIST'         => $conf_UAM[7],
     383                'UAM_MAILINFO_TEXT'              => $conf_UAM[8],
     384                'UAM_USERNAME_CHAR_TRUE'         => $conf_UAM[5]=='true' ?  'checked="checked"' : '' ,
     385                'UAM_USERNAME_CHAR_FALSE'        => $conf_UAM[5]=='false' ?  'checked="checked"' : '' ,
     386                'UAM_USERNAME_CHAR_LIST'         => $conf_UAM[6],
    404387                'UAM_CONFIRM_MAIL_TRUE'          => $conf_UAM[1]=='true' ?  'checked="checked"' : '' ,
    405388                'UAM_CONFIRM_MAIL_FALSE'         => $conf_UAM[1]=='false' ?  'checked="checked"' : '' ,
    406389    'UAM_CONFIRM_MAIL_LOCAL'         => $conf_UAM[1]=='local' ?  'checked="checked"' : '' ,
    407                 'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[10],
     390                'UAM_CONFIRMMAIL_TEXT'           => $conf_UAM[9],
    408391                'UAM_No_Confirm_Group'           => $conf_UAM[2],
    409392                'UAM_Validated_Group'            => $conf_UAM[3],
    410                 'UAM_No_Confirm_Status'          => $conf_UAM[8],
     393                'UAM_No_Confirm_Status'          => $conf_UAM[7],
    411394                'UAM_Validated_Status'           => $conf_UAM[4],
    412                 'UAM_NO_COMMENT_ANO_TRUE'        => $conf_UAM[5]=='true' ?  'checked="checked"' : '' ,
    413                 'UAM_NO_COMMENT_ANO_FALSE'       => $conf_UAM[5]=='false' ?  'checked="checked"' : '' ,
    414                 'UAM_MAILEXCLUSION_TRUE'         => $conf_UAM[11]=='true' ?  'checked="checked"' : '' ,
    415                 'UAM_MAILEXCLUSION_FALSE'        => $conf_UAM[11]=='false' ?  'checked="checked"' : '' ,
    416                 'UAM_MAILEXCLUSION_LIST'         => $conf_UAM[12],
    417                 'UAM_PASSWORDENF_TRUE'           => $conf_UAM[13]=='true' ?  'checked="checked"' : '' ,
    418                 'UAM_PASSWORDENF_FALSE'          => $conf_UAM[13]=='false' ?  'checked="checked"' : '' ,
    419                 'UAM_PASSWORD_SCORE'             => $conf_UAM[14],
    420     'UAM_ADMINPASSWENF_TRUE'         => $conf_UAM[15]=='true' ?  'checked="checked"' : '' ,
    421                 'UAM_ADMINPASSWENF_FALSE'        => $conf_UAM[15]=='false' ?  'checked="checked"' : '' ,
    422     'UAM_GHOSTRACKER_TRUE'           => $conf_UAM[16]=='true' ?  'checked="checked"' : '' ,
    423                 'UAM_GHOSTRACKER_FALSE'          => $conf_UAM[16]=='false' ?  'checked="checked"' : '' ,
    424     'UAM_GHOSTRACKER_DAYLIMIT'       => $conf_UAM[17],
    425     'UAM_GHOSTRACKER_REMINDERTEXT'   => $conf_UAM[18],
    426     'UAM_ADDLASTVISIT_TRUE'          => $conf_UAM[19]=='true' ?  'checked="checked"' : '' ,
    427     'UAM_ADDLASTVISIT_FALSE'         => $conf_UAM[19]=='false' ?  'checked="checked"' : '' ,
    428     'UAM_ADMINCONFMAIL_TRUE'         => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
    429     'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
    430     'UAM_REDIRTOPROFILE_TRUE'        => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
    431     'UAM_REDIRTOPROFILE_FALSE'       => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
    432     'UAM_GTAUTO_TRUE'                => $conf_UAM[22]=='true' ?  'checked="checked"' : '' ,
    433     'UAM_GTAUTO_FALSE'               => $conf_UAM[22]=='false' ?  'checked="checked"' : '' ,
    434     'UAM_GTAUTOMAIL_TRUE'            => $conf_UAM[23]=='true' ?  'checked="checked"' : '' ,
    435     'UAM_GTAUTOMAIL_FALSE'           => $conf_UAM[23]=='false' ?  'checked="checked"' : '' ,
    436     'UAM_GTAUTODEL_TEXT'             => $conf_UAM[24],
    437     'UAM_GTAUTOMAILTEXT'             => $conf_UAM[25],
    438                 'UAM_Downgrade_Group'            => $conf_UAM[26],
    439                 'UAM_Downgrade_Status'           => $conf_UAM[27],
    440     'UAM_ADMINVALIDATIONMAIL_TEXT'   => $conf_UAM[28],
    441     'UAM_CUSTOMPASSWRETR_TRUE'       => $conf_UAM[29]=='true' ?  'checked="checked"' : '' ,
    442     'UAM_CUSTOMPASSWRETR_FALSE'      => $conf_UAM[29]=='false' ?  'checked="checked"' : '' ,
    443     'UAM_CUSTOMPASSWRETR_TEXT'       => $conf_UAM[30],
    444     'UAM_USRAUTO_TRUE'               => $conf_UAM[31]=='true' ?  'checked="checked"' : '' ,
    445     'UAM_USRAUTO_FALSE'              => $conf_UAM[31]=='false' ?  'checked="checked"' : '' ,
    446     'UAM_USRAUTODEL_TEXT'            => $conf_UAM[32],
    447     'UAM_USRAUTOMAIL_TRUE'           => $conf_UAM[33]=='true' ?  'checked="checked"' : '' ,
    448     'UAM_USRAUTOMAIL_FALSE'          => $conf_UAM[33]=='false' ?  'checked="checked"' : '' ,
    449     'UAM_STUFFS_TRUE'                => $conf_UAM[34]=='true' ?  'checked="checked"' : '' ,
    450     'UAM_STUFFS_FALSE'               => $conf_UAM[34]=='false' ?  'checked="checked"' : '' ,
    451     'UAM_HIDEPASSW_TRUE'             => $conf_UAM[35]=='true' ?  'checked="checked"' : '' ,
    452     'UAM_HIDEPASSW_FALSE'            => $conf_UAM[35]=='false' ?  'checked="checked"' : '' ,
    453     'UAM_GROUPCOMM_TRUE'             => $conf_UAM[36]=='true' ?  'checked="checked"' : '' ,
    454     'UAM_GROUPCOMM_FALSE'            => $conf_UAM[36]=='false' ?  'checked="checked"' : '' ,
    455     'UAM_ALLOWCOMM_GROUP'            => $conf_UAM[37],
     395                'UAM_MAILEXCLUSION_TRUE'         => $conf_UAM[10]=='true' ?  'checked="checked"' : '' ,
     396                'UAM_MAILEXCLUSION_FALSE'        => $conf_UAM[10]=='false' ?  'checked="checked"' : '' ,
     397                'UAM_MAILEXCLUSION_LIST'         => $conf_UAM[11],
     398                'UAM_PASSWORDENF_TRUE'           => $conf_UAM[12]=='true' ?  'checked="checked"' : '' ,
     399                'UAM_PASSWORDENF_FALSE'          => $conf_UAM[12]=='false' ?  'checked="checked"' : '' ,
     400                'UAM_PASSWORD_SCORE'             => $conf_UAM[13],
     401    'UAM_ADMINPASSWENF_TRUE'         => $conf_UAM[14]=='true' ?  'checked="checked"' : '' ,
     402                'UAM_ADMINPASSWENF_FALSE'        => $conf_UAM[14]=='false' ?  'checked="checked"' : '' ,
     403    'UAM_GHOSTRACKER_TRUE'           => $conf_UAM[15]=='true' ?  'checked="checked"' : '' ,
     404                'UAM_GHOSTRACKER_FALSE'          => $conf_UAM[15]=='false' ?  'checked="checked"' : '' ,
     405    'UAM_GHOSTRACKER_DAYLIMIT'       => $conf_UAM[16],
     406    'UAM_GHOSTRACKER_REMINDERTEXT'   => $conf_UAM[17],
     407    'UAM_ADDLASTVISIT_TRUE'          => $conf_UAM[18]=='true' ?  'checked="checked"' : '' ,
     408    'UAM_ADDLASTVISIT_FALSE'         => $conf_UAM[18]=='false' ?  'checked="checked"' : '' ,
     409    'UAM_ADMINCONFMAIL_TRUE'         => $conf_UAM[19]=='true' ?  'checked="checked"' : '' ,
     410    'UAM_ADMINCONFMAIL_FALSE'        => $conf_UAM[19]=='false' ?  'checked="checked"' : '' ,
     411    'UAM_REDIRTOPROFILE_TRUE'        => $conf_UAM[20]=='true' ?  'checked="checked"' : '' ,
     412    'UAM_REDIRTOPROFILE_FALSE'       => $conf_UAM[20]=='false' ?  'checked="checked"' : '' ,
     413    'UAM_GTAUTO_TRUE'                => $conf_UAM[21]=='true' ?  'checked="checked"' : '' ,
     414    'UAM_GTAUTO_FALSE'               => $conf_UAM[21]=='false' ?  'checked="checked"' : '' ,
     415    'UAM_GTAUTOMAIL_TRUE'            => $conf_UAM[22]=='true' ?  'checked="checked"' : '' ,
     416    'UAM_GTAUTOMAIL_FALSE'           => $conf_UAM[22]=='false' ?  'checked="checked"' : '' ,
     417    'UAM_GTAUTODEL_TEXT'             => $conf_UAM[23],
     418    'UAM_GTAUTOMAILTEXT'             => $conf_UAM[24],
     419                'UAM_Downgrade_Group'            => $conf_UAM[25],
     420                'UAM_Downgrade_Status'           => $conf_UAM[26],
     421    'UAM_ADMINVALIDATIONMAIL_TEXT'   => $conf_UAM[27],
     422    'UAM_CUSTOMPASSWRETR_TRUE'       => $conf_UAM[28]=='true' ?  'checked="checked"' : '' ,
     423    'UAM_CUSTOMPASSWRETR_FALSE'      => $conf_UAM[28]=='false' ?  'checked="checked"' : '' ,
     424    'UAM_CUSTOMPASSWRETR_TEXT'       => $conf_UAM[29],
     425    'UAM_USRAUTO_TRUE'               => $conf_UAM[30]=='true' ?  'checked="checked"' : '' ,
     426    'UAM_USRAUTO_FALSE'              => $conf_UAM[30]=='false' ?  'checked="checked"' : '' ,
     427    'UAM_USRAUTODEL_TEXT'            => $conf_UAM[31],
     428    'UAM_USRAUTOMAIL_TRUE'           => $conf_UAM[32]=='true' ?  'checked="checked"' : '' ,
     429    'UAM_USRAUTOMAIL_FALSE'          => $conf_UAM[32]=='false' ?  'checked="checked"' : '' ,
     430    'UAM_STUFFS_TRUE'                => $conf_UAM[33]=='true' ?  'checked="checked"' : '' ,
     431    'UAM_STUFFS_FALSE'               => $conf_UAM[33]=='false' ?  'checked="checked"' : '' ,
     432    'UAM_HIDEPASSW_TRUE'             => $conf_UAM[34]=='true' ?  'checked="checked"' : '' ,
     433    'UAM_HIDEPASSW_FALSE'            => $conf_UAM[34]=='false' ?  'checked="checked"' : '' ,
    456434                'UAM_PASSWORD_TEST_SCORE'        => $UAM_Password_Test_Score,
    457435    'UAM_ERROR_REPORTS4'             => $UAM_Exclusionlist_Error,
     
    473451               
    474452    //Username without forbidden keys
    475     if ( isset($conf_UAM[6]) and $conf_UAM[6] == 'true' )
     453    if ( isset($conf_UAM[5]) and $conf_UAM[5] == 'true' )
    476454          {
    477455                        $query = "
     
    492470               
    493471    //Email without forbidden domain
    494     if ( isset($conf_UAM[11]) and $conf_UAM[11] == 'true' )
     472    if ( isset($conf_UAM[10]) and $conf_UAM[10] == 'true' )
    495473          {
    496474                        $query = "
     
    503481                  while($row = pwg_db_fetch_assoc($result))
    504482                  {
    505                           $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[12]);
     483                          $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
    506484                          for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
    507485                          {
     
    558536  $conf_UAM = unserialize($conf['UserAdvManager']);
    559537 
    560   if (isset($conf_UAM[19]) and $conf_UAM[19]=='true')
     538  if (isset($conf_UAM[18]) and $conf_UAM[18]=='true')
    561539  {
    562540// +-----------------------------------------------------------------------+
     
    607585      $deltadays = floor($deltasecs / 86400);// Convert result from seconds to days
    608586     
    609       if (isset($conf_UAM[16]) and $conf_UAM[16]=='true' and $conf_UAM[17] <> '')
     587      if (isset($conf_UAM[15]) and $conf_UAM[15]=='true' and $conf_UAM[16] <> '')
    610588      {
    611         if ($deltadays <= ($conf_UAM[17]/2))
     589        if ($deltadays <= ($conf_UAM[16]/2))
    612590        {
    613591          $display = 'green';
    614592        }
    615593       
    616         if (($deltadays > ($conf_UAM[17]/2)) and ($deltadays < $conf_UAM[17]))
     594        if (($deltadays > ($conf_UAM[16]/2)) and ($deltadays < $conf_UAM[16]))
    617595        {
    618596          $display = 'orange';
    619597        }
    620598       
    621         if ($deltadays >= $conf_UAM[17])
     599        if ($deltadays >= $conf_UAM[16])
    622600        {
    623601          $display = 'red';
     
    681659  $conf_UAM_ConfirmMail = unserialize($conf['UserAdvManager_ConfirmMail']);
    682660       
    683   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')))
     661  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[7]) and $conf_UAM[7] <> '-1')))
    684662  {
    685663// +-----------------------------------------------------------------------+
     
    11951173  $conf_UAM = unserialize($conf['UserAdvManager']);
    11961174       
    1197   if (isset($conf_UAM[16]) and $conf_UAM[16]=='true')
     1175  if (isset($conf_UAM[16]) and $conf_UAM[15]=='true')
    11981176  {
    11991177// +-----------------------------------------------------------------------+
  • extensions/UserAdvManager/trunk/admin/template/global.tpl

    r10957 r11018  
    666666
    667667            <li>
    668               <label class="cluetip" title="{'UAM_commentTitle'|translate}|{'UAM_commentTitle_d'|translate}">
    669                 {'UAM_No_Comment_Anonymous'|@translate}
    670               </label>
    671             <br><br>
    672               <input type="radio" value="false" {$UAM_NO_COMMENT_ANO_FALSE} name="UAM_No_Comment_Anonymous">
    673                 {'UAM_Disable'|@translate}
    674             <br>
    675               <input type="radio" value="true" {$UAM_NO_COMMENT_ANO_TRUE} name="UAM_No_Comment_Anonymous">
    676                 {'UAM_Enable'|@translate}
    677             <br><br>
    678             </li>
    679 
    680             <li>
    681               <label class="cluetip" title="{'UAM_GroupCommTitle'|translate}|{'UAM_GroupCommTitle_d'|translate}">
    682                 {'UAM_Group_Comments'|@translate}
    683               </label>
    684             <br><br>
    685               <input type="radio" value="false" {$UAM_GROUPCOMM_FALSE} name="UAM_GroupComm">
    686                 {'UAM_Disable'|@translate}
    687             <br>
    688               <input type="radio" value="true" {$UAM_GROUPCOMM_TRUE} name="UAM_GroupComm">
    689                 {'UAM_Enable'|@translate}
    690             <br><br>
    691               <ul>
    692                 <li>
    693                   <label>
    694                     {'UAM_AllowedComm_Group'|@translate}
    695                   </label>
    696                 <br><br>
    697                   <div id="uam_leftmargin">
    698                     {html_options name="UAM_AllowComm_Group" options=$AllowComm_Group.group_options selected=$AllowComm_Group.group_selected}
    699                   </div>
    700                 </li>
    701               </ul>
    702             <br><br>
    703             </li>
    704 
    705             <li>
    706668              <label class="cluetip" title="{'UAM_RedirTitle'|translate}|{'UAM_RedirTitle_d'|translate}">
    707669                {'UAM_RedirToProfile'|@translate}
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r10976 r11018  
    252252            Database upgrade process simplied (using version_compare() and code refactoring)
    253253            Bug 2253 fixed - New feature to allow comments on pictures only for specific users (who belong to a group) when "comments for all" is disabled
     254
     255-- 2.20.8 : Remove all options related to comments because they are processed in new "Comments Access Manager" plugin.
    254256*/
    255257?>
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r10957 r11018  
    4242  if (!is_admin() and !is_a_guest() and $user['username'] != "16" and $user['username'] != "18")
    4343  {
    44     if ((isset($conf_UAM[16]) and $conf_UAM[16] == 'true') or (isset($conf_UAM[19]) and $conf_UAM[19] == 'true'))
     44    if ((isset($conf_UAM[15]) and $conf_UAM[15] == 'true') or (isset($conf_UAM[18]) and $conf_UAM[18] == 'true'))
    4545    {
    4646
     
    116116    elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true' or $conf_UAM[0] == 'false') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'true'))
    117117    {
    118       if (is_admin() and isset($conf_UAM[20]) and $conf_UAM[20] == 'true')
     118      if (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'true')
    119119      {
    120120        $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    121121        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
    122122      }
    123       elseif (is_admin() and isset($conf_UAM[20]) and $conf_UAM[20] == 'false')
     123      elseif (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'false')
    124124      {
    125125        $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     
    171171
    172172    // Password enforcement control
    173     if (isset($conf_UAM[13]) and $conf_UAM[13] == 'true' and !empty($conf_UAM[14]))
     173    if (isset($conf_UAM[12]) and $conf_UAM[12] == 'true' and !empty($conf_UAM[13]))
    174174    {
    175175      if (!empty($user['password']) and !is_admin())
     
    177177        $PasswordCheck = testpassword($user['password']);
    178178 
    179         if ($PasswordCheck < $conf_UAM[14])
     179        if ($PasswordCheck < $conf_UAM[13])
    180180        {
    181181          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    182           $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14];
     182          $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[13];
    183183          array_push($errors, $lang['reg_err_pass']);
    184184        }
    185185      }
    186       else if (!empty($user['password']) and is_admin() and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
     186      else if (!empty($user['password']) and is_admin() and isset($conf_UAM[14]) and $conf_UAM[14] == 'true')
    187187      {
    188188        $PasswordCheck = testpassword($user['password']);
    189189 
    190         if ($PasswordCheck < $conf_UAM[14])
     190        if ($PasswordCheck < $conf_UAM[13])
    191191        {
    192192          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    193           $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[14];
     193          $lang['reg_err_pass'] = l10n_args($message).$conf_UAM[13];
    194194          array_push($errors, $lang['reg_err_pass']);
    195195        }
     
    198198
    199199    // Username without forbidden keys
    200     if (isset($conf_UAM[6]) and $conf_UAM[6] == 'true' and !empty($user['username']) and ValidateUsername($user['username']) and !is_admin())
    201     {
    202       $lang['reg_err_login1'] = l10n('UAM_reg_err_login2')."'".$conf_UAM[7]."'";
     200    if (isset($conf_UAM[5]) and $conf_UAM[5] == 'true' and !empty($user['username']) and ValidateUsername($user['username']) and !is_admin())
     201    {
     202      $lang['reg_err_login1'] = l10n('UAM_reg_err_login2')."'".$conf_UAM[6]."'";
    203203      array_push($errors, $lang['reg_err_login1']);
    204204    }
    205205
    206206    // Email without forbidden domains
    207     if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($user['email']) and ValidateEmailProvider($user['email']) and !is_admin())
    208     {
    209       $lang['reg_err_login1'] = l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'";
     207    if (isset($conf_UAM[10]) and $conf_UAM[10] == 'true' and !empty($user['email']) and ValidateEmailProvider($user['email']) and !is_admin())
     208    {
     209      $lang['reg_err_login1'] = l10n('UAM_reg_err_login5')."'".$conf_UAM[11]."'";
    210210      array_push($errors, $lang['reg_err_login1']);
    211211    }
     
    224224  $conf_UAM = unserialize($conf['UserAdvManager']);
    225225   
    226   if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
     226  if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
    227227  {
    228228    $user_idsOK = array();
     
    243243  {
    244244    // Email without forbidden domains
    245     if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['mail_address']))
     245    if (isset($conf_UAM[10]) and $conf_UAM[10] == 'true' and !empty($_POST['mail_address']))
    246246    {
    247247      if (ValidateEmailProvider($_POST['mail_address']))
    248248      {
    249         $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'");
     249        $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[11]."'");
    250250        unset($_POST['validate']);
    251251      }
     
    259259
    260260      // Password enforcement control
    261       if (isset($conf_UAM[13]) and $conf_UAM[13] == 'true' and !empty($conf_UAM[14]))
     261      if (isset($conf_UAM[12]) and $conf_UAM[12] == 'true' and !empty($conf_UAM[13]))
    262262      {
    263263        $PasswordCheck = testpassword($_POST['use_new_pwd']);
    264264
    265         if ($PasswordCheck < $conf_UAM[14])
     265        if ($PasswordCheck < $conf_UAM[13])
    266266        {
    267267          $message = get_l10n_args('UAM_reg_err_login4_%s', $PasswordCheck);
    268           $template->append('errors', l10n_args($message).$conf_UAM[14]);
     268          $template->append('errors', l10n_args($message).$conf_UAM[13]);
    269269          unset($_POST['use_new_pwd']);
    270270          unset($_POST['validate']);
     
    330330 
    331331  // Performing GhostTracker scheduled tasks
    332   if ((isset($conf_UAM[22]) and $conf_UAM[22] == 'true'))
     332  if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
    333333  {
    334334    UAM_GT_ScheduledTasks();
     
    336336
    337337  // Performing User validation scheduled tasks
    338   if ((isset($conf_UAM[31]) and $conf_UAM[31] == 'true'))
     338  if ((isset($conf_UAM[30]) and $conf_UAM[30] == 'true'))
    339339  {
    340340    UAM_USR_ScheduledTasks();
    341341  }
    342342
    343   if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true'))
     343  if ((isset($conf_UAM[20]) and $conf_UAM[20] == 'true'))
    344344  {
    345345    // Performing redirection 
     
    408408
    409409  // Ghost accounts auto group or status downgrade with or without information email sending and autodeletion if user already reminded
    410   if ((isset($conf_UAM[22]) and $conf_UAM[22] == 'true') and ((isset($conf_UAM[26]) and $conf_UAM[26] <> -1) or (isset($conf_UAM[27]) and $conf_UAM[27] <> -1)))
     410  if ((isset($conf_UAM[21]) and $conf_UAM[21] == 'true') and ((isset($conf_UAM[25]) and $conf_UAM[25] <> -1) or (isset($conf_UAM[26]) and $conf_UAM[26] <> -1)))
    411411  {
    412412    if (count($collection) > 0)
     
    492492
    493493            // Change user status
    494             if ($conf_UAM[27] <> -1)
     494            if ($conf_UAM[26] <> -1)
    495495            {
    496496              $query = "
    497497UPDATE ".USER_INFOS_TABLE."
    498 SET status = '".$conf_UAM[27]."'
     498SET status = '".$conf_UAM[26]."'
    499499WHERE user_id = '".$user_id."'
    500500;";
     
    503503
    504504            // Change user group
    505             if ($conf_UAM[26] <> -1)
     505            if ($conf_UAM[25] <> -1)
    506506            {
    507507              $query = "
     
    509509  (user_id, group_id)
    510510VALUES
    511   ('".$user_id."', '".$conf_UAM[26]."')
     511  ('".$user_id."', '".$conf_UAM[25]."')
    512512;";
    513513              pwg_query($query);
     
    515515
    516516            // Auto send email notification on group / status downgrade
    517             if (isset($conf_UAM[23]) and $conf_UAM[23] == 'true')
     517            if (isset($conf_UAM[22]) and $conf_UAM[22] == 'true')
    518518            {
    519519              // Set reminder true
     
    586586
    587587  // Unvalidated accounts auto email sending and autodeletion if user already reminded
    588   if ((isset($conf_UAM[31]) and $conf_UAM[31] == 'true'))
     588  if ((isset($conf_UAM[30]) and $conf_UAM[30] == 'true'))
    589589  {
    590590    if (count($collection) > 0)
     
    611611
    612612        // If never reminded before, send reminder and set reminder True
    613         if (!$reminder and isset($conf_UAM[33]) and $conf_UAM[33] == 'true')
     613        if (!$reminder and isset($conf_UAM[32]) and $conf_UAM[32] == 'true')
    614614        {
    615615                  $typemail = 1;
     
    660660
    661661          // If never reminded before, send reminder and set reminder True
    662           if (!$reminder and isset($conf_UAM[33]) and $conf_UAM[33] == 'true')
     662          if (!$reminder and isset($conf_UAM[32]) and $conf_UAM[32] == 'true')
    663663          {
    664664            $typemail = 1;
     
    704704    {
    705705      // Email without forbidden domains
    706       if (isset($conf_UAM[11]) and $conf_UAM[11] == 'true' and !empty($_POST['email']) and ValidateEmailProvider($_POST['email']))
     706      if (isset($conf_UAM[10]) and $conf_UAM[10] == 'true' and !empty($_POST['email']) and ValidateEmailProvider($_POST['email']))
    707707      {
    708         $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[12]."'");
     708        $template->append('errors', l10n('UAM_reg_err_login5')."'".$conf_UAM[11]."'");
    709709        unset($_POST['submit_add']);
    710710      }
     
    733733  $conf_UAM = unserialize($conf['UserAdvManager']);
    734734 
    735   if (isset($conf_UAM[29]) and $conf_UAM[29] == 'true')
     735  if (isset($conf_UAM[28]) and $conf_UAM[28] == 'true')
    736736  {
    737737    // Management of Extension flags ([mygallery], [myurl])
     
    743743    $replacements[] = $conf['gallery_url'];
    744744   
    745     $infos = preg_replace($patterns, $replacements, $conf_UAM[30])."\n"."\n".$infos;
     745    $infos = preg_replace($patterns, $replacements, $conf_UAM[29])."\n"."\n".$infos;
    746746  }
    747747  return $infos;
    748 }
    749 
    750 
    751 /**
    752  * Triggered on user_comment_check
    753  *
    754  * checks if author is mandatory and set on comments post when comments for all is set
    755  *
    756  * cheks if author is in an allowed group to post comment when comments for all is not set
    757  *
    758  * @param : comment action, comment
    759  *
    760  * @return : comment action
    761  *
    762  */
    763 function UAM_CheckEmptyCommentAuthor($comment_action, $comm)
    764 {
    765   load_language('plugin.lang', UAM_PATH);
    766   global $infos, $conf, $user;
    767 
    768   $conf_UAM = unserialize($conf['UserAdvManager']);
    769 
    770 // Does not allow empty author name on comments for all
    771   if (isset($conf_UAM[5]) and $conf_UAM[5] == 'true' and $comm['author'] == 'guest' and $conf['comments_forall'])
    772   {
    773     $comment_action = 'reject';
    774 
    775     array_push($infos, l10n('UAM_Empty Author'));
    776   }
    777 
    778 
    779 // Do not allow comments if user is not in an allowed group
    780   if (isset($conf_UAM[36]) and $conf_UAM[36] == 'true' and !$conf['comments_forall'])
    781   {
    782     if (!UAM_CheckAuthor($comm['author']))
    783     {
    784       $comment_action = 'reject';
    785 
    786       array_push($infos, l10n('UAM_Not_Allowed_Author'));
    787     }
    788   }
    789 
    790   return $comment_action;
    791748}
    792749
     
    838795      $password = $password <> '' ? $password : l10n('UAM_empty_pwd');
    839796     
    840       if (isset($conf_UAM[9]) and $conf_UAM[9] <> '')
     797      if (isset($conf_UAM[8]) and $conf_UAM[8] <> '')
    841798      {
    842799        // Management of Extension flags ([username], [mygallery], [myurl])
     
    850807        if (function_exists('get_user_language_desc'))
    851808        {
    852           $infos1_perso = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[9]))."\n\n";
     809          $infos1_perso = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[8]))."\n\n";
    853810        }
    854         else $infos1_perso = l10n(preg_replace($patterns, $replacements, $conf_UAM[9]))."\n\n";
     811        else $infos1_perso = l10n(preg_replace($patterns, $replacements, $conf_UAM[8]))."\n\n";
    855812      }
    856813     
     
    872829  if (isset($conf_UAM[0]) and $conf_UAM[0] == 'true')
    873830  {
    874     if (isset($conf_UAM[35]) and $conf_UAM[35] == 'true') // Allow display of clear password in email
     831    if (isset($conf_UAM[34]) and $conf_UAM[34] == 'true') // Allow display of clear password in email
    875832    {
    876833      $infos1 = array(
     
    901858    );
    902859
    903     if (isset($conf_UAM[10]) and $conf_UAM[10] <> '')
     860    if (isset($conf_UAM[9]) and $conf_UAM[9] <> '')
    904861    {
    905862      // Management of Extension flags ([username], [mygallery], [myurl])
     
    913870      if (function_exists('get_user_language_desc'))
    914871      {
    915         $infos2_perso = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[10]))."\n\n";
     872        $infos2_perso = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[9]))."\n\n";
    916873      }
    917       else $infos2_perso = l10n(preg_replace($patterns, $replacements, $conf_UAM[10]))."\n\n";
     874      else $infos2_perso = l10n(preg_replace($patterns, $replacements, $conf_UAM[9]))."\n\n";
    918875    }
    919876  }
     
    10961053  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Ghost_reminder_of_%s', $username));     
    10971054
    1098   if (isset($conf_UAM[18]) and $conf_UAM[18] <> '' and isset($conf_UAM[16]) and $conf_UAM[16] == 'true')
     1055  if (isset($conf_UAM[17]) and $conf_UAM[17] <> '' and isset($conf_UAM[15]) and $conf_UAM[15] == 'true')
    10991056  {
    11001057    // Management of Extension flags ([username], [mygallery], [myurl])
     
    11081065    if (function_exists('get_user_language_desc'))
    11091066    {
    1110       $infos1 = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[18]))."\n\n";
     1067      $infos1 = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[17]))."\n\n";
    11111068    }
    11121069    else
    11131070    {
    1114       $infos1 = l10n(preg_replace($patterns, $replacements, $conf_UAM[18]))."\n\n";
     1071      $infos1 = l10n(preg_replace($patterns, $replacements, $conf_UAM[17]))."\n\n";
    11151072    }
    11161073
     
    11691126  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Demotion of %s', stripslashes($username)));
    11701127     
    1171   if (isset($conf_UAM[25]) and $conf_UAM[25] <> '')
     1128  if (isset($conf_UAM[24]) and $conf_UAM[24] <> '')
    11721129  {
    11731130    // Management of Extension flags ([username], [mygallery], [myurl])
     
    11811138    if (function_exists('get_user_language_desc'))
    11821139    {
    1183       $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[25]))."\n\n";
    1184     }
    1185     else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[25]))."\n\n";
     1140      $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[24]))."\n\n";
     1141    }
     1142    else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[24]))."\n\n";
    11861143  }
    11871144
     
    12601217  $subject = '['.$conf['gallery_title'].'] '.l10n_args(get_l10n_args('UAM_Validation of %s', stripslashes($result['username'])));
    12611218     
    1262   if (isset($conf_UAM[28]) and $conf_UAM[28] <> '')
     1219  if (isset($conf_UAM[27]) and $conf_UAM[27] <> '')
    12631220  {
    12641221    // Management of Extension flags ([username], [mygallery], [myurl])
     
    12721229    if (function_exists('get_user_language_desc'))
    12731230    {
    1274       $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[28]))."\n\n";
    1275     }
    1276     else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[28]))."\n\n";
     1231      $custom_txt = get_user_language_desc(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n";
     1232    }
     1233    else $custom_txt = l10n(preg_replace($patterns, $replacements, $conf_UAM[27]))."\n\n";
    12771234  }
    12781235
     
    13651322
    13661323    // Set user unvalidated status
    1367     if (!is_admin() and $conf_UAM[8] <> -1)
     1324    if (!is_admin() and $conf_UAM[7] <> -1)
    13681325    {
    13691326      $query = "
    13701327UPDATE ".USER_INFOS_TABLE."
    1371 SET status = '".$conf_UAM[8]."'
     1328SET status = '".$conf_UAM[7]."'
    13721329WHERE user_id = '".$user_id."'
    13731330;";
     
    14161373  pwg_query($query);
    14171374
    1418   if (!is_admin() and $conf_UAM[8] <> -1)
     1375  if (!is_admin() and $conf_UAM[7] <> -1)
    14191376  {
    14201377    $query = "
    14211378UPDATE ".USER_INFOS_TABLE."
    1422 SET status = '".$conf_UAM[8]."'
     1379SET status = '".$conf_UAM[7]."'
    14231380WHERE user_id = '".$user_id."'
    14241381;";
     
    18521809  $conf_UAM = unserialize($conf['UserAdvManager']);
    18531810
    1854   if (isset($login) and isset($conf_UAM[7]) and $conf_UAM[7] <> '')
    1855   {
    1856     $conf_CharExclusion = preg_split("/,/",$conf_UAM[7]);
     1811  if (isset($login) and isset($conf_UAM[6]) and $conf_UAM[6] <> '')
     1812  {
     1813    $conf_CharExclusion = preg_split("/,/",$conf_UAM[6]);
    18571814    for ($i = 0 ; $i < count($conf_CharExclusion) ; $i++)
    18581815    {
     
    18861843  $conf_UAM = unserialize($conf['UserAdvManager']);
    18871844 
    1888         if (isset($email) and isset($conf_UAM[12]) and $conf_UAM[12] <> '')
     1845        if (isset($email) and isset($conf_UAM[11]) and $conf_UAM[11] <> '')
    18891846        {
    1890                 $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[12]);
     1847                $conf_MailExclusion = preg_split("/[\s,]+/",$conf_UAM[11]);
    18911848                for ($i = 0 ; $i < count($conf_MailExclusion) ; $i++)
    18921849                {
     
    19401897  OR TO_DAYS(NOW()) - TO_DAYS(ui.registration_date) < "'.$conf_UAM_ConfirmMail[1].'")';
    19411898
    1942         if ($conf_UAM[2] <> '-1' and $conf_UAM[8] == '-1')
     1899        if ($conf_UAM[2] <> '-1' and $conf_UAM[7] == '-1')
    19431900  {
    19441901    $query.= '
    19451902  AND ug.group_id = '.$conf_UAM[2];
    19461903  }
    1947   if ($conf_UAM[2] == '-1' and $conf_UAM[8] <> '-1')
     1904  if ($conf_UAM[2] == '-1' and $conf_UAM[7] <> '-1')
    19481905  {
    19491906    $query.= '
    1950   AND ui.status = \''.$conf_UAM[8]."'";
    1951   }
    1952   if ($conf_UAM[2] <> '-1' and $conf_UAM[8] <> '-1')
     1907  AND ui.status = \''.$conf_UAM[7]."'";
     1908  }
     1909  if ($conf_UAM[2] <> '-1' and $conf_UAM[7] <> '-1')
    19531910  {
    19541911    $query.= '
     
    20632020  INNER JOIN '.USER_LASTVISIT_TABLE.' AS lv
    20642021    ON u.'.$conf['user_fields']['id'].' = lv.user_id
    2065 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[17].'")
     2022WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[16].'")
    20662023ORDER BY lv.lastvisit ASC;';
    20672024
     
    21082065  INNER JOIN '.USER_LASTVISIT_TABLE.' AS lv
    21092066    ON u.'.$conf['user_fields']['id'].' = lv.user_id
    2110 WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[17].'")
     2067WHERE (TO_DAYS(NOW()) - TO_DAYS(lv.lastvisit) >= "'.$conf_UAM[16].'")
    21112068ORDER BY lv.lastvisit ASC;';
    21122069
     
    25402497
    25412498/**
    2542  * Called from UAM_CheckEmptyCommentAuthor()
    2543  * Checks if comment's author name is in the allowed group
    2544  *
    2545  * @author   : author's name
    2546  *
    2547  * @returns  : Boolean (true is user is allowed to post / false if not allowed)
    2548  *
    2549  */
    2550 function UAM_CheckAuthor($author)
    2551 {
    2552   global $conf;
    2553  
    2554         // Get UAM configuration
    2555   $conf_UAM = unserialize($conf['UserAdvManager']);
    2556  
    2557   if (isset($conf_UAM[37]) and $conf_UAM[37] <> -1)
    2558   {
    2559     $query = '
    2560 SELECT u.id,
    2561        u.username,
    2562        ug.user_id,
    2563        ug.group_id
    2564 FROM '.USERS_TABLE.' AS u
    2565   INNER JOIN '.USER_GROUP_TABLE.' AS ug
    2566     ON u.id = ug.user_id
    2567 WHERE u.username LIKE "'.$author.'"
    2568   AND ug.group_id = '.$conf_UAM[37].'
    2569 ;';
    2570 
    2571     $count = pwg_db_num_rows(pwg_query($query));
    2572 
    2573     if (is_null($count) or $count == 0)
    2574     {
    2575       return false;
    2576     }
    2577     else
    2578       return true;
    2579   }
    2580 }
    2581 
    2582 
    2583 /**
    25842499 * Useful for debugging - 4 vars can be set
    25852500 * Output result to log.txt file
  • extensions/UserAdvManager/trunk/include/upgradedb.inc.php

    r10976 r11018  
    427427  conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
    428428}
     429
     430/* upgrade from 2.20.7 to 2.20.8 */
     431/* ***************************** */
     432function upgrade_2207_2208()
     433{
     434  global $conf;
     435
     436  // Upgrading options
     437  $query = '
     438SELECT value
     439  FROM '.CONFIG_TABLE.'
     440WHERE param = "UserAdvManager"
     441;';
     442
     443  $result = pwg_query($query);
     444  $conf_UAM = pwg_db_fetch_assoc($result);
     445   
     446  $Newconf_UAM = unserialize($conf_UAM['value']);
     447
     448  // Refactoring all configuration options
     449  $Newconf_UAM[0] = $Newconf_UAM[0];
     450  $Newconf_UAM[1] = $Newconf_UAM[1];
     451  $Newconf_UAM[2] = $Newconf_UAM[2];
     452  $Newconf_UAM[3] = $Newconf_UAM[3];
     453  $Newconf_UAM[4] = $Newconf_UAM[4];
     454  $Newconf_UAM[5] = $Newconf_UAM[6]; //remove osolete anonymus comments option
     455  $Newconf_UAM[6] = $Newconf_UAM[7];
     456  $Newconf_UAM[7] = $Newconf_UAM[8];
     457  $Newconf_UAM[8] = $Newconf_UAM[9];
     458  $Newconf_UAM[9] = $Newconf_UAM[10];
     459  $Newconf_UAM[10] = $Newconf_UAM[11];
     460  $Newconf_UAM[11] = $Newconf_UAM[12];
     461  $Newconf_UAM[12] = $Newconf_UAM[13];
     462  $Newconf_UAM[13] = $Newconf_UAM[14];
     463  $Newconf_UAM[14] = $Newconf_UAM[15];
     464  $Newconf_UAM[15] = $Newconf_UAM[16];
     465  $Newconf_UAM[16] = $Newconf_UAM[17];
     466  $Newconf_UAM[17] = $Newconf_UAM[18];
     467  $Newconf_UAM[18] = $Newconf_UAM[19];
     468  $Newconf_UAM[19] = $Newconf_UAM[20];
     469  $Newconf_UAM[20] = $Newconf_UAM[21];
     470  $Newconf_UAM[21] = $Newconf_UAM[22];
     471  $Newconf_UAM[22] = $Newconf_UAM[23];
     472  $Newconf_UAM[23] = $Newconf_UAM[24];
     473  $Newconf_UAM[24] = $Newconf_UAM[25];
     474  $Newconf_UAM[25] = $Newconf_UAM[26];
     475  $Newconf_UAM[26] = $Newconf_UAM[27];
     476  $Newconf_UAM[27] = $Newconf_UAM[28];
     477  $Newconf_UAM[28] = $Newconf_UAM[29];
     478  $Newconf_UAM[29] = $Newconf_UAM[30];
     479  $Newconf_UAM[30] = $Newconf_UAM[31];
     480  $Newconf_UAM[31] = $Newconf_UAM[32];
     481  $Newconf_UAM[32] = $Newconf_UAM[33];
     482  $Newconf_UAM[33] = $Newconf_UAM[34];
     483  $Newconf_UAM[34] = $Newconf_UAM[35];
     484 
     485  // unset obsolete conf
     486  unset ($Newconf_UAM[35]);
     487  unset ($Newconf_UAM[36]);
     488  unset ($Newconf_UAM[37]);
     489 
     490  $update_conf = serialize($Newconf_UAM);
     491
     492  conf_update_param('UserAdvManager', pwg_db_real_escape_string($update_conf));
     493}
    429494?>
  • extensions/UserAdvManager/trunk/language/de_DE/help/plugin.lang.php

    r10957 r11018  
    4747$lang['UAM_lastvisitTitle'] = 'Tracking registrierte Benutzer';
    4848$lang['UAM_lastvisitTitle_d'] = 'Dies aktiviert einen Tisch in der &quot;Tracking users&quot;-Reiter, die Mitglieder der Galerie aufgef&uuml;hrt sind und zum Zeitpunkt ihres letzten Besuch und verbrachte Zeit (Tage) seit ihrem letzten Besuch. Die &Uuml;berwachung ist rein informativ f&uuml;r den Administrator der Galerie.';
    49 $lang['UAM_commentTitle'] = 'Nickname obligatorisch für Gäste Kommentare';
    50 $lang['UAM_commentTitle_d'] = 'Wenn &quot;Kommentare f&uuml;r alle&quot; aktiv ist (Beh&ouml;rde f&uuml;r unregistrierte Besucher Kommentare post), erm&ouml;glicht diese Option, um den nicht registrierten Besucher zu zwingen, ein Spitzname, der Kommentar ist willkommen in Kraft.';
    5149$lang['UAM_tipsTitle'] = 'Tipps und Beispiele';
    5250$lang['UAM_tipsTitle_d'] = 'Tipps und verschiedene Anwendungsbeispiele';
     
    285283/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    286284// --------- End: New or revised $lang ---- from version 2.20.4
    287 
    288 
    289 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    290 $lang['UAM_GroupCommTitle'] = 'Kommentare zulassen, um eine Gruppe von Benutzern';
    291 /*TODO*/$lang['UAM_GroupCommTitle_d'] = 'This option lets you specify a group of users who will allowed to post comments when the gallery is configured to not allow comments for all.
    292 <br><br>
    293 By default, when &quot;comments for all&quot; option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
    294 // --------- End: New or revised $lang ---- from version 2.20.7
    295285?>
  • extensions/UserAdvManager/trunk/language/de_DE/plugin.lang.php

    r10957 r11018  
    2828$lang['UAM_Err_audit_email_forbidden'] = '<b>Dieses Konto verwendet eine E-Mail-Anbieter sind untersagt:</b> ';
    2929$lang['UAM_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';
    30 $lang['UAM_Empty Author'] = 'Der Autor Feld müssen ausgefüllt werden um einen Kommentar zu schicken.';
    3130$lang['UAM_reg_err_login2'] = 'Benutzername muss nicht die folgenden Zeichen übereinstimmen: ';
    3231$lang['UAM_reg_err_login5'] = 'Ihre E-Mail-Anbieter für die Registrierung ist verboten. Gebannten E-Mail-Anbieter sind: ';
     
    144143$lang['UAM_GhostTracker_ReminderText'] = 'Anpassen der Geist Tracker Erinnerungs-Nachricht';
    145144$lang['UAM_LastVisit'] = ' Tracking registrierte Benutzer';
    146 $lang['UAM_No_Comment_Anonymous'] = 'Nickname obligatorisch für Gäste Kommentare';
    147145
    148146$lang['UAM_Tab_UserManager'] = 'Tracking Validierungen';
     
    330328$lang['UAM_HidePassw'] = 'Passwort im Klartext in der Informations-E-Mail';
    331329// --------- End: New or revised $lang ---- from version 2.20.4
    332 
    333 
    334 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    335 $lang['UAM_Group_Comments'] = 'Kommentare zulassen um eine Gruppe von Benutzern';
    336 $lang['UAM_AllowedComm_Group'] = 'Wählen Sie die Gruppe von Benutzern gestattet Kommentare anzulegen:';
    337 $lang['UAM_Not_Allowed_Author'] = 'Entschuldigung, Sie sind nicht befugt einen Kommentar abzugeben. Bitte kontaktieren Sie den Administrator der Website.';
    338 // --------- End: New or revised $lang ---- from version 2.20.7
    339330?>
  • extensions/UserAdvManager/trunk/language/en_UK/help/plugin.lang.php

    r10957 r11018  
    4747$lang['UAM_lastvisitTitle'] = 'Tracking registered users';
    4848$lang['UAM_lastvisitTitle_d'] = 'This activates a table in the &quot;Tracking users&quot; tab which are registered users listed on the gallery and the date of their last visit and time spent (in days) since their last visit. Monitoring is purely informative for the administrator of the gallery.';
    49 $lang['UAM_commentTitle'] = 'Nickname mandatory for guests comments';
    50 $lang['UAM_commentTitle_d'] = 'If &quot;Comments for All&quot; is active (authority to unregistered visitors to post comments), this option allows to force the non-registered visitor to enter a nickname that the comment is accepted.';
    5149$lang['UAM_tipsTitle'] = 'Tips and Examples';
    5250$lang['UAM_tipsTitle_d'] = 'Tips and various examples of use';
     
    285283$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    286284// --------- End: New or revised $lang ---- from version 2.20.4
    287 
    288 
    289 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    290 $lang['UAM_GroupCommTitle'] = 'Allow comments to a group of users';
    291 $lang['UAM_GroupCommTitle_d'] = 'This option lets you specify a group of users who will allowed to post comments when the gallery is configured to not allow comments for all.
    292 <br><br>
    293 By default, when &quot;comments for all&quot; option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
    294 // --------- End: New or revised $lang ---- from version 2.20.7
    295285?>
  • extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r10957 r11018  
    2727$lang['UAM_Err_audit_email_forbidden'] = '<b>This account uses a forbidden email provider :</b> ';
    2828$lang['UAM_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';
    29 $lang['UAM_Empty Author'] = 'The author field have to be filled to send a comment.';
    3029$lang['UAM_reg_err_login2'] = 'Username does not have to match the following characters: ';
    3130$lang['UAM_reg_err_login5'] = 'Your email provider is banned for registration. Banned email providers are: ';
     
    143142$lang['UAM_GhostTracker_ReminderText'] = 'Customizing Ghost Tracker\'s reminder message';
    144143$lang['UAM_LastVisit'] = ' Tracking registered users';
    145 $lang['UAM_No_Comment_Anonymous'] = 'Nickname mandatory for guests comments';
    146144
    147145$lang['UAM_Tab_UserManager'] = 'Tracking validations';
     
    332330$lang['UAM_HidePassw'] = 'Password in clear text in the information email';
    333331// --------- End: New or revised $lang ---- from version 2.20.4
    334 
    335 
    336 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    337 $lang['UAM_Group_Comments'] = 'Allow comments to a group of users';
    338 $lang['UAM_AllowedComm_Group'] = 'Select the group of users allowed to post comments:';
    339 $lang['UAM_Not_Allowed_Author'] = 'Sorry, you are not authorized to post a comment. Please contact the site administrator.';
    340 // --------- End: New or revised $lang ---- from version 2.20.7
    341332?>
  • extensions/UserAdvManager/trunk/language/es_ES/help/plugin.lang.php

    r10957 r11018  
    4747$lang['UAM_lastvisitTitle'] = 'Seguimiento de usuarios registrados';
    4848$lang['UAM_lastvisitTitle_d'] = 'Esto activa una tabla de &quot;Seguimiento de los usuarios&quot; ficha de matriculaci&oacute;n de los usuarios que aparecen en la galer&iacute;a y la fecha de su &uacute;ltima visita y el tiempo (en d&iacute;as) desde su &uacute;ltima visita. El seguimiento es meramente informativo para el administrador de la galer&iacute;a.';
    49 $lang['UAM_commentTitle'] = 'Nickname obligatorio para los comentarios de los huéspedes';
    50 $lang['UAM_commentTitle_d'] = 'Si &quot;Comentarios para Todos&quot; est&aacute; activo (a los visitantes no registrados para enviar comentarios), esta opci&oacute;n permite forzar el visitante no registrado para ingresar un apodo para que se acepta el comentario.';
    5149$lang['UAM_tipsTitle'] = 'Consejos y ejemplos';
    5250$lang['UAM_tipsTitle_d'] = 'Consejos y diversos ejemplos de uso de';
     
    281279/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    282280// --------- End: New or revised $lang ---- from version 2.20.4
    283 
    284 
    285 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    286 /*TODO*/$lang['UAM_GroupCommTitle'] = 'Allow comments to a group of users';
    287 /*TODO*/$lang['UAM_GroupCommTitle_d'] = 'This option lets you specify a group of users who will allowed to post comments when the gallery is configured to not allow comments for all.
    288 <br><br>
    289 By default, when &quot;comments for all&quot; option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
    290 // --------- End: New or revised $lang ---- from version 2.20.7
    291281?>
  • extensions/UserAdvManager/trunk/language/es_ES/plugin.lang.php

    r10957 r11018  
    2828$lang['UAM_Err_audit_email_forbidden'] = '<b>Esta cuenta utiliza un proveedor de correo electrónico  prohibido:</b> ';
    2929$lang['UAM_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';
    30 $lang['UAM_Empty Author'] = 'El campo de autor tienen que ser llenados para enviar un comentario.';
    3130$lang['UAM_reg_err_login2'] = 'El nombre de usuario no puede coincidir con los siguientes caracteres: ';
    3231$lang['UAM_reg_err_login5'] = 'Su proveedor de correo electrónico está prohibido para el registro. Proveedores de correo electrónico en veda son: ';
     
    145144$lang['UAM_GhostTracker_ReminderText'] = 'Personalización del mensaje recordatorio de Ghost Tracker';
    146145$lang['UAM_LastVisit'] = ' Seguimiento de usuarios registrados';
    147 $lang['UAM_No_Comment_Anonymous'] = 'Nickname obligatorio para los comentarios de los huéspedes';
    148146
    149147$lang['UAM_Tab_UserManager'] = 'Seguimiento de las validaciones';
     
    370368$lang['UAM_HidePassw'] = 'Contraseña en texto claro en la información del correo electrónico';
    371369// --------- End: New or revised $lang ---- from version 2.20.4
    372 
    373 
    374 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    375 /*TODO*/$lang['UAM_Group_Comments'] = 'Allow comments to a group of users';
    376 /*TODO*/$lang['UAM_AllowedComm_Group'] = 'Select the group of users allowed to post comments:';
    377 /*TODO*/$lang['UAM_Not_Allowed_Author'] = 'Sorry, you are not authorized to post a comment. Please contact the site administrator.';
    378 // --------- End: New or revised $lang ---- from version 2.20.7
    379370?>
  • extensions/UserAdvManager/trunk/language/fr_FR/help/plugin.lang.php

    r10957 r11018  
    4646$lang['UAM_lastvisitTitle'] = 'Suivi des utilisateurs inscrits';
    4747$lang['UAM_lastvisitTitle_d'] = 'Cette option active, dans l\'onglet &quot;Suivi des utilisateurs&quot;, un tableau recensant les utilisateurs inscrits, la date de leur dernière visite et le nombre de jours écoulés depuis leur dernière visite. Il s\'agit d\'un suivi purement informatif pour l\'administrateur de la galerie.';
    48 $lang['UAM_commentTitle'] = 'Commentaires : pseudo obligatoire pour les non-inscrits.';
    49 $lang['UAM_commentTitle_d'] = 'Lorsque les visiteurs non inscrits sont autorisés à poster des commentaires (&quot;Commentaires pour tous&quot; actif), cette option oblige le visiteur non inscrit à saisir un pseudo pour que le commentaire soit accepté.';
    5048$lang['UAM_tipsTitle'] = 'Astuces et exemples';
    5149$lang['UAM_tipsTitle_d'] = 'Astuces et exemples divers d\'utilisation';
     
    281279$lang['UAM_HidePasswTitle_d'] = 'Choisissez ici si vous souhaitez faire afficher le mot de passe choisi par le visiteur dans le mail d\'information. Si vous activez l\'option, le mot de passe apparaitra alors en clair. Si vous la désactivez, le mot de passe n\'apparaitra pas du tout.';
    282280// --------- End: New or revised $lang ---- from version 2.20.4
    283 
    284 
    285 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    286 $lang['UAM_GroupCommTitle'] = 'Autoriser les commentaires pour un groupe d\'utilisateurs';
    287 $lang['UAM_GroupCommTitle_d'] = 'Cette option permet de spécifier un groupe d\'utilisateurs qui seront autorisés à poster des commentaires lorsque la galerie est configurée pour ne pas autoriser les commentaires pour tous.
    288 <br><br>
    289 Par défaut, lorsque les &quot;commentaires pour tous&quot; sont désactivés, seuls les utilisateurs inscrits peuvent poster des commentaires. Avec cette option, vous pouvez restreindre d\'avantage ce fonctionnement en précisant un groupe d\'utilisateurs. Ainsi, seuls les utilisateurs inscrits et faisant partie de ce groupe pourront poster des commentaires.';
    290 // --------- End: New or revised $lang ---- from version 2.20.7
    291281?>
  • extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php

    r10957 r11018  
    2727$lang['UAM_Err_audit_email_forbidden'] = '<b>Ce compte contient des domaines de messagerie interdit :</b> ';
    2828$lang['UAM_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>';
    29 $lang['UAM_Empty Author'] = 'Le champs auteur doit être rempli pour enregistrer un commentaire.';
    3029$lang['UAM_reg_err_login2'] = 'le nom utilisateur ne doit pas contenir les caractère suivants : ';
    3130$lang['UAM_reg_err_login5'] = 'L\'adresse email est issue d\'un prestataire interdit. Les prestataires d\'adresses email interdits à l\'inscription sont : ';
     
    144143$lang['UAM_GhostTracker_ReminderText'] = 'Texte de rappel personnalisé';
    145144$lang['UAM_LastVisit'] = ' Suivi des utilisateurs inscrits';
    146 $lang['UAM_No_Comment_Anonymous'] = 'Commentaires : pseudo obligatoire pour les non-inscrits';
    147145
    148146$lang['UAM_Tab_UserManager'] = 'Suivi des validations';
     
    331329$lang['UAM_HidePassw'] = 'Mot de passe en clair dans le mail d\'information';
    332330// --------- End: New or revised $lang ---- from version 2.20.4
    333 
    334 
    335 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    336 $lang['UAM_Group_Comments'] = 'Autoriser les commentaires pour un groupe d\'utilisateurs';
    337 $lang['UAM_AllowedComm_Group'] = 'Sélectionnez le groupe d\'utilisateurs autorisé à poster des commentaires :';
    338 $lang['UAM_Not_Allowed_Author'] = 'Désolé, vous n\'êtes pas autorisé à poster un commentaire. Veuillez contacter l\'administrateur du site.';
    339 // --------- End: New or revised $lang ---- from version 2.20.7
    340331?>
  • extensions/UserAdvManager/trunk/language/it_IT/help/plugin.lang.php

    r10957 r11018  
    4747/* TODO */$lang['UAM_lastvisitTitle'] = 'Tracking registered users';
    4848/* TODO */$lang['UAM_lastvisitTitle_d'] = 'This activates a table in the &quot;Tracking users&quot; tab which are registered users listed on the gallery and the date of their last visit and time spent (in days) since their last visit. Monitoring is purely informative for the administrator of the gallery.';
    49 /* TODO */$lang['UAM_commentTitle'] = 'Nickname mandatory for guests comments';
    50 /* TODO */$lang['UAM_commentTitle_d'] = 'If &quot;Comments for All&quot; is active (authority to unregistered visitors to post comments), this option allows to force the non-registered visitor to enter a nickname that the comment is accepted.';
    5149/* TODO */$lang['UAM_tipsTitle'] = 'Tips and Examples';
    5250/* TODO */$lang['UAM_tipsTitle_d'] = 'Tips and various examples of use';
     
    272270/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    273271// --------- End: New or revised $lang ---- from version 2.20.4
    274 
    275 
    276 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    277 /*TODO*/$lang['UAM_GroupCommTitle'] = 'Allow comments to a group of users';
    278 /*TODO*/$lang['UAM_GroupCommTitle_d'] = 'This option lets you specify a group of users who will allowed to post comments when the gallery is configured to not allow comments for all.
    279 <br><br>
    280 By default, when &quot;comments for all&quot; option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
    281 // --------- End: New or revised $lang ---- from version 2.20.7
    282272?>
  • extensions/UserAdvManager/trunk/language/it_IT/plugin.lang.php

    r10957 r11018  
    2727$lang['UAM_Err_audit_email_forbidden'] = '<b>Questo conto utente usa un dominio d\'Email proibito:</b> ';
    2828$lang['UAM_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';
    29 $lang['UAM_Empty Author'] = 'Il campo autore deve essere riempito per potere inviare un commento.';
    3029$lang['UAM_reg_err_login2'] = 'Nome utente non deve contenere in caratteri seguenti: ';
    3130$lang['UAM_reg_err_login5'] = 'Il tuo provider di posta usa dominio d\'Email proibito. I domini preibiti sono i seguenti: ';
     
    145144$lang['UAM_GhostTracker_ReminderText'] = 'Testo di rilancio personalizzato';
    146145$lang['UAM_LastVisit'] = ' Tracciamento utenti registrati';
    147 $lang['UAM_No_Comment_Anonymous'] = 'Commenti : Pseudo obbligatorio per gli ospiti';
    148146
    149147$lang['UAM_Tab_UserManager'] = 'Tracciamento convalide';
     
    329327$lang['UAM_HidePassw'] = 'Password in chiaro nelle informazioni e-mail';
    330328// --------- End: New or revised $lang ---- from version 2.20.4
    331 
    332 
    333 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    334 /*TODO*/$lang['UAM_Group_Comments'] = 'Allow comments to a group of users';
    335 /*TODO*/$lang['UAM_AllowedComm_Group'] = 'Select the group of users allowed to post comments:';
    336 /*TODO*/$lang['UAM_Not_Allowed_Author'] = 'Sorry, you are not authorized to post a comment. Please contact the site administrator.';
    337 // --------- End: New or revised $lang ---- from version 2.20.7
    338329?>
  • extensions/UserAdvManager/trunk/language/lv_LV/help/plugin.lang.php

    r10957 r11018  
    5353$lang['UAM_lastvisitTitle'] = 'Reģistrēto lietotāju izsekošana (Tracking)';
    5454$lang['UAM_lastvisitTitle_d'] = 'Šis aktivē tabulu &quot;Tracking users&quot; iezīmē (tabā), kurā reģistrēti galeriju apmeklējušie lietotāji, viņu pēdējā apmeklējuma datums, kā arī galerijā pavadītais laiks (dienās) kopš pēdējā apmeklējuma. Monitoringam ir tīri informatīvs raksturs galerijas administratora vajadzībām.';
    55 $lang['UAM_commentTitle'] = 'Viesa komentāriem obligāts Nickname (segvārds)';
    56 $lang['UAM_commentTitle_d'] = 'Ja &quot;Comments for All&quot; (komentāri visiem) ir aktīvs (pilnvaras neriģestrētiem lietotājiem pievienot komentārus), šī opcija dod iespēju piespiest nereģistrētos apmeklētājus lietot segvārdu, lai akceptētu savu komentāru.';
    5755$lang['UAM_tipsTitle'] = 'Padomi un Piemēri';
    5856$lang['UAM_tipsTitle_d'] = 'Padomi un dažādi izmantošanas piemēri';
     
    307305/*TODO*/$lang['UAM_HidePasswTitle_d'] = 'Choose here if you want to display the password chosen by the visitor in the information email. If you enable the option, the password will then appear in clear text. If you disable the password will not appear at all.';
    308306// --------- End: New or revised $lang ---- from version 2.20.4
    309 
    310 
    311 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    312 /*TODO*/$lang['UAM_GroupCommTitle'] = 'Allow comments to a group of users';
    313 /*TODO*/$lang['UAM_GroupCommTitle_d'] = 'This option lets you specify a group of users who will allowed to post comments when the gallery is configured to not allow comments for all.
    314 <br><br>
    315 By default, when &quot;comments for all&quot; option is disabled, only registered users can post comments. With this option, you can restrict this behavior by specifying a user group. Thus, only registered users and members of this group may post comments.';
    316 // --------- End: New or revised $lang ---- from version 2.20.7
    317307?>
  • extensions/UserAdvManager/trunk/language/lv_LV/plugin.lang.php

    r10957 r11018  
    2727$lang['UAM_Err_audit_email_forbidden'] = '<b>Šinī kontā izmanots neatļauts e-pasta pakalpojuma sniedzējs :</b> ';
    2828$lang['UAM_Err_audit_advise'] = '<b>Jums ir jāveic korekcijas, lai panāktu atbilstību jaunajiem nosacījumiem, ko esat aktivizējuši.<br> Izmantojiet datu bāzes pārvaldības rīku, lai koriģētu lietotāja kontus tieši tabulā ###_USERS';
    29 $lang['UAM_Empty Author'] = 'Lai nosūtītu komentāru, ir jābūt aizpildītam autora laukam.';
    3029$lang['UAM_reg_err_login2'] = 'Lietotājvārdam nav jāsakrīt ar sekojošām rakstzīmēm: ';
    3130$lang['UAM_reg_err_login5'] = 'Jūsu e-pasta pakalpojumu sniedzējam aizliegta reģistrācija. Aizniegtie e-pasta pakalpojumu sniedzēji ir: ';
     
    143142$lang['UAM_GhostTracker_ReminderText'] = 'Ghost Tracker atgadinājuma ziņojuma pielāgošana';
    144143$lang['UAM_LastVisit'] = ' Reģistrēto lietotāju izsekošana';
    145 $lang['UAM_No_Comment_Anonymous'] = 'Viesu komentāriem iesauka (Nickname) obligāta';
    146144
    147145$lang['UAM_Tab_UserManager'] = 'Apstiprinājumu izsekošana';
     
    367365/*TODO*/$lang['UAM_HidePassw'] = 'Clear password in information email';
    368366// --------- End: New or revised $lang ---- from version 2.20.4
    369 
    370 
    371 // --------- Starting below: New or revised $lang ---- from version 2.20.7
    372 /*TODO*/$lang['UAM_Group_Comments'] = 'Allow comments to a group of users';
    373 /*TODO*/$lang['UAM_AllowedComm_Group'] = 'Select the group of users allowed to post comments:';
    374 /*TODO*/$lang['UAM_Not_Allowed_Author'] = 'Sorry, you are not authorized to post a comment. Please contact the site administrator.';
    375 // --------- End: New or revised $lang ---- from version 2.20.7
    376367?>
  • extensions/UserAdvManager/trunk/main.inc.php

    r10942 r11018  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.20.7
     4Version: 2.20.8
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
     
    5757add_event_handler('init', 'UAM_InitPage');
    5858
    59 // Comment without author
    60 add_event_handler('user_comment_check', 'UAM_CheckEmptyCommentAuthor', 50, 2);
    61 
    6259// PWG_Stuffs module
    63 if ((isset($conf_UAM[34]) and $conf_UAM[34] == 'true'))
     60if ((isset($conf_UAM[33]) and $conf_UAM[33] == 'true'))
    6461{
    6562  add_event_handler('get_stuffs_modules', 'register_UAM_stuffs_module');
  • extensions/UserAdvManager/trunk/maintain.inc.php

    r10957 r11018  
    1414        global $conf;
    1515       
    16   $default1 = array('false','false',-1,-1,-1,'false','false','',-1,'','','false','','false',100,'false','false',10,'Hello [username].
     16  $default1 = array('false','false',-1,-1,-1,'false','',-1,'','','false','','false',100,'false','false',10,'Hello [username].
    1717       
    1818This is a reminder because a very long time passed since your last visit on our gallery [mygallery]. 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.
     
    259259      upgrade_2204_2207();
    260260    }
     261
     262    if (version_compare($conf['UserAdvManager_Version'], '2.20.8') < 0)
     263    {
     264    /* upgrade from version 2.20.7 to 2.20.8 */
     265    /* ************************************* */
     266      upgrade_2207_2208();
     267    }
    261268  }
    262269
Note: See TracChangeset for help on using the changeset viewer.