Changeset 534 for trunk/xpressme_integration_kit/include

Timestamp:

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

Author:

toemon

Message:

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

Location:

trunk/xpressme_integration_kit/include

Files:

• add_xpress_process.php (modified) (1 diff)
• oninstall.php (modified) (1 diff)
• onupdate.php (modified) (2 diffs)

trunk/xpressme_integration_kit/include/add_xpress_process.php

@@ -18 +18 @@
                 $guess_url = preg_replace('|/' . $module_name . '/.*|i', '/' . $module_name, $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
                 $blog_sub_path = '';
-                if (defined('MULTISITE') && MULTISITE){
+                if(function_exists('is_multisite') && is_multisite()){
                         if ($blog_id > 1){
-                                $blog_path = '/cube_mu/modules/xpress3/toy/';
                                 $blog_sub_path = '/' .$blogname;
                         }

trunk/xpressme_integration_kit/include/oninstall.php

@@ -121 +121 @@
         $views_queries ="CREATE TABLE $group_role (
                 groupid smallint(5) unsigned NOT NULL default '0',
+                blog_id bigint(20) unsigned NOT NULL default '0',
                 name varchar(50)  NOT NULL default '' ,
                 description text  NOT NULL default '',

trunk/xpressme_integration_kit/include/onupdate.php

@@ -254 +254 @@
         }
 
+        $group_role = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_group_role' ;
         if (! enhanced_table_check($mydirname,'group_role')){
-                $group_role = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_group_role' ;
                 $queries ="CREATE TABLE $group_role (
                         groupid smallint(5) unsigned NOT NULL default '0',
+                        blog_id bigint(20) unsigned NOT NULL default '0',
                         name varchar(50)  NOT NULL default '' ,
                         description text  NOT NULL default '',
@@ -269 +270 @@
                 $db->queryF( $sql ) ;
                 $msgs[] = "$group_role table of XPressME was made.";
+        } else {
+                if (!is_found_table_column($group_role,'blog_id')){
+                        $queries ="ALTER TABLE $group_role ADD blog_id bigint(20)  AFTER groupid";
+                        $db->queryF( $queries ) ;
+                        $msgs[] = "$group_role  ADD blog_id .";
+                }
+                // The table is repaired.
+                $update_sql = "UPDATE $group_role SET blog_id = 1 WHERE(blog_id IS NULL OR blog_id < 1)";
+                $db->queryF( $update_sql ) ;
         }