Changeset 21827 for branches/version-2_12-dev/html/install/index.php

Timestamp:

2012/05/14 00:39:37 (14 years ago)

Author:

nanasess

bzr:base-revision:

svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_12-dev:21826

bzr:committer:

Kentaro Ohkouchi <[email protected]>

bzr:file-ids:

data/class/SC_SendMail.php 16322@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_SendMail.php
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/install/templates/step1.tpl 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Ftemplates%2Fstep1.tpl

bzr:mapping-version:

v4

bzr:merge:

[email protected]

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

[email protected]

bzr:revno:

4495

bzr:revprop:branch-nick:

branches/version-2_12-dev

bzr:root:

branches/version-2_12-dev

bzr:testament:

bazaar-ng testament short form 2.1
revision-id: [email protected]
sha1: 3fc6dd26982bec03024559e164c31ffa58931bd0

bzr:timestamp:

2012-05-14 00:39:30.311000109 +0900

bzr:user-agent:

bzr2.4.2+bzr-svn1.1.2

Message:

#1622 (SMTP Auth の対応)

• MAIL_BACKEND, SMTP 関連の定数を data/config/config.php に移動

File:

• branches/version-2_12-dev/html/install/index.php (modified) (4 diffs)

branches/version-2_12-dev/html/install/index.php

@@ -53 +53 @@
     'mysql' => '',
 );
+$objPage->arrMailBackend = array('mail' => 'mail',
+                                 'smtp' => 'SMTP',
+                                 'sendmail' => 'sendmail');
 
 $objDb = new SC_Helper_DB_Ex();
@@ -630 +633 @@
     }
 
+    if (defined('MAIL_BACKEND')) {
+        $mail_backend = MAIL_BACKEND;
+    }
+    if (defined('SMTP_HOST')) {
+        $smtp_host = SMTP_HOST;
+    }
+    if (defined('SMTP_PORT')) {
+        $smtp_port = SMTP_PORT;
+    }
+    if (defined('SMTP_USER')) {
+        $smtp_user = SMTP_USER;
+    }
+    if (defined('SMTP_PASSWORD')) {
+        $smtp_password = SMTP_PASSWORD;
+    }
+
     $objWebParam->addParam('店名', 'shop_name', MTEXT_LEN, '', array('EXIST_CHECK', 'MAX_LENGTH_CHECK'), $shop_name);
     $objWebParam->addParam('管理者：メールアドレス', 'admin_mail', null, '', array('EXIST_CHECK', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'), $admin_mail);
@@ -640 +659 @@
     $objWebParam->addParam('URL(セキュア)', 'secure_url', MTEXT_LEN, '', array('EXIST_CHECK', 'URL_CHECK', 'MAX_LENGTH_CHECK'), $secure_url);
     $objWebParam->addParam('ドメイン', 'domain', MTEXT_LEN, '', array('MAX_LENGTH_CHECK'));
+    $objWebParam->addParam('メーラーバックエンド', 'mail_backend', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK', 'EXIST_CHECK'), $mail_backend);
+    $objWebParam->addParam('SMTPホスト', 'smtp_host', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'), $smtp_host);
+    $objWebParam->addParam('SMTPポート', 'smtp_port', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'), $smtp_port);
+    $objWebParam->addParam('SMTPユーザー', 'smtp_user', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'), $smtp_user);
+    $objWebParam->addParam('SMTPパスワード', 'smtp_password', STEXT_LEN, 'a', array('MAX_LENGTH_CHECK'), $smtp_password);
 
     return $objWebParam;
@@ -962 +986 @@
                  . "define('AUTH_MAGIC', '"            . $auth_magic . "');\n"
                  . "define('PASSWORD_HASH_ALGOS', '"   . $algos . "');\n"
-                 . "define('RELEASE_YEAR', '"          . date('Y') . "');\n";
+                 . "define('RELEASE_YEAR', '"          . date('Y') . "');\n"
+                 . "define('MAIL_BACKEND', '"          . $objWebParam->getValue('mail_backend') . "');\n"
+                 . "define('SMTP_HOST', '"             . $objWebParam->getValue('smtp_host') . "');\n"
+                 . "define('SMTP_PORT', '"             . $objWebParam->getValue('smtp_port') . "');\n"
+                 . "define('SMTP_USER', '"             . $objWebParam->getValue('smtp_user') . "');\n"
+                 . "define('SMTP_PASSWORD', '"         . $objWebParam->getValue('smtp_password') . "');\n";
 
     if ($fp = fopen(CONFIG_REALFILE, 'w')) {