adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-06 09:52:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolved Issue ID 0000507:

Browse Source 
o format of email
  o max_execution_time equal to 0
  o -f with only adress mail
  o use of standard function get_webmaster_mail_address

2 news $conf parameters.

Merge branch-1_6 r1529:1530 into BSF


git-svn-id: http://piwigo.org/svn/trunk@1531 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-08-09 22:10:12 +00:00
parent 9d38573074
commit e097dba6a6
4 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_mail.inc.php
+14 -5
View File
@@ -78,15 +78,24 @@ function get_mail_configuration()
*/
function format_email($name, $email)
{
$cvt7b_name = str_translate_to_ascii7bits($name);
global $conf;
if (strpos($email, '<') === false)
if ($conf['enabled_format_email'])
{
return $cvt7b_name.' <'.$email.'>';
$cvt7b_name = str_translate_to_ascii7bits($name);
if (strpos($email, '<') === false)
{
return $cvt7b_name.' <'.$email.'>';
}
else
{
return $cvt7b_name.$email;
}
}
else
{
return $cvt7b_name.$email;
return $email;
}
}
@@ -128,7 +137,7 @@ function pwg_mail($to, $from = '', $subject = 'PhpWebGallery', $infos = '')
if ($conf_mail['mail_options'])
{
$options = '-f '.$from;
$options = '-f '.$conf_mail['email_webmaster'];
return mail($to, $cvt7b_subject, $content, $headers, $options);
}