SMTP設定の分割

diff --git a/.gitignore b/.gitignore
index dd5742f..e73bacb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,6 @@
 app/tmp/*
 app/config/core.php
 app/config/database.php
+app/config/conf/mail.php
 app/webroot/media/*
 

diff --git a/app/config/bootstrap.php b/app/config/bootstrap.php
index ae101f8..1021ef7 100644 (file)
--- a/app/config/bootstrap.php
+++ b/app/config/bootstrap.php
@@ -44,6 +44,7 @@
 
 require_once ('init.php');
 require_once ('conf/config.php');
+require_once ('conf/mail.php');
 require_once ('conf/mobile.php');
 
 /* media plugin */

diff --git a/app/config/conf/config.php b/app/config/conf/config.php
index 371e827..2efeeef 100644 (file)
--- a/app/config/conf/config.php
+++ b/app/config/conf/config.php
@@ -4,41 +4,6 @@
  */
 
 /* 
- * 使用言語(Language)
- */
-// jpn:Japanese, en:English
-Configure::write('Config.language', 'jpn'); 
-
-/* メール送信設定 */
-// SMTP送信する
-Configure::write('Qdmailer.smtp', false);
-
-// SMTP設定
-// SMTP AUTH(認証が必要)
-Configure::write('Qdmailer.smtpServer', array(
-       'user' => 'username',
-       'pass' => 'password',
-       'host' => 'host',
-       'port' => 587,
-       'from' => 'from Address',
-       'protocol' => 'SMTP_AUTH',
-));
-// POP Before SMTP(送信前認証が必要)
-/*
-Configure::write('Qdmailer.smtpServer', array(
-       'user' => 'username',
-       'pass' => 'password',
-       'host' => 'host',
-       'port' => 587,
-       'from' => 'from Address',
-       'protocol'=>'POP_BEFORE',
-       'pop_host' =>'pop_host',
-       'pop_user' => 'pop_username',
-       'pop_pass'=> 'pop_password',
-));
-*/
-
-/* 
  * ユーザID/パスワード関連
  */
 // ユーザIDの文字数
@@ -51,3 +16,10 @@ Configure::write('User.Password.Length',
        array('min' => 4, 'max' => 12)
 );
 
+
+/* 
+ * 使用言語(Language)
+ */
+// jpn:Japanese, en:English
+Configure::write('Config.language', 'jpn'); 
+

diff --git a/app/config/conf/mail.php b/app/config/conf/mail.php
new file mode 100644 (file)
index 0000000..f0c03ab
--- /dev/null
+++ b/app/config/conf/mail.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * メール送信設定
+ */
+
+// SMTP送信する
+Configure::write('Qdmailer.smtp', false);
+
+// SMTP設定
+// SMTP AUTH(認証が必要)
+Configure::write('Qdmailer.smtpServer', array(
+       'user' => 'username',
+       'pass' => 'password',
+       'host' => 'host',
+       'port' => 587,
+       'from' => 'from Address',
+       'protocol' => 'SMTP_AUTH',
+));
+// POP Before SMTP(送信前認証が必要)
+/*
+Configure::write('Qdmailer.smtpServer', array(
+       'user' => 'username',
+       'pass' => 'password',
+       'host' => 'host',
+       'port' => 587,
+       'from' => 'from Address',
+       'protocol'=>'POP_BEFORE',
+       'pop_host' =>'pop_host',
+       'pop_user' => 'pop_username',
+       'pop_pass'=> 'pop_password',
+));
+*/
+