Index: trunk/include/search.php
===================================================================
--- trunk/include/search.php	(revision 30)
+++ trunk/include/search.php	(revision 30)
@@ -0,0 +1,116 @@
+<?php
+$mydirname = basename( dirname(dirname( __FILE__ ) ) );
+
+eval( '
+
+function  '.$mydirname.'_global_search( $keywords , $andor , $limit , $offset , $userid )
+{
+	return xpress_global_search_base( "'.$mydirname.'" , $keywords , $andor , $limit , $offset , $userid ) ;
+}
+
+' ) ;
+
+
+if( ! function_exists( 'xpress_global_search_base' ) ) {
+
+function xpress_global_search_base( $mydirname , $queryarray , $andor , $limit , $offset , $userid )
+{
+	global $xoopsDB, $myts;
+
+	$myts =& MyTextSanitizer::getInstance();
+	
+	$time_difference = get_time_difference($mydirname);
+	$now = date('Y-m-d H:i:s',(time() + ($time_difference * 3600)));
+	$where = "(post_status = 'publish') AND (post_date <= '".$now."')";
+
+	if ( is_array($queryarray) && $count = count($queryarray) ) {
+		$str_query = array();
+		for($i=0;$i<$count;$i++){
+			$str_query[] = "(post_title LIKE '%".$queryarray[$i]."%' OR post_content LIKE '%".$queryarray[$i]."%')";
+		}
+		$where .= " AND ".implode(" $andor ", $str_query);
+	}
+	if ($userid) {
+		$userid = intval($userid);
+		$where  .= " AND (post_author=".$userid.")";
+	}
+	
+	$xp_prefix = $mydirname;
+	if ($xp_prefix == 'wordpress'){
+ 		$xp_prefix = 'wp';
+	}
+	$views_table = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_posts' ;
+	
+	$request = "SELECT * FROM " . $views_table ." WHERE ".$where;
+	$request .= " ORDER BY post_date DESC";
+	$result = $xoopsDB->query($request,$limit,$offset);
+
+	$ret = array();
+	$i = 0;
+	while($myrow = $xoopsDB->fetchArray($result)){
+		
+		
+//		$ret[$i]['link'] = str_replace(get_settings('home')."/","",get_permalink(($myrow['ID'])));
+		switch ($myrow['post_type']) {
+		case 'page':
+			$ret[$i]['link'] = '?page_id=' . $myrow['ID'];
+			break;
+		case 'post':
+		case '':
+			$ret[$i]['link'] = '?p=' . $myrow['ID'];
+		}
+
+		$ret[$i]['title'] = $myts->htmlSpecialChars($myrow['post_title']);
+		$date_str = $myrow['post_date'];
+		$yyyy = substr($date_str,0,4);
+		$mm   = substr($date_str,5,2);
+		$dd   = substr($date_str,8,2);
+		$hh   = substr($date_str,11,2);
+		$nn   = substr($date_str,14,2);
+		$ss   = substr($date_str,17,2);
+		$ret[$i]['time'] = mktime( $hh,$nn,$ss,$mm,$dd,$yyyy);
+		$ret[$i]['uid'] = $myrow['post_author'];
+//		$ret[$i]['page'] = $myts->htmlSpecialChars($myrow['post_title']);
+
+		$context = '' ;
+		$text =$myrow['post_content'];
+		// get context for module "search"
+		$showcontext = empty( $_GET['showcontext'] ) ? 0 : 1 ;
+		if( function_exists( 'search_make_context' ) && $showcontext ) {
+			if( function_exists( 'easiestml' ) ) $text = easiestml( $text ) ;
+			$full_context = strip_tags($text) ;
+			$context = search_make_context( $full_context , $queryarray ) ;
+		}
+		$ret[$i]['context']=$context;
+
+
+		$i++;
+	}
+	return $ret;
+
+}
+
+}
+
+if( ! function_exists( 'get_time_difference' ) ) {
+function get_time_difference($mydirname){
+	$xoopsDB =& Database::getInstance();
+
+	$xp_prefix = $mydirname;
+	if ($xp_prefix == 'wordpress'){
+ 		$xp_prefix = 'wp';
+	}
+	$option_tbl = XOOPS_DB_PREFIX . '_' . $xp_prefix .'_options' ;
+	
+	$sql = "SELECT option_value FROM $option_tbl WHERE option_name = 'gmt_offset'";
+	
+	$result =  $xoopsDB->query($sql, 0, 0);
+	if ($xoopsDB->getRowsNum($result)  > 0){
+		$row = $xoopsDB->fetchArray($result);
+		return $row['option_value'];
+	}
+	return 0;
+}
+}
+
+?>
Index: trunk/xoops_version.php
===================================================================
--- trunk/xoops_version.php	(revision 29)
+++ trunk/xoops_version.php	(revision 30)
@@ -32,8 +32,8 @@
 $modversion['description'] = constant( '_MI_XPRESS_DESC');
 $modversion['version'] = "0.01";
-$modversion['credits'] = "XPressME DEV Toemon) (http://www.toemon.com) Wordpress DEV (http://wordpress.org/);";
+$modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://www.toemon.com) ;";
 $modversion['author'] = "toemon (http://www.toemon.com)";
 $modversion['license'] = "GPL see LICENSE";
-$modversion['official'] = r18 ;
+$modversion['official'] = 0 ;
 $modversion['image'] =  'module_icon.php' ;
 $modversion['dirname'] = $mydirname;
@@ -71,7 +71,7 @@
 
 // Search
-//$modversion['hasSearch'] = 1 ;
-//$modversion['search']['file'] = 'include/search.php' ;
-//$modversion['search']['func'] = $mydirname.'_global_search' ;
+$modversion['hasSearch'] = 1 ;
+$modversion['search']['file'] = 'include/search.php' ;
+$modversion['search']['func'] = $mydirname.'_global_search' ;
 //Admin things
 $modversion['hasAdmin'] = 0;