Changeset 96 for trunk/wp-content/plugins

Timestamp:

Mar 6, 2009, 5:16:22 PM (16 years ago)

Author:

toemon

Message:

途中経過でインストール、アップデートできなくなってしまっていたバグ修正
イベント通知の部分をFix、（ゲストのモジュールアクセス権限がないと通知できないのは直らない）
ブロックのキャッシュを見直し、キャッシュがない場合と、ブロックオプションが変更された場合にリフレッシュする機能を追加
ブロックキャッシュの更新にてポスト削除時のイベントをDB削除前にとっていたバグを修正。

Location:

trunk/wp-content/plugins/xpressme

Files:

• include/common_functions.php (deleted)
• include/custom_functions.php (modified) (4 diffs)
• include/notify_functions.php (modified) (3 diffs)
• include/pluggable-override.php (modified) (3 diffs)
• include/xpress_common_functions.php (modified) (2 diffs)
• xpressme.php (modified) (1 diff)

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

@@ -3 +3 @@
 function xpress_credit($show = false)
 {
-        global $xoopsModule,$wp_version;
-        
-        $ret = '<a href="http://www.toemon.com"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xoopsModule->getInfo('version'),$xoopsModule->getInfo('codename')) .'</a>';
+        global $wp_version , $modversion;
+        
+        $xpress_version = $modversion['version'];
+        $xpress_codename = $modversion['codename'];
+        $ret = '<a href="http://www.toemon.com"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
         if (strstr($wp_version,'ME')){
                 $ret .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
@@ -192 +194 @@
 // Set post views given a post ID or post object. 
 function post_views_counting($post_id = 0) {
+        global $xoops_db,$wpdb;
         global $table_prefix;
         static $views;
@@ -201 +204 @@
 
 
-        $views_db = $table_prefix . "views";
+        $views_db = get_wp_prefix() . 'views';
 
         if($post_id==0 || !empty($views[$post_id])) return null;
@@ -212 +215 @@
 
     $sql = "SELECT post_views FROM " . $views_db . " WHERE post_id=$post_id";
-    $exist = false;
-    if ($result = $GLOBALS["xoopsDB"]->query($sql)) {
-        while($row = $GLOBALS["xoopsDB"]->fetchArray($result)){
-                $exist = true;
-                break;
-        }
-        }
-        if($exist){
+        $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";
     }else{
         $sql = "INSERT INTO " . $views_db . " (post_id, post_views) VALUES ($post_id, 1)";
     }
-    if ($result = $GLOBALS["xoopsDB"]->queryF($sql)) {
-        $views[$post_id] = 1;
-    }
-    
+    $xoops_db->query($sql);
         return true;
 }

trunk/wp-content/plugins/xpressme/include/notify_functions.php

@@ -48 +48 @@
                 $_SERVER['REQUEST_METHOD'] = 'POST';
         }
-        
-        include_once $xoops_config->xoops_mainfile_path;        // load XOOPS System
-        include_once $xoops_config->xoops_root_path . '/include/notification_functions.php' ;
+//      set_error_handler("xpress_error_handler");
+        require $xoops_config->xoops_mainfile_path;     // load XOOPS System
         $module_id = get_xpress_modid() ;
         $notification_handler =& xoops_gethandler( 'notification' ) ;
@@ -58 +57 @@
 function do_CommentWaiting($commentID, $comment_post_ID)
 {
-//      global $xoops_config;
-//      require_once $xoops_config->xoops_mainfile_path;
-//      xoops_mainfile_path;
 //      require_once XOOPS_ROOT_PATH . '/include/notification_functions.php' ;
 //      $notification_handler =& xoops_gethandler( 'notification' ) ;
@@ -120 +116 @@
 {
         global $xoops_config, $xoops_db;
-        xpress_debug();
         
 

trunk/wp-content/plugins/xpressme/include/pluggable-override.php

@@ -56 +56 @@
 endif;
 
+if ( !function_exists('xpress_login') ) :
 function xpress_login(){
         global $current_user;
@@ -81 +82 @@
         return 0;       
 }
+endif;
 
+if ( !function_exists('check_xpress_auth_cookie') ) :
 function check_xpress_auth_cookie() {           // for wp2.5
         if ( empty($_COOKIE[AUTH_COOKIE]) ){
@@ -112 +115 @@
         return false;
 }
+endif;
 
 if ( !function_exists('wp_check_password') ) :

trunk/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -49 +49 @@
 }
 
+function is_block_cache_found($block_name)
+{
+        global $xoops_config;
+        $mydirname = get_xpress_dir_name();
+
+        if(defined('XOOPS_ROOT_PATH')){
+                $cache_dir = XOOPS_ROOT_PATH . '/cache/';
+        } else {
+                $cache_dir = $xoops_config->xoops_root_path . '/cache/';
+        }
+        $xml_name = $block_name . '.xml';
+
+    $filename = $cache_dir .$mydirname . '_' . $xml_name;
+        $cache_time = 0;
+//        if (file_exists($filename) && ((time() - filemtime($filename)) < $cache_time)) {
+    if (file_exists($filename)) {
+        return true;
+        } else {
+                return false;
+        }
+}
+
+
+//When there is no block cash, and an optional block is different, false is returned.
+function is_block_cache_normal()
+{
+        global $xoops_config;
+        global $xoops_db;
+        $mid = get_xpress_modid();
+        $sql = "SELECT bid,options,func_file FROM " . get_xoops_prefix() . "newblocks WHERE mid = $mid ";
+        $blocks = $xoops_db->get_results($sql);
+        $mydirname = get_xpress_dir_name();
+        require_once get_xpress_dir_path() . '/include/xpress_block_render.php';
+
+        foreach($blocks as $block){
+                $func_file = $block->func_file;
+                $call_theme_function_name = str_replace(".php", "", $func_file);
+                $inc_theme_file_name = str_replace(".php", "", $func_file) . '_theme.php';
+                $cache_title = str_replace(".php", "", $func_file);
+                $blockID = $block->bid;
+                $options = explode("|", $block->options);
+                
+                if (!is_block_cache_found($cache_title . $blockID)) return false;
+                $xml = xpress_block_cache_read($mydirname,$cache_title. $blockID);
+                $options = '';
+                $options = @$xml['block']['options'];
+                if( strcmp($options,$block->options) != 0 ) return false;
+        }
+        return true;
+}
+
+
 function block_cache_refresh()
 {
@@ -71 +123 @@
                 $block_render = $call_theme_function_name($options);            //The block name and the called function name should be assumed to be the same name.                    
                 $xml['block'] = $block_render;
+                $xml['block']['options'] = $block->options;
                 xpress_block_cache_write($mydirname,$cache_title. $blockID, $xml);
         }

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

@@ -27 +27 @@
         remove_action( 'pre_post_update', 'wp_save_post_revision' );                    // Not Save Post Revision
 }
+
+//XOOPS Bloack Cache Refresh
 add_action("comment_post",      "block_cache_refresh");
 add_action("edit_comment",      "block_cache_refresh");
-add_action("delete_comment","block_cache_refresh");
-add_action("delete_post",       "block_cache_refresh");
+add_action("wp_set_comment_status","block_cache_refresh"); //wp_delete_comment() at deleted
+add_action("deleted_post",      "block_cache_refresh");
 add_action("publish_post",      "block_cache_refresh");
 add_action("edit_post",         "block_cache_refresh");
 add_action("private_to_published",      "block_cache_refresh");
-add_action("wp_set_comment_status" , "block_cache_refresh");
+add_action("transition_post_status", "block_cache_refresh");
 
 add_action("the_content",       "set_post_views_count");