Index: trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php	(revision 109)
+++ trunk/wp-content/themes/xpress_default/blocks/calender_block_theme.php	(revision 109)
@@ -0,0 +1,210 @@
+<?php
+function calender_block($options)
+{
+	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+	$sun_color = empty( $options[1] ) ? '#DB0000' : $options[1] ;
+	$sat_color = empty( $options[2] ) ? '#004D99' : $options[2] ;
+	$this_template = empty( $options[3] ) ? 'db:'.$mydirname.'_calender_block.html' : trim( $options[3] );
+//	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+	$mydirpath = get_xpress_dir_path();
+
+	$block['content'] = get_xpress_calendar($sun_color,$sat_color);
+	return $block ;	
+}
+
+function get_xpress_calendar($sun_color = '#DB0000' ,$sat_color = '#004D99' ,$initial = true) {
+	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
+
+
+
+	ob_start();
+	// Quick check. If we have no posts at all, abort!
+	if ( !$posts ) {
+		$gotsome = $wpdb->get_var("SELECT ID from $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' ORDER BY post_date DESC LIMIT 1");
+		if ( !$gotsome )
+			return;
+	}
+
+	if ( isset($_GET['w']) )
+		$w = ''.intval($_GET['w']);
+
+	// week_begins = 0 stands for Sunday
+	$week_begins = intval(get_option('start_of_week'));
+
+	// Let's figure out when we are
+	if ( !empty($monthnum) && !empty($year) ) {
+		$thismonth = ''.zeroise(intval($monthnum), 2);
+		$thisyear = ''.intval($year);
+	} elseif ( !empty($w) ) {
+		// We need to get the month from MySQL
+		$thisyear = ''.intval(substr($m, 0, 4));
+		$d = (($w - 1) * 7) + 6; //it seems MySQL's weeks disagree with PHP's
+		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('${thisyear}0101', INTERVAL $d DAY) ), '%m')");
+	} elseif ( !empty($m) ) {
+		$thisyear = ''.intval(substr($m, 0, 4));
+		if ( strlen($m) < 6 )
+				$thismonth = '01';
+		else
+				$thismonth = ''.zeroise(intval(substr($m, 4, 2)), 2);
+	} else {
+		$thisyear = gmdate('Y', current_time('timestamp'));
+		$thismonth = gmdate('m', current_time('timestamp'));
+	}
+
+	$unixmonth = mktime(0, 0 , 0, $thismonth, 1, $thisyear);
+
+	// Get the next and previous month and year with at least one post
+	$previous = $wpdb->get_row("SELECT DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+		FROM $wpdb->posts
+		WHERE post_date < '$thisyear-$thismonth-01'
+		AND post_type = 'post' AND post_status = 'publish'
+			ORDER BY post_date DESC
+			LIMIT 1");
+	$next = $wpdb->get_row("SELECT	DISTINCT MONTH(post_date) AS month, YEAR(post_date) AS year
+		FROM $wpdb->posts
+		WHERE post_date >	'$thisyear-$thismonth-01'
+		AND MONTH( post_date ) != MONTH( '$thisyear-$thismonth-01' )
+		AND post_type = 'post' AND post_status = 'publish'
+			ORDER	BY post_date ASC
+			LIMIT 1");
+
+	echo '<table id="wp-calendar" summary="' . __('Calendar') . '">
+	<caption>' . sprintf(_c('%1$s %2$s|Used as a calendar caption'), $wp_locale->get_month($thismonth), date('Y', $unixmonth)) . '</caption>
+	<thead>
+	<tr>';
+
+	$myweek = array();
+
+	for ( $wdcount=0; $wdcount<=6; $wdcount++ ) {
+		$myweek[] = $wp_locale->get_weekday(($wdcount+$week_begins)%7);
+	}
+
+	foreach ( $myweek as $wd ) {
+
+		for($week_num=0;$week_num<=6;$week_num++){
+			$week_name = $wp_locale->get_weekday($week_num);
+			if ($week_name === $wd) break;
+		}
+		
+		$day_name = (true == $initial) ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
+		if ($week_num ==0) $day_name = '<span style="color: ' . $sun_color . '">' . $day_name . '</span>';
+		if ($week_num ==6) $day_name = '<span style="color: ' . $sat_color . '">' . $day_name . '</span>';
+		echo "\n\t\t<th align=\"center\" abbr=\"$wd\" scope=\"col\" title=\"$wd\">$day_name</th>";
+	}
+
+	echo '
+	</tr>
+	</thead>
+
+	<tfoot>
+	<tr>';
+
+	if ( $previous ) {
+		echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($previous->month) . '" colspan="3" id="prev"><a href="' .
+		get_month_link($previous->year, $previous->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($previous->month),
+			date('Y', mktime(0, 0 , 0, $previous->month, 1, $previous->year))) . '">&laquo; ' . $wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)) . '</a></td>';
+	} else {
+		echo "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
+	}
+
+	echo "\n\t\t".'<td class="pad">&nbsp;</td>';
+
+	if ( $next ) {
+		echo "\n\t\t".'<td abbr="' . $wp_locale->get_month($next->month) . '" colspan="3" id="next"><a href="' .
+		get_month_link($next->year, $next->month) . '" title="' . sprintf(__('View posts for %1$s %2$s'), $wp_locale->get_month($next->month),
+			date('Y', mktime(0, 0 , 0, $next->month, 1, $next->year))) . '">' . $wp_locale->get_month_abbrev($wp_locale->get_month($next->month)) . ' &raquo;</a></td>';
+	} else {
+		echo "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
+	}
+
+	echo '
+	</tr>
+	</tfoot>
+
+	<tbody>
+	<tr>';
+
+	// Get days with posts
+	$dayswithposts = $wpdb->get_results("SELECT DISTINCT DAYOFMONTH(post_date)
+		FROM $wpdb->posts WHERE MONTH(post_date) = '$thismonth'
+		AND YEAR(post_date) = '$thisyear'
+		AND post_type = 'post' AND post_status = 'publish'
+		AND post_date < '" . current_time('mysql') . '\'', ARRAY_N);
+	if ( $dayswithposts ) {
+		foreach ( (array) $dayswithposts as $daywith ) {
+			$daywithpost[] = $daywith[0];
+		}
+	} else {
+		$daywithpost = array();
+	}
+
+	if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'camino') !== false || strpos(strtolower($_SERVER['HTTP_USER_AGENT']), 'safari') !== false)
+		$ak_title_separator = "\n";
+	else
+		$ak_title_separator = ', ';
+
+	$ak_titles_for_day = array();
+	$ak_post_titles = $wpdb->get_results("SELECT post_title, DAYOFMONTH(post_date) as dom "
+		."FROM $wpdb->posts "
+		."WHERE YEAR(post_date) = '$thisyear' "
+		."AND MONTH(post_date) = '$thismonth' "
+		."AND post_date < '".current_time('mysql')."' "
+		."AND post_type = 'post' AND post_status = 'publish'"
+	);
+	if ( $ak_post_titles ) {
+		foreach ( (array) $ak_post_titles as $ak_post_title ) {
+
+				$post_title = apply_filters( "the_title", $ak_post_title->post_title );
+				$post_title = str_replace('"', '&quot;', wptexturize( $post_title ));
+
+				if ( empty($ak_titles_for_day['day_'.$ak_post_title->dom]) )
+					$ak_titles_for_day['day_'.$ak_post_title->dom] = '';
+				if ( empty($ak_titles_for_day["$ak_post_title->dom"]) ) // first one
+					$ak_titles_for_day["$ak_post_title->dom"] = $post_title;
+				else
+					$ak_titles_for_day["$ak_post_title->dom"] .= $ak_title_separator . $post_title;
+		}
+	}
+
+
+	// See how much we should pad in the beginning
+	$pad = calendar_week_mod(date('w', $unixmonth)-$week_begins);
+	if ( 0 != $pad )
+		echo "\n\t\t".'<td colspan="'.$pad.'" class="pad">&nbsp;</td>';
+
+	$daysinmonth = intval(date('t', $unixmonth));
+	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
+		if ( isset($newrow) && $newrow )
+			echo "\n\t</tr>\n\t<tr>\n\t\t";
+		$newrow = false;
+
+		if ( $day == gmdate('j', (time() + (get_option('gmt_offset') * 3600))) && $thismonth == gmdate('m', time()+(get_option('gmt_offset') * 3600)) && $thisyear == gmdate('Y', time()+(get_option('gmt_offset') * 3600)) )
+			echo '<td id="today" align="center">';
+		else
+			echo '<td align="center">';
+
+		if ( in_array($day, $daywithpost) ) // any posts today?
+				echo '<a href="' . get_day_link($thisyear, $thismonth, $day) . "\" title=\"$ak_titles_for_day[$day]\">$day</a>";
+		else
+			echo $day;
+		echo '</td>';
+
+		if ( 6 == calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins) )
+			$newrow = true;
+	}
+
+	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0 , 0, $thismonth, $day, $thisyear))-$week_begins);
+	if ( $pad != 0 && $pad != 7 )
+		echo "\n\t\t".'<td class="pad" colspan="'.$pad.'">&nbsp;</td>';
+
+	echo "\n\t</tr>\n\t</tbody>\n\t</table>";
+
+	$output = ob_get_contents();
+	ob_end_clean();
+//	echo $output;
+//	$cache[ $key ] = $output;
+//	wp_cache_set( 'get_calendar', $cache, 'calendar' );
+	return $output;
+}
+
+?>
Index: trunk/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 109)
+++ trunk/wp-content/themes/xpress_default/blocks/popular_posts_block_theme.php	(revision 109)
@@ -0,0 +1,203 @@
+<?php
+function popular_posts_block($options)
+{
+	$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+	$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
+	$show_month_range = empty( $options[2] ) ? '0' : $options[2] ;
+	$tag_select = $options[3] ;
+	$selected = array_slice($options,4); // get allowed cats
+	$this_template = empty( $options[5] ) ? 'db:'.$mydirname.'_block_popular.html' : trim( $options[5] );
+	$mydirpath = get_xpress_dir_path();
+	
+	if (array_search(0,$selected)===0) {
+		$cat_select = false;
+	}else {
+		$cat_select = true;			
+	}
+	$cat_id = implode(',',$selected);
+	$block = array();
+	$item_no = 0;	
+
+	global $wpdb,$wp_query;
+	
+	$db_prefix = get_wp_prefix();
+	
+	$post_tb = $db_prefix . 'posts';
+	$view_tb = $db_prefix . 'views';
+	$user_tb = $db_prefix . 'users';
+	
+	$term_relationships_tb = $db_prefix . 'term_relationships';	// upper 2.3
+	$term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
+	$terms_tb = $db_prefix . 'terms';							// upper 2.3
+	
+	$post2cat_tb = $db_prefix . 'post2cat'; 					//under 2.3
+	$categories_tb = $db_prefix . 'categories'; 				//under 2.3
+	
+	include ($mydirpath . '/wp-includes/version.php');
+		
+	$select = "SELECT $view_tb.post_views, $post_tb.ID, $post_tb.post_title, $post_tb.post_date, $user_tb.display_name";				
+	if ($wp_db_version >= 6124){
+ 		$from  = " FROM ((((";
+ 		$from .= " $post_tb LEFT JOIN $view_tb ON $post_tb.ID = $view_tb.post_id)";
+ 		$from .= " INNER JOIN $term_relationships_tb ON $post_tb.ID = $term_relationships_tb.object_id)";
+ 		$from .= " INNER JOIN $term_taxonomy ON $term_relationships_tb.term_taxonomy_id = $term_taxonomy.term_taxonomy_id)";
+ 		$from .= " INNER JOIN $terms_tb ON $term_taxonomy.term_id = $terms_tb.term_id)";
+ 		$from .= " INNER JOIN $user_tb ON $post_tb.post_author = $user_tb.ID";
+ 		
+	 	$where = " WHERE ($post_tb.post_type = 'post') AND ($post_tb.post_status = 'publish')";
+
+	 	if ($cat_select) {
+	 		$where .= " AND ($term_taxonomy.term_id IN ($cat_id))";
+		}
+		
+		if (!empty($tag_select)) {
+			$tag_id_list= get_tag_id($tag_select);
+			if (!empty($tag_id_list))
+				$where .= " AND ($term_taxonomy.term_id IN ($tag_id_list))";
+		}
+		
+	} else {
+		$from  = " FROM ((";
+		$from .= " $post_tb LEFT JOIN $view_tb ON $post_tb.ID = $view_tb.post_id)";
+		$from .= " LEFT JOIN $post2cat_tb ON $post_tb.ID = $post2cat_tb.post_id)";
+		$from .= " INNER JOIN $user_tb ON $post_tb.post_author = $user_tb.ID";
+		
+		$where = " WHERE ($post_tb.post_status = 'publish') AND  (UNIX_TIMESTAMP($post_tb.post_date) <= UNIX_TIMESTAMP())" ;
+		
+	 	if ($cat_select) {
+	 		$where .= " AND ($post2cat_tb.category_id IN ($cat_id))";
+		}
+	}
+	if ($show_month_range > 0) {
+	 		$where .= " AND (UNIX_TIMESTAMP($post_tb.post_date) >= UNIX_TIMESTAMP(DATE_ADD(CURRENT_DATE, INTERVAL -$show_month_range month)))";
+	}
+	$order_limmit = " GROUP BY $post_tb.ID ORDER BY $view_tb.post_views DESC LIMIT 0, $disp_count";
+	
+	$populars = $wpdb->get_results($select . $from . $where . $order_limmit);
+	
+	foreach ($populars as $popular){
+		$wp_query->in_the_loop = true;		//for use the_tags() in multi lopp 
+		$r = new WP_Query("p=$popular->ID");
+		if($r->have_posts()){
+			$r->the_post();
+			ob_start();
+				the_ID();
+				$post_id = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_title();
+				$title = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_permalink();
+				$permalink = ob_get_contents();
+			ob_end_clean();					
+			
+			ob_start();
+				the_author_posts_link();
+				$author = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_category(' &bull; ');
+				$category = ob_get_contents();
+			ob_end_clean();	
+			
+			ob_start();
+				the_tags(__('Tags:', 'kubrick') . ' ',' &bull; ','');
+				$tags = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_modified_date(get_settings('date_format'));
+				$post_modified_date = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_modified_date(get_settings('time_format'));
+				$post_modified_time = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_time(get_settings('date_format'));
+				$post_date = ob_get_contents();
+			ob_end_clean();
+			
+			ob_start();
+				the_time(get_settings('time_format'));
+				$post_time = ob_get_contents();
+			ob_end_clean();
+			
+			
+			ob_start();
+				comments_popup_link(__('Comments (0)'), __('Comments (1)'), __('Comments (%)'));
+				$comments_popup_link = ob_get_contents();
+			ob_end_clean();
+			
+
+			$post_title = '<a href="' . $permalink . '">' . $title . '</a>';
+			$post_date_time = $post_date . ' ' . $post_time ;
+			$post_modified_date_time = $post_modified_date . ' ' . $post_modified_time ;
+			$trackback_url = trackback_url(false);
+			$post_viwes = xpress_post_views_count($post_id,'views: %d' ,false);
+//			if (empty($tags)) $tags = __('Not Tag');
+
+			$row_data = array(
+				'post_id'		=> $post_id ,
+				'post_title'	=> $post_title ,
+				'post_date' => $post_date ,
+				'post_time' => $post_time ,
+				'post_date_time' => $post_date_time ,
+				'post_modified_date' => $post_modified_date ,
+				'post_modified_time' => $post_modified_time ,
+				'post_modified_date_time' => $post_modified_date_time ,
+				'post_author' 	=> $author ,
+				'post_category' 	=> $category ,	
+				'post_tags' 		=> $tags,
+				'post_views' 		=> $post_viwes,
+				'comment_link' 	=> $comments_popup_link ,
+				'trackback_url' => $trackback_url
+			);
+			$block['contents']['item'.$item_no] = $row_data;
+			$item_no++;
+		}
+	}  // end of foreach
+	$block['data_count'] = $item_no;  //xml unserialise error
+	return $block ;
+}
+
+function get_tag_id($tag_list = ''){
+	global $wpdb,$wp_query;
+	
+	if (empty($tag_list)) return '';
+	
+	$tag_arrys = explode(',',$tag_list);
+	$tag_str = '';
+	foreach ($tag_arrys as $tag_s){
+		if (!empty($tag_str)) $tag_str .= ',';
+		$tag_str .= "'" . $tag_s . "'";
+	}
+	
+	
+	
+	$db_prefix = get_wp_prefix();
+	$db_xpress_terms = $db_prefix . 'terms';					// upper 2.3
+	$db_xpress_term_taxonomy = $db_prefix . 'term_taxonomy';				// upper 2.3
+	$query = "
+		SELECT $db_xpress_terms.term_id as tag_ID  
+		FROM $db_xpress_terms LEFT JOIN $db_xpress_term_taxonomy ON $db_xpress_terms.term_id = $db_xpress_term_taxonomy.term_id 
+		WHERE $db_xpress_term_taxonomy.taxonomy = 'post_tag' AND $db_xpress_terms.name IN ($tag_str)
+    ";
+
+	$tags = $wpdb->get_results($query);
+	$no =0;
+	foreach ($tags as $tag){
+		$tags_id[$no] = $tag->tag_ID;
+		$no++;	
+	}
+	$tags_id_list = implode(',' , $tags_id);
+	return $tags_id_list;
+}
+?>
Index: trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 104)
+++ trunk/wp-content/themes/xpress_default/blocks/recent_comments_block_theme.php	(revision 109)
@@ -8,5 +8,5 @@
 	$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
 	$selected = array_slice($options,3); // get allowed cats
-	$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_block_comments.html' : trim( $options[4] );
+	$this_template = empty( $options[4] ) ? 'db:'.$mydirname.'_recent_comments_block.html' : trim( $options[4] );
 //	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
 	$mydirpath = get_xpress_dir_path();
Index: trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php	(revision 104)
+++ trunk/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php	(revision 109)
@@ -10,5 +10,5 @@
 	$tag_select = $options[4] ;
     $selected = array_slice($options,5); // get allowed cats
-	$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_block_content.html' : trim( $options[6] );
+	$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_content_block.html' : trim( $options[6] );
 //	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
 	$mydirpath = get_xpress_dir_path();
Index: trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php
===================================================================
--- trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php	(revision 104)
+++ trunk/wp-content/themes/xpress_default/blocks/recent_posts_list_block_theme.php	(revision 109)
@@ -8,5 +8,5 @@
 	$tag_select = $options[4] ;
 	$selected = array_slice($options,5); // get allowed cats
-	$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_block_posts.html' : trim( $options[6] );
+	$this_template = empty( $options[6] ) ? 'db:'.$mydirname.'_recent_posts_list_block.html' : trim( $options[6] );
 //	$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
 	$mydirpath = get_xpress_dir_path();
