Commit 64c1b5f1 authored by Kjartan's avatar Kjartan

- updated configuration/user.module to use ini_get("sendmail_from") as

  default value.
parent fc88037a
......@@ -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.");
......
......@@ -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.");
......
......@@ -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"] ."' &lt;". $edit["mail"] ."&gt;");
$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) {
......
......@@ -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"] ."' &lt;". $edit["mail"] ."&gt;");
$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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment