[mxbb-commits] core/modules/mx_phpbb3blocks mx_announce.php, 1.1, 1.2

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

Update of /cvsroot/mxbb/core/modules/mx_phpbb3blocks
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv2098/mx_phpbb3blocks

Modified Files:
	mx_announce.php 
Log Message:
bbcodes as a class, backend extended

Index: mx_announce.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/mx_announce.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mx_announce.php	5 Jul 2008 22:38:22 -0000	1.1
--- mx_announce.php	13 Jul 2008 19:31:27 -0000	1.2
***************
*** 145,157 ****
  	$poster = mx_get_username_string('username', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
  	$post_date = $mx_user->format_date($postrow[$i]['post_time']);
! 	
! 	
  	$title = $postrow[$i]['topic_title'];
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
! 	$title = mx_decode($title, $bbcode_uid);
  
  	$message = $postrow[$i]['post_text'];
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
! 	$message = mx_decode($message, $bbcode_uid );
  
  	$topic_title = ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $postrow[$i]['topic_title']) : $postrow[$i]['topic_title'];
--- 145,157 ----
  	$poster = mx_get_username_string('username', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
  	$post_date = $mx_user->format_date($postrow[$i]['post_time']);
! 
! 
  	$title = $postrow[$i]['topic_title'];
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
! 	$title = $mx_bbcode->decode($title, $bbcode_uid);
  
  	$message = $postrow[$i]['post_text'];
  	$bbcode_uid = $postrow[$i]['bbcode_uid'];
! 	$message = $mx_bbcode->decode($message, $bbcode_uid );
  
  	$topic_title = ( count($orig_word) ) ? preg_replace($orig_word, $replacement_word, $postrow[$i]['topic_title']) : $postrow[$i]['topic_title'];
***************
*** 177,184 ****
  	}
  
! 	$poster_id = $postrow[$i]['user_id'];	
  	$poster = mx_get_username_string('username', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
  	$poster_color = mx_get_username_string('colour', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
! 	$poster_full = mx_get_username_string('full', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);	
  
  	$annoucement_image = $announce_img_normal;
--- 177,184 ----
  	}
  
! 	$poster_id = $postrow[$i]['user_id'];
  	$poster = mx_get_username_string('username', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
  	$poster_color = mx_get_username_string('colour', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
! 	$poster_full = mx_get_username_string('full', $poster_id, $postrow[$i]['username'], $postrow[$i]['topic_first_poster_colour']);
  
  	$annoucement_image = $announce_img_normal;
***************
*** 307,317 ****
  	$replies = $postrow[$i]['topic_replies'];
  	$views = $postrow[$i]['topic_views'];
! 	
  	$first_post_time = $mx_user->format_date($postrow[$i]['topic_time']);
! 	$last_post_time = $mx_user->format_date($postrow[$i]['last_post_time']);	
! 	
  	$last_poster = mx_get_username_string('username', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);
  	$last_poster_color = mx_get_username_string('colour', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);
! 	$last_poster_full = mx_get_username_string('full', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);	
  
  	//$last_poster_full = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>';
--- 307,317 ----
  	$replies = $postrow[$i]['topic_replies'];
  	$views = $postrow[$i]['topic_views'];
! 
  	$first_post_time = $mx_user->format_date($postrow[$i]['topic_time']);
! 	$last_post_time = $mx_user->format_date($postrow[$i]['last_post_time']);
! 
  	$last_poster = mx_get_username_string('username', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);
  	$last_poster_color = mx_get_username_string('colour', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);
! 	$last_poster_full = mx_get_username_string('full', $postrow[$i]['id2'], $postrow[$i]['user2'], $postrow[$i]['topic_last_poster_colour']);
  
  	//$last_poster_full = ( $postrow[$i]['id2'] == ANONYMOUS ) ? ( ( $postrow[$i]['post_username2'] != '' ) ? $postrow[$i]['post_username2'] . ' ' : $lang['Guest'] . ' ' ) : '<a href="' . mx_append_sid(PHPBB_URL . "profile.$phpEx?mode=viewprofile&amp;" . POST_USERS_URL . '=' . $postrow[$i]['id2']) . '">' . $postrow[$i]['user2'] . '</a>';
***************
*** 326,330 ****
  		'POST_SUBJECT' => $post_subject,
  		'POSTER_NAME' => $poster,
! 		'POSTER_FULL' => $poster_full,		
  		'POSTER_ID' => $poster_id,
  		'TOPIC_ID' => $postrow[$i]['topic_id'],
--- 326,330 ----
  		'POST_SUBJECT' => $post_subject,
  		'POSTER_NAME' => $poster,
! 		'POSTER_FULL' => $poster_full,
  		'POSTER_ID' => $poster_id,
  		'TOPIC_ID' => $postrow[$i]['topic_id'],