Changeset 428 for trunk

Timestamp:

Oct 31, 2009, 11:36:52 PM (15 years ago)

Author:

toemon

Message:

WPMUで閲覧数が正常に機能しないバグ修正 Fixes #241

Location:

trunk/xpressme_integration_kit

Files:

• include/oninstall.php (modified) (1 diff)
• include/onupdate.php (modified) (3 diffs)
• wp-content/plugins/xpressme/include/custom_functions.php (modified) (5 diffs)

trunk/xpressme_integration_kit/include/oninstall.php

@@ -100 +100 @@
         }
         $views_queries ="CREATE TABLE $views_table (
+                blog_id bigint(20) unsigned NOT NULL default '0',
                 post_id bigint(20) unsigned NOT NULL default '0',
                 post_views bigint(20) unsigned NOT NULL default '0',

trunk/xpressme_integration_kit/include/onupdate.php

@@ -175 +175 @@
         $msgs = array();
 
+        $views_table = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_views' ;
         if (! enhanced_table_check($mydirname,'views')){
-                $views_table = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_views' ;
                 $queries ="CREATE TABLE $views_table (
+                blog_id bigint(20) unsigned NOT NULL default '0',
                 post_id bigint(20) unsigned NOT NULL default '0',
                 post_views bigint(20) unsigned NOT NULL default '0',
@@ -184 +185 @@
                 $db->queryF( $queries ) ;
                 $msgs[] = "$views_table table of XPressME was made.";
+        } else {
+                if (!is_found_table_column($views_table,'blog_id')){
+                        $queries ="ALTER TABLE $views_table ADD blog_id bigint(20)  FIRST";
+                        $db->queryF( $queries ) ;
+                        $msgs[] = "$views_table  ADD blog_id .";
+                }
         }
         
@@ -261 +268 @@
 endif;
 
+if( ! function_exists( 'is_found_table_column' ) ) :
+function is_found_table_column($table,$column){
+                global $xoopsModule;
+                $xoopsDB =& Database::getInstance();
+
+                $sql = "DESCRIBE $table $column";
+                $res = $xoopsDB->queryF($sql, 0, 0);
+                if ($res === false){
+                        return false;
+                } else {
+                        if ($xoopsDB->getRowsNum($res)  > 0)
+                                return true;
+                        else
+                                return false;
+                }
+}
+endif;
 
 

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -422 +422 @@
 function xpress_post_views_count($args ='') {
         global $xoops_db,$wpdb;
-
+        global $blog_id;
         static $post_cache_views;
 
@@ -442 +442 @@
         if($post_id==0) return null;
         if(!isset($post_cache_views[$post_id])){
-        $sql = "SELECT post_views FROM " . get_wp_prefix() . "views" . " WHERE post_id=$post_id";
-        $post_views = $xoops_db->get_var($sql);
+                if (is_null($blog_id)){
+                        $blog_where = '';
+                } else {
+                        $blog_where = ' AND blog_id = '. $blog_id;
+                }
+                $sql = "SELECT post_views FROM " . get_wp_prefix() . "views" . " WHERE post_id=$post_id " .  $blog_where;
+       $post_views = $xoops_db->get_var($sql);
         if (!$post_views) {
                 $post_cache_views[$post_id] = 0;
@@ -473 +478 @@
         global $xoops_db,$wpdb;
         global $table_prefix;
+        global $blog_id;
         static $views;
         
@@ -481 +487 @@
 
         $views_db = get_wp_prefix() . 'views';
+        if (is_null($blog_id)) $blog_id = 0;
 
         if($post_id==0 || !empty($views[$post_id])) return null;
@@ -489 +496 @@
                 if ($current_user_id ==$post_author_id) return null;
         }
-
-    $sql = "SELECT post_views FROM " . $views_db . " WHERE post_id=$post_id";
+        if (is_null($blog_id)){
+                $blog_where = '';
+        } else {
+                $blog_where = ' AND blog_id = ' . $blog_id;
+        }
+        $sql = "SELECT post_views FROM " . $views_db . " WHERE post_id=$post_id" . $blog_where;
         $post_views_found = $xoops_db->get_var($sql);
         if($post_views_found){
-        $sql = "UPDATE " . $views_db . " SET post_views=post_views+1 WHERE post_id=$post_id";
+        $sql = "UPDATE " . $views_db . " SET post_views=post_views+1 WHERE post_id=$post_id" . $blog_where;
     }else{
-        $sql = "INSERT INTO " . $views_db . " (post_id, post_views) VALUES ($post_id, 1)";
+        if (is_null($blog_id)){
+                        $sql = "INSERT INTO " . $views_db . " (post_id, post_views) VALUES ($post_id, 1)";
+                } else {
+                        $sql = "INSERT INTO " . $views_db . " (blog_id, post_id, post_views) VALUES ($blog_id, $post_id, 1)";
+                }
     }
     $xoops_db->query($sql);