From 40a73d7211ce2107387f5004342db5cbccb354b0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=E9=9F=B3=E6=B5=B4=E5=8D=9A=E7=89=A9=E9=A4=A8?=
 <onyoku@enoch.(none)>
Date: Tue, 22 Jan 2013 18:21:03 +0900
Subject: [PATCH] =?utf8?q?bootstrap.php=E3=81=A8AppModel.php=E3=82=92?=
 =?utf8?q?=E5=87=BA=E5=8A=9B=E3=81=AB=E5=8A=A0=E3=81=88=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 app/Config/m_const.php                          |  6 ------
 app/Controller/Component/eXmasCakeComponent.php | 11 +++++++++++
 app/Controller/DbsController.php                |  3 ++-
 app/Model/AppModel.php                          |  8 +++++---
 4 files changed, 18 insertions(+), 10 deletions(-)
 delete mode 100644 app/Config/m_const.php

diff --git a/app/Config/m_const.php b/app/Config/m_const.php
deleted file mode 100644
index a4b4958..0000000
--- a/app/Config/m_const.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-const NOTEMPTY = '何か値が必要です';
-const NUMERIC = '数値で入力してください';
-const DATE_TYPE = '日付形式で入力してください';
-
diff --git a/app/Controller/Component/eXmasCakeComponent.php b/app/Controller/Component/eXmasCakeComponent.php
index 981c934..f92a74c 100644
--- a/app/Controller/Component/eXmasCakeComponent.php
+++ b/app/Controller/Component/eXmasCakeComponent.php
@@ -68,6 +68,7 @@ class eXmasCakeComponent extends Object{
 
 	public function createFolder($path) {
 		$this->rmrf($path);
+	
 		mkdir($path);
 		mkdir($path.DS.'Config');
 		mkdir($path.DS.'Controller');
@@ -75,6 +76,16 @@ class eXmasCakeComponent extends Object{
 		mkdir($path.DS.'View');
 	}
 
+	public function copyConstants($path) {
+		$source = APP.DS.'Config'.DS.'bootstrap.php';
+		$dist = $path.DS.'Config'.DS.'bootstrap.php';
+		copy($source,$dist);
+		
+		$source = APP.DS.'Model'.DS.'AppModel.php';
+		$dist = $path.DS.'Model'.DS.'AppModel.php';
+		copy($source,$dist);
+	}
+
 	public function getDbScript($db) {
 		$spt = '<?php'.PHP_EOL;
         $spt .= 'class DATABASE_CONFIG {'.PHP_EOL;
diff --git a/app/Controller/DbsController.php b/app/Controller/DbsController.php
index 2ad4312..4ea8873 100644
--- a/app/Controller/DbsController.php
+++ b/app/Controller/DbsController.php
@@ -53,7 +53,8 @@ class DbsController extends AppController {
 		$db = $this->Db->read(null, $id);
 		$path = dirname(dirname(__FILE__)).DS.'tmp'.DS.'output'.DS.'app';
 		$this->eXmasCake->createFolder($path);
-
+		$this->eXmasCake->copyConstants($path);
+		
 		if (!$this->createDbScript($path,$db)) {
             $this->Session->setFlash(SAVE_NG);
 		}
diff --git a/app/Model/AppModel.php b/app/Model/AppModel.php
index f9cd7a8..1fa8007 100644
--- a/app/Model/AppModel.php
+++ b/app/Model/AppModel.php
@@ -22,9 +22,6 @@
 
 App::uses('Model', 'Model');
 
-config('m_const');
-
-
 /**
  * Application model for Cake.
  *
@@ -35,3 +32,8 @@ config('m_const');
  */
 class AppModel extends Model {
 }
+
+const NOTEMPTY = '何か値が必要です';
+const NUMERIC = '数値で入力してください';
+const DATE_TYPE = '日付形式で入力してください';
+
-- 
2.11.0