Index: trunk/blocks/recent_comments_block.php
===================================================================
--- trunk/blocks/recent_comments_block.php	(revision 44)
+++ trunk/blocks/recent_comments_block.php	(revision 44)
@@ -0,0 +1,100 @@
+<?php
+if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
+$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
+
+eval( '
+function b_'.$mydirname.'_comments_show($options){
+	return _b_comments_show($options) ;
+}
+function b_'.$mydirname.'_comments_edit($options){
+	return _b_comments_edit($options) ;
+}
+' ) ;
+
+
+if( ! defined( 'XPRESS_COMMENTS_BLOCK_INCLUDED' ) ) {
+	define( 'XPRESS_COMMENTS_BLOCK_INCLUDED' , 1 ) ;
+	function _b_comments_edit($options)
+	{
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
+		$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] );
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+
+		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
+		
+		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
+		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />";
+		$form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[2]' value='" . $disp_length . "' />";
+	    $form .= "<br /><br />" . _MB_XPRESS_COM_TYPE ;
+	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
+	    $form .= "<br />&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
+		    $form .= "<option value=\"0\" ";
+		    if ($isAll) $form .= " selected=\"selected\"";
+		    $form .= ">"._MB_XPRESS_ALL ."</option>";
+
+		    $form .= "<option value=\"1\" ";
+		    if (in_array(1, $selected))
+				$form .= " selected=\"selected\"";
+		    $form .= ">"._MB_XPRESS_COMMENT ."</option>";
+
+		    $form .= "<option value=\"2\" ";
+		    if (in_array(2, $selected))
+				$form .= " selected=\"selected\"";
+		    $form .= ">"._MB_XPRESS_TRUCKBACK ."</option>";
+
+		    $form .= "<option value=\"3\" ";
+		    if (in_array(3, $selected))
+				$form .= " selected=\"selected\"";
+		    $form .= ">"._MB_XPRESS_PINGBACK ."</option>";
+		$form .= "</select><br />";
+		//	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
+
+
+		return $form;
+	}
+	
+	function _b_comments_show($options)
+	{
+		global $wpdb;
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		$block_function_name = basename( __FILE__ );
+		
+		require_once $mydirpath.'/include/xpress_block_render.php';
+		return xpress_block_render($mydirname,$block_function_name,$options);
+/*
+
+		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
+		$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
+		$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
+		$selected = array_slice($options,3); // get allowed cats
+		
+		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
+		global $wpdb;
+		
+		if (!is_null($wpdb)){
+			require_once $mydirpath.'/include/xpress_block_theme.php';
+			xpress_block_css_set($mydirname);
+			
+			$block_theme_file = get_block_file_path($mydirname,'recent_comments_block');
+			require_once $block_theme_file;
+			$block = recent_comments_block($options);
+			
+			require_once $mydirpath.'/include/xoops_block_cache.php';
+			$my_name = basename( __FILE__ );
+			$blockID =get_block_id($mydirname,$my_name,$options);			
+			xpress_block_cache_write($mydirname,'recent_comments_block'. $blockID, $block);
+		} else {
+			require_once $mydirpath.'/include/xoops_block_cache.php';
+			$my_name = basename( __FILE__ );
+			$blockID =get_block_id($mydirname,$my_name,$options);			
+			$block = xpress_block_cache_read($mydirname,'recent_comments_block'. $blockID);
+		}
+		return 	$block;
+*/
+	}
+}
+?>
Index: trunk/blocks/xpress_block_recent_comments.php
===================================================================
--- trunk/blocks/xpress_block_recent_comments.php	(revision 43)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?php
-if( ! defined( 'XOOPS_ROOT_PATH' ) ) exit ;
-$mydirname = basename( dirname( dirname( __FILE__ ) ) ) ;
-
-eval( '
-function b_'.$mydirname.'_comments_show($options){
-	return _b_comments_show($options) ;
-}
-function b_'.$mydirname.'_comments_edit($options){
-	return _b_comments_edit($options) ;
-}
-' ) ;
-
-
-if( ! defined( 'XPRESS_COMMENTS_BLOCK_INCLUDED' ) ) {
-	define( 'XPRESS_COMMENTS_BLOCK_INCLUDED' , 1 ) ;
-	function _b_comments_edit($options)
-	{
-		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-		$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] );
-		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
-
-		require_once(XOOPS_ROOT_PATH.'/modules/'.$mydirname.'/blocks/block_common.php');
-		
-		$form  = "MyDirectory <input type='text' name='options[0]' value='" . $mydirname . "' /><br />";
-		$form .= _MB_XPRESS_COUNT .": <input type='text' name='options[1]' value='" . $disp_count . "' /><br />";
-		$form .= _MB_XPRESS_LENGTH .": <input type='text' name='options[2]' value='" . $disp_length . "' />";
-	    $form .= "<br /><br />" . _MB_XPRESS_COM_TYPE ;
-	    $isAll = (count($selected)==0||empty($selected[0]))?true:false;
-	    $form .= "<br />&nbsp;&nbsp;<select name=\"options[]\" multiple=\"multiple\">";
-		    $form .= "<option value=\"0\" ";
-		    if ($isAll) $form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_ALL ."</option>";
-
-		    $form .= "<option value=\"1\" ";
-		    if (in_array(1, $selected))
-				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_COMMENT ."</option>";
-
-		    $form .= "<option value=\"2\" ";
-		    if (in_array(2, $selected))
-				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_TRUCKBACK ."</option>";
-
-		    $form .= "<option value=\"3\" ";
-		    if (in_array(3, $selected))
-				$form .= " selected=\"selected\"";
-		    $form .= ">"._MB_XPRESS_PINGBACK ."</option>";
-		$form .= "</select><br />";
-		//	    $form .="<br /><input type='text' size='60' name='options[5]' id='this_template' value='".htmlspecialchars($this_template,ENT_QUOTES)."' />";
-
-
-		return $form;
-	}
-	
-	function _b_comments_show($options)
-	{
-		$mydirname = empty( $options[0] ) ? 'xpress' : $options[0] ;
-		$disp_count = empty( $options[1] ) ? '10' : $options[1] ;
-		$disp_length = empty( $options[2] ) ? '30' : $options[2] ;
-		$selected = array_slice($options,3); // get allowed cats
-		
-		$mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname;
-		
-		$Identification = '-' . $disp_count . '-' . $disp_length ;
-		foreach ($selected as $item){
-			$Identification .= '-' . $item ;
-		}
-
-
-		global $wpdb;
-		
-		if (!is_null($wpdb)){
-			require_once $mydirpath.'/include/xpress_block_theme.php';
-			xpress_block_css_set($mydirname);
-			
-			$block_theme_file = get_block_file_path($mydirname,'recent_comments_block');
-			require_once $block_theme_file;
-			$block = recent_comments_block($options);
-			
-			require_once $mydirpath.'/include/xoops_block_cache.php';
-			$my_name = basename( __FILE__ );
-			$blockID =get_block_id($mydirname,$my_name,$options);			
-			xpress_block_cache_write($mydirname,'recent_comments_block'. $blockID, $block);
-		} else {
-			require_once $mydirpath.'/include/xoops_block_cache.php';
-			$my_name = basename( __FILE__ );
-			$blockID =get_block_id($mydirname,$my_name,$options);			
-			$block = xpress_block_cache_read($mydirname,'recent_comments_block'. $blockID);
-		}
-		return 	$block;
-	}
-}
-?>