Changeset 1530
- Timestamp:
- Aug 10, 2006, 12:05:29 AM (18 years ago)
- Location:
- branches/branch-1_6
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1_6/admin/include/functions_notification_by_mail.inc.php
r1178 r1530 35 35 ); 36 36 37 if 38 ( 39 (!isset($env_nbm['sendmail_timeout'])) or 40 (!is_numeric($env_nbm['sendmail_timeout'])) or 41 ($env_nbm['sendmail_timeout'] <= 0) 42 ) 43 { 44 $env_nbm['sendmail_timeout'] = $conf['nbm_treatment_timeout_default']; 45 } 37 46 38 47 /* -
branches/branch-1_6/include/config_default.inc.php
r1471 r1530 206 206 $conf['send_bcc_mail_webmaster'] = false; 207 207 208 // enabled_format_email: 209 // on true email will be formatted with name and address 210 // on false email will be only address 211 // There are webhosting wich not allow email formatted (Lycos, ...) 212 $conf['enabled_format_email'] = true; 213 208 214 // check_upgrade_feed: check if there are database upgrade required. Set to 209 215 // true, a message will strongly encourage you to upgrade your database if … … 479 485 $conf['nbm_default_value_user_enabled'] = false; 480 486 481 // Search List user to send with quick (List all withoutcheck news)487 // Search list user to send quickly (List all without to check news) 482 488 // More quickly but less fun to use 483 489 $conf['nbm_list_all_enabled_users_to_send'] = false; 484 490 485 // Max mails sended on one pass 491 // Max time used on one pass in order to send mails. 492 // Timeout delay ratio. 486 493 $conf['nbm_max_treatment_timeout_percent'] = 0.8; 494 495 // If timeout cannot be compite with nbm_max_treatment_timeout_percent, 496 // nbm_treatment_timeout_default is used by default 497 $conf['nbm_treatment_timeout_default'] = 20; 487 498 488 499 // +-----------------------------------------------------------------------+ -
branches/branch-1_6/include/functions_mail.inc.php
r1362 r1530 79 79 function format_email($name, $email) 80 80 { 81 $cvt7b_name = str_translate_to_ascii7bits($name);81 global $conf; 82 82 83 if ( strpos($email, '<') === false)83 if ($conf['enabled_format_email']) 84 84 { 85 return $cvt7b_name.' <'.$email.'>'; 85 $cvt7b_name = str_translate_to_ascii7bits($name); 86 87 if (strpos($email, '<') === false) 88 { 89 return $cvt7b_name.' <'.$email.'>'; 90 } 91 else 92 { 93 return $cvt7b_name.$email; 94 } 86 95 } 87 96 else 88 97 { 89 return $ cvt7b_name.$email;98 return $email; 90 99 } 91 100 } … … 129 138 if ($conf_mail['mail_options']) 130 139 { 131 $options = '-f '.$ from;140 $options = '-f '.$conf_mail['email_webmaster']; 132 141 133 142 return mail($to, $cvt7b_subject, $content, $headers, $options); -
branches/branch-1_6/password.php
r1082 r1530 43 43 if (isset($_POST['submit'])) 44 44 { 45 // in case of error, creation of mailto link46 $query = '47 SELECT '.$conf['user_fields']['email'].'48 FROM '.USERS_TABLE.'49 WHERE '.$conf['user_fields']['id'].' = '.$conf['webmaster_id'].'50 ;';51 list($mail_webmaster) = mysql_fetch_array(pwg_query($query));52 53 45 $mailto = 54 '<a href="mailto:'. $mail_webmaster.'">'46 '<a href="mailto:'.get_webmaster_mail_address().'">' 55 47 .l10n('Contact webmaster') 56 48 .'</a>' … … 93 85 ; 94 86 95 if (pwg_mail($row['email'], $mail_webmaster, l10n('password updated'), $infos))87 if (pwg_mail($row['email'], '', l10n('password updated'), $infos)) 96 88 { 97 89 $data =
Note: See TracChangeset
for help on using the changeset viewer.