Changeset 21827 for branches/version-2_12-dev/data

Timestamp:

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

Author:

nanasess

bzr:base-revision:

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

bzr:committer:

Kentaro Ohkouchi <nanasess@fsm.ne.jp>

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:

nanasess@fsm.ne.jp-20120513153829-mzuromauqoy0gftz

bzr:repository-uuid:

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

bzr:revision-id:

nanasess@fsm.ne.jp-20120513153930-ytysgid7azrgnu46

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: nanasess@fsm.ne.jp-20120513153930-ytysgid7azrgnu46
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 に移動

Location:

branches/version-2_12-dev/data

Files:

• class/SC_SendMail.php (modified) (1 diff)
• mtb_constants_init.php (modified) (1 diff)

branches/version-2_12-dev/data/class/SC_SendMail.php

@@ -303 +303 @@
                     'port' => $this->port,
                 );
+                if (defined('SMTP_USER')
+                    && defined('SMTP_PASSWORD')
+                    && !SC_Utils_Ex::isBlank(SMTP_USER)
+                    && !SC_Utils_Ex::isBlank(SMTP_PASSWORD)) {
+                    $arrParams['auth'] = true;
+                    $arrParams['username'] = SMTP_USER;
+                    $arrParams['password'] = SMTP_PASSWORD;
+                }
                 break;
         }

branches/version-2_12-dev/data/mtb_constants_init.php

@@ -307 +307 @@
 /** 商品レビューでURL書き込みを許可するか否か */
 define('REVIEW_ALLOW_URL', 0);
-/** Pear::Mail バックエンド:"mail"|"smtp"|"sendmail" */
-define('MAIL_BACKEND', "mail");
-/** SMTPサーバー (MAIL_BACKEND が "smtp" の場合のみ) */
-define('SMTP_HOST', "127.0.0.1");
-/** SMTPポート (MAIL_BACKEND が "smtp" の場合のみ) */
-define('SMTP_PORT', "25");
 /** アップデート時にサイト情報を送出するか */
 define('UPDATE_SEND_SITE_INFO', false);