git-svn-id: http://xe-core.googlecode.com/svn/trunk@1144 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/comment/comment.controller.php

@@ -71,6 +71,7 @@
             if(Context::get('is_logged')) {
                 $logged_info = Context::get('logged_info');
                 $obj->member_srl = $logged_info->member_srl;
+                $obj->user_id = $logged_info->user_id;
                 $obj->user_name = $logged_info->user_name;
                 $obj->nick_name = $logged_info->nick_name;
                 $obj->email_address = $logged_info->email_address;

modules/comment/queries/insertComment.xml

@@ -10,6 +10,7 @@
         <column name="content" var="content" notnull="notnull" />
         <column name="password" var="password" minlength="2" maxlength="60" />
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
+        <column name="user_id" var="user_id" default="" />
         <column name="user_name" var="user_name" default="" />
         <column name="member_srl" var="member_srl" default="0" filter="number" />
         <column name="email_address" var="email_address" filter="email" maxlength="250" />

modules/comment/schemas/comments.xml

@@ -6,6 +6,7 @@
     <column name="is_secret" type="char" size="1" default="N" notnull="notnull" />
     <column name="content" type="bigtext" notnull="notnull" />
     <column name="password" type="varchar" size="60" />
+    <column name="user_id" type="varchar" size="80" />
     <column name="user_name" type="varchar" size="80" notnull="notnull" />
     <column name="nick_name" type="varchar" size="80" notnull="notnull" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />

modules/document/document.controller.php

@@ -94,6 +94,7 @@
             if(Context::get('is_logged')) {
                 $logged_info = Context::get('logged_info');
                 $obj->member_srl = $logged_info->member_srl;
+                $obj->user_id = $logged_info->user_id;
                 $obj->user_name = $logged_info->user_name;
                 $obj->nick_name = $logged_info->nick_name;
                 $obj->email_address = $logged_info->email_address;
@@ -304,21 +305,21 @@
                 return $output;
             }
 
-            // 코멘트의 이동
+            // 댓글의 이동
             $output = executeQuery('comment.updateCommentModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
 
-            // 트랙백의 이동
+            // 엮인글의 이동
             $output = executeQuery('trackback.updateTrackbackModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
 
-            // 엮인글
+            // 태그
             $output = executeQuery('tag.updateTagModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();

modules/document/queries/insertDocument.xml

@@ -18,6 +18,7 @@
         <column name="password" var="password" minlength="2" maxlength="60" />
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
         <column name="member_srl" var="member_srl" default="0" filter="number" />
+        <column name="user_id" var="user_id" default="" />
         <column name="user_name" var="user_name" default="" />
         <column name="email_address" var="email_address" filter="email" maxlength="250" />
         <column name="homepage" var="homepage" filter="homepage" maxlength="250" />

modules/document/schemas/documents.xml

@@ -12,6 +12,7 @@
     <column name="trackback_count" type="number" size="11" default="0" notnull="notnull" index="idx_trackback_count" />
     <column name="uploaded_count" type="number" size="11" default="0" notnull="notnull" index="idx_uploaded_count" />
     <column name="password" type="varchar" size="60" />
+    <column name="user_id" type="varchar" size="80" />
     <column name="user_name" type="varchar" size="80" notnull="notnull" />
     <column name="nick_name" type="varchar" size="80" notnull="notnull" />
     <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />

modules/install/tpl/filter/cubrid.xml

@@ -28,7 +28,7 @@
         <param name="nick_name" target="nick_name" />
         <param name="email_address" target="email_address" />
     </parameter>
-    <response >
+    <response callback_func="completeInstalled">
         <tag name="error" />
         <tag name="message" />
         <tag name="redirect_url" />

modules/install/tpl/filter/mysql.xml

@@ -26,7 +26,7 @@
         <param name="nick_name" target="nick_name" />
         <param name="email_address" target="email_address" />
     </parameter>
-    <response >
+    <response callback_func="completeInstalled">
         <tag name="error" />
         <tag name="message" />
         <tag name="redirect_url" />

modules/install/tpl/filter/sqlite2.xml

@@ -20,7 +20,7 @@
         <param name="nick_name" target="nick_name" />
         <param name="email_address" target="email_address" />
     </parameter>
-    <response >
+    <response callback_func="completeInstalled">
         <tag name="error" />
         <tag name="message" />
         <tag name="redirect_url" />

modules/install/tpl/form.cubrid.html

@@ -1,4 +1,5 @@
 <!--%import("filter/cubrid.xml")-->
+<!--%import("js/install_admin.js")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
     <input type="hidden" name="db_type" value="{$db_type}" />

modules/install/tpl/form.mysql.html

@@ -1,4 +1,5 @@
 <!--%import("filter/mysql.xml")-->
+<!--%import("js/install_admin.js")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
     <input type="hidden" name="db_type" value="{$db_type}" />

modules/install/tpl/form.mysql_innodb.html

@@ -1,4 +1,5 @@
 <!--%import("filter/mysql.xml")-->
+<!--%import("js/install_admin.js")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
     <input type="hidden" name="db_type" value="{$db_type}" />

modules/install/tpl/form.sqlite2.html

@@ -1,4 +1,5 @@
 <!--%import("filter/sqlite2.xml")-->
+<!--%import("js/install_admin.js")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
     <input type="hidden" name="db_type" value="{$db_type}" />

modules/install/tpl/form.sqlite3_pdo.html

@@ -1,4 +1,5 @@
 <!--%import("filter/sqlite2.xml")-->
+<!--%import("js/install_admin.js")-->
 
 <form action="./" method="post" onsubmit="return procFilter(this, install)">
     <input type="hidden" name="db_type" value="{$db_type}" />

modules/install/tpl/js/install_admin.js

@@ -0,0 +1,7 @@
+/**
+ * @brief 설치 완료후 실행될 함수
+ */
+function completeInstalled(ret_obj) {
+    alert(ret_obj["message"]);
+    location.href = "./";
+}