Changeset 8539

Timestamp:

Oct 1, 2008, 7:22:08 AM (12 years ago)

Author:

shingo

Message:

#2992:アクション内にあるSQL文をDBファイル（webapp/lib/db/commu.php）に記述するように修正・不要な空行を削除

Location:

OpenPNE/branches/stable-2.10.x/webapp

Files:

• lib/db/commu.php (modified) (1 diff)
• modules/ktai/do/c_edit_update_c_commu.php (modified) (1 diff)
• modules/pc/do/c_edit_update_c_commu.php (modified) (3 diffs)

OpenPNE/branches/stable-2.10.x/webapp/lib/db/commu.php

@@ -3042 +3042 @@
 
 /**
- * コミュニティIDからパブリックフラグを取得
- */
-function db_commu_public_flg4c_commu_id($c_commu_id)
-{
-    $sql = "SELECT public_flag FROM c_commu WHERE c_commu_id = ?";
+ * コミュニティ参加要請状況をコミュニティIDから取得
+ *
+ * @param  int $c_commu_id
+ * @return array コミュニティ参加要請状況
+ */
+function db_commu_c_commu_member_confirm4c_commu_id($c_commu_id)
+{
+    $sql = 'SELECT c_commu_member_confirm_id, c_member_id FROM c_commu_member_confirm'
+         . ' WHERE c_commu_id = ?';
     $params = array(intval($c_commu_id));
-    return db_get_one($sql, $params);
+    $c_commu_member_confirm = db_get_all($sql, $params);
+
+    return $c_commu_member_confirm;
 }
 

OpenPNE/branches/stable-2.10.x/webapp/modules/ktai/do/c_edit_update_c_commu.php

@@ -36 +36 @@
 
         // 承認待ちメンバー登録処理
-        $registered_public_flag = db_commu_public_flg4c_commu_id($target_c_commu_id);
-        if ($public_flag == 'public' && ($registered_public_flag == 'auth_sns' || $registered_public_flag == 'auth_commu_member')) {
-            $sql = 'SELECT c_commu_member_confirm_id, c_member_id FROM c_commu_member_confirm'
-                 . ' WHERE c_commu_id = ?';
-            $params = array(intval($target_c_commu_id));
-            $c_commu_member_confirm_list = db_get_all($sql, $params);
+        $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
+        if ($public_flag == 'public' && ($c_commu['publec_flag'] == 'auth_sns' || $c_commu['publec_flag'] == 'auth_commu_member')) {
+            $c_commu_member_confirm_list = db_commu_c_commu_member_confirm4c_commu_id($target_c_commu_id);
             foreach ($c_commu_member_confirm_list as $c_commu_member_confirm) {
                 db_commu_join_c_commu($target_c_commu_id, $c_commu_member_confirm['c_member_id']);

OpenPNE/branches/stable-2.10.x/webapp/modules/pc/do/c_edit_update_c_commu.php

@@ -86 +86 @@
         }
 
+        $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
+
         //画像アップデート
         $sessid = session_id();
@@ -99 +101 @@
         if ($image_filename) {
             //画像削除
-            $c_commu = db_commu_c_commu4c_commu_id($target_c_commu_id);
             image_data_delete($c_commu['image_filename']);
         }
 
         // 承認待ちメンバー登録処理
-        $registered_public_flag = db_commu_public_flg4c_commu_id($target_c_commu_id);
-        if ($public_flag == 'public' && ($registered_public_flag == 'auth_sns' || $registered_public_flag == 'auth_commu_member')) {
-            $sql = 'SELECT c_commu_member_confirm_id, c_member_id FROM c_commu_member_confirm'
-                 . ' WHERE c_commu_id = ?';
-            $params = array(intval($target_c_commu_id));
-            $c_commu_member_confirm_list = db_get_all($sql, $params);
+        if ($public_flag == 'public' && ($c_commu['publec_flag'] == 'auth_sns' || $c_commu['publec_flag'] == 'auth_commu_member')) {
+            $c_commu_member_confirm_list = db_commu_c_commu_member_confirm4c_commu_id($target_c_commu_id);
             foreach ($c_commu_member_confirm_list as $c_commu_member_confirm) {
                 db_commu_join_c_commu($target_c_commu_id, $c_commu_member_confirm['c_member_id']);
@@ -131 +128 @@
             $map_zoom);
 
-
         $p = array('target_c_commu_id' => $target_c_commu_id);
         openpne_redirect('pc', 'page_c_home', $p);