Changeset 901

Timestamp:

Oct 18, 2005, 11:37:08 PM (19 years ago)

Author:

plg

Message:

• bug 159 and 166 fixed: parameter "options" for mail() function disabled by default.

Location:

trunk

Files:

• doc/ChangeLog (modified) (1 diff)
• include/config_default.inc.php (modified) (3 diffs)
• password.php (modified) (1 diff)

trunk/doc/ChangeLog

@@ +1 @@
+2005-10-18 Pierrick LE GALL
+
+        * bug 159 and 166 fixed: parameter "options" for mail() function
+        disabled by default.
+
 2005-10-18 chrisaga
 

trunk/include/config_default.inc.php

@@ -179 +179 @@
 $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                                |
@@ -362 +366 @@
 
 // +-----------------------------------------------------------------------+
-// |                               history                                   |
+// |                               history                                 |
 // +-----------------------------------------------------------------------+
 
@@ -368 +372 @@
 $conf['nb_logs_page'] = 300;
 
-// history__admin : history admin visits  ?
+// history_admin : history admin visits  ?
 $conf['history_admin'] = false;
 

trunk/password.php

@@ -53 +53 @@
   $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);
+  }
 }