Changeset 488 for branches/XPressMU/xpressme_integration_kit/wp-content

Timestamp:

Dec 15, 2009, 4:52:57 PM (15 years ago)

Author:

toemon

Message:

開発ベースにVer2.2をマージ

Location:

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme

Files:

• include/custom_functions.php (modified) (5 diffs)
• include/functions_for_wp_old.php (modified) (1 diff)
• include/xpress_common_functions.php (modified) (3 diffs)
• xpressme.php (modified) (2 diffs)

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -95 +95 @@
 
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $uid = intval($_COOKIE[$author_cookie]);
@@ -115 +115 @@
         extract( $r );
         $output = '';
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if (!empty($_COOKIE[$author_cookie])){
                 $output = intval($_COOKIE[$author_cookie]);
@@ -161 +161 @@
         $xpress_codename = $xoops_config->module_codename;
         if ($no_link){
-                $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                 if ($xoops_config->is_wpmu) {
+                        $output = 'XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                         $output .= '(included WordPress MU ' . $wpmu_version. ')';
                 } else {
+                        $output = 'XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename);
                         if (strstr($wp_version,'ME')){
                                 $output .= '(included WordPress ' . $wp_version . ')';
@@ -172 +173 @@
                 }
         } else {
-                $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                 if ($xoops_config->is_wpmu) {
+                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressMU Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                         $output .= '(included <a href="http://mu.wordpress.org/" title="Powered by WordPress"'." target='_blank'". '>WordPress MU ' . $wpmu_version . '</a>)';
                 } else {
+                        $output = '<a href="http://ja.xpressme.info"'. " target='_blank'" . '>XPressME Ver.' . sprintf('%.2f %s',$xpress_version,$xpress_codename) .'</a>';
                         if (strstr($wp_version,'ME')){
                                 $output .= '(included <a href="http://wpme.sourceforge.jp/" title="Powered by WordPress"'." target='_blank'". '>WordPress ' . $wp_version . '</a>)';
@@ -467 +469 @@
 }
 
-function set_post_views_count(&$content) {
+function set_post_views_count($content) {
         if ( empty($_GET["feed"]) &&  empty($GLOBALS["feed"]) && empty($GLOBALS["doing_trackback"]) && empty($GLOBALS["doing_rss"]) && empty($_POST) && is_single() ){
                 post_views_counting();

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php

@@ -190 +190 @@
 
 endif;  // Under WP2.5
+
+// Under WP2.7
+if (version_compare($xoops_config->wp_version,'2.6', '<')) :
+        /**
+         * Guess the URL for the site.
+         *
+         * Will remove wp-admin links to retrieve only return URLs not in the wp-admin
+         * directory.
+         *
+         * @since 2.6.0
+         *
+         * @return string
+         */
+        function wp_guess_url() {
+        if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+                $url = WP_SITEURL;
+        } else {
+                $schema = ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
+                $url = preg_replace('|/wp-admin/.*|i', '', $schema . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
+        }
+        return $url;
+}
+endif;  // Under WP2.6
 
 // Under WP2.7

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php

@@ -242 +242 @@
         if (is_admin()) return $query_vars;
         
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         if(xpress_is_multi_user()){
                 if (!empty($_GET)){
@@ -290 +290 @@
 }
 
-function xpress_query_filter(&$query)
+function xpress_query_filter($query)
 {
         if (is_admin()) return $query;
 
-        $author_cookie = get_xpress_dir_name() . "_select_author" ;
+        $author_cookie = 'select_' . get_xpress_dir_name() . "_author" ;
         
         if (strpos($query,'SELECT') === false)  return $query;
@@ -357 +357 @@
 }
 
-function safe_site_url_filter($site_url){
-        global $xoops_config;
-        if (!$xoops_config->is_wpmu){
-                if ($site_url != get_xpress_url()) $site_url = get_xpress_url();
-        }
-        return $site_url;
-}
-
 function get_block_file_path($mydirname,$file_name)
 {

branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php

@@ -71 +71 @@
 }
 add_action("wp_meta" , "wp_meta_add_xpress_menu");                      // add xpress menu  in wp_meta
-        
-//Site URL check
-add_filter('option_home',                       "safe_site_url_filter");
-add_filter('option_siteurl',            "safe_site_url_filter");
-        
 
 //XOOPS Bloack Cache Refresh
@@ -301 +296 @@
 
 include_once dirname( __FILE__ ).'/include/dashboard_feed.php' ;
-
-include_once dirname( __FILE__ ).'/xpressme_widget_class.php' ;
-
+if(xpress_is_wp_version('>=','2.8')){
+        include_once dirname( __FILE__ ).'/xpressme_widget_class.php' ;
+}
 ?>