Changeset 8540

Timestamp:

Oct 1, 2008, 7:29:21 PM (12 years ago)

Author:

shingo

Message:

#2992:既に承認待ち状態のメンバーへの対応を追加

File:

• OpenPNE/branches/stable-2.12.x/webapp/lib/db/commu.php (modified) (1 diff)

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

@@ -1108 +1108 @@
 function db_commu_get_c_join_status($c_member_id,$c_commu_id)
 {
-    $is_c_commu_member = db_commu_is_c_commu_member($c_commu_id, $c_member_id);
-    $is_wait = db_commu_is_c_commu_join_wait($c_commu_id, $c_member_id);
+    if (db_commu_is_c_commu_member($c_commu_id, $c_member_id)) {
+        return STATUS_C_JOIN_ALREADY;
+    }
+ 
     $c_commu = db_commu_c_commu4c_commu_id($c_commu_id);
-    $is_join_request_free = false;
     if ($c_commu['public_flag'] == "public") {
-        $is_join_request_free = true;
-    }
-
-    $ret = STATUS_C_JOIN_ALREADY;
-    if (!$is_c_commu_member) { //メンバーで無い
-        if ($is_wait == true) {
-            $ret = STATUS_C_JOIN_WAIT;
-        } else {
-            if ($is_join_request_free) {
-                $ret = STATUS_C_JOIN_REQUEST_FREE;
-            } else {
-                $ret = STATUS_C_JOIN_REQUEST_NEED;
-            }
-        }
-    }
-    return $ret;
+        return STATUS_C_JOIN_REQUEST_FREE;
+    }
+
+    if (db_commu_is_c_commu_join_wait($c_commu_id, $c_member_id)) {
+        return STATUS_C_JOIN_WAIT;
+    }
+
+    return STATUS_C_JOIN_REQUEST_NEED;
 }