Changeset 7657


Ignore:
Timestamp:
11/05/10 19:19:52 (9 years ago)
Author:
Eric
Message:

Merge from Trunk to Branch 2.15

Location:
extensions/NBC_UserAdvManager/branches/2.15
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/NBC_UserAdvManager/branches/2.15/include/functions.inc.php

    r6787 r7657  
    66function SendMail2User($typemail, $id, $username, $password, $email, $confirm) 
    77{ 
    8   /* Only available for next Piwigo release (bug in switch_lang function) */ 
    98  global $conf; 
    109 
  • extensions/NBC_UserAdvManager/branches/2.15/main.inc.php

    r7278 r7657  
    22/* 
    33Plugin Name: UserAdvManager 
    4 Version: 2.15.8 
     4Version: 2.15.9 
    55Description: Renforcer la gestion des utilisateurs - Enforce users management 
    66Plugin URI: http://fr.piwigo.org/ext/extension_view.php?eid=216 
     
    110110  if ($register_user['username'] != "16" and $register_user['username'] != "18") 
    111111  { 
    112     if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') and ($register_user['username'] != "16" and $register_user['username'] != "18")) 
     112    if ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')) 
    113113    { 
    114114      /* This is to send an information email and set user to "waiting" group or status until admin validation */ 
     
    117117      setgroup($register_user['id']);// Set to "waiting" group or status until admin validation 
    118118    } 
    119     elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'false') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') and ($register_user['username'] != "16" and $register_user['username'] != "18")) 
     119    elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'false') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'local')) 
    120120    { 
    121121      /* This is to set user to "waiting" group or status until admin validation */ 
    122122      setgroup($register_user['id']);// Set to "waiting" group or status until admin validation 
    123123    } 
    124     elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'false') and ($register_user['username'] != "16" and $register_user['username'] != "18")) 
     124    elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'false')) 
    125125    { 
    126126      /* This is to send an information email without validation key */ 
     
    129129    } 
    130130    /* Sending registration confirmation by email */ 
    131     elseif ((isset($conf_UAM[0]) and $conf_UAM[0] == 'true') and (isset($conf_UAM[1]) and $conf_UAM[1] == 'true') and ($register_user['username'] != "16" and $register_user['username'] != "18")) 
     131    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')) 
    132132    { 
    133133      if (is_admin() and isset($conf_UAM[20]) and $conf_UAM[20] == 'true') 
Note: See TracChangeset for help on using the changeset viewer.