diff options
| -rw-r--r-- | modules/system.module | 3 | ||||
| -rw-r--r-- | modules/system/system.module | 3 | ||||
| -rw-r--r-- | modules/user.module | 4 | ||||
| -rw-r--r-- | modules/user/user.module | 4 |
4 files changed, 6 insertions, 8 deletions
diff --git a/modules/system.module b/modules/system.module index e29dada99..47c92862e 100644 --- a/modules/system.module +++ b/modules/system.module @@ -37,11 +37,10 @@ function system_link($type) { function system_view_options() { global $conf, $cmodes, $corder, $themes; - // general settings: $output .= "<h3>General settings</h3>\n"; $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 55, 55, "The name of this website."); - $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", "root@localhost"), 55, 128, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts."); + $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", ini_get("sendmail_from")), 55, 128, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts."); $output .= form_textfield("Slogan", "site_slogan", variable_get("site_slogan", ""), 55, 128, "The slogan of this website"); $output .= form_textarea("Mission", "site_mission", variable_get("site_mission", ""), 55, 5, "Your site's mission statement or focus."); $output .= form_textarea("Footer message", "site_footer", variable_get("site_footer", ""), 55, 5, "This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."); diff --git a/modules/system/system.module b/modules/system/system.module index e29dada99..47c92862e 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -37,11 +37,10 @@ function system_link($type) { function system_view_options() { global $conf, $cmodes, $corder, $themes; - // general settings: $output .= "<h3>General settings</h3>\n"; $output .= form_textfield("Name", "site_name", variable_get("site_name", "drupal"), 55, 55, "The name of this website."); - $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", "root@localhost"), 55, 128, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts."); + $output .= form_textfield("E-mail address", "site_mail", variable_get("site_mail", ini_get("sendmail_from")), 55, 128, "A valid e-mail address for this website, used by the auto-mailer to create new user accounts."); $output .= form_textfield("Slogan", "site_slogan", variable_get("site_slogan", ""), 55, 128, "The slogan of this website"); $output .= form_textarea("Mission", "site_mission", variable_get("site_mission", ""), 55, 5, "Your site's mission statement or focus."); $output .= form_textarea("Footer message", "site_footer", variable_get("site_footer", ""), 55, 5, "This text will be displayed at the bottom of each page. Useful for adding a copyright notice to your pages."); diff --git a/modules/user.module b/modules/user.module index df2e522bb..5fb552a2e 100644 --- a/modules/user.module +++ b/modules/user.module @@ -781,7 +781,7 @@ function user_pass($edit = array()) { if ($edit["name"] && $edit["mail"]) { if ($account = db_fetch_object(db_query("SELECT uid FROM users WHERE name = '". check_input($edit["name"]) ."' AND mail = '". check_input($edit["mail"]) ."'"))) { - $from = variable_get("site_mail", "root@localhost"); + $from = variable_get("site_mail", ini_get("sendmail_from")); $pass = user_password(); /* @@ -867,7 +867,7 @@ function user_register($edit = array()) { watchdog("user", "new user: '". $edit["name"] ."' <". $edit["mail"] .">"); - $from = variable_get("site_mail", "root@localhost"); + $from = variable_get("site_mail", ini_get("sendmail_from")); $pass = user_password(); if (variable_get("user_register", 1) == 1) { diff --git a/modules/user/user.module b/modules/user/user.module index df2e522bb..5fb552a2e 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -781,7 +781,7 @@ function user_pass($edit = array()) { if ($edit["name"] && $edit["mail"]) { if ($account = db_fetch_object(db_query("SELECT uid FROM users WHERE name = '". check_input($edit["name"]) ."' AND mail = '". check_input($edit["mail"]) ."'"))) { - $from = variable_get("site_mail", "root@localhost"); + $from = variable_get("site_mail", ini_get("sendmail_from")); $pass = user_password(); /* @@ -867,7 +867,7 @@ function user_register($edit = array()) { watchdog("user", "new user: '". $edit["name"] ."' <". $edit["mail"] .">"); - $from = variable_get("site_mail", "root@localhost"); + $from = variable_get("site_mail", ini_get("sendmail_from")); $pass = user_password(); if (variable_get("user_register", 1) == 1) { |