Changeset 3404:2d629dd0e6e9

Timestamp:

11/12/16 10:08:45 (9 years ago)

Author:

Jean-Christian Denis

Branch:

default

Message:

Add field for master email to install wizard, addresses #2132

File:

• admin/install/wizard.php (modified) (4 diffs)

admin/install/wizard.php

@@ -61 +61 @@
 $DBPASSWORD = !empty($_POST['DBPASSWORD']) ? $_POST['DBPASSWORD'] : '';
 $DBPREFIX = !empty($_POST['DBPREFIX']) ? $_POST['DBPREFIX'] : 'dc_';
+$ADMINMAILFROM = !empty($_POST['ADMINMAILFROM']) ? $_POST['ADMINMAILFROM'] : '';
 
 if (!empty($_POST))
@@ -98 +99 @@
                throw new Exception(__('Dotclear is already installed.'));
           }
+          # Check master email
+          if (!text::isEmail($ADMINMAILFROM)) {
+               throw new Exception(__('Master email is not valid.'));
+          }
 
           # Does config.php.in exist?
@@ -122 +127 @@
           $admin_url = preg_replace('%install/wizard.php$%','',$_SERVER['REQUEST_URI']);
           writeConfigValue('DC_ADMIN_URL',http::getHost().$admin_url,$full_conf);
-          writeConfigValue('DC_ADMIN_MAILFROM','dotclear@'.$_SERVER['HTTP_HOST'],$full_conf);
+          $admin_email = !empty($ADMINMAILFROM) ? $ADMINMAILFROM : 'dotclear@'.$_SERVER['HTTP_HOST'];
+          writeConfigValue('DC_ADMIN_MAILFROM',$admin_email,$full_conf);
           writeConfigValue('DC_MASTER_KEY',md5(uniqid()),$full_conf);
 
@@ -206 +212 @@
 '<p><label for="DBPREFIX" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Database Tables Prefix:').'</label> '.
 form::field('DBPREFIX',30,255,html::escapeHTML($DBPREFIX)).'</p>'.
+'<p><label for="ADMINMAILFROM">'.__('Master Email: (used as sender for password recovery)').'</label> '.
+form::field('ADMINMAILFROM',30,255,html::escapeHTML($ADMINMAILFROM)).'</p>'.
 
 '<p><input type="submit" value="'.__('Continue').'" /></p>'.