Changeset 13822


Ignore:
Timestamp:
Mar 30, 2012, 9:38:52 PM (9 years ago)
Author:
Eric
Message:

Bug 2602 fixed - Sql error when Confirmation by admin is set
en_UK reference translation spellchecking

Location:
extensions/UserAdvManager/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/UserAdvManager/trunk/changelog.txt.php

    r13213 r13822  
    285285
    286286-- 2.30.4 : Bug 2580 fixed - DE translation files corrupted
     287
     288-- 2.30.5 : Bug 2583 fixed - help.lang.php was not loaded correctly
     289            Bug 2602 fixed - Sql error when Confirmation by admin is set
     290            en_UK reference translation spellchecking
     291            de_DE translation updated
     292            fr_FR translation updated
     293
     294**************************************************************
     295***** Plugin history (branch 2.40 - Piwigo 2.4 compliant)*****
     296**************************************************************
     297-- 2.40.0 : Bug 2570 fixed - Adding Wiki link to complete plugin documentation
     298            Bug 2591 fixed - Excluding Adult_Content generic users from users tracking list
    287299*/
    288300?>
  • extensions/UserAdvManager/trunk/include/functions.inc.php

    r13528 r13822  
    100100  if ($register_user['username'] != "16" and $register_user['username'] != "18")
    101101  {
     102    $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
     103   
    102104    if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local'))
    103105    {
    104106      // This is to send an information email and set user to "waiting" group or status until admin validation
    105107      // -----------------------------------------------------------------------------------------------------
    106       $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    107108      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
    108109      SetPermission($register_user['id']);// Set to "waiting" group or status until admin validation
     
    118119      // This is to send an information email without validation key
    119120      // -----------------------------------------------------------
    120       $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    121121      SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
    122122    }
     
    127127      if (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'true')
    128128      {
    129         $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    130129        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
    131130      }
    132131      elseif (is_admin() and isset($conf_UAM[19]) and $conf_UAM[19] == 'false')
    133132      {
    134         $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    135133        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], false);
    136134      }
    137135      elseif (!is_admin())
    138136      {
    139         $passwd = (isset($_POST['password'])) ? $_POST['password'] : '';
    140137        SendMail2User(1, $register_user['id'], $register_user['username'], $passwd, $register_user['email'], true);
    141138      }
     
    15981595  }
    15991596
    1600   if (!is_admin() and $conf_UAM[2] <> -1) // Set privacy level
     1597  if (!is_admin() and $conf_UAM[35] <> -1) // Set privacy level
    16011598  {
    16021599    $query = "
     
    16041601  (user_id, level)
    16051602VALUES
    1606   ('".$user_id."', '".$conf_UAM[level]."')
     1603  ('".$user_id."', '".$conf_UAM[35]."')
    16071604;";
    16081605    pwg_query($query);
  • extensions/UserAdvManager/trunk/language/en_UK/plugin.lang.php

    r13245 r13822  
    240240$lang['UAM_Default_ConfirmMail_Txt'] = 'Hello [username]! Thank you to have register on [mygallery].
    241241
    242 To complete the procedure and be able to browse through the pictures, thank you kindly confirm your registration by clicking on the link in this message.';
     242To complete the process and be able to browse through the pictures, thank you kindly confirm your registration by clicking on the link in this message.';
    243243$lang['UAM_Default_GhstReminder_Txt'] = 'Hello [username].
    244244       
  • extensions/UserAdvManager/trunk/main.inc.php

    r13285 r13822  
    22/*
    33Plugin Name: UserAdvManager
    4 Version: 2.30.4
     4Version: 2.40.0
    55Description: Renforcer la gestion des utilisateurs - Enforce users management
    66Plugin URI: http://piwigo.org/ext/extension_view.php?eid=216
Note: See TracChangeset for help on using the changeset viewer.