From 631355e5e855ac7ec727e7abe67691808dcc223a Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Thu, 16 May 2013 15:30:15 +0900
Subject: [PATCH 1/6] WIP

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ddc2628..1487799 100644
--- a/README.md
+++ b/README.md
@@ -2,3 +2,5 @@ NetCommons2
 ===========
 
 NetCommons Version2
+
+:D

From b2a57d7f4bf111caf663bade15521203a96d5654 Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Fri, 17 May 2013 15:11:16 +0900
Subject: [PATCH 2/6] add deploy fix error const

---
 .gitmodules           | 3 +++
 deploy                | 1 +
 html/htdocs/index.php | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 deploy

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..6dc1613
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "deploy"]
+	path = deploy
+	url = git://github.com/yandod/engineyard-netcommons-deploy.git
diff --git a/deploy b/deploy
new file mode 160000
index 0000000..557efcf
--- /dev/null
+++ b/deploy
@@ -0,0 +1 @@
+Subproject commit 557efcfa1de886b3f98e34b405fdbc65cc60a6fc
diff --git a/html/htdocs/index.php b/html/htdocs/index.php
index 047f140..2bde37b 100644
--- a/html/htdocs/index.php
+++ b/html/htdocs/index.php
@@ -15,7 +15,7 @@
  * @access      public
  */
 if (version_compare(phpversion(), '5.3.0', '>=')) {
-	error_reporting(E_ALL ^ E_DEPRECATED);
+	error_reporting(E_ALL & ~E_DEPRECATED & ~E_STRICT);
 } else {
 	error_reporting(E_ALL);
 }
@@ -73,4 +73,4 @@ function transPathSeparator($path) {
 	$controller = new Controller();
 	$controller->execute();
 }
-?>
\ No newline at end of file
+?>

From 1aff4fda1d593d24454d3d14fa0f02f3574b7cef Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Fri, 17 May 2013 18:09:26 +0900
Subject: [PATCH 3/6] add placeholder

---
 .../install/templates/install_view_main_general.html      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/webapp/modules/install/templates/install_view_main_general.html b/html/webapp/modules/install/templates/install_view_main_general.html
index 6c9556e..075f8d7 100644
--- a/html/webapp/modules/install/templates/install_view_main_general.html
+++ b/html/webapp/modules/install/templates/install_view_main_general.html
@@ -56,7 +56,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbhost<{$id}>" type="text" value="<{$action.setting_arr.dbhost}>" maxlength="100" size="30" name="dbhost" />
+				<input id="dbhost<{$id}>" type="text" value="<{$action.setting_arr.dbhost}>" maxlength="100" size="30" name="dbhost" placeholder="{$smarty.env.DB_HOST}" />
 			</td>
 		</tr>
 		<tr>
@@ -70,7 +70,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbusername<{$id}>" type="text" value="<{$action.setting_arr.dbusername}>" maxlength="100" size="30" name="dbusername" />
+				<input id="dbusername<{$id}>" type="text" value="<{$action.setting_arr.dbusername}>" maxlength="100" size="30" name="dbusername" placeholder="{$smarty.env.DB_USER}" />
 			</td>
 		</tr>
 		<tr>
@@ -84,7 +84,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbpass<{$id}>" type="text" value="<{$action.setting_arr.dbpass}>" maxlength="100" size="30" name="dbpass" />
+				<input id="dbpass<{$id}>" type="text" value="<{$action.setting_arr.dbpass}>" maxlength="100" size="30" name="dbpass" placeholder="{$smarty.env.DB_PASS}" />
 			</td>
 		</tr>
 		<tr>
@@ -98,7 +98,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbname<{$id}>" type="text" value="<{$action.setting_arr.dbname}>" maxlength="100" size="30" name="dbname" />
+				<input id="dbname<{$id}>" type="text" value="<{$action.setting_arr.dbname}>" maxlength="100" size="30" name="dbname" placeholder="{$smarty.env.DB_NAME}" />
 			</td>
 		</tr>
 		<tr>

From c1d57203d6926a6da4cc45a1aa04d41cb65b6b18 Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Fri, 17 May 2013 18:22:29 +0900
Subject: [PATCH 4/6] fix tag

---
 .../install/templates/install_view_main_general.html      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/webapp/modules/install/templates/install_view_main_general.html b/html/webapp/modules/install/templates/install_view_main_general.html
index 075f8d7..9522070 100644
--- a/html/webapp/modules/install/templates/install_view_main_general.html
+++ b/html/webapp/modules/install/templates/install_view_main_general.html
@@ -56,7 +56,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbhost<{$id}>" type="text" value="<{$action.setting_arr.dbhost}>" maxlength="100" size="30" name="dbhost" placeholder="{$smarty.env.DB_HOST}" />
+				<input id="dbhost<{$id}>" type="text" value="<{$smarty.env.DB_HOST}>" maxlength="100" size="30" name="dbhost" />
 			</td>
 		</tr>
 		<tr>
@@ -70,7 +70,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbusername<{$id}>" type="text" value="<{$action.setting_arr.dbusername}>" maxlength="100" size="30" name="dbusername" placeholder="{$smarty.env.DB_USER}" />
+				<input id="dbusername<{$id}>" type="text" value="<{$smarty.env.DB_USER}>" maxlength="100" size="30" name="dbusername" />
 			</td>
 		</tr>
 		<tr>
@@ -84,7 +84,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbpass<{$id}>" type="text" value="<{$action.setting_arr.dbpass}>" maxlength="100" size="30" name="dbpass" placeholder="{$smarty.env.DB_PASS}" />
+				<input id="dbpass<{$id}>" type="text" value="<{$smarty.env.DB_PASS}>" maxlength="100" size="30" name="dbpass" />
 			</td>
 		</tr>
 		<tr>
@@ -98,7 +98,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbname<{$id}>" type="text" value="<{$action.setting_arr.dbname}>" maxlength="100" size="30" name="dbname" placeholder="{$smarty.env.DB_NAME}" />
+				<input id="dbname<{$id}>" type="text" value="<{{$smarty.env.DB_NAME}}>" maxlength="100" size="30" name="dbname" />
 			</td>
 		</tr>
 		<tr>

From b8badb0d4bac255f2e928a029bd70473c32c496d Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Fri, 17 May 2013 18:26:45 +0900
Subject: [PATCH 5/6] fail

---
 .../install/templates/install_view_main_general.html      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/html/webapp/modules/install/templates/install_view_main_general.html b/html/webapp/modules/install/templates/install_view_main_general.html
index 9522070..6c9556e 100644
--- a/html/webapp/modules/install/templates/install_view_main_general.html
+++ b/html/webapp/modules/install/templates/install_view_main_general.html
@@ -56,7 +56,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbhost<{$id}>" type="text" value="<{$smarty.env.DB_HOST}>" maxlength="100" size="30" name="dbhost" />
+				<input id="dbhost<{$id}>" type="text" value="<{$action.setting_arr.dbhost}>" maxlength="100" size="30" name="dbhost" />
 			</td>
 		</tr>
 		<tr>
@@ -70,7 +70,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbusername<{$id}>" type="text" value="<{$smarty.env.DB_USER}>" maxlength="100" size="30" name="dbusername" />
+				<input id="dbusername<{$id}>" type="text" value="<{$action.setting_arr.dbusername}>" maxlength="100" size="30" name="dbusername" />
 			</td>
 		</tr>
 		<tr>
@@ -84,7 +84,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbpass<{$id}>" type="text" value="<{$smarty.env.DB_PASS}>" maxlength="100" size="30" name="dbpass" />
+				<input id="dbpass<{$id}>" type="text" value="<{$action.setting_arr.dbpass}>" maxlength="100" size="30" name="dbpass" />
 			</td>
 		</tr>
 		<tr>
@@ -98,7 +98,7 @@
 				</div>
 			</th>
 			<td class="install_general_data">
-				<input id="dbname<{$id}>" type="text" value="<{{$smarty.env.DB_NAME}}>" maxlength="100" size="30" name="dbname" />
+				<input id="dbname<{$id}>" type="text" value="<{$action.setting_arr.dbname}>" maxlength="100" size="30" name="dbname" />
 			</td>
 		</tr>
 		<tr>

From a2f8976ecd107e898192b26d27e50245e17b817e Mon Sep 17 00:00:00 2001
From: Yusuke Ando <yandod@gmail.com>
Date: Wed, 22 May 2013 18:08:20 +0900
Subject: [PATCH 6/6] up

---
 deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deploy b/deploy
index 557efcf..cb232dc 160000
--- a/deploy
+++ b/deploy
@@ -1 +1 @@
-Subproject commit 557efcfa1de886b3f98e34b405fdbc65cc60a6fc
+Subproject commit cb232dc90dd4aaba81d74e3f650715811b690891