Changeset 252 for trunk/xpressme_integration_kit/wp-content/plugins/xpressme

Timestamp:

Jun 4, 2009, 2:02:54 PM (15 years ago)

Author:

toemon

Message:

WordPressME2.0.11への対応,(ブロック周りは未完)

Location:

trunk/xpressme_integration_kit/wp-content/plugins/xpressme

Files:

• include/custom_functions.php (modified) (4 diffs)
• include/functions_for_wp20.php (added)
• include/pluggable-override.php (modified) (4 diffs)
• xpressme.php (modified) (1 diff)
• xpressme_class.php (modified) (2 diffs)

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

@@ -399 +399 @@
         $blog_encoding = get_option('blog_charset');
         $text = get_the_content('');
-        $text = strip_shortcodes( $text );
+        if (function_exists('strip_shortcodes')){ //@since WP2.5
+                $text = strip_shortcodes( $text );
+        }
         $text = apply_filters('the_content', $text);
         $text = str_replace(']]>', ']]>', $text);
@@ -454 +456 @@
 function xpress_post_new_link($link_title = 'Post New',$display = true)
 {
-        $output = '<a href="'. get_xpress_url() . '/wp-admin/post-new.php' . '">' . $link_title . '</a>';
+        global $xoops_config;
+        
+        if ($xoops_config->wp_db_version  > 5000){
+                $output = '<a href="'. get_xpress_url() . '/wp-admin/post-new.php' . '">' . $link_title . '</a>';
+        } else {
+                $output = '<a href="'. get_xpress_url() . '/wp-admin/post.php' . '">' . $link_title . '</a>';
+        }       
         if ($display) 
                 echo $output;
@@ -469 +477 @@
         if (is_category())
                 $output = sprintf(__('Archive for the &#8216;%s&#8217; Category', 'xpressme'), single_cat_title('', false));
-        if (is_tag())
-                $output = sprintf(__('Posts Tagged &#8216;%s&#8217;', 'xpressme'), single_tag_title('', false) );
+        if (function_exists( 'is_tag' )){
+                if (is_tag())
+                        $output = sprintf(__('Posts Tagged &#8216;%s&#8217;', 'xpressme'), single_tag_title('', false) );
+        }
         if (is_day())
                 $output = sprintf(__('Archive for %s|Daily archive page', 'xpressme'), get_the_time(__('F jS, Y', 'xpressme')));
@@ -587 +597 @@
 
 function xpress_get_calendar($sun_color = '#DB0000' ,$sat_color = '#004D99' ,$initial = true) {
-        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
-
-
+        global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $xoops_config;
+
+        if ($xoops_config->is_wp20){
+                ob_start();
+                        get_calendar(true);
+                        $output = ob_get_contents();
+                ob_end_clean();
+                $output = preg_replace('/<th abbr=/', '<th align="center"  abbr=', $output); //week name align center
+                $output = preg_replace('/<td>/', '<td align="center">', $output); //days align center
+                $output = preg_replace('/<td id="today">/', '<td id="today" align="center">', $output); //today align center
+
+                return $output;
+        }
 
         ob_start();

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

@@ -51 +51 @@
 
         } else {
-                // WP2.7 original
+                // WP original
                 if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST )
                         return false;
@@ -58 +58 @@
                         return;
 
-                if ( ! $user = wp_validate_auth_cookie() ) {
-                         if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
-                                wp_set_current_user(0);
-                                return false;
-                         }
-                }
-
-                wp_set_current_user($user);
+                if (function_exists('wp_validate_auth_cookie')){
+                        if ( ! $user = wp_validate_auth_cookie() ) {
+                                 if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) {
+                                        wp_set_current_user(0);
+                                        return false;
+                                 }
+                        }
+                        wp_set_current_user($user);
+                } else { // for WP2.0
+                        if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 
+                                !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
+                                wp_set_current_user(0);
+                                return false;
+                        }
+                        $user_login = $_COOKIE[USER_COOKIE];
+                        wp_set_current_user(0, $user_login);
+                }
         }
 }
@@ -77 +86 @@
         if(is_object($xoopsUser)){
                 $u_name = $xoopsUser->getVar("uname");
-                $u_pass_md5 = $xoopsUser->getVar("pass");       
+                $u_pass_md5 = $xoopsUser->getVar("pass");
                 if ( ! empty($u_name) && ! empty($u_pass_md5) ) {
                         include_once dirname( __FILE__ ).'/user_sync_xoops.php';
@@ -96 +105 @@
         wp_set_current_user(0);
         wp_clearcookie();
-        return 0;       
+        return 0;
 }
 endif;

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

@@ -20 +20 @@
 
 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
+if ($xoops_config->is_wp20)
+        require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ;
 
 add_action('admin_menu', array(&$xpress_config, 'add_option_page'));

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

@@ -410 +410 @@
 
         }
-        
+
         function groupe_role_option(){
                 global $wp_roles , $xoops_db;
@@ -427 +427 @@
                 
                         $select_value = $groupe->role;
-                
-                        
+
+
                                 
                         foreach($wp_roles->role_names as $role => $name) {