Changeset 534 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php

Timestamp:

Mar 10, 2010, 4:47:23 PM (14 years ago)

Author:

toemon

Message:

グループ権限のMultiBlog対応 Fixes #298

File:

• trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (modified) (7 diffs)

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php

@@ -156 +156 @@
         
         function GroupeRoleRead() {
+                global $xoops_db, $blog_id;
+                
+                if (empty($blog_id)) $blog_id = 1;
+                $table = get_wp_prefix() . 'group_role';
+                
+                $sql=  "SELECT * FROM $table WHERE blog_id = $blog_id ORDER BY groupid";
+                $this->groupe_role =  $xoops_db->get_results($sql);
+        }
+
+        function GroupeRoleCheck($blog_id = 1) {
                 global $xoops_db;
                 
-                $table = get_wp_prefix() . 'group_role';
-                
-                $sql=  "SELECT * FROM $table";
-                $this->groupe_role =  $xoops_db->get_results($sql);
-        }
-
-        function GroupeRoleCheck() {
-                global $xoops_db;
+                if (empty($blog_id)) $blog_id = 1;
                 
                 $module_id = get_xpress_modid();
@@ -173 +176 @@
                 $xoops_group_permission_table = get_xoops_prefix() . 'group_permission';
                 
-
-                
                 $sql =  "SELECT *  FROM $xoops_group_permission_table WHERE gperm_itemid = $module_id";
                 $gperms = $xoops_db->get_results($sql);
                 
-                $sql =  "SELECT * FROM $xoops_group_table WHERE group_type <> 'Anonymous'";
+                $sql =  "SELECT * FROM $xoops_group_table WHERE group_type <> 'Anonymous' ORDER BY groupid";
                 $groupes = $xoops_db->get_results($sql);
 
@@ -194 +195 @@
                 }
                 
-                $sql =  "SELECT *  FROM $group_role_table";
+                $sql =  "SELECT *  FROM $group_role_table WHERE blog_id = $blog_id";
                 $groupes_role = $xoops_db->get_results($sql);
                 
@@ -214 +215 @@
                                         if ($group_type == 'module_admin') $role = 'administrator';
                                         if ($group_type == 'module_inhibit') $role = '';
-                                        $edit_sql = "UPDATE $group_role_table SET group_type='$group_type',role='$role' WHERE groupid = $groupe->groupid";
+                                        $edit_sql = "UPDATE $group_role_table SET group_type='$group_type',role='$role' WHERE groupid = $groupe->groupid AND blog_id = $blog_id";
                                         $found = true;
                                         break;
@@ -224 +225 @@
 
                                 $edit_sql  = "INSERT INTO  $group_role_table ";
-                                $edit_sql .= "(groupid , name , description , group_type , role , login_all) ";
+                                $edit_sql .= "(groupid , blog_id , name , description , group_type , role , login_all) ";
                                 $edit_sql .= "VALUES (";
                                 $edit_sql .= $groupe->groupid . ', ';
+                                $edit_sql .= $blog_id . ', ';
                                 $edit_sql .= "'" . $groupe->name . "' , ";
                                 $edit_sql .= "'" . $groupe->description . "' , ";
-                                $edit_sql .= "'" . $parmission . "' , ";
+                                $edit_sql .= "'" . $group_type . "' , ";
                                 $edit_sql .= "'" . $role . "' , '";
                                 $edit_sql .= $login_all . "')";
@@ -252 +254 @@
         function ReadPostData($post_data = null)
         {
-                global $xoops_db;
-                
+                global $xoops_db, $blog_id;
+                
+                if (empty($blog_id)) $blog_id = 1;
                 foreach ( (array) $post_data as $index_key => $value ){
                         if (preg_match('/^ch_/',$index_key)){  // case ch_
@@ -322 +325 @@
                                 $update_sql .= "role  = '$role' , ";
                                 $update_sql .= "login_all  = $login_all ";
-                                $update_sql .= "WHERE (groupid = '$groupe->groupid' )";
+                                $update_sql .= "WHERE (groupid = '$groupe->groupid' AND blog_id = $blog_id)";
                                 $xoops_db->query($update_sql);  
                         }