Index: /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
===================================================================
--- /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 413)
+++ /branches/XPressMU/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php	(revision 413)
@@ -0,0 +1,438 @@
+<?php
+/*
+Plugin Name: Plugin for XPressME
+Plugin URI: http://ja.xpressme.info
+Description: Plugin for XPressME (custom function,filter,action)
+Author: toemon
+Version: 1.0
+Author URI: http://ja.xpressme.info
+*/
+require_once('xpressme_class.php');
+
+require_once dirname( __FILE__ ).'/include/custom_functions.php' ;		// XPressME functions for themes
+require_once dirname( __FILE__ ).'/include/xpress_common_functions.php' ;
+
+$xoops_db = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
+$xoops_db->prefix = get_xoops_prefix();
+$xoops_db->tables = array('modules', 'newblocks', 'users');
+
+$xpress_config = new XPressME_Class();
+
+require_once dirname( __FILE__ ).'/include/pluggable-override.php' ;
+require_once dirname( __FILE__ ).'/include/functions_for_wp_old.php' ;
+
+function my_plugin_menu()
+{
+	global $xpress_config,$xoops_config;
+	
+	$plugin_url = WP_PLUGIN_URL."/xpressme/";
+
+	// Add a new top-level menu:
+	add_menu_page('XPressME','XPressME', 8, __FILE__, 'display_option_page' , $plugin_url.'/images/menu_icon.png');
+	// Add submenus to the custom top-level menu:
+	add_submenu_page(__FILE__, __('Display Settings', 'xpressme'), __('Display Settings', 'xpressme'), 8, __FILE__, 'display_option_page');
+	add_submenu_page(__FILE__, __('Integration Settings', 'xpressme'), __('Integration Settings', 'xpressme'), 8, 'integration_option_page', 'integration_option_page');
+	add_submenu_page(__FILE__, __('Other Settings', 'xpressme'), __('Other Settings', 'xpressme'), 8, 'other_option_page', 'other_option_page');
+//	if (function_exists('wp_remote_get'))
+		add_submenu_page(__FILE__, __('Upgrade', 'xpressme'), __('Upgrade', 'xpressme'), 8, 'upgrade_page', 'upgrade_page');
+	add_submenu_page(__FILE__, __('to Modules Admin', 'xpressme'), __('to Modules Admin', 'xpressme'), 8,  'redirect_xoops_admin', 'redirect_xoops_admin');
+}
+add_action('admin_menu', 'my_plugin_menu');
+
+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
+}
+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
+add_action("comment_post",	"block_cache_refresh");
+add_action("edit_comment",	"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("transition_post_status", "block_cache_refresh");
+
+add_action("the_content",	"set_post_views_count");
+
+//XOOPS notifiction
+require_once dirname( __FILE__ ).'/include/notify_functions.php' ;
+add_action("transition_post_status",	"onaction_publish_post_notify" ,10 , 3);
+//	add_action("edit_post",	"onaction_edit_post_notify");
+add_action("comment_post",	"onaction_comment_notify");
+//	add_action("approve_comment" , "onaction_comment_apobe_notify");
+add_action("wp_set_comment_status" , "onaction_comment_apobe_notify");
+
+// user data sync  user_sync_to_xoops($user_id)
+require_once dirname( __FILE__ ).'/include/user_sync_xoops.php' ;
+add_action('profile_update', 'user_sync_to_xoops');
+add_action('user_register', 'user_sync_to_xoops');
+//require_once('../include/custom_functions.php');
+
+//D3Forum Comment Integration
+if ($xpress_config->is_use_d3forum){
+	require_once dirname( __FILE__ ).'/include/d3forum_comment_synchro.php' ;
+	add_action("comment_post",	"onaction_comment_post");
+	add_action("edit_comment",	"onaction_edit_comment");
+	add_action("delete_comment","onaction_delete_comment");
+	add_action("delete_post",	"onaction_delete_post");
+	add_action("wp_set_comment_status" , "onaction_comment_apobe");
+	
+	
+	add_filter('comments_template', "disp_d3forum_comments" );
+
+}
+
+
+
+//The trackback and the pingback are excluded from the count of the comment. 
+add_filter('get_comments_number', 'xpress_comment_count', 0);
+
+// Query filter for  MultiUser
+add_filter('query','xpress_query_filter');
+//add_action("init", "xpress_set_author_cookie");
+if(xpress_is_wp_version('<','2.1')){
+	// It is called before parse_request() makes $GET. 
+	add_action("query_vars", "xpress_set_author_cookie");
+} else {
+	// It is called at the end of parse_request(). 
+	add_filter('request', 'xpress_set_author_cookie');
+}
+
+// SQL debug windows
+add_filter('query', array(&$xpress_config, 'xpress_sql_debug'));
+add_action('admin_footer', array(&$xpress_config, 'displayDebugLog'));
+add_action('wp_footer', array(&$xpress_config, 'displayDebugLog'));
+
+function redirect_xoops_admin()
+{
+	global $xoops_config,$xpress_config;
+	$xoops_admin_url = $xoops_config->module_url . '/admin/index.php';
+	wp_redirect($xoops_admin_url);
+}
+
+function display_option_page()
+{
+	global $xoops_config,$xpress_config;
+	
+		$xoops_admin_url = $xoops_config->module_url . '/admin/index.php';
+
+		$do_message ='';
+		if (!empty($_POST['submit_update'])) {
+			$xpress_config->ReadPostData($_POST);
+			$xpress_config->SettingValueWrite('update');
+		} else if (isset($_POST['submit_reset'])) {
+			$xpress_config->setDefault();
+			$xpress_config->SettingValueWrite('update');
+		}
+		
+		echo	'<div class="wrap">'."\n";
+		echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
+		echo		'<h2>' . __('XPressME Display Setting', 'xpressme') . "</h2><br>\n";
+//		echo 		'<div align="right"><a href="' . $xoops_admin_url . '"><h3>'. __('to XOOPS Modules Admin Page', 'xpressme') . '</h3></a></div>';
+		echo		'<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">'."\n" ;
+		echo			'<table class="form-table">'."\n";
+		echo				$xpress_config->viewer_type_option();
+		echo				$xpress_config->yes_no_radio_option('is_theme_sidebar_disp',
+												__('Thema Sidebar Display','xpressme'),
+												__('YES','xpressme'),
+												__('NO','xpressme')
+												);
+		echo 				$xpress_config->single_post_navi_option();
+		echo 				$xpress_config->posts_page_navi_option();
+		echo 				$xpress_config->excerpt_option();
+		echo 				$xpress_config->dashboard_display_option();
+		echo			"</table>\n";
+		
+		echo		'<p class="submit">'."\n";
+		echo		'<input type="submit" value= "' . __('Update Config', 'xpressme') . '" name="submit_update" />' ."\n";
+		echo		'<input type="submit" value= "' . __('Preset Config', 'xpressme') . '" name="submit_reset" />' ."\n";
+		echo		"</p>\n";
+
+		echo		"</form>\n" ;
+		echo	"</div>\n";
+}
+
+function integration_option_page()
+{
+	global $xoops_config,$xpress_config;
+	
+		$xoops_admin_url = $xoops_config->module_url . '/admin/index.php';
+
+		$do_message ='';
+		if (!empty($_POST['submit_update'])) {
+			$xpress_config->ReadPostData($_POST);
+			$xpress_config->SettingValueWrite('update');
+		} else if (isset($_POST['submit_reset'])) {
+			$xpress_config->setDefault();
+			$xpress_config->SettingValueWrite('update');
+		} else if (isset($_POST['export_d3f'])) {
+			$do_message  = 'export(' . $xpress_config->d3forum_module_dir . '--ID=' . $xpress_config->d3forum_forum_id . ')................';
+			$do_message .= wp_to_d3forum($xpress_config->d3forum_forum_id, $xpress_config->d3forum_module_dir);
+			$do_message .= '....END';
+		} else if (isset($_POST['inport_d3f'])) {
+			$do_message  = 'Import(' . $xpress_config->d3forum_module_dir . '--ID=' . $xpress_config->d3forum_forum_id . ')................';
+			$do_message .= d3forum_to_wp($xpress_config->d3forum_forum_id, $xpress_config->d3forum_module_dir);
+			$do_message .= '....END';
+		} 		
+		
+		echo	'<div class="wrap">'."\n";
+		echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
+		echo		'<h2>' . __('XPressME Integration Setting', 'xpressme') . "</h2><br>\n";
+//		echo 		'<div align="right"><a href="' . $xoops_admin_url . '"><h3>'. __('to XOOPS Modules Admin Page', 'xpressme') . '</h3></a></div>';
+		echo		'<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">'."\n" ;
+		echo			'<table class="form-table">'."\n";
+		echo				$xpress_config->yes_no_radio_option('is_use_xoops_upload_path',
+												__('Media Upload Base Path','xpressme'),
+												__('Use XOOPS UPLOAD PATH','xpressme'),
+												__('USE WordPress BASE_PATH','xpressme')
+												);
+		
+		echo				$xpress_config->groupe_role_option();		
+		
+		echo				$xpress_config->d3forum_option($do_message);		
+		echo			"</table>\n";
+		
+		echo		'<p class="submit">'."\n";
+		echo		'<input type="submit" value= "' . __('Update Config', 'xpressme') . '" name="submit_update" />' ."\n";
+		echo		'<input type="submit" value= "' . __('Preset Config', 'xpressme') . '" name="submit_reset" />' ."\n";
+		echo		"</p>\n";
+
+		echo		"</form>\n" ;
+		echo	"</div>\n";
+}
+
+function other_option_page()
+{
+	global $xoops_config,$xpress_config;
+	
+		$xoops_admin_url = $xoops_config->module_url . '/admin/index.php';
+
+		$do_message ='';
+		if (!empty($_POST['submit_update'])) {
+			$xpress_config->ReadPostData($_POST);
+			$xpress_config->SettingValueWrite('update');
+		} else if (isset($_POST['submit_reset'])) {
+			$xpress_config->setDefault();
+			$xpress_config->SettingValueWrite('update');
+		}
+		
+		echo	'<div class="wrap">'."\n";
+		echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
+		echo		'<h2>' . __('XPressME Other Setting', 'xpressme') . "</h2><br>\n";
+//		echo 		'<div align="right"><a href="' . $xoops_admin_url . '"><h3>'. __('to XOOPS Modules Admin Page', 'xpressme') . '</h3></a></div>';
+		echo		'<form method="post" action="' . $_SERVER["REQUEST_URI"] . '">'."\n" ;
+		echo			'<table class="form-table">'."\n";
+		echo				$xpress_config->yes_no_radio_option('is_save_post_revision',
+												__('The change tracking of the post is preserved','xpressme'),
+												__('YES','xpressme'),
+												__('NO','xpressme')
+												);
+		
+		echo				$xpress_config->yes_no_radio_option('is_multi_user',
+												__('Select Multi user mode','xpressme'),
+												__('YES','xpressme'),
+												__('NO','xpressme')
+												);
+		echo				$xpress_config->yes_no_radio_option('is_author_view_count',
+												__('Is the posts author views counted?','xpressme'),
+												__('YES','xpressme'),
+												__('NO','xpressme')		
+												);
+		echo 				$xpress_config->header_meta_option();
+		echo				$xpress_config->yes_no_radio_option('is_sql_debug',
+												__('Is SQL debugging window displayed?','xpressme'),
+												__('YES','xpressme'),
+												__('NO','xpressme')		
+												);
+		echo			"</table>\n";
+		
+		echo		'<p class="submit">'."\n";
+		echo		'<input type="submit" value= "' . __('Update Config', 'xpressme') . '" name="submit_update" />' ."\n";
+		echo		'<input type="submit" value= "' . __('Preset Config', 'xpressme') . '" name="submit_reset" />' ."\n";
+		echo		"</p>\n";
+
+		echo		"</form>\n" ;
+		echo	"</div>\n";
+}
+
+function upgrade_page()
+{
+	global $xoops_config,$xpress_config;
+	
+	$xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+	$check_url = "http://ja1.xpressme.info/version_check/?version=$xpress_version";
+
+	echo	'<div class="wrap">'."\n";
+	echo		'<div id="icon-options-general" class="icon32"><br /></div>'."\n";
+	echo		'<h2>' . __('XPressME Upgrade', 'xpressme') . "</h2><br>\n";
+	
+	if(get_xpress_latest_version()){
+		$latest = get_option('xpressme_latest_version');
+		if ($latest) {
+			$site_url=$latest['url'];
+			$package=$latest['package'];
+			$latest_version=$latest['latest_version'];
+			$check_time=$latest['check_time'];
+		}
+
+
+		if (version_compare($xpress_version, $latest_version, '>')){
+				echo '<h3 class="response">';
+				printf(__('You are using a XPressME Integration Kit development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.', 'xpressme') , $xpress_version , $site_url);
+				echo '</h3>';
+
+		} else if (version_compare($xpress_version, $latest_version, '<')) {
+			echo	'<h3 class="response">'. __('There is a new version of XPressME Integration Kit available for upgrade', 'xpressme') . '</h3>';
+			echo '<p>';
+	//		printf(__('You can upgrade to version %s automatically or download the package and install it manually:'),$latest_version);
+			printf(__('You can upgrade to version %s download the package and install it manually:', 'xpressme'),$latest_version);
+			echo '</p>';
+			echo '<a class="button" href="' . $package . '">';
+			printf(__('Download %s', 'xpressme') , $latest_version);
+			echo '</a>';
+		} else {
+			echo	'<h3 class="response">'. __('You have the latest version of XPressME Integration Kit. You do not need to upgrade', 'xpressme') . '</h3>';
+		}
+	} else {
+		echo '<h3 class="response">';
+		printf(__('There is no response from <a href="%s">version check API</a> now. sorry, please confirm it after.', 'xpressme'),$check_url);
+		echo	"</div>\n";
+	}
+}
+
+function xp_remote_get($url, $headers = ""){
+	global $xoops_config;
+	$xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+
+	require_once( $xoops_config->module_path . '/wp-includes/class-snoopy.php');
+
+	// Snoopy is an HTTP client in PHP
+	$client = new Snoopy();
+	$client->agent = 'XPressME/' . $xpress_version;
+	$client->read_timeout = 2;
+	if (is_array($headers) ) {
+		$client->rawheaders = $headers;
+	}
+
+	@$client->fetch($url);
+	$response['response']['code'] = $client->status;
+	$response['body'] = $client->results;
+	return $response;
+	return $client;
+
+}
+
+function get_xpress_latest_version(){
+	global $wp_version, $wpdb, $wp_local_package;
+	global $xoops_config;
+	
+	$xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+
+	$check_url = "http://ja.xpressme.info/version_check/?version=$xpress_version";
+	$request_options = array(
+	'timeout' => 3,
+	'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
+	);
+
+	if (! function_exists('wp_remote_get')) {
+		$response = xp_remote_get($check_url);
+		
+		if (empty($response['body'])) return false;
+	} else {
+	
+		$response = wp_remote_get($check_url, $request_options);
+		
+		if ( is_wp_error( $response ) )
+			return false;
+	}
+	if ( 200 != $response['response']['code'] )
+		return false;
+	$body = trim( $response['body'] );
+	$body = str_replace(array("\r\n", "\r"), "\n", $body);
+	$returns = explode("\n", $body);
+	$response = $returns[0];
+	if ( isset( $returns[1] ) )
+		$url = clean_url( $returns[1] );
+	if ( isset( $returns[2] ) )
+		$package = clean_url( $returns[2] );
+	if ( isset( $returns[3] ) )
+		$latest_version = $returns[3];
+
+	$write_options = array (
+		'url' => $url ,
+		'package' => $package ,
+		'latest_version' => $latest_version ,
+		'check_time' => time()
+	);
+	
+	$latest_version = get_option('xpressme_latest_version');
+	if (!$latest_version) {
+		add_option('xpressme_latest_version', $write_options);
+	} else {
+		update_option('xpressme_latest_version', $write_options);
+	}
+	return true;
+}
+
+function xpress_update_check() {
+	if ( defined('WP_INSTALLING') )
+		return;
+	global $pagenow;
+
+	$php_query_string = $_SERVER['QUERY_STRING'];
+
+	if ( 'admin.php' == $pagenow && 'page=upgrade_page' == $php_query_string)
+		return;
+
+	global $wp_version, $wpdb, $wp_local_package;
+	global $xoops_config;
+
+	$php_query_string = $_SERVER['QUERY_STRING'];
+	$xpress_version = $xoops_config->module_version . $xoops_config->module_codename;
+
+	$latest = get_option('xpressme_latest_version');
+	if (!$latest ) {
+		get_xpress_latest_version();
+		$latest = get_option('xpressme_latest_version');
+	}
+
+	if ($latest) {
+		$next_check = $latest['check_time'] + (60*60*24);
+		$now_time = time();
+		if ($next_check < $now_time ){
+			get_xpress_latest_version();
+			$latest = get_option('xpressme_latest_version');
+		}
+	}
+
+	if ($latest) {
+		$url=$latest['url'];
+		$package=$latest['package'];
+		$latest_version=$latest['latest_version'];
+		$check_time=$latest['check_time'];
+		$upgrade_page = $xoops_config->module_url . "/wp-admin/admin.php?page=upgrade_page";
+
+		if (version_compare($xpress_version, $latest_version, '<')) {
+			if ( current_user_can('manage_options') ){
+				$msg = sprintf( __('XPressME Integration Kit Version %1$s is available! <a href="%2$s">Please update now</a>.', 'xpressme'), $latest_version, $upgrade_page );
+			} else {
+				$msg = sprintf( __('XPressME Integration Kit Version %1$s is available! Please notify the site administrator.', 'xpressme'), $latest_version );
+			}
+			echo "<div id='update-nag'>$msg </div>";
+		}
+	}
+}
+
+add_action( 'admin_notices', 'xpress_update_check', 3 );
+
+include_once dirname( __FILE__ ).'/include/dashboard_feed.php' ;
+
+?>
