[mxbb-commits] core/modules/mx_coreblocks mx_site_log.php, 1.11, 1.12

[Jon O. <jon...@us...>]

Update of /cvsroot/mxbb/core/modules/mx_coreblocks
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv27392/modules/mx_coreblocks

Modified Files:
	mx_site_log.php 
Log Message:
Selvens B4 fix (RC1) - B4 Site log not work

Index: mx_site_log.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_coreblocks/mx_site_log.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_site_log.php	30 Aug 2006 19:15:43 -0000	1.11
--- mx_site_log.php	4 Sep 2006 18:07:20 -0000	1.12
***************
*** 160,261 ****
  $log_total_match_count = count( $block_ids );
  
! //
! // Generate page_blocks data
! //
! $sql = "SELECT block_id, block_desc, block_title, block_time, block_editor_id
!    		FROM " . BLOCK_TABLE . "
! 		WHERE block_id IN (" . $valid_block_ids . ")
! 		ORDER BY block_time DESC
! 		LIMIT ".$log_start.", ".$log_numberOfEvents;
! 
! if ( !( $result = $db->sql_query( $sql ) ) )
! {
! 	mx_message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql );
! }
! 
! $folder_image = $images['mx_dot'];
! 
! //
! // Dump out the results
! //
! $row_count = 0;
! $editor_name_tmp = array();
! while( $searchdata = $db->sql_fetchrow($result) )
  {
! 	$row_count++;
! 	$search_block_id = $searchdata['block_id'];
  
! 	if (is_array($page_ids[$search_block_id]) && !empty($page_ids[$search_block_id]['block_id']))
! 	{
! 		$dynamic_block_id = $page_ids[$search_block_id]['block_id'];
! 		$pageid = $page_ids[$search_block_id]['page_id'];
! 	}
! 	else if (is_array($page_ids[$search_block_id]))
  	{
! 		$dynamic_block_id = '';
! 		$pageid = $page_ids[$search_block_id]['page_id'];
  	}
! 	else
  	{
! 		$dynamic_block_id = '';
! 		$pageid = $page_ids[$search_block_id];
! 	}
  
! 	$row_color = ( !( $row_count % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
! 	$row_class = ( !( $row_count % 2 ) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 	$page_title = $page_ids[$search_block_id]['page_name'];
! 	$page_desc = $page_ids[$search_block_id]['page_desc'];
  
! 	$temp_url = !empty($dynamic_block_id) ?  append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id )  : append_sid( PORTAL_URL . 'index.php?page=' . $pageid );
  
! 	if (empty($editor_name_tmp[$searchdata['block_editor_id']]))
! 	{
! 		$editor_name_tmp[$searchdata['block_editor_id']] = mx_get_userdata( $searchdata['block_editor_id'] );
! 		$editor_name = $editor_name_tmp[$searchdata['block_editor_id']]['username'];
! 	}
  
! 	$edit_time = !empty($searchdata['block_time']) ? create_date( $board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : '';
  
! 	$block_editor = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">';
! 	$block_editor .= $editor_name;
! 	$block_editor .= '</a>';
  
! 	$block_title = $searchdata['block_title'];
! 	$block_desc = $searchdata['block_desc'];
  
! 	$block_title_url = $temp_url;
! 	$page_title_url = $temp_url;
  
! 	$template->assign_block_vars("msg_row", array(
! 		'L_BLOCK_UPDATED' => $lang['Block_updated_by'],
! 		"ROW_COLOR" => "#" . $row_color,
! 		"ROW_CLASS" => $row_class,
! 		"EDIT_TIME" => $edit_time,
! 		"LAST_PAGE" => $page_title,
! 		"LAST_BLOCK" => $block_title,
! 		"U_PAGE" => $page_title_url,
! 		"U_BLOCK" => $block_title_url ,
! 		'FOLDER_IMG' => $folder_image,
! 		'EDITOR' => $editor_name
! 	));
! }
  
! $db->sql_freeresult($result);
  
! $base_url = mx_this_url();
  
! $template->assign_vars( array(
! 	'L_TITLE' => ( !empty( $title ) ? $title : 'Last Message' ),
! 	'BLOCK_SIZE' => $block_size,
! 	'U_URL_NEXT' => $url_next,
! 	'U_URL_PREV' => $url_prev,
! 	'L_MSG_PREV' => $lang['Previous'],
! 	'L_MSG_NEXT' => $lang['Next'],
! 	'PAGINATION' => mx_generate_pagination( $base_url, $log_total_match_count, $log_numberOfEvents, $log_start, true, true, true, false, 'log_start' ),
! 	'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $log_start / $log_numberOfEvents ) + 1 ), ceil( $log_total_match_count / $log_numberOfEvents ) )
! ));
  
! if ( $log_total_match_count == 0 || $log_total_match_count == '')
  {
  	$template->assign_block_vars("no_row", array(
--- 160,263 ----
  $log_total_match_count = count( $block_ids );
  
! if ( $log_total_match_count == 0 || $log_total_match_count == '')
  {
! 	//
! 	// Generate page_blocks data
! 	//
! 	$sql = "SELECT block_id, block_desc, block_title, block_time, block_editor_id
! 	   		FROM " . BLOCK_TABLE . "
! 			WHERE block_id IN (" . $valid_block_ids . ")
! 			ORDER BY block_time DESC
! 			LIMIT ".$log_start.", ".$log_numberOfEvents;
  
! 	if ( !( $result = $db->sql_query( $sql ) ) )
  	{
! 		mx_message_die( GENERAL_ERROR, 'Could not obtain search results', '', __LINE__, __FILE__, $sql );
  	}
! 
! 	$folder_image = $images['mx_dot'];
! 
! 	//
! 	// Dump out the results
! 	//
! 	$row_count = 0;
! 	$editor_name_tmp = array();
! 	while( $searchdata = $db->sql_fetchrow($result) )
  	{
! 		$row_count++;
! 		$search_block_id = $searchdata['block_id'];
  
! 		if (is_array($page_ids[$search_block_id]) && !empty($page_ids[$search_block_id]['block_id']))
! 		{
! 			$dynamic_block_id = $page_ids[$search_block_id]['block_id'];
! 			$pageid = $page_ids[$search_block_id]['page_id'];
! 		}
! 		else if (is_array($page_ids[$search_block_id]))
! 		{
! 			$dynamic_block_id = '';
! 			$pageid = $page_ids[$search_block_id]['page_id'];
! 		}
! 		else
! 		{
! 			$dynamic_block_id = '';
! 			$pageid = $page_ids[$search_block_id];
! 		}
  
! 		$row_color = ( !( $row_count % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
! 		$row_class = ( !( $row_count % 2 ) ) ? $theme['td_class1'] : $theme['td_class2'];
  
! 		$page_title = $page_ids[$search_block_id]['page_name'];
! 		$page_desc = $page_ids[$search_block_id]['page_desc'];
  
! 		$temp_url = !empty($dynamic_block_id) ?  append_sid( PORTAL_URL . 'index.php?page=' . $pageid . '&dynamic_block=' . $dynamic_block_id )  : append_sid( PORTAL_URL . 'index.php?page=' . $pageid );
  
! 		if (empty($editor_name_tmp[$searchdata['block_editor_id']]))
! 		{
! 			$editor_name_tmp[$searchdata['block_editor_id']] = mx_get_userdata( $searchdata['block_editor_id'] );
! 			$editor_name = $editor_name_tmp[$searchdata['block_editor_id']]['username'];
! 		}
  
! 		$edit_time = !empty($searchdata['block_time']) ? create_date( $board_config['default_dateformat'], $searchdata['block_time'], $board_config['board_timezone'] ) : '';
  
! 		$block_editor = '<a href="' . append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $searchdata['block_editor_id']) . '" class="name">';
! 		$block_editor .= $editor_name;
! 		$block_editor .= '</a>';
  
! 		$block_title = $searchdata['block_title'];
! 		$block_desc = $searchdata['block_desc'];
  
! 		$block_title_url = $temp_url;
! 		$page_title_url = $temp_url;
  
! 		$template->assign_block_vars("msg_row", array(
! 			'L_BLOCK_UPDATED' => $lang['Block_updated_by'],
! 			"ROW_COLOR" => "#" . $row_color,
! 			"ROW_CLASS" => $row_class,
! 			"EDIT_TIME" => $edit_time,
! 			"LAST_PAGE" => $page_title,
! 			"LAST_BLOCK" => $block_title,
! 			"U_PAGE" => $page_title_url,
! 			"U_BLOCK" => $block_title_url ,
! 			'FOLDER_IMG' => $folder_image,
! 			'EDITOR' => $editor_name
! 		));
! 	}
  
! 	$db->sql_freeresult($result);
  
! 	$base_url = mx_this_url();
  
! 	$template->assign_vars( array(
! 		'L_TITLE' => ( !empty( $title ) ? $title : 'Last Message' ),
! 		'BLOCK_SIZE' => $block_size,
! 		'U_URL_NEXT' => $url_next,
! 		'U_URL_PREV' => $url_prev,
! 		'L_MSG_PREV' => $lang['Previous'],
! 		'L_MSG_NEXT' => $lang['Next'],
! 		'PAGINATION' => mx_generate_pagination( $base_url, $log_total_match_count, $log_numberOfEvents, $log_start, true, true, true, false, 'log_start' ),
! 		'PAGE_NUMBER' => sprintf( $lang['Page_of'], ( floor( $log_start / $log_numberOfEvents ) + 1 ), ceil( $log_total_match_count / $log_numberOfEvents ) )
! 	));
! }
! else
  {
  	$template->assign_block_vars("no_row", array(