Changeset 152

Timestamp:

Apr 3, 2009, 11:04:47 PM (16 years ago)

Author:

toemon

Message:

Bump Ver0.22 「ログイン時の権限設定」権限リストをグループタイプではなく
module_read（モジュールアクセス権限)のあるものはwordPressの全ての権限をリストし
module_admin(モジュール管理者権限)のあるものはwordPressの管理者権限だけをリストするようにする。
但しグループタイプがゲスト(Anonymous)のグループはリストから省く　#86

Location:

trunk

Files:

• include/oninstall.php (modified) (1 diff)
• include/onupdate.php (modified) (1 diff)
• wp-content/plugins/xpressme/xpressme_class.php (modified) (3 diffs)
• xoops_version.php (modified) (2 diffs)

trunk/include/oninstall.php

@@ -153 +153 @@
                 name varchar(50)  NOT NULL default '' ,
                 description text  NOT NULL default '',
-                group_type varchar(10)  NOT NULL default '' ,
+                group_type varchar(50)  NOT NULL default '' ,
                 role varchar(20)  NOT NULL default '' ,
                 login_all smallint(5) unsigned NOT NULL default '0' ,

trunk/include/onupdate.php

@@ -126 +126 @@
                         name varchar(50)  NOT NULL default '' ,
                         description text  NOT NULL default '',
-                        group_type varchar(10)  NOT NULL default '' ,
+                        group_type varchar(50)  NOT NULL default '' ,
                         role varchar(20)  NOT NULL default '' ,
                         login_all smallint(5) unsigned NOT NULL default '0' ,

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

@@ -139 +139 @@
                 $table = get_wp_prefix() . 'group_role';
                 $xoops_group = get_xoops_prefix() . 'groups';
+                $xoops_group_permission = get_xoops_prefix() . 'group_permission';
+                
+                $module_id = get_xpress_modid();
+                
                 $sql=  "SELECT * FROM $table";
                 $before_groupes = $xoops_db->get_results($sql);
@@ -145 +149 @@
                 $xoops_db->query($sql);
                 
-                
-                $sql=  "SELECT * FROM $xoops_group WHERE group_type <> 'Anonymous'";
+                $sql =  "SELECT *  FROM $xoops_group_permission WHERE gperm_itemid = $module_id";
+                $gperms = $xoops_db->get_results($sql);
+                
+                $sql =  "SELECT * FROM $xoops_group WHERE group_type <> 'Anonymous'";
                 $groupes = $xoops_db->get_results($sql);
                 $insert_sql = '';
                 foreach ($groupes as $groupe) {
-                        $role = '';
-                        foreach ($before_groupes as $before_groupe) {
-                                if ($groupe->groupid == $before_groupe->groupid) {
-                                        $role = $before_groupe->role;
-                                        $login_all = $before_groupe->login_all;
+                        $parmsql =  "SELECT *  FROM $xoops_group_permission WHERE gperm_itemid = $module_id AND gperm_groupid = $groupe->groupid";
+                        $gperms = $xoops_db->get_results($parmsql);
+                        $parmission = '';
+                        foreach ($gperms as $gperm) {
+                                $parmission = $gperm->gperm_name;
+                                if ($parmission == 'module_admin') break;
+                        }
+                        
+                        if (!empty($parmission)){
+                                $role = ''; 
+                                foreach ($before_groupes as $before_groupe) {
+                                        if ($groupe->groupid == $before_groupe->groupid) {
+                                                $role = $before_groupe->role;
+                                                $login_all = $before_groupe->login_all;
+                                        }
                                 }
-                        }
-                        
-                        $insert_sql  = "INSERT INTO  $table ";
-                        $insert_sql .= "(groupid , name , description , group_type , role , login_all) ";
-                        $insert_sql .= "VALUES (";
-                        $insert_sql .= $groupe->groupid . ', ';
-                        $insert_sql .= "'" . $groupe->name . "' , ";
-                        $insert_sql .= "'" . $groupe->description . "' , ";
-                        $insert_sql .= "'" . $groupe->group_type . "' , ";
-                        $insert_sql .= "'" . $role . "' , '";
-                        $insert_sql .= $login_all . "')";
-                        $xoops_db->query($insert_sql);
+                                if ($parmission == 'module_admin') $role = 'administrator';
+                                
+                                $insert_sql  = "INSERT INTO  $table ";
+                                $insert_sql .= "(groupid , name , description , group_type , role , login_all) ";
+                                $insert_sql .= "VALUES (";
+                                $insert_sql .= $groupe->groupid . ', ';
+                                $insert_sql .= "'" . $groupe->name . "' , ";
+                                $insert_sql .= "'" . $groupe->description . "' , ";
+                                $insert_sql .= "'" . $parmission . "' , ";
+                                $insert_sql .= "'" . $role . "' , '";
+                                $insert_sql .= $login_all . "')";
+                                $xoops_db->query($insert_sql);
+                        }
                 }
                 
@@ -406 +423 @@
                                         $selected = '';
                                 }
-                                if ($groupe->group_type != 'Admin' || $groupe->groupid > 3 || !empty($selected)) {
+                                if ($groupe->group_type != 'module_admin'|| !empty($selected)) {
                                         $role_list .= "<option value=\"{$role}\"{$selected}>{$name}</option>\n";
                                 }
                         }
-                        if ($groupe->group_type != 'Admin' || $groupe->groupid > 3) {
+                        if ($groupe->group_type != 'module_admin') {
                                 if ( $group_has_role ) {
                                         $role_list .= '<option value="default">' . __('Default Role of WordPress', 'xpressme') . "</option>\n";

trunk/xoops_version.php

@@ -31 +31 @@
 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XPRESS_NAME') ;
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
-$modversion['version'] = "0.22";
+$modversion['version'] = "0.23";
 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
@@ -40 +40 @@
 
 // status
-$modversion['codename'] = "r150";
+$modversion['codename'] = "r152";
 
 // onInstall, onUpdate, onUninstall