diff options
| author | plegall <plg@piwigo.org> | 2005-10-18 21:37:08 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2005-10-18 21:37:08 +0000 |
| commit | 0aa1bcc73ceb24d91d5483171af994a05d2e60b0 (patch) | |
| tree | bf9e9dc2461479e692e32c24c358f0c7b1739247 | |
| parent | 7a37fded516452ec62ffb60124408b1120a81088 (diff) | |
- bug 159 and 166 fixed: parameter "options" for mail() function disabled by
default.
git-svn-id: http://piwigo.org/svn/trunk@901 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | doc/ChangeLog | 5 | ||||
| -rw-r--r-- | include/config_default.inc.php | 8 | ||||
| -rw-r--r-- | password.php | 11 |
3 files changed, 20 insertions, 4 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog index 70cc30e6c..a38f0ae93 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2005-10-18 Pierrick LE GALL + + * bug 159 and 166 fixed: parameter "options" for mail() function + disabled by default. + 2005-10-18 chrisaga * display : smaller font-size and, as requested, fonts more like 1.4 diff --git a/include/config_default.inc.php b/include/config_default.inc.php index 119aafde2..3b48dc72a 100644 --- a/include/config_default.inc.php +++ b/include/config_default.inc.php @@ -178,6 +178,10 @@ $conf['prefix_thumbnail'] = 'TN-'; // Administration>Identification>Users? $conf['users_page'] = 20; +// mail_options: only set it true if you have a send mail warning with +// "options" parameter missing on mail() function execution. +$conf['mail_options'] = false; + // +-----------------------------------------------------------------------+ // | metadata | // +-----------------------------------------------------------------------+ @@ -361,13 +365,13 @@ $conf['upload_maxheight_thumbnail'] = 100; $conf['upload_maxwidth_thumbnail'] = 150; // +-----------------------------------------------------------------------+ -// | history | +// | history | // +-----------------------------------------------------------------------+ // nb_logs_page : how many logs to display on a page $conf['nb_logs_page'] = 300; -// history__admin : history admin visits ? +// history_admin : history admin visits ? $conf['history_admin'] = false; ?> diff --git a/password.php b/password.php index 0be971964..f5ee6b2f8 100644 --- a/password.php +++ b/password.php @@ -52,8 +52,15 @@ function pwg_mail($to, $from, $infos = '') $content = $infos; $content.= "\n\n-- \nPhpWebGallery ".PHPWG_VERSION; - - return mail($to, $subject, $content, $headers, $options); + + if ($conf['mail_options']) + { + return mail($to, $subject, $content, $headers, $options); + } + else + { + return mail($to, $subject, $content, $headers); + } } // +-----------------------------------------------------------------------+ |