Changeset 17988 for extensions/UserAdvManager/trunk
- Timestamp:
- Sep 18, 2012, 7:14:24 PM (12 years ago)
- Location:
- extensions/UserAdvManager/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/UserAdvManager/trunk/admin/UAM_admin.php
r17972 r17988 650 650 'UAM_ERROR_REPORTS4' => $UAM_Illegal_Flag_Error3, 651 651 'UAM_EMAIL_MANDATORY' => $UAM_Email_Mandatory_Check, 652 'UAM_CONFIRMMAIL_TIMEOUT_TRUE' => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' ,652 'UAM_CONFIRMMAIL_TIMEOUT_TRUE' => $conf_UAM_ConfirmMail[0]=='true' ? 'checked="checked"' : '' , 653 653 'UAM_CONFIRMMAIL_TIMEOUT_FALSE' => $conf_UAM_ConfirmMail[0]=='false' ? 'checked="checked"' : '' , 654 'UAM_CONFIRMMAIL_DELAY' 654 'UAM_CONFIRMMAIL_DELAY' => $conf_UAM_ConfirmMail[1], 655 655 'UAM_CONFIRMMAIL_REMAIL_TRUE' => $conf_UAM_ConfirmMail[3]=='true' ? 'checked="checked"' : '', 656 656 'UAM_CONFIRMMAIL_REMAIL_FALSE' => $conf_UAM_ConfirmMail[3]=='false' ? 'checked="checked"' : '', -
extensions/UserAdvManager/trunk/include/functions.inc.php
r17987 r17988 1181 1181 if (isset($conf_UAM[1]) and $conf_UAM[1] == 'local') 1182 1182 { 1183 <<<<<<< .mine 1184 $keyargs_content = array(); 1185 $keyargs_content[] = get_l10n_args('Manual validation needed for %s', $username); 1186 $keyargs_content[] = get_l10n_args('UAM_Link: %s', AddConfirmMail($id, $email)); 1187 pwg_mail_notification_admins(get_l10n_args('Manual validation for %s',$username),$keyargs_content,false); 1188 # $admins = array(); 1189 # $query = ' 1190 # SELECT 1191 # u.'.$conf['user_fields']['username'].' AS username, 1192 # u.'.$conf['user_fields']['email'].' AS mail_address 1193 # FROM '.USERS_TABLE.' AS u 1194 # JOIN '.USER_INFOS_TABLE.' AS i ON i.user_id = u.'.$conf['user_fields']['id'].' 1195 # WHERE i.status in (\'webmaster\', \'admin\') 1196 # AND '.$conf['user_fields']['email'].' IS NOT NULL 1197 # AND i.user_id <> '.$user['id'].' 1198 # ORDER BY username 1199 # ;'; 1200 # 1201 # $datas = pwg_query($query); 1202 # if (!empty($datas)) 1203 # { 1204 # while ($admin = pwg_db_fetch_assoc($datas)) 1205 # { 1206 # if (!empty($admin['mail_address'])) 1207 # { 1208 # array_push($admins, format_email($admin['username'], $admin['mail_address'])); 1209 # } 1210 # } 1211 # } 1212 # pwg_mail(implode(', ', $admins), array( 1213 # 'subject' => $subject, 1214 # 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 1215 # )); 1216 ======= 1183 1217 $admins = array(); 1184 1218 $query = ' … … 1208 1242 'content' => (isset($infos1) ? $infos1_perso.l10n_args($infos1)."\n\n" : "").(isset($infos2) ? $infos2_perso.l10n_args($infos2)."\n\n" : "").get_absolute_root_url(), 1209 1243 )); 1244 >>>>>>> .r17987 1210 1245 } 1211 1246 else -
extensions/UserAdvManager/trunk/language/fr_FR/plugin.lang.php
r17947 r17988 14 14 $lang['UAM_User: %s'] = 'Utilisateur : %s'; 15 15 $lang['UAM_Password: %s'] = 'Mot de passe: %s'; 16 $lang['UAM_Link: %s'] = 'Cliquez sur le lien suivant pour confirmer votreinscription : %s';16 $lang['UAM_Link: %s'] = 'Cliquez sur le lien suivant pour confirmer l\'inscription : %s'; 17 17 18 18 … … 432 432 Note : Ce message disparaitra après que vous ayez effectué la correction nécessaire et rechargé la page d\'administration.<br><br>'; 433 433 // --------- End: New or revised $lang ---- from version 2.40.4 and 2.30.7 434 435 // --------- Starting below: New or revised $lang ---- from version 2.41.0 436 $lang['Manual validation for %s'] = 'Inscription de %s à valider'; 437 // --------- End: New or revised $lang ---- from version 2.41.0 434 438 ?>
Note: See TracChangeset
for help on using the changeset viewer.