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

classes/db/DBMysql_innodb.class.php

@@ -131,8 +131,8 @@
         /**
          * @brief 커밋
          **/
-        function commit() {
+        function commit($force = false) {
-            if(!$this->isConnected() || !$this->transaction_started) return;
+            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
             $this->_query("commit");
             $this->transaction_started = false;
         }

classes/db/DBSqlite2.class.php

@@ -105,7 +105,8 @@
         /**
          * @brief 커밋
          **/
-        function commit() {
+        function commit($force = false) {
+            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
             if(!$this->is_connected || !$this->transaction_started) return;
             $this->_query("COMMIT;");
             $this->transaction_started = false;

classes/db/DBSqlite3_pdo.class.php

@@ -113,8 +113,8 @@
         /**
          * @brief 커밋
          **/
-        function commit() {
+        function commit($force = false) {
-            if(!$this->isConnected() || !$this->transaction_started) return;
+            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
             $this->handler->commit();
             $this->transaction_started = false;
         }

config/config.inc.php

@@ -24,7 +24,7 @@
      * 2 : 1 + DB 쿼리
      * 3 : 모든 로그
      **/
-    define('__DEBUG__', 3);
+    define('__DEBUG__', 0);
 
     /**
      * @brief 간단하게 사용하기 위한 함수 정의한 파일 require

modules/member/member.controller.php

@@ -98,7 +98,7 @@
                 if(!$output->toBool()) {
                     $args->password = md5(getmicrotime());
                     $output = $this->insertMember($args);
-                    $this->doLogin($args->user_id);
+                    $output = $this->doLogin($args->user_id);
                 }
 
                 // 페이지 이동
@@ -896,7 +896,7 @@
                 }
             }
 
-            $oDB->commit();
+            $oDB->commit(true);
 
             $output->add('member_srl', $args->member_srl);
             return $output;

modules/member/member.model.php

@@ -10,7 +10,6 @@
         /**
          * @brief 자주 호출될거라 예상되는 데이터는 내부적으로 가지고 있자...
          **/
-        var $member_info = NULL;
         var $member_groups = NULL;
         var $join_form_list = NULL;
 
@@ -104,17 +103,14 @@
          **/
         function getMemberInfoByUserID($user_id) {
             if(!$user_id) return;
-            if(!$this->member_info[$user_id]) {
-                $args->user_id = $user_id;
-                $output = executeQuery('member.getMemberInfo', $args);
-                if(!$output) return $output;
 
-                $member_info = $this->arrangeMemberInfo($output->data);
+            $args->user_id = $user_id;
-                $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+            $output = executeQuery('member.getMemberInfo', $args);
+            if(!$output) return $output;
 
-                $this->member_info[$user_id] = $member_info;
+            $member_info = $this->arrangeMemberInfo($output->data);
-            }
+            $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
-            return $this->member_info[$user_id];
+            return $member_info;
         }
 
         /**
@@ -122,17 +118,13 @@
          **/
         function getMemberInfoByMemberSrl($member_srl) {
             if(!$member_srl) return;
-            if(!$this->member_info[$member_srl]) {
+            $args->member_srl = $member_srl;
-                $args->member_srl = $member_srl;
+            $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
-                $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
+            if(!$output) return $output;
-                if(!$output) return $output;
 
-                $member_info = $this->arrangeMemberInfo($output->data);
+            $member_info = $this->arrangeMemberInfo($output->data);
-                $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
+            $member_info->group_list = $this->getMemberGroups($member_info->member_srl);
-
+            return $member_info;
-                $this->member_info[$member_srl] = $member_info;
-            }
-            return $this->member_info[$member_srl];
         }
 
         /**

modules/member/queries/getMemberInfo.xml

@@ -6,6 +6,6 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="user_id" var="user_id" filter="user_id" notnull="notnull" />
+        <condition operation="equal" column="user_id" var="user_id" notnull="notnull" />
     </conditions>
 </query>

modules/member/queries/getMemberInfoByMemberSrl.xml

@@ -6,6 +6,6 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="equal" column="member_srl" var="member_srl" filter="member_srl" notnull="notnull" />
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
     </conditions>
 </query>

modules/member/skins/default/login_form.html

@@ -11,18 +11,18 @@
     <col width="*" />
     <tr>
         <th rowspan="2">{$lang->user_id}</th>
-        <td><input type="text" name="user_id" tabindex="1" /></td>
+        <td><input type="text" name="user_id" /></td>
     </tr>
     <tr>
-        <td><input type="checkbox" name="remember_user_id" value="Y" tabindex="4" /> {$lang->remember_user_id}</td>
+        <td><input type="checkbox" name="remember_user_id" value="Y" /> {$lang->remember_user_id}</td>
     </tr>
     <tr>
         <th>{$lang->password}</th>
-        <td><input type="password" name="password" value="" tabindex="2" /></td>
+        <td><input type="password" name="password" value="" /></td>
     </tr>
     <tr>
         <td colspan="2">
-            <input type="submit" value="{$lang->cmd_login}" tabindex="3" />
+            <input type="submit" value="{$lang->cmd_login}" />
             <input type="button" value="{$lang->cmd_cancel}" onclick="location.href='{getUrl('act','')}'" />
         </td>
     </tr>
@@ -43,8 +43,8 @@
     </tr>
     <tr>
         <td>
-            <input type="text" name="user_id" tabindex="1" class="openid_user_id" />
+            <input type="text" name="user_id" class="openid_user_id" />
-            <input type="submit" value="{$lang->cmd_login}" tabindex="2" />
+            <input type="submit" value="{$lang->cmd_login}" />
         </td>
     </tr>
     </table>