Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 354)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (revision 360)
@@ -16,8 +16,7 @@
}
-function xpress_is_wp20() {
+function xpress_is_wp_version($operator='==',$comp_version){
global $xoops_config;
-
- return $xoops_config->is_wp20;
+ return version_compare($xoops_config->wp_version, $comp_version, $operator);
}
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php (revision 354)
+++ (revision )
@@ -1,273 +1,0 @@
-getVar("dirname")){
- if(!is_object($GLOBALS["xoopsUser"])){
- wp_clearcookie();
- return false;
- }
- }
-
- $username = sanitize_user($username);
-
- if ( '' == $username )
- return false;
-
- if ( '' == $password ) {
- $error = __('ERROR: The password field is empty.');
- return false;
- }
-
- $login = get_userdatabylogin($username);
- //$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
-
- if (!$login) {
- $error = __('ERROR: Invalid username.');
- return false;
- } else {
- if ($login->user_login == $username) {
- if ($login->user_pass == $password) return true;
- if ($login->user_pass == md5($password)) return true;
- }
-
- $error = __('ERROR: Incorrect password.');
- $pwd = '';
- return false;
- }
-}
-endif;
-
-if ( !function_exists('wp_sanitize_redirect') ) :
-/**
- * Sanitizes a URL for use in a redirect.
- *
- * @since 2.3
- *
- * @return string redirect-sanitized URL
- **/
-function wp_sanitize_redirect($location) {
- $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
- $location = wp_kses_no_null($location);
-
- // remove %0d and %0a from location
- $strip = array('%0d', '%0a');
- $found = true;
- while($found) {
- $found = false;
- foreach( (array) $strip as $val ) {
- while(strpos($location, $val) !== false) {
- $found = true;
- $location = str_replace($val, '', $location);
- }
- }
- }
- return $location;
-}
-endif;
-
-
-// Added WP2.7 separate_comments()
-function &separate_comments(&$comments) {
- $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
- $count = count($comments);
- for ( $i = 0; $i < $count; $i++ ) {
- $type = $comments[$i]->comment_type;
- if ( empty($type) )
- $type = 'comment';
- $comments_by_type[$type][] = &$comments[$i];
- if ( 'trackback' == $type || 'pingback' == $type )
- $comments_by_type['pings'][] = &$comments[$i];
- }
-
- return $comments_by_type;
-}
-
-// Added WP2.7 get_comments()
-function get_comments( $args = '' ) {
- global $wpdb;
-
- $defaults = array('status' => '', 'orderby' => 'comment_date_gmt', 'order' => 'DESC', 'number' => '', 'offset' => '', 'post_id' => 0);
-
- $args = wp_parse_args( $args, $defaults );
- extract( $args, EXTR_SKIP );
-
- // $args can be whatever, only use the args defined in defaults to compute the key
- $key = md5( serialize( compact(array_keys($defaults)) ) );
- $last_changed = wp_cache_get('last_changed', 'comment');
- if ( !$last_changed ) {
- $last_changed = time();
- wp_cache_set('last_changed', $last_changed, 'comment');
- }
- $cache_key = "get_comments:$key:$last_changed";
-
- if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
- return $cache;
- }
-
- $post_id = absint($post_id);
-
- if ( 'hold' == $status )
- $approved = "comment_approved = '0'";
- elseif ( 'approve' == $status )
- $approved = "comment_approved = '1'";
- elseif ( 'spam' == $status )
- $approved = "comment_approved = 'spam'";
- else
- $approved = "( comment_approved = '0' OR comment_approved = '1' )";
-
- $order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
-
- $orderby = 'comment_date_gmt'; // Hard code for now
-
- $number = absint($number);
- $offset = absint($offset);
-
- if ( !empty($number) ) {
- if ( $offset )
- $number = 'LIMIT ' . $offset . ',' . $number;
- else
- $number = 'LIMIT ' . $number;
-
- } else {
- $number = '';
- }
-
- if ( ! empty($post_id) )
- $post_where = "comment_post_ID = $post_id AND" ;
- else
- $post_where = '';
-
- $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE $post_where $approved ORDER BY $orderby $order $number" );
- wp_cache_add( $cache_key, $comments, 'comment' );
-
- return $comments;
-}
-
-// Added WP2.2 wp_parse_args()
-function wp_parse_args( $args, $defaults = '' ) {
- if ( is_object( $args ) )
- $r = get_object_vars( $args );
- elseif ( is_array( $args ) )
- $r =& $args;
- else
- wp_parse_str( $args, $r );
-
- if ( is_array( $defaults ) )
- return array_merge( $defaults, $r );
- return $r;
-}
-
-// Added WP2.2.1 wp_parse_str()
-function wp_parse_str( $string, &$array ) {
- parse_str( $string, $array );
- if ( get_magic_quotes_gpc() )
- $array = stripslashes_deep( $array );
- $array = apply_filters( 'wp_parse_str', $array );
-}
-// Added WP2.5 absint()
-function absint( $maybeint ) {
- return abs( intval( $maybeint ) );
-}
-
-// Added WP2.7 absint()
-function locate_template($template_names, $load = false) {
- if (!is_array($template_names))
- return '';
-
- $located = '';
- foreach($template_names as $template_name) {
- if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
- $located = STYLESHEETPATH . '/' . $template_name;
- break;
- } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
- $located = TEMPLATEPATH . '/' . $template_name;
- break;
- }
- }
-
- if ($load && '' != $located)
- load_template($located);
-
- return $located;
-}
-
-// Added WP2.5 translate_with_context()
-function translate_with_context( $text, $domain = 'default' ) {
- return before_last_bar(translate( $text, $domain ) );
-
-}
-
-// Added WP2.2 translate()
-function translate($text, $domain = 'default') {
- global $l10n;
-
- if (isset($l10n[$domain]))
- return apply_filters('gettext', $l10n[$domain]->translate($text), $text, $domain);
- else
- return apply_filters('gettext', $text, $text, $domain);
-}
-
-// Added WP2.2 translate_with_context()
-function before_last_bar( $string ) {
- $last_bar = strrpos( $string, '|' );
- if ( false == $last_bar )
- return $string;
- else
- return substr( $string, 0, $last_bar );
-}
-
-// Added WP2.7 post_password_required()
-function post_password_required( $post = null ) {
- $post = get_post($post);
-
- if ( empty($post->post_password) )
- return false;
-
- if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
- return true;
-
- if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
- return true;
-
- return false;
-}
-// Added WP2.7 comment_form_title()
-function comment_form_title( $noreplytext = 'Leave a Reply', $replytext = 'Leave a Reply to %s', $linktoparent = TRUE ) {
- global $comment;
-
- $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
-
- if ( 0 == $replytoid )
- echo $noreplytext;
- else {
- $comment = get_comment($replytoid);
- $author = ( $linktoparent ) ? '' . get_comment_author() . '' : get_comment_author();
- printf( $replytext, $author );
- }
-}
-
-// ADD WP 2.1.0
-function the_modified_date($d = '') {
- echo apply_filters('the_modified_date', get_the_modified_date($d), $d);
-}
-
-// ADD WP 2.1.0
-function get_the_modified_date($d = '') {
- if ( '' == $d )
- $the_time = get_post_modified_time(get_option('date_format'));
- else
- $the_time = get_post_modified_time($d);
- return apply_filters('get_the_modified_date', $the_time, $d);
-}
-
-/**
- * @ignore
- */
-function _c() {}
-
-
-?>
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php (revision 360)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp_old.php (revision 360)
@@ -0,0 +1,315 @@
+wp_version,'2.3', '<')) :
+ function wp_login($username, $password, $already_md5 = false) {
+ global $wpdb, $error;
+
+
+ if(is_object($GLOBALS["xoopsModule"]) && WP_BLOG_DIRNAME == $GLOBALS["xoopsModule"]->getVar("dirname")){
+ if(!is_object($GLOBALS["xoopsUser"])){
+ wp_clearcookie();
+ return false;
+ }
+ }
+
+ $username = sanitize_user($username);
+
+ if ( '' == $username )
+ return false;
+
+ if ( '' == $password ) {
+ $error = __('ERROR: The password field is empty.');
+ return false;
+ }
+
+ $login = get_userdatabylogin($username);
+ //$login = $wpdb->get_row("SELECT ID, user_login, user_pass FROM $wpdb->users WHERE user_login = '$username'");
+
+ if (!$login) {
+ $error = __('ERROR: Invalid username.');
+ return false;
+ } else {
+ if ($login->user_login == $username) {
+ if ($login->user_pass == $password) return true;
+ if ($login->user_pass == md5($password)) return true;
+ }
+
+ $error = __('ERROR: Incorrect password.');
+ $pwd = '';
+ return false;
+ }
+ }
+endif;
+
+// Under WP2.1
+if (version_compare($xoops_config->wp_version,'2.1', '<')) :
+ // ADD WP 2.1.0
+ function the_modified_date($d = '') {
+ echo apply_filters('the_modified_date', get_the_modified_date($d), $d);
+ }
+
+ // ADD WP 2.1.0
+ function get_the_modified_date($d = '') {
+ if ( '' == $d )
+ $the_time = get_post_modified_time(get_option('date_format'));
+ else
+ $the_time = get_post_modified_time($d);
+ return apply_filters('get_the_modified_date', $the_time, $d);
+ }
+endif; // Under WP2.1
+
+// Under WP2.2
+if (version_compare($xoops_config->wp_version,'2.2', '<')):
+ // Added WP2.2 wp_parse_args()
+ function wp_parse_args( $args, $defaults = '' ) {
+ if ( is_object( $args ) )
+ $r = get_object_vars( $args );
+ elseif ( is_array( $args ) )
+ $r =& $args;
+ else
+ wp_parse_str( $args, $r );
+
+ if ( is_array( $defaults ) )
+ return array_merge( $defaults, $r );
+ return $r;
+ }
+ // Added WP2.2 translate()
+ function translate($text, $domain = 'default') {
+ global $l10n;
+
+ if (isset($l10n[$domain]))
+ return apply_filters('gettext', $l10n[$domain]->translate($text), $text, $domain);
+ else
+ return apply_filters('gettext', $text, $text, $domain);
+ }
+
+ // Added WP2.2 translate_with_context()
+ function before_last_bar( $string ) {
+ $last_bar = strrpos( $string, '|' );
+ if ( false == $last_bar )
+ return $string;
+ else
+ return substr( $string, 0, $last_bar );
+ }
+endif; // Under WP2.2
+
+// Under WP2.2.1
+if (version_compare($xoops_config->wp_version,'2.2.1', '<')) :
+ // Added WP2.2.1 wp_parse_str()
+ function wp_parse_str( $string, &$array ) {
+ parse_str( $string, $array );
+ if ( get_magic_quotes_gpc() )
+ $array = stripslashes_deep( $array );
+ $array = apply_filters( 'wp_parse_str', $array );
+ }
+
+endif; // Under WP2.2.1
+
+// Under WP2.3
+if (version_compare($xoops_config->wp_version,'2.3', '<')) :
+ if ( !function_exists('wp_sanitize_redirect') ) :
+ /**
+ * Sanitizes a URL for use in a redirect.
+ *
+ * @since 2.3
+ *
+ * @return string redirect-sanitized URL
+ **/
+ function wp_sanitize_redirect($location) {
+ $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
+ $location = wp_kses_no_null($location);
+
+ // remove %0d and %0a from location
+ $strip = array('%0d', '%0a');
+ $found = true;
+ while($found) {
+ $found = false;
+ foreach( (array) $strip as $val ) {
+ while(strpos($location, $val) !== false) {
+ $found = true;
+ $location = str_replace($val, '', $location);
+ }
+ }
+ }
+ return $location;
+ }
+ endif;
+
+ if ( !function_exists('wp_sanitize_redirect') ) :
+ /**
+ * Sanitizes a URL for use in a redirect.
+ *
+ * @since 2.3
+ *
+ * @return string redirect-sanitized URL
+ **/
+ function wp_sanitize_redirect($location) {
+ $location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
+ $location = wp_kses_no_null($location);
+
+ // remove %0d and %0a from location
+ $strip = array('%0d', '%0a');
+ $found = true;
+ while($found) {
+ $found = false;
+ foreach( (array) $strip as $val ) {
+ while(strpos($location, $val) !== false) {
+ $found = true;
+ $location = str_replace($val, '', $location);
+ }
+ }
+ }
+ return $location;
+ }
+ endif;
+
+endif; // Under WP2.3
+
+// Under WP2.5
+if (version_compare($xoops_config->wp_version,'2.5', '<')) :
+ // Added WP2.5 absint()
+ function absint( $maybeint ) {
+ return abs( intval( $maybeint ) );
+ }
+ // Added WP2.5 translate_with_context()
+ function translate_with_context( $text, $domain = 'default' ) {
+ return before_last_bar(translate( $text, $domain ) );
+ }
+ /**
+ * @ignore
+ */
+ function _c() {}
+
+endif; // Under WP2.5
+
+// Under WP2.7
+if (version_compare($xoops_config->wp_version,'2.7', '<')) :
+ // Added WP2.7 separate_comments()
+ function &separate_comments(&$comments) {
+ $comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
+ $count = count($comments);
+ for ( $i = 0; $i < $count; $i++ ) {
+ $type = $comments[$i]->comment_type;
+ if ( empty($type) )
+ $type = 'comment';
+ $comments_by_type[$type][] = &$comments[$i];
+ if ( 'trackback' == $type || 'pingback' == $type )
+ $comments_by_type['pings'][] = &$comments[$i];
+ }
+
+ return $comments_by_type;
+ }
+
+ // Added WP2.7 get_comments()
+ function get_comments( $args = '' ) {
+ global $wpdb;
+
+ $defaults = array('status' => '', 'orderby' => 'comment_date_gmt', 'order' => 'DESC', 'number' => '', 'offset' => '', 'post_id' => 0);
+
+ $args = wp_parse_args( $args, $defaults );
+ extract( $args, EXTR_SKIP );
+
+ // $args can be whatever, only use the args defined in defaults to compute the key
+ $key = md5( serialize( compact(array_keys($defaults)) ) );
+ $last_changed = wp_cache_get('last_changed', 'comment');
+ if ( !$last_changed ) {
+ $last_changed = time();
+ wp_cache_set('last_changed', $last_changed, 'comment');
+ }
+ $cache_key = "get_comments:$key:$last_changed";
+
+ if ( $cache = wp_cache_get( $cache_key, 'comment' ) ) {
+ return $cache;
+ }
+
+ $post_id = absint($post_id);
+
+ if ( 'hold' == $status )
+ $approved = "comment_approved = '0'";
+ elseif ( 'approve' == $status )
+ $approved = "comment_approved = '1'";
+ elseif ( 'spam' == $status )
+ $approved = "comment_approved = 'spam'";
+ else
+ $approved = "( comment_approved = '0' OR comment_approved = '1' )";
+
+ $order = ( 'ASC' == $order ) ? 'ASC' : 'DESC';
+
+ $orderby = 'comment_date_gmt'; // Hard code for now
+
+ $number = absint($number);
+ $offset = absint($offset);
+
+ if ( !empty($number) ) {
+ if ( $offset )
+ $number = 'LIMIT ' . $offset . ',' . $number;
+ else
+ $number = 'LIMIT ' . $number;
+
+ } else {
+ $number = '';
+ }
+
+ if ( ! empty($post_id) )
+ $post_where = "comment_post_ID = $post_id AND" ;
+ else
+ $post_where = '';
+
+ $comments = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE $post_where $approved ORDER BY $orderby $order $number" );
+ wp_cache_add( $cache_key, $comments, 'comment' );
+
+ return $comments;
+ }
+
+ // Added WP2.7 absint()
+ function locate_template($template_names, $load = false) {
+ if (!is_array($template_names))
+ return '';
+
+ $located = '';
+ foreach($template_names as $template_name) {
+ if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
+ $located = STYLESHEETPATH . '/' . $template_name;
+ break;
+ } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
+ $located = TEMPLATEPATH . '/' . $template_name;
+ break;
+ }
+ }
+
+ if ($load && '' != $located)
+ load_template($located);
+
+ return $located;
+ }
+ // Added WP2.7 post_password_required()
+ function post_password_required( $post = null ) {
+ $post = get_post($post);
+
+ if ( empty($post->post_password) )
+ return false;
+
+ if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
+ return true;
+
+ if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
+ return true;
+
+ return false;
+ }
+ // Added WP2.7 comment_form_title()
+ function comment_form_title( $noreplytext = 'Leave a Reply', $replytext = 'Leave a Reply to %s', $linktoparent = TRUE ) {
+ global $comment;
+
+ $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
+
+ if ( 0 == $replytoid )
+ echo $noreplytext;
+ else {
+ $comment = get_comment($replytoid);
+ $author = ( $linktoparent ) ? '' . get_comment_author() . '' : get_comment_author();
+ printf( $replytext, $author );
+ }
+ }
+endif; // Under WP2.7
+?>
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php (revision 354)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/xpress_common_functions.php (revision 360)
@@ -250,5 +250,5 @@
}
} else {
- if(xpress_is_wp20()){
+ if(xpress_is_wp_version('<','2.1')){ // Maybe, I think that it is ver2.1 or less.
if (!empty($wp->matched_query) ){
if (strpos($wp->matched_query,'author_name') !== false ){
@@ -303,5 +303,5 @@
$query = preg_replace('/\s\s+/', ' ', $query);
if (!empty($_COOKIE[$author_cookie])){
- if(xpress_is_wp20()){
+ if(xpress_is_wp_version('<','2.1')){
$pattern = "WHERE.*AND\s?\(*post_author\s*=";
if ( preg_match ( "/".$pattern."/i", $query, $match ) ){
Index: trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 354)
+++ trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (revision 360)
@@ -20,6 +20,5 @@
require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
-if ($xoops_config->is_wp20)
- require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ;
+require_once dirname( __FILE__ ).'/include/functions_for_wp_old.php' ;
function my_plugin_menu()
@@ -98,5 +97,5 @@
add_filter('query','xpress_query_filter');
//add_action("init", "xpress_set_author_cookie");
-if(xpress_is_wp20()){
+if(xpress_is_wp_version('<','2.1')){
// It is called before parse_request() makes $GET.
add_action("query_vars", "xpress_set_author_cookie");