Changeset 144 for trunk/wp-content/plugins/xpressme

Timestamp:

Mar 31, 2009, 12:43:04 PM (16 years ago)

Author:

toemon

Message:

オブジェクト名$XPressMEを$xpress_configに変更（気分的な問題）

Location:

trunk/wp-content/plugins/xpressme

Files:

• include/custom_functions.php (modified) (11 diffs)
• include/d3forum_comment_disp.php (modified) (3 diffs)
• include/d3forum_comment_synchro.php (modified) (11 diffs)
• xpressme.php (modified) (3 diffs)

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

@@ -30 +30 @@
 
 function xpress_is_theme_sidebar_disp(){
-        global $XPressME;
-        return $XPressME->is_theme_sidebar_disp;
+        global $xpress_config;
+        return $xpress_config->is_theme_sidebar_disp;
 }       
 
 function xpress_left_arrow_post_link($show = false)
 {
-        global $XPressME;
+        global $xpress_config;
         $ret = '';
                 
-        if($XPressME->is_left_postnavi_old){
-                $link_title = $XPressME->old_post_link_text;
-                ob_start();
-                if ($XPressME->is_postnavi_title_disp)
+        if($xpress_config->is_left_postnavi_old){
+                $link_title = $xpress_config->old_post_link_text;
+                ob_start();
+                if ($xpress_config->is_postnavi_title_disp)
                         previous_post_link('« %link');
                 else 
@@ -49 +49 @@
                 ob_end_clean();
         } else {
-                $link_title = $XPressME->newer_post_link_text;
-                ob_start();
-                if ($XPressME->is_postnavi_title_disp)
+                $link_title = $xpress_config->newer_post_link_text;
+                ob_start();
+                if ($xpress_config->is_postnavi_title_disp)
                         next_post_link('« %link');
                 else
@@ -59 +59 @@
         }
         
-        if ($XPressME->is_postnavi_title_disp){
+        if ($xpress_config->is_postnavi_title_disp){
                 $on_mouse_show = $link_title;
         } else  {
-                if($XPressME->is_left_postnavi_old){
+                if($xpress_config->is_left_postnavi_old){
                         ob_start();
                                 previous_post_link('%link');
@@ -87 +87 @@
 function xpress_right_arrow_post_link($show = false)
 {
-        global $XPressME;
+        global $xpress_config;
         $ret = '';              
         
-        if($XPressME->is_left_postnavi_old){
-                $link_title = $XPressME->newer_post_link_text;
-                ob_start();
-                if ($XPressME->is_postnavi_title_disp)
+        if($xpress_config->is_left_postnavi_old){
+                $link_title = $xpress_config->newer_post_link_text;
+                ob_start();
+                if ($xpress_config->is_postnavi_title_disp)
                         next_post_link('%link »');
                 else
@@ -100 +100 @@
                 ob_end_clean();
         } else {
-                $link_title = $XPressME->old_post_link_text;
-                ob_start();
-                if ($XPressME->is_postnavi_title_disp)
+                $link_title = $xpress_config->old_post_link_text;
+                ob_start();
+                if ($xpress_config->is_postnavi_title_disp)
                         previous_post_link('%link »');
                 else 
@@ -110 +110 @@
         }
         
-        if ($XPressME->is_postnavi_title_disp){
+        if ($xpress_config->is_postnavi_title_disp){
                 $on_mouse_show = $link_title;
         } else  {
-                if($XPressME->is_left_postnavi_old){
+                if($xpress_config->is_left_postnavi_old){
                         ob_start();
                                 next_post_link('%link');
@@ -138 +138 @@
 function xpress_left_arrow_posts_link($show = false)
 {
-        global $XPressME;
+        global $xpress_config;
         $ret = '';
                 
-        if($XPressME->is_left_page_navi_old){
-                $link_title = $XPressME->old_page_link_text;
+        if($xpress_config->is_left_page_navi_old){
+                $link_title = $xpress_config->old_page_link_text;
                 ob_start();
                 next_posts_link("« $link_title");
@@ -148 +148 @@
                 ob_end_clean();
         } else {
-                $link_title = $XPressME->newer_page_link_text;
+                $link_title = $xpress_config->newer_page_link_text;
                 ob_start();
                 previous_posts_link("« $link_title");
@@ -163 +163 @@
 function xpress_right_arrow_posts_link($show = false)
 {
-        global $XPressME;
+        global $xpress_config;
         $ret = '';              
         
-        if($XPressME->is_left_page_navi_old){
-                $link_title = $XPressME->newer_page_link_text;
+        if($xpress_config->is_left_page_navi_old){
+                $link_title = $xpress_config->newer_page_link_text;
                 ob_start();
                 previous_posts_link("$link_title »");
@@ -173 +173 @@
                 ob_end_clean();
         } else {
-                $link_title = $XPressME->old_page_link_text;
+                $link_title = $xpress_config->old_page_link_text;
                 ob_start();
                 next_posts_link("$link_title »");
@@ -188 +188 @@
 
 function xpress_is_author_view_count(){
-        global $XPressME;
-        return $XPressME->is_author_view_count;
+        global $xpress_config;
+        return $xpress_config->is_author_view_count;
 }
 

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

@@ -1 +1 @@
 <?php
-                global $xoops_db,$XPressME;
+                global $xoops_db,$xpress_config;
                 $xoops_trust_path = get_xoops_trust_path();
                 $xoops_root_path = get_xoops_root_path();
@@ -10 +10 @@
                 include_once($xpress_dir . '/class/xpressD3commentContent.class.php');
                 
-                $dir_name = $XPressME->d3forum_module_dir;
-                $forum_id = $XPressME->d3forum_forum_id;
-                $external_link_format = $XPressME->d3forum_external_link_format;
-                if ($XPressME->is_d3forum_desc){
+                $dir_name = $xpress_config->d3forum_module_dir;
+                $forum_id = $xpress_config->d3forum_forum_id;
+                $external_link_format = $xpress_config->d3forum_external_link_format;
+                if ($xpress_config->is_d3forum_desc){
                         $order = 'desc';
                 } else {
                         $order = 'asc';
                 }
-                if ($XPressME->is_d3forum_desc){
+                if ($xpress_config->is_d3forum_desc){
                         $order = 'desc';
                 } else {
@@ -24 +24 @@
                 }
 
-                if ($XPressME->is_d3forum_flat){
+                if ($xpress_config->is_d3forum_flat){
                         $view = 'listposts_flat';
                 } else {
                         $view = 'listtopics';
                 }
-                $posts_num = $XPressME->d3forum_views_num;
+                $posts_num = $xpress_config->d3forum_views_num;
                 
         // force UPDATE forums.forum_external_link_format "(dirname)::(classname)::(trustdirname)"

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

@@ -147 +147 @@
 
 function is_d3forum_setting(){
-        global $XPressME,$xoops_db;
-
-        $use_d3f = $XPressME->is_use_d3forum;
+        global $xpress_config,$xoops_db;
+
+        $use_d3f = $xpress_config->is_use_d3forum;
         if (empty($use_d3f)) {
                 return false;
         }
-        $d3f_forum_id = $XPressME->d3forum_forum_id;
-        $d3f_forum_dir  = $XPressME->d3forum_module_dir;
+        $d3f_forum_id = $xpress_config->d3forum_forum_id;
+        $d3f_forum_dir  = $xpress_config->d3forum_module_dir;
         if (! d3f_module_found($d3f_forum_dir)) die( "D3Forum Directory ($d3f_forum_dir) not found" ) ; 
         if (! d3f_forum_id_found($d3f_forum_id , $d3f_forum_dir)) die( "D3Forum ForumID($d3f_forum_id) not found" ) ;
         
-        $xoops_db->query( "UPDATE ".get_xoops_prefix() . $d3f_forum_dir."_forums" ." SET forum_external_link_format='".addslashes($XPressME->d3forum_external_link_format)."' WHERE forum_id= $d3f_forum_id" ) ;
+        $xoops_db->query( "UPDATE ".get_xoops_prefix() . $d3f_forum_dir."_forums" ." SET forum_external_link_format='".addslashes($xpress_config->d3forum_external_link_format)."' WHERE forum_id= $d3f_forum_id" ) ;
         
         return true;
@@ -165 +165 @@
 function d3forum_topic_rock($wp_post_id,$lock = '0')
 {
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
-        $d3f_forum_dir  = $XPressME->d3forum_module_dir;
+        $d3f_forum_dir  = $xpress_config->d3forum_module_dir;
         
         $d3f_topic = get_xoops_prefix() . $d3f_forum_dir . '_topics';
@@ -180 +180 @@
 // All comments of WordPress are exported to the D3Forum comment. 
 function wp_to_d3forum($forum_id = 1, $d3f_prefix = 'd3forum'){
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
 
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
@@ -254 +254 @@
 // All comments of D3Forum are import to the WordPress comment. 
 function d3forum_to_wp($forum_id = 1, $d3f_prefix = 'd3forum'){
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
         
@@ -322 +322 @@
 
 function wp_post_delete_sync($post_id){
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
 
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
-        $d3forum_dirname = $XPressME->d3forum_module_dir;
+        $d3forum_dirname = $xpress_config->d3forum_module_dir;
         $d3forum_prefix = get_xoops_prefix() . $d3forum_dirname . '_';
 
@@ -346 +346 @@
 
 function d3forum_sync_to_wp_comment( $mode , $link_id , $forum_id , $topic_id , $post_id = 0 ){
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
 
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
-        $d3forum_prefix = get_xoops_prefix() . $XPressME->d3forum_module_dir . '_';
+        $d3forum_prefix = get_xoops_prefix() . $xpress_config->d3forum_module_dir . '_';
         $xpress_prefix = get_wp_prefix();
         
@@ -458 +458 @@
 //  The content is reflected in the D3Forum comment when there is a change in the WordPress comment. 
 function wp_comment_sync_to_d3forum($comment_ID = 0,$sync_mode){
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         
         if (!is_d3forum_setting()) die('The setting of the D3Forum comment integration is wrong. ');
 
-        $d3f_forum_id = $XPressME->d3forum_forum_id;
-        $d3f_forum_dir  = $XPressME->d3forum_module_dir;
+        $d3f_forum_id = $xpress_config->d3forum_forum_id;
+        $d3f_forum_dir  = $xpress_config->d3forum_module_dir;
         
         $d3forum_prefix = get_xoops_prefix() . $d3f_forum_dir . '_';
@@ -696 +696 @@
 {
         $post_id = intval( $post_id ) ; // post_id is d3forum post(comments) id.
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         $d3forum_prefix = get_xoops_prefix() . $d3forum_dirname . '_';
         $xpress_prefix = get_wp_prefix();
@@ -733 +733 @@
 function wp_d3forum_delete_topic( $d3forum_dirname , $topic_id , $delete_also_posts = true )
 {
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         $d3forum_prefix = get_xoops_prefix() . $d3forum_dirname . '_';
         $xpress_prefix = get_wp_prefix();
@@ -762 +762 @@
 function wp_d3forum_sync_topic( $d3forum_dirname , $topic_id , $sync_also_forum = true , $sync_topic_title = false )
 {
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
         $d3forum_prefix = get_xoops_prefix() . $d3forum_dirname . '_';
         $xpress_prefix = get_wp_prefix();
@@ -816 +816 @@
 function wp_d3forum_maketree_recursive( $tablename , $post_id , $order = 'post_id' , $parray = array() , $depth = 0 , $unique_path = '.1' )
 {
-        global $XPressME,$xoops_db;
+        global $xpress_config,$xoops_db;
 
         $parray[] = array( 'post_id' => $post_id , 'depth' => $depth , 'unique_path' => $unique_path ) ;

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

@@ -17 +17 @@
 $xoops_db->tables = array('modules', 'newblocks', 'users');
 
-$XPressME = new XPressME_Class();
+$xpress_config = new XPressME_Class();
 
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
 
-add_action('admin_menu', array(&$XPressME, 'add_option_page'));
-add_action('admin_head', array(&$XPressME, 'add_admin_head'));
-add_filter("upload_dir",array(&$XPressME, 'xpress_upload_filter'),      1);             // Change wp-include/wp_upload_dir()
-if (!$XPressME->is_save_post_revision){
+add_action('admin_menu', array(&$xpress_config, 'add_option_page'));
+add_action('admin_head', array(&$xpress_config, 'add_admin_head'));
+add_filter("upload_dir",array(&$xpress_config, 'xpress_upload_filter'), 1);             // Change wp-include/wp_upload_dir()
+if (!$xpress_config->is_save_post_revision){
         remove_action( 'pre_post_update', 'wp_save_post_revision' );                    // Not Save Post Revision
 }
@@ -55 +55 @@
 
 //D3Forum Comment Integration
-if ($XPressME->is_use_d3forum){
+if ($xpress_config->is_use_d3forum){
         require_once dirname( __FILE__ ).'/include/d3forum_comment_synchro.php' ;
         add_action("comment_post",      "onaction_comment_post");
@@ -70 +70 @@
 
 // SQL debug windows
-add_filter('query', array(&$XPressME, 'xpress_sql_debug'));
-add_action('admin_footer', array(&$XPressME, 'displayDebugLog'));
-add_action('get_footer', array(&$XPressME, 'displayDebugLog'));
+add_filter('query', array(&$xpress_config, 'xpress_sql_debug'));
+add_action('admin_footer', array(&$xpress_config, 'displayDebugLog'));
+add_action('get_footer', array(&$xpress_config, 'displayDebugLog'));
 ?>