mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] core/includes mx_functions_tools.php, 1.15.2.10, 1.15.2.11

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv25295

Modified Files:
      Tag: core28x
	mx_functions_tools.php 
Log Message:
comments, notifications, etc

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.10
retrieving revision 1.15.2.11
diff -C2 -d -r1.15.2.10 -r1.15.2.11
*** mx_functions_tools.php	6 Jul 2008 19:22:53 -0000	1.15.2.10
--- mx_functions_tools.php	6 Jul 2008 22:10:32 -0000	1.15.2.11
***************
*** 2059,2074 ****
  		global $lang, $phpEx;
  
  			//
  			// Compose phpBB post header
  			//
! 			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);
! 
! 			$this->auto_message = $this->langs['item_title'] . ":  " . $this->data['item_title'] . "\n";
! 			$this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . "\n";
! 			$this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . "\n";
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "\n" . $this->langs['read_full_item'] . ": \n" . $this->temp_url . "\n";
  			}
  
--- 2059,2074 ----
  		global $lang, $phpEx;
  
+ 			$new_line_char = $this->allow_comment_wysiwyg  ? '<br />' : "\n";
+ 
  			//
  			// Compose phpBB post header
  			//
! 			$this->auto_message = $this->langs['item_title'] . ":  " . $this->data['item_title'] . $new_line_char;
! 			$this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . $new_line_char;
! 			$this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . $new_line_char;
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= $new_line_char . $this->langs['read_full_item'] . ": " . $new_line_char . $this->temp_url . $new_line_char;
  			}
  
***************
*** 2076,2080 ****
  			// Update message
  			//
! 			$this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . "\n";
  
  			//
--- 2076,2080 ----
  			// Update message
  			//
! 			$this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . $new_line_char;
  
  			//
***************
*** 2086,2090 ****
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new'];
! 					$this->message = $this->langs['notify_new_body'] . "\n\n" . $this->auto_message;
  				break;
  
--- 2086,2090 ----
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new'];
! 					$this->message = $this->langs['notify_new_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
***************
*** 2092,2111 ****
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited'];
! 					$this->message = $this->langs['notify_edited_body'] . "\n\n" . $this->auto_message_update . $this->auto_message;
  				break;
  
  				case MX_APPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved'];
! 					$this->message = $this->langs['notify_approved_body'] . "\n\n". $this->auto_message;
  				break;
  
  				case MX_UNAPPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved'];
! 					$this->message = $this->langs['notify_unapproved_body'] . "\n\n" . $this->auto_message;
  				break;
  
  				case MX_DELETED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted'];
! 					$this->message = $this->langs['notify_deleted_body'] . "\n\n" . $this->auto_message;
  				break;
  
--- 2092,2111 ----
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited'];
! 					$this->message = $this->langs['notify_edited_body'] . $new_line_char . $new_line_char . $this->auto_message_update . $this->auto_message;
  				break;
  
  				case MX_APPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved'];
! 					$this->message = $this->langs['notify_approved_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
  				case MX_UNAPPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved'];
! 					$this->message = $this->langs['notify_unapproved_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
  				case MX_DELETED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted'];
! 					$this->message = $this->langs['notify_deleted_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
***************
*** 3825,3836 ****
  
  			//
- 			// Little temp fix for autogenerated comments, with newlines.
- 			//
- 			if ($this->allow_comment_wysiwyg)
- 			{
- 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
- 			}
- 
- 			//
  			// Remove Images and/or links
  			//
--- 3825,3828 ----
***************
*** 4073,4084 ****
  
  			//
- 			// Little temp fix for autogenerated comments, with newlines.
- 			//
- 			if ($this->allow_comment_wysiwyg)
- 			{
- 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
- 			}
- 
- 			//
  			// Remove Images and/or links
  			//
--- 4065,4068 ----

[mxbb-commits] core/includes mx_functions_tools.php,1.34,1.35

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24812

Modified Files:
	mx_functions_tools.php 
Log Message:
comments, notifications, etc

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** mx_functions_tools.php	2 Jul 2008 22:02:02 -0000	1.34
--- mx_functions_tools.php	6 Jul 2008 22:10:01 -0000	1.35
***************
*** 2070,2085 ****
  		global $lang, $phpEx;
  
  			//
  			// Compose phpBB post header
  			//
! 			//$this->temp_url = PORTAL_URL . this_kb_mxurl("mode=" . "article&k=" . $this->data['item_id'], false, true);
! 
! 			$this->auto_message = $this->langs['item_title'] . ":  " . $this->data['item_title'] . "\n";
! 			$this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . "\n";
! 			$this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . "\n";
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= "\n" . $this->langs['read_full_item'] . ": \n" . $this->temp_url . "\n";
  			}
  
--- 2070,2085 ----
  		global $lang, $phpEx;
  
+ 			$new_line_char = $this->allow_comment_wysiwyg  ? '<br /> ' : "\n ";
+ 
  			//
  			// Compose phpBB post header
  			//
! 			$this->auto_message = $this->langs['item_title'] . ":  " . $this->data['item_title'] . $new_line_char;
! 			$this->auto_message .= $this->langs['author'] . ": " . $this->data['item_author'] . $new_line_char;
! 			$this->auto_message .= $this->langs['item_description'] . ": " . $this->data['item_desc'] . $new_line_char;
  
  			if ($action != MX_DELETED_NOTIFICATION)
  			{
! 				$this->auto_message .= $new_line_char . $this->langs['read_full_item'] . ": " . $new_line_char . $this->temp_url . $new_line_char;
  			}
  
***************
*** 2087,2091 ****
  			// Update message
  			//
! 			$this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . "\n";
  
  			//
--- 2087,2091 ----
  			// Update message
  			//
! 			$this->auto_message_update = $this->langs['edited_item_info'] . $this->data['item_editor'] . $new_line_char;
  
  			//
***************
*** 2097,2101 ****
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new'];
! 					$this->message = $this->langs['notify_new_body'] . "\n\n" . $this->auto_message;
  				break;
  
--- 2097,2101 ----
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_new'];
! 					$this->message = $this->langs['notify_new_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
***************
*** 2103,2122 ****
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited'];
! 					$this->message = $this->langs['notify_edited_body'] . "\n\n" . $this->auto_message_update . $this->auto_message;
  				break;
  
  				case MX_APPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved'];
! 					$this->message = $this->langs['notify_approved_body'] . "\n\n". $this->auto_message;
  				break;
  
  				case MX_UNAPPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved'];
! 					$this->message = $this->langs['notify_unapproved_body'] . "\n\n" . $this->auto_message;
  				break;
  
  				case MX_DELETED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted'];
! 					$this->message = $this->langs['notify_deleted_body'] . "\n\n" . $this->auto_message;
  				break;
  
--- 2103,2122 ----
  					$this->topic_title = $this->langs['module_title'] . ' - ' . $this->data['item_title'];
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_edited'];
! 					$this->message = $this->langs['notify_edited_body'] . $new_line_char . $new_line_char . $this->auto_message_update . $this->auto_message;
  				break;
  
  				case MX_APPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_approved'];
! 					$this->message = $this->langs['notify_approved_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
  				case MX_UNAPPROVED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_unapproved'];
! 					$this->message = $this->langs['notify_unapproved_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
  				case MX_DELETED_NOTIFICATION:
  					$this->subject = $this->langs['module_title'] . ' - ' . $this->langs['notify_subject_deleted'];
! 					$this->message = $this->langs['notify_deleted_body'] . $new_line_char . $new_line_char . $this->auto_message;
  				break;
  
***************
*** 3844,3855 ****
  
  			//
- 			// Little temp fix for autogenerated comments, with newlines.
- 			//
- 			if ($this->allow_comment_wysiwyg)
- 			{
- 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
- 			}
- 
- 			//
  			// Remove Images and/or links
  			//
--- 3844,3847 ----
***************
*** 3971,3975 ****
  				));
  			}
- 
  		}
  
--- 3963,3966 ----
***************
*** 4094,4105 ****
  
  			//
- 			// Little temp fix for autogenerated comments, with newlines.
- 			//
- 			if ($this->allow_comment_wysiwyg)
- 			{
- 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
- 			}
- 
- 			//
  			// Remove Images and/or links
  			//
--- 4085,4088 ----

[mxbb-commits] core/includes mx_functions_tools.php, 1.15.2.9, 1.15.2.10

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv7414

Modified Files:
      Tag: core28x
	mx_functions_tools.php 
Log Message:
comments fix

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.9
retrieving revision 1.15.2.10
diff -C2 -d -r1.15.2.9 -r1.15.2.10
*** mx_functions_tools.php	2 Jul 2008 22:02:52 -0000	1.15.2.9
--- mx_functions_tools.php	6 Jul 2008 19:22:53 -0000	1.15.2.10
***************
*** 3635,3638 ****
--- 3635,3639 ----
  
  	var $images = array('icon_minipost'=>'', 'comment_post'=>'', 'icon_edit'=>'', 'icon_delpost'=>'');
+ 
  	var $u_post = '';
  	var $u_delete = '';
***************
*** 3762,3765 ****
--- 3763,3767 ----
  		global $template, $lang, $board_config, $phpEx, $db, $userdata, $images;
  		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars, $portal_config;
+ 		global $mx_user;
  
  		//
***************
*** 3929,3932 ****
--- 3931,3935 ----
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['comments_id']),
  					'EDIT_IMG' => $this->images['icon_edit'],
+ 					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['comments_id'])),
  				));
  			}
***************
*** 3938,3941 ****
--- 3941,3945 ----
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['comments_id']),
  					'DELETE_IMG' => $this->images['icon_delpost'],
+ 					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['comments_id'])),
  				));
  			}
***************
*** 3956,3959 ****
--- 3960,3964 ----
  				'U_COMMENT_POST' => $this->u_post(),
  				'REPLY_IMG' => $this->images['comment_post'],
+ 				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));
  		}

[mxbb-commits] core/modules/mx_phpbb3blocks mx_announce.php, NONE, 1.1 phpbb3blocks.pak, 1.3, 1.4

[FlorinCB <ory...@us...>]

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

Modified Files:
	phpbb3blocks.pak 
Added Files:
	mx_announce.php 
Log Message:
announcement block added

--- NEW FILE: mx_announce.php ---
<?php
/**
*
* @package MX-Publisher Module - mx_phpbb3blocks
* @version $Id: mx_announce.php,v 1.1 2008/07/05 22:38:22 orynider Exp $
* @copyright (c) 2002-2008 MX-Publisher Project Team
* @license http://opensource.org/licenses/gpl-license.php GNU General Public License v2
* @link http://www.mx-publisher.com
*
*/

if( !defined('IN_PORTAL') || !is_object($mx_block))
{
	die("Hacking attempt");
}

// ===================================================
// Include the constants file
// ===================================================
include_once($module_root_path . 'includes/phpbb3blocks_constants.' . $phpEx);

//
// Read Block Settings
//
$title = $mx_block->block_info['block_title'];

$announce_nbr_display		= $mx_block->get_parameters( 'announce_nbr_display' );
$announce_nbr_days			= $mx_block->get_parameters( 'announce_nbr_days' );
$announce_display_global	= $mx_block->get_parameters( 'announce_display_global' );
$announce_display			= $mx_block->get_parameters( 'announce_display' );
$announce_display_sticky	= $mx_block->get_parameters( 'announce_display_sticky' );
$announce_display_normal	= $mx_block->get_parameters( 'announce_display_normal' );
$announce_img_global		= $mx_block->get_parameters( 'announce_img_global' );
$announce_img				= $mx_block->get_parameters( 'announce_img' );
$announce_img_sticky		= $mx_block->get_parameters( 'announce_img_sticky' );
$announce_img_normal		= $mx_block->get_parameters( 'announce_img_normal' );
$announce_forum				= $mx_block->get_parameters( 'announce_forum' );

if ( empty($announce_nbr_display) ) $announce_nbr_display = 10;
if ( empty($announce_nbr_days) ) $announce_nbr_days = 365;

//
// Start initial var setup
//
if ($mx_request_vars->is_request(POST_FORUM_URL))
{
	$forum_id = $mx_request_vars->request(POST_FORUM_URL, MX_TYPE_INT);
}
else if ($mx_request_vars->is_get('forum') )
{
	$forum_id = $mx_request_vars->get('forum', MX_TYPE_INT);
}
else
{
	$forum_id = 1; //'';
}

//
// Decide how to order the post display
//
if ( !$mx_request_vars->is_empty_request('postorder') )
{
	$post_order = $mx_request_vars->request('postorder');
}

$post_time_order = ( $post_order == 'asc' ) ? 'ASC' : 'DESC';
$start = $mx_request_vars->get('start', MX_TYPE_INT, 0);

//
// Grab all the basic data (all topics except announcements)
// for this forum
//

//
// Authorization SQL
//
$phpbb_auth->acl($mx_user->data); // Do only once, in user_init // Move later
$auth_data_sql = $phpbb_auth->get_auth_forum();

if ( empty($announce_forum) )
{
	$announce_forum = $auth_data_sql;
}

$min_topic_time = time() - ( $announce_nbr_days * 86400 );

$topic_type = array();
if( $announce_display_global == 'TRUE' )
{
	$topic_type[] = POST_GLOBAL;
}
if( $announce_display == 'TRUE' )
{
	$topic_type[] = POST_ANNOUNCE;
}
if( $announce_display_sticky == 'TRUE' )
{
	$topic_type[] = POST_STICKY;
}
if( $announce_display_normal == 'TRUE' )
{
	$topic_type[] = POST_NORMAL;
}
$topic_type = ( empty($topic_type) ? 0 : implode(', ', $topic_type) );

$sql = "SELECT t.*, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.*, pt.post_text, pt.post_subject, pt.bbcode_uid, p2.post_time AS last_post_time
	FROM " . TOPICS_TABLE . " t, " . USERS_TABLE . " u, " . POSTS_TABLE . " p, " . POSTS_TABLE . " p2, " . USERS_TABLE . " u2, " . POSTS_TABLE . " pt
	WHERE p.topic_id = t.topic_id
		AND t.topic_type IN ( " . $topic_type . " )
		AND p.post_id = t.topic_first_post_id
	  	AND pt.post_id = p.post_id
		AND u.user_id = p.poster_id
		AND p.post_time >= $min_topic_time
		AND t.forum_id IN ( $auth_data_sql )
		AND t.forum_id IN ( $announce_forum )
		AND p2.post_id = t.topic_last_post_id
		AND u2.user_id = p2.poster_id
	ORDER BY p.post_time $post_time_order
	LIMIT $start, " . $announce_nbr_display;

if ( !($result = $db->sql_query($sql)) )
{
	mx_message_die(GENERAL_ERROR, 'Could not obtain announce information', '', __LINE__, __FILE__, $sql);
}

$postrow = array();

while( $row = $db->sql_fetchrow($result) )
{
	$postrow[] = $row;
}
$total_posts = count($postrow);
$db->sql_freeresult($result);

if ( $total_posts == 0 )
{
	$mx_block->show_title = false;
	$mx_block->show_block = false;
	return;
}

for( $i = 0; $i < $total_posts; $i++ )
{
	$poster_id = $postrow[$i]['user_id'];
	$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'];
	$replies = $postrow[$i]['topic_replies'];
	$topic_type = $postrow[$i]['topic_type'];

	if ( $topic_type == POST_ANNOUNCE )
	{
		$topic_type = $lang['Topic_Announcement'] . ' ';
	}
	else if ( $topic_type == POST_STICKY )
	{
		$topic_type = $lang['Topic_Sticky'] . ' ';
	}
	else
	{
		$topic_type = '';
	}

	if ( $postrow[$i]['topic_vote'] )
	{
		$topic_type .= $lang['Topic_Poll'] . ' ';
	}

	$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;

	if ( $postrow[$i]['topic_status'] == TOPIC_MOVED )
	{
		$topic_type = $lang['Topic_Moved'] . ' ';
		$topic_id = $postrow[$i]['topic_moved_id'];

		$folder_image = $images['mx_folder'];
		$folder_alt = $lang['Topics_Moved'];
		$newest_post_img = '';
	}
	else
	{
		if ( $postrow[$i]['topic_type'] == POST_GLOBAL )
		{
			$folder = $mx_user->img('global_read', 'POST_GLOBAL', false, '', 'src');
			$folder_new = $mx_user->img('global_unread', 'POST_GLOBAL', false, '', 'src');
			$annoucement_image = $announce_img_global;
		}
		else if ( $postrow[$i]['topic_type'] == POST_ANNOUNCE )
		{
			$folder = $mx_user->img('announce_read', 'POST_ANNOUNCEMENT', false, '', 'src');
			$folder_new = $mx_user->img('announce_unread', 'POST_ANNOUNCEMENT', false, '', 'src');
			$annoucement_image = $announce_img;
		}
		else if ( $postrow[$i]['topic_type'] == POST_STICKY )
		{
			$folder = $mx_user->img('sticky_read', 'POST_STICKY', false, '', 'src');
			$folder_new = $mx_user->img('sticky_unread', 'POST_STICKY', false, '', 'src');
			$annoucement_image = $announce_img_sticky;
		}
		else if ( $postrow[$i]['topic_status'] == TOPIC_LOCKED )
		{
			$folder = $mx_user->img('topic_read_locked', 'NEW_POSTS', false, '', 'src');
			$folder_new = $mx_user->img('topic_unread_locked', 'NEW_POSTS', false, '', 'src');
		}
		else
		{
			if ( $replies >= $board_config['hot_threshold'] )
			{
				$folder = $mx_user->img('topic_read_hot', 'NEW_POSTS_HOT', false, '', 'src');
				$folder_new = $mx_user->img('topic_unread_hot', 'NEW_POSTS_HOT', false, '', 'src');
			}
			else
			{
				$folder = $mx_user->img('topic_unread', 'NEW_POSTS', false, '', 'src');
				$folder_new = $mx_user->img('topic_read', 'NEW_POSTS', false, '', 'src');
			}
		}

		$newest_post_img = '';
		if ( $userdata['session_logged_in'] )
		{
			if ( $postrow[$i]['last_post_time'] > $userdata['user_lastvisit'] )
			{
				if ( !empty($tracking_topics) || !empty($tracking_forums) || isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) )
				{
					$unread_topics = true;

					if ( !empty($tracking_topics[$topic_id]) )
					{
						if ( $tracking_topics[$topic_id] >= $postrow[$i]['last_post_time'] )
						{
							$unread_topics = false;
						}
					}

					if ( !empty($tracking_forums[$forum_id]) )
					{
						if ( $tracking_forums[$forum_id] >= $postrow[$i]['last_post_time'] )
						{
							$unread_topics = false;
						}
					}

					if ( isset($_COOKIE[$board_config['cookie_name'] . '_f_all']) )
					{
						if ( $_COOKIE[$board_config['cookie_name'] . '_f_all'] >= $postrow[$i]['last_post_time'] )
						{
							$unread_topics = false;
						}
					}

					if ( $unread_topics )
					{
						$folder_image = $folder_new;
						$folder_alt = $lang['New_posts'];

						$newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $mx_user->img('icon_topic_newest', 'VIEW_LATEST_POST', false, '', 'src') . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
					}
					else
					{
						$folder_image = $folder;
						$folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];

						$newest_post_img = '';
					}
				}
				else
				{
					$folder_image = $folder_new;
					$folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['New_posts'];

					$newest_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&amp;view=newest") . '"><img src="' . $mx_user->img('icon_topic_newest', 'VIEW_LATEST_POST', false, '', 'src') . '" alt="' . $lang['View_newest_post'] . '" title="' . $lang['View_newest_post'] . '" border="0" /></a> ';
				}
			}
			else
			{
				$folder_image = $folder;
				$folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];

				$newest_post_img = '';
			}
		}
		else
		{
			$folder_image = $folder;
			$folder_alt = ( $postrow[$i]['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['No_new_posts'];

			$newest_post_img = '';
		}
	}

	$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>';
	$last_post_img = '<a href="' . mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?f=" . $postrow[$i]['forum_id'] . '&amp;' . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id']) . '#' . $postrow[$i]['topic_last_post_id'] . '"><img src="' . $mx_user->img('icon_topic_latest', 'VIEW_LATEST_POST', false, '', 'src') . '" alt="' . $lang['View_latest_post'] . '" title="' . $lang['View_latest_post'] . '" border="0" /></a>';

	$last_post_url = mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?" . POST_POST_URL . '=' . $postrow[$i]['topic_last_post_id'] . '#' . $postrow[$i]['topic_last_post_id']);

	$template->assign_block_vars("postrow", array(
		'TITLE' => $title,
		'MESSAGE' => $message,
		'POST_DATE' => $post_date,
		'POST_SUBJECT' => $post_subject,
		'POSTER_NAME' => $poster,
		'POSTER_FULL' => $poster_full,		
		'POSTER_ID' => $poster_id,
		'TOPIC_ID' => $postrow[$i]['topic_id'],
		'SIGNATURE' => $user_sig,
		'FOLDER_IMG' => $folder_image,
		'IMAGE' => ($current_module_images) ? $current_module_images . '/'  . $annoucement_image : $module_root_path . TEMPLATE_ROOT_PATH . 'images/' . $annoucement_image,

		'U_TOPIC_URL' => mx_append_sid(PHPBB_URL . "viewtopic.$phpEx?f=" . $postrow[$i]['forum_id'] . '&amp;' . POST_TOPIC_URL . '=' . $postrow[$i]['topic_id']),
		'U_LAST_POST_URL' => $last_post_url,
		'U_PROFILE_POSTER' => mx_append_sid(PHPBB_URL . "memberlist.$phpEx?mode=viewprofile&amp;u=$poster_id"),

		'REPLIES' => $replies,
		'VIEWS' => $views,
		'FIRST_POST_TIME' => $first_post_time,
		'LAST_POST_TIME' => $last_post_time,
		'LAST_POST_AUTHOR' => $last_poster_full,
		'LAST_POST_IMG' => $last_post_img,

		'L_AUTHOR' => $lang['Author'],
		'L_POSTED' => $lang['Posted'],
		'L_REPLIES' => $lang['Replies'],
		'L_VIEWS' => $lang['Views'],
		'L_POSTS' => $lang['Posts'],
		'L_LASTPOST' => $lang['Last_Post'],

		'L_TOPIC_FOLDER_ALT' => $folder_alt
	));

}

$template->set_filenames(array(
	'body_announce' => "mx_announce.$tplEx")
);

$template->assign_vars(array(
	'BLOCK_SIZE' => (!empty($block_size) ? $block_size : '100%'),
	'U_PHPBB_ROOT_PATH' => PHPBB_URL,
	'TEMPLATE_ROOT_PATH' => TEMPLATE_ROOT_PATH
));

$template->pparse('body_announce');

?>
Index: phpbb3blocks.pak
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb3blocks/phpbb3blocks.pak,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** phpbb3blocks.pak	25 Jun 2008 12:41:17 -0000	1.3
--- phpbb3blocks.pak	5 Jul 2008 22:38:22 -0000	1.4
***************
*** 1,4 ****
--- 1,19 ----
  module=+:53=+:phpBB3 Blocks=+:modules/mx_phpbb3blocks/=+:MX-Publisher phpBB3 blocks=+:
  New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
+ function=+:53=+:2=+:phpBB Announcements=+:phpBB Announcements Block=+:mx_announce.php=+:
+ parameter=+:2=+:1=+:announce_nbr_display=+:Number=+:1=+:=+:0=+:0
+ parameter=+:2=+:10=+:announce_img_global=+:Text=+:thumb_globe.gif=+:=+:0=+:0
+ parameter=+:2=+:6=+:announce_display_global=+:Boolean=+:TRUE=+:=+:0=+:0
+ parameter=+:2=+:9=+:announce_img_normal=+:Text=+:thumb_globe.gif=+:=+:0=+:0
+ parameter=+:2=+:8=+:announce_img_sticky=+:Text=+:thumb_globe.gif=+:=+:0=+:0
+ parameter=+:2=+:7=+:announce_img=+:Text=+:thumb_globe.gif=+:=+:0=+:0
+ parameter=+:2=+:5=+:announce_display_normal=+:Boolean=+:FALSE=+:=+:0=+:0
+ parameter=+:2=+:4=+:announce_display_sticky=+:Boolean=+:TRUE=+:=+:0=+:0
+ parameter=+:2=+:3=+:announce_display=+:Boolean=+:TRUE=+:=+:0=+:0
+ parameter=+:2=+:2=+:announce_nbr_days=+:Number=+:14=+:=+:0=+:0
+ parameter=+:2=+:11=+:announce_forum=+:Function=+:=+:get_list_multiple("{parameter_id}[]", FORUMS_TABLE, 'forum_id', 'forum_name', "{parameter_value}", TRUE)=+:0=+:0
+ parameter=+:0=+:0=+:0=+:endoflist=+:0=+:0
+ block=+:=+:Demo - phpBB Announcements=+:Demo block=+:2=+:0=+:5=+:0=+:0=+:0=+:0=+:1=+:1
+ New_function=+:---------------------------=+:0=+:0=+:0=+:0=+:0
  function=+:53=+:51=+:Last Posts=+:phpBB Last Posts Function=+:mx_last_msg.php=+:
  parameter=+:51=+:17=+:Last_Msg_Number_Title=+:Number=+:15=+:=+:0=+:0

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/prosilver mx_announce.html, NONE, 1.1

[FlorinCB <ory...@us...>]

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

Added Files:
	mx_announce.html 
Log Message:
announcement block added

--- NEW FILE: mx_announce.html ---
<!-- BEGIN postrow -->
<div class="clear"></div>
<div class="forabg block">
	<div id="p1" class="post bg2 online">
		<div class="inner"><span class="corners-top"><span></span></span>
			<dl class="textbody">
				<dt>
					<p>
						<a href="{postrow.U_TOPIC_URL}">
						<img src="{postrow.IMAGE}" align="right" hspace="5" vspace="5" border="1" title="{postrow.TITLE}" alt="{postrow.TITLE}" />
						</a>
						<a href="{postrow.U_LAST_POST_URL}" class="topictitle">
						<img src="{postrow.FOLDER_IMG}" alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}" border="0" align="absmiddle" /></a>
						<a href="{postrow.U_TOPIC_URL}" class="topictitle">{postrow.TITLE}</a>
					</p>
					<span class="postbody">{postrow.MESSAGE}</span>
				</dt>
			</dl>
		</div>
	</div>
	<div id="p1" class="post bg2 online">
		<div class="inner"><span class="corners-top"><span></span></span>
			<dl class="textbody">
				<dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_AUTHOR}:&nbsp;{postrow.POSTER_FULL}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="gensmall">{postrow.L_POSTED}:<br />{postrow.FIRST_POST_TIME}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_REPLIES}:<br />{postrow.REPLIES}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_VIEWS}:<br />{postrow.VIEWS}</span></dt>
				<dt style="vertical-align:middle; text-align:center;"><span class="postdetails">{postrow.L_LASTPOST}:<br />{postrow.LAST_POST_TIME}&nbsp;{postrow.LAST_POST_AUTHOR}&nbsp;{postrow.LAST_POST_IMG}</span></dt>
			</dl>
		</div>
	</div>
	<span class="corners-bottom"><span></span></span>
</div>
<br clear="all" />
<!-- END postrow -->

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/prosilver/images index.htm, NONE, 1.1 thumb_globe.gif, NONE, 1.1 thumb_news.gif, NONE, 1.1

[FlorinCB <ory...@us...>]

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

Added Files:
	index.htm thumb_globe.gif thumb_news.gif 
Log Message:
announcement block added

--- NEW FILE: thumb_globe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/_core index.htm, NONE, 1.1 mx_announce.html, NONE, 1.1 mx_statistics.html, NONE, 1.1

[FlorinCB <ory...@us...>]

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

Added Files:
	index.htm mx_announce.html mx_statistics.html 
Log Message:
announcement block added

--- NEW FILE: mx_statistics.html ---
<table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%" style="border-top:none;">
	<tr>
		<td class="catHead" align="center"><span class="cattitle">{L_ADMIN_STATISTICS}</span></td>
	</tr>
	<tr>
		<td>
			<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;">
				<tr>
					<th width="25%" class="thCornerL" align="center"><b>{L_STATISTIC}</b></td>
					<th width="25%" class="thTop" align="center"><b>{L_VALUE}</b></td>
					<th width="25%" class="thTop" align="center"><b>{L_STATISTIC}</b></td>
					<th width="25%" class="thCornerR" align="center"><b>{L_VALUE}</b></td>
				</tr>
				<!-- BEGIN adminrow -->
				<tr>
					<td class="row2" align="center"><span class="gen">{adminrow.STATISTIC}</span></td>
					<td class="row1" align="center"><span class="gen">{adminrow.VALUE}</span></td>
					<td class="row2" align="center"><span class="gen">{adminrow.STATISTIC2}</span></td>
					<td class="row1" align="center"><span class="gen">{adminrow.VALUE2}</span></td>
				</tr>
				<!-- END adminrow -->
			</table>
		</td>
	</tr>
</table>
<br clear="all" />
<table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%">
	<tr>
		<td class="catHead" align="center"><span class="cattitle">{L_TOP_POSTERS}</span></td>
	</tr>
	<tr>
		<td>
			<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;">
				<tr>
					<th class="thCornerL" align="center" width="10%"><b>{L_RANK}</b></th>
					<th class="thTop" align="center" width="20%"><b>{L_USERNAME}</b></th>
					<th class="thTop" align="center" width="10%"><b>{L_POSTS}</b></th>
					<th class="thTop" align="center" width="10%"><b>{L_PERCENTAGE}</b></th>
					<th class="thCornerR" align="center" width="50%"><b>{L_GRAPH}</b></th>
				</tr>
				<!-- BEGIN users -->
				<tr>
					<td class="{users.CLASS}" align="center"><span class="gen">{users.RANK}</span></td>
					<td class="{users.CLASS}" align="center"><span class="gen"><a href="{users.URL}">{users.USERNAME}</a></span></td>
					<td class="{users.CLASS}" align="center"><span class="gen">{users.POSTS}</span></td>
					<td class="{users.CLASS}" align="center"><span class="gen">{users.PERCENTAGE}%</span></td>
					<td class="{users.CLASS}" align="left">
						<table cellspacing="0" cellpadding="0" border="0" align="left">
							<tr>
								<td align="right"><img src="{LEFT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td>
							</tr>
						</table>
						<table cellspacing="0" cellpadding="0" border="0" align="left" width="{users.BAR}%">
							<tr>
								<td><img src="{GRAPH_IMAGE}" width="100%" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td>
							</tr>
						</table>
						<table cellspacing="0" cellpadding="0" border="0" align="left">
							<tr>
								<td align="left"><img src="{RIGHT_GRAPH_IMAGE}" width="4" height="12" alt="{users.PERCENTAGE}%" title="{users.PERCENTAGE}%" /></td>
							</tr>
						</table>
					</td>
				</tr>
				<!-- END users -->
			</table>
		</td>
	</tr>
</table>
<br clear="all" />
<table width="100%" border="0" cellspacing="0" cellpadding="0">
	<tr>
		<td valign="top" width="50%" style="padding-right:2px;">
			<table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%">
				<tr>
					<td class="catHead" align="center"><span class="cattitle">{L_MOST_VIEWED}</span></td>
				</tr>
				<tr>
					<td>
						<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;">
							<tr>
								<th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th>
								<th class="thTop" align="center" width="20%"><b>{L_VIEWS}</b></th>
								<th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th>
							</tr>
							<!-- BEGIN topicviews -->
							<tr>
								<td class="{topicviews.CLASS}" align="left"><span class="gen">{topicviews.RANK}</span></td>
								<td class="{topicviews.CLASS}" align="center"><span class="gen">{topicviews.VIEWS}</span></td>
								<td class="{topicviews.CLASS}" align="left"><span class="gen"><a href="{topicviews.URL}">{topicviews.TITLE}</a></span></td>
							</tr>
							<!-- END topicviews -->
						</table>
					</td>
				</tr>
			</table>
		</td>
		<td valign="top" width="50%" style="padding-left:2px;">
			<table border="0" cellpadding="0" cellspacing="0" class="forumline" width="100%">
				<tr>
					<td class="catHead" align="center"> <span class="cattitle">{L_MOST_ACTIVE}</span></td>
				</tr>
				<tr>
					<td>
						<table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline" style="border:none;">
							<tr>
								<th class="thCornerL" align="left" width="5%"><b>{L_RANK}</b></th>
								<th class="thTop" align="center" width="20%"><b>{L_REPLIES}</b></th>
								<th class="thCornerR" align="center" width="75%"><b>{L_TOPIC}</b></th>
							</tr>
							<!-- BEGIN topicreplies -->
							<tr>
								<td class="{topicreplies.CLASS}" align="left"><span class="gen">{topicreplies.RANK}</span></td>
								<td class="{topicreplies.CLASS}" align="center"><span class="gen">{topicreplies.REPLIES}</span></td>
								<td class="{topicreplies.CLASS}" align="left"><span class="gen"><a href="{topicreplies.URL}">{topicreplies.TITLE}</a></span></td>
							</tr>
							<!-- END topicreplies -->
						</table>
					</td>
				</tr>
			</table>
		</td>
	</tr>
</table>
--- NEW FILE: mx_announce.html ---
<!-- BEGIN postrow -->
<table width="100%" border="0" cellpadding="1" cellspacing="0" class="forumline" style="border-top:none;">
	<tr>
		<td class="row1">
			<table width="100%" border="0" cellpadding="2" cellspacing="1">
				<tbody>
					<tr>
						<td class="row1">
							<p>
								<a href="{postrow.U_TOPIC_URL}">
									<img src="{postrow.IMAGE}" align="right" hspace="5" vspace="5" border="1" title="{postrow.TITLE}" alt="{postrow.TITLE}" />
								</a>
								<a href="{postrow.U_LAST_POST_URL}" class="topictitle">
									<img src="{postrow.FOLDER_IMG}"
										alt="{postrow.L_TOPIC_FOLDER_ALT}" title="{postrow.L_TOPIC_FOLDER_ALT}"
										border="0" align="absmiddle" /></a>
								<a href="{postrow.U_TOPIC_URL}" class="topictitle">{postrow.TITLE}</a>
							</p>
							<span class="postbody">{postrow.MESSAGE}</span>
						</td>
					</tr>
				</tbody>
			</table>
		</td>
	</tr>
	<tr>
		<td class="row1" width="100%" valign="top">
			<table width="100%" border="0" cellpadding="2" cellspacing="1">
				<tr>
					<td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_AUTHOR}:&nbsp;{postrow.POSTER_FULL}</span></td>
					<td class="row2" align="center" valign="middle"><span class="gensmall">{postrow.L_POSTED}:<br />{postrow.FIRST_POST_TIME}</span></td>
					<td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_REPLIES}:<br />{postrow.REPLIES}</span></td>
					<td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_VIEWS}:<br />{postrow.VIEWS}</span></td>
					<td class="row2" align="center" valign="middle"><span class="postdetails">{postrow.L_LASTPOST}:<br />{postrow.LAST_POST_TIME}&nbsp;{postrow.LAST_POST_AUTHOR}&nbsp;{postrow.LAST_POST_IMG}</span></td>
				</tr>
			</table>
		</td>
	</tr>
</table>
<br clear="all" />
<!-- END postrow -->
--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/_core/images index.htm, NONE, 1.1 thumb_globe.gif, NONE, 1.1 thumb_news.gif, NONE, 1.1

[FlorinCB <ory...@us...>]

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

Added Files:
	index.htm thumb_globe.gif thumb_news.gif 
Log Message:
announcement block added

--- NEW FILE: thumb_globe.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: thumb_news.gif ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: index.htm ---
<html>
<head>
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
</head>

<body bgcolor="#FFFFFF" text="#000000">

</body>
</html>

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/_core/images - New directory

[FlorinCB <ory...@us...>]

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

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/_core/images added to the repository

[mxbb-commits] core/modules/mx_phpbb3blocks/templates/prosilver/images - New directory

[FlorinCB <ory...@us...>]

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

Log Message:
Directory /cvsroot/mxbb/core/modules/mx_phpbb3blocks/templates/prosilver/images added to the repository

[mxbb-commits] mx_news db_install.php, 1.7, 1.8 db_upgrade.php, 1.5, 1.6 mx_install_readme.htm, 1.3, 1.4

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

Update of /cvsroot/mxbb/mx_news
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14119

Modified Files:
	db_install.php db_upgrade.php mx_install_readme.htm 
Log Message:
1.0.3 release

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_news/mx_install_readme.htm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mx_install_readme.htm	22 Jun 2008 19:16:14 -0000	1.3
--- mx_install_readme.htm	5 Jul 2008 22:22:05 -0000	1.4
***************
*** 221,225 ****
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              News Manager<br>
!         <font size="2">v. 1.0.2</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />
--- 221,225 ----
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              News Manager<br>
!         <font size="2">v. 1.0.3</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />
***************
*** 248,252 ****
          <br />
          <span style="font-weight: bold">I. Installation Instructions</span> <br />
!       To install this module, follow these instructions.</p>      
        <p>If you encounter any
            problems during install, or if you need further assistance, visit the
--- 248,252 ----
          <br />
          <span style="font-weight: bold">I. Installation Instructions</span> <br />
!       To install this module, follow these instructions.</p>
        <p>If you encounter any
            problems during install, or if you need further assistance, visit the

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/db_install.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** db_install.php	22 Jun 2008 19:44:52 -0000	1.7
--- db_install.php	5 Jul 2008 22:22:04 -0000	1.8
***************
*** 30,34 ****
  }
  
! $mx_module_version = '1.0.2';
  $mx_module_copy = 'Designed for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>.';
  
--- 30,34 ----
  }
  
! $mx_module_version = '1.0.3';
  $mx_module_copy = 'Designed for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>.';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_news/db_upgrade.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** db_upgrade.php	22 Jun 2008 19:44:52 -0000	1.5
--- db_upgrade.php	5 Jul 2008 22:22:05 -0000	1.6
***************
*** 30,34 ****
  }
  
! $mx_module_version = '1.0.2';
  $mx_module_copy = 'Designed for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>.</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '1.0.3';
  $mx_module_copy = 'Designed for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>.</a>';
  

[mxbb-commits] core/includes mx_functions_phpbb.php,1.68,1.69

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12918

Modified Files:
	mx_functions_phpbb.php 
Log Message:
fix

Index: mx_functions_phpbb.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_phpbb.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** mx_functions_phpbb.php	25 Jun 2008 23:45:29 -0000	1.68
--- mx_functions_phpbb.php	5 Jul 2008 22:19:58 -0000	1.69
***************
*** 1567,1571 ****
  function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $mx_root_path, $phpEx, $mx_user, $phpbb_auth;
  
  	$profile_url = '';
--- 1567,1571 ----
  function mx_get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $phpEx, $user, $phpbb_auth;
  
  	$profile_url = '';
***************
*** 1574,1582 ****
  	if ($guest_username === false)
  	{
! 		$username = ($username) ? $username : $mx_user->lang['GUEST'];
  	}
  	else
  	{
! 		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $mx_user->lang['GUEST']);
  	}
  
--- 1574,1582 ----
  	if ($guest_username === false)
  	{
! 		$username = ($username) ? $username : $user->lang['GUEST'];
  	}
  	else
  	{
! 		$username = ($user_id && $user_id != ANONYMOUS) ? $username : ((!empty($guest_username)) ? $guest_username : $user->lang['GUEST']);
  	}
  
***************
*** 1586,1590 ****
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($mx_user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';
--- 1586,1590 ----
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';
***************
*** 1592,1596 ****
  		else
  		{
! 			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
  			$profile_url .= '&u=' . (int) $user_id;
  		}
--- 1592,1596 ----
  		else
  		{
! 			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
  			$profile_url .= '&u=' . (int) $user_id;
  		}

[mxbb-commits] mx_linkdb db_install.php, 1.26, 1.27 db_upgrade.php, 1.28, 1.29 mx_install_readme.htm, 1.6, 1.7

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

Update of /cvsroot/mxbb/mx_linkdb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12892

Modified Files:
	db_install.php db_upgrade.php mx_install_readme.htm 
Log Message:
2.2.5 release

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/mx_install_readme.htm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mx_install_readme.htm	1 Jul 2008 21:49:38 -0000	1.6
--- mx_install_readme.htm	5 Jul 2008 22:19:48 -0000	1.7
***************
*** 221,225 ****
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              Links Manager<br>
!         <font size="2">v. 2.2.4</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />
--- 221,225 ----
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              Links Manager<br>
!         <font size="2">v. 2.2.5</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/db_install.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** db_install.php	3 Jun 2008 20:08:40 -0000	1.26
--- db_install.php	5 Jul 2008 22:19:48 -0000	1.27
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.4';
  $mx_module_copy = 'Original phpBB <i>LinkDb</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=1183059" target="_blank">CRLin</a>, <a href="http://www.hostsector.com/~mohd/" target="_blank">pafileDB</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=110836" target="_blank">Advanced Links Mod</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>LinkDb</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=1183059" target="_blank">CRLin</a>, <a href="http://www.hostsector.com/~mohd/" target="_blank">pafileDB</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=110836" target="_blank">Advanced Links Mod</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/db_upgrade.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** db_upgrade.php	3 Jun 2008 20:08:42 -0000	1.28
--- db_upgrade.php	5 Jul 2008 22:19:48 -0000	1.29
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.4';
  $mx_module_copy = 'Original phpBB <i>LinkDb</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=1183059" target="_blank">CRLin</a>, <a href="http://www.hostsector.com/~mohd/" target="_blank">pafileDB</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=110836" target="_blank">Advanced Links Mod</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>LinkDb</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?p=1183059" target="_blank">CRLin</a>, <a href="http://www.hostsector.com/~mohd/" target="_blank">pafileDB</a> & <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=110836" target="_blank">Advanced Links Mod</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

[mxbb-commits] core/includes/shared/phpbb3/includes functions.php, 1.19, 1.20

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes/shared/phpbb3/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12439

Modified Files:
	functions.php 
Log Message:
fix

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/shared/phpbb3/includes/functions.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** functions.php	20 Jun 2008 15:55:05 -0000	1.19
--- functions.php	5 Jul 2008 22:18:50 -0000	1.20
***************
*** 531,535 ****
  function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false)
  {
! 	global $board_config, $auth, $template, $user, $db;
  
  	if (!$board_config['load_jumpbox'])
--- 531,535 ----
  function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false)
  {
! 	global $board_config, $phpbb_auth, $template, $user, $db;
  
  	if (!$board_config['load_jumpbox'])
***************
*** 574,578 ****
  		}
  
! 		if (!$auth->acl_get('f_list', $row['forum_id']))
  		{
  			// if the user does not have permissions to list this forum skip
--- 574,578 ----
  		}
  
! 		if (!$phpbb_auth->acl_get('f_list', $row['forum_id']))
  		{
  			// if the user does not have permissions to list this forum skip
***************
*** 580,584 ****
  		}
  
! 		if ($acl_list && !$auth->acl_gets($acl_list, $row['forum_id']))
  		{
  			continue;
--- 580,584 ----
  		}
  
! 		if ($acl_list && !$phpbb_auth->acl_gets($acl_list, $row['forum_id']))
  		{
  			continue;
***************
*** 2042,2052 ****
  * Examples:
  * <code>
! * append_sid("{$phpbb_root_path}viewtopic.$phpEx?t=1&amp;f=2");
! * append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&amp;f=2');
! * append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&f=2', false);
! * append_sid("{$phpbb_root_path}viewtopic.$phpEx", array('t' => 1, 'f' => 2));
  * </code>
  */
! function append_sid($url, $params = false, $is_amp = true, $session_id = false)
  {
  	global $_SID, $_EXTRA_URL;
--- 2042,2052 ----
  * Examples:
  * <code>
! * mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx?t=1&amp;f=2");
! * mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&amp;f=2');
! * mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=1&f=2', false);
! * mx3_append_sid("{$phpbb_root_path}viewtopic.$phpEx", array('t' => 1, 'f' => 2));
  * </code>
  */
! function mx3_append_sid($url, $params = false, $is_amp = true, $session_id = false)
  {
  	global $_SID, $_EXTRA_URL;
***************
*** 2312,2320 ****
  	if ($url === "index.$phpEx")
  	{
! 		return append_sid("index.$phpEx");
  	}
  	else if ($url === "{$phpbb_root_path}index.$phpEx")
  	{
! 		return append_sid("{$phpbb_root_path}index.$phpEx");
  	}
  
--- 2312,2320 ----
  	if ($url === "index.$phpEx")
  	{
! 		return mx3_append_sid("index.$phpEx");
  	}
  	else if ($url === "{$phpbb_root_path}index.$phpEx")
  	{
! 		return mx3_append_sid("{$phpbb_root_path}index.$phpEx");
  	}
  
***************
*** 2345,2349 ****
  	// Append SID
  	$redirect = (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name'] . (($user->page['query_string']) ? "?{$user->page['query_string']}" : '');
! 	$redirect = append_sid($redirect, false, false);
  
  	// Add delimiter if not there...
--- 2345,2349 ----
  	// Append SID
  	$redirect = (($user->page['page_dir']) ? $user->page['page_dir'] . '/' : '') . $user->page['page_name'] . (($user->page['query_string']) ? "?{$user->page['query_string']}" : '');
! 	$redirect = mx3_append_sid($redirect, false, false);
  
  	// Add delimiter if not there...
***************
*** 2530,2534 ****
  function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
  {
! 	global $db, $user, $template, $auth, $phpEx, $phpbb_root_path, $board_config;
  
  	$err = '';
--- 2530,2534 ----
  function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = false, $s_display = true)
  {
! 	global $db, $user, $template, $phpbb_auth, $phpEx, $phpbb_root_path, $board_config;
  
  	$err = '';
***************
*** 2541,2545 ****
  
  	// Print out error if user tries to authenticate as an administrator without having the privileges...
! 	if ($admin && !$auth->acl_get('a_'))
  	{
  		// Not authd
--- 2541,2545 ----
  
  	// Print out error if user tries to authenticate as an administrator without having the privileges...
! 	if ($admin && !$phpbb_auth->acl_get('a_'))
  	{
  		// Not authd
***************
*** 2576,2580 ****
  
  		// If authentication is successful we redirect user to previous page
! 		$result = $auth->login($username, $password, $autologin, $viewonline, $admin);
  
  		// If admin authentication and login, we will log if it was a success or not...
--- 2576,2580 ----
  
  		// If authentication is successful we redirect user to previous page
! 		$result = $phpbb_auth->login($username, $password, $autologin, $viewonline, $admin);
  
  		// If admin authentication and login, we will log if it was a success or not...
***************
*** 2654,2658 ****
  					'S_CONFIRM_CODE'			=> true,
  					'CONFIRM_ID'				=> $confirm_id,
! 					'CONFIRM_IMAGE'				=> '<img src="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&amp;id=' . $confirm_id . '&amp;type=' . CONFIRM_LOGIN) . '" alt="" title="" />',
  					'L_LOGIN_CONFIRM_EXPLAIN'	=> sprintf($user->lang['LOGIN_CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">', '</a>'),
  				));
--- 2654,2658 ----
  					'S_CONFIRM_CODE'			=> true,
  					'CONFIRM_ID'				=> $confirm_id,
! 					'CONFIRM_IMAGE'				=> '<img src="' . mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=confirm&amp;id=' . $confirm_id . '&amp;type=' . CONFIRM_LOGIN) . '" alt="" title="" />',
  					'L_LOGIN_CONFIRM_EXPLAIN'	=> sprintf($user->lang['LOGIN_CONFIRM_EXPLAIN'], '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">', '</a>'),
  				));
***************
*** 2665,2669 ****
  				$err = sprintf(
  					$user->lang[$result['error_msg']],
! 					($board_config['email_enable']) ? '<a href="' . append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
  					($board_config['email_enable']) ? '</a>' : '',
  					($board_config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">' : '',
--- 2665,2669 ----
  				$err = sprintf(
  					$user->lang[$result['error_msg']],
! 					($board_config['email_enable']) ? '<a href="' . mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') . '">' : '',
  					($board_config['email_enable']) ? '</a>' : '',
  					($board_config['board_contact']) ? '<a href="mailto:' . htmlspecialchars($board_config['board_contact']) . '">' : '',
***************
*** 2706,2716 ****
  		'LOGIN_EXPLAIN'		=> $l_explain,
  
! 		'U_SEND_PASSWORD' 		=> ($board_config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
! 		'U_RESEND_ACTIVATION'	=> ($board_config['require_activation'] != USER_ACTIVATION_NONE && $board_config['email_enable']) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
! 		'U_TERMS_USE'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
! 		'U_PRIVACY'				=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
  
  		'S_DISPLAY_FULL_LOGIN'	=> ($s_display) ? true : false,
! 		'S_LOGIN_ACTION'		=> (!$admin) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
  		'S_HIDDEN_FIELDS' 		=> $s_hidden_fields,
  
--- 2706,2716 ----
  		'LOGIN_EXPLAIN'		=> $l_explain,
  
! 		'U_SEND_PASSWORD' 		=> ($board_config['email_enable']) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '',
! 		'U_RESEND_ACTIVATION'	=> ($board_config['require_activation'] != USER_ACTIVATION_NONE && $board_config['email_enable']) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=resend_act') : '',
! 		'U_TERMS_USE'			=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
! 		'U_PRIVACY'				=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'),
  
  		'S_DISPLAY_FULL_LOGIN'	=> ($s_display) ? true : false,
! 		'S_LOGIN_ACTION'		=> (!$admin) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : mx3_append_sid("index.$phpEx", false, true, $user->session_id), // Needs to stay index.$phpEx because we are within the admin directory
  		'S_HIDDEN_FIELDS' 		=> $s_hidden_fields,
  
***************
*** 2812,2819 ****
  function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
  {
! 	global $board_config, $auth, $user;
  
  	// Check permission and make sure the last post was not already bumped
! 	if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped)
  	{
  		return false;
--- 2812,2819 ----
  function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster)
  {
! 	global $board_config, $phpbb_auth, $user;
  
  	// Check permission and make sure the last post was not already bumped
! 	if (!$phpbb_auth->acl_get('f_bump', $forum_id) || $topic_bumped)
  	{
  		return false;
***************
*** 3490,3494 ****
  			}
  
! 			$download_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
  
  			switch ($display_cat)
--- 3490,3494 ----
  			}
  
! 			$download_link = mx3_append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
  
  			switch ($display_cat)
***************
*** 3497,3501 ****
  				case ATTACHMENT_CATEGORY_IMAGE:
  					$l_downloaded_viewed = 'VIEWED_COUNT';
! 					$inline_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
  					$download_link .= '&amp;mode=view';
  
--- 3497,3501 ----
  				case ATTACHMENT_CATEGORY_IMAGE:
  					$l_downloaded_viewed = 'VIEWED_COUNT';
! 					$inline_link = mx3_append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id']);
  					$download_link .= '&amp;mode=view';
  
***************
*** 3511,3515 ****
  				case ATTACHMENT_CATEGORY_THUMB:
  					$l_downloaded_viewed = 'VIEWED_COUNT';
! 					$thumbnail_link = append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1');
  					$download_link .= '&amp;mode=view';
  
--- 3511,3515 ----
  				case ATTACHMENT_CATEGORY_THUMB:
  					$l_downloaded_viewed = 'VIEWED_COUNT';
! 					$thumbnail_link = mx3_append_sid("{$phpbb_root_path}download.$phpEx", 'id=' . $attachment['attach_id'] . '&amp;t=1');
  					$download_link .= '&amp;mode=view';
  
***************
*** 4000,4004 ****
  function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $phpEx, $user, $auth;
  
  	$profile_url = '';
--- 4000,4004 ----
  function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false)
  {
! 	global $phpbb_root_path, $phpEx, $user, $phpbb_auth;
  
  	$profile_url = '';
***************
*** 4019,4023 ****
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';
--- 4019,4023 ----
  		// Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly).
  		// For all others the link leads to a login page or the profile.
! 		if ($user->data['user_id'] != ANONYMOUS && !$phpbb_auth->acl_get('u_viewprofile'))
  		{
  			$profile_url = '';
***************
*** 4025,4029 ****
  		else
  		{
! 			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
  			$profile_url .= '&amp;u=' . (int) $user_id;
  		}
--- 4025,4029 ----
  		else
  		{
! 			$profile_url = ($custom_profile_url !== false) ? $custom_profile_url : mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile');
  			$profile_url .= '&amp;u=' . (int) $user_id;
  		}
***************
*** 4133,4137 ****
  function msg_handler($errno, $msg_text, $errfile, $errline)
  {
! 	global $mx_cache, $db, $auth, $template, $board_config, $user;
  	global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
  
--- 4133,4137 ----
  function msg_handler($errno, $msg_text, $errfile, $errline)
  {
! 	global $mx_cache, $db, $phpbb_auth, $template, $board_config, $user;
  	global $phpEx, $phpbb_root_path, $msg_title, $msg_long_text;
  
***************
*** 4252,4256 ****
  
  			// We re-init the auth array to get correct results on login/logout
! 			$auth->acl($user->data);
  
  			if (empty($user->lang))
--- 4252,4256 ----
  
  			// We re-init the auth array to get correct results on login/logout
! 			$phpbb_auth->acl($user->data);
  
  			if (empty($user->lang))
***************
*** 4311,4315 ****
  function page_header($page_title = '', $display_online_list = true)
  {
! 	global $db, $board_config, $template, $SID, $_SID, $user, $auth, $phpEx, $phpbb_root_path;
  
  	if (defined('HEADER_INC'))
--- 4311,4315 ----
  function page_header($page_title = '', $display_online_list = true)
  {
! 	global $db, $board_config, $template, $SID, $_SID, $user, $phpbb_auth, $phpEx, $phpbb_root_path;
  
  	if (defined('HEADER_INC'))
***************
*** 4332,4341 ****
  	if ($user->data['user_id'] != ANONYMOUS)
  	{
! 		$u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout', true, $user->session_id);
  		$l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']);
  	}
  	else
  	{
! 		$u_login_logout = append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login');
  		$l_login_logout = $user->lang['LOGIN'];
  	}
--- 4332,4341 ----
  	if ($user->data['user_id'] != ANONYMOUS)
  	{
! 		$u_login_logout = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout', true, $user->session_id);
  		$l_login_logout = sprintf($user->lang['LOGOUT_USER'], $user->data['username']);
  	}
  	else
  	{
! 		$u_login_logout = mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login');
  		$l_login_logout = $user->lang['LOGIN'];
  	}
***************
*** 4424,4432 ****
  					}
  
! 					if (($row['session_viewonline']) || $auth->acl_get('u_viewonline'))
  					{
  						if ($row['user_type'] <> USER_IGNORE)
  						{
! 							$user_online_link = '<a href="' . append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']) . '"' . $user_colour . '>' . $user_online_link . '</a>';
  						}
  						else
--- 4424,4432 ----
  					}
  
! 					if (($row['session_viewonline']) || $phpbb_auth->acl_get('u_viewonline'))
  					{
  						if ($row['user_type'] <> USER_IGNORE)
  						{
! 							$user_online_link = '<a href="' . mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&amp;u=' . $row['user_id']) . '"' . $user_colour . '>' . $user_online_link . '</a>';
  						}
  						else
***************
*** 4589,4614 ****
  		'L_ONLINE_EXPLAIN'	=> $l_online_time,
  
! 		'U_PRIVATEMSGS'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
! 		'U_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
! 		'UA_RETURN_INBOX'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false),
! 		'U_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=popup'),
! 		'UA_POPUP_PM'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup', false),
! 		'U_MEMBERLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
! 		'U_MEMBERSLIST'			=> append_sid("{$phpbb_root_path}memberlist.$phpEx"),
! 		'U_VIEWONLINE'			=> ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '',
  		'U_LOGIN_LOGOUT'		=> $u_login_logout,
! 		'U_INDEX'				=> append_sid("{$phpbb_root_path}index.$phpEx"),
! 		'U_SEARCH'				=> append_sid("{$phpbb_root_path}search.$phpEx"),
! 		'U_REGISTER'			=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
! 		'U_PROFILE'				=> append_sid("{$phpbb_root_path}ucp.$phpEx"),
! 		'U_MODCP'				=> append_sid("{$phpbb_root_path}mcp.$phpEx", false, true, $user->session_id),
! 		'U_FAQ'					=> append_sid("{$phpbb_root_path}faq.$phpEx"),
! 		'U_SEARCH_SELF'			=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=egosearch'),
! 		'U_SEARCH_NEW'			=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=newposts'),
! 		'U_SEARCH_UNANSWERED'	=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'),
! 		'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),
! 		'U_DELETE_COOKIES'		=> append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
! 		'U_TEAM'				=> append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'),
! 		'U_RESTORE_PERMISSIONS'	=> ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
  
  		'S_USER_LOGGED_IN'		=> ($user->data['user_id'] != ANONYMOUS) ? true : false,
--- 4589,4614 ----
  		'L_ONLINE_EXPLAIN'	=> $l_online_time,
  
! 		'U_PRIVATEMSGS'			=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
! 		'U_RETURN_INBOX'		=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;folder=inbox'),
! 		'UA_RETURN_INBOX'		=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox', false),
! 		'U_POPUP_PM'			=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&amp;mode=popup'),
! 		'UA_POPUP_PM'			=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=popup', false),
! 		'U_MEMBERLIST'			=> mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx"),
! 		'U_MEMBERSLIST'			=> mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx"),
! 		'U_VIEWONLINE'			=> ($phpbb_auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? mx3_append_sid("{$phpbb_root_path}viewonline.$phpEx") : '',
  		'U_LOGIN_LOGOUT'		=> $u_login_logout,
! 		'U_INDEX'				=> mx3_append_sid("{$phpbb_root_path}index.$phpEx"),
! 		'U_SEARCH'				=> mx3_append_sid("{$phpbb_root_path}search.$phpEx"),
! 		'U_REGISTER'			=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'),
! 		'U_PROFILE'				=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx"),
! 		'U_MODCP'				=> mx3_append_sid("{$phpbb_root_path}mcp.$phpEx", false, true, $user->session_id),
! 		'U_FAQ'					=> mx3_append_sid("{$phpbb_root_path}faq.$phpEx"),
! 		'U_SEARCH_SELF'			=> mx3_append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=egosearch'),
! 		'U_SEARCH_NEW'			=> mx3_append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=newposts'),
! 		'U_SEARCH_UNANSWERED'	=> mx3_append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'),
! 		'U_SEARCH_ACTIVE_TOPICS'=> mx3_append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'),
! 		'U_DELETE_COOKIES'		=> mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
! 		'U_TEAM'				=> mx3_append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'),
! 		'U_RESTORE_PERMISSIONS'	=> ($user->data['user_perm_from'] && $phpbb_auth->acl_get('a_switchperm')) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',
  
  		'S_USER_LOGGED_IN'		=> ($user->data['user_id'] != ANONYMOUS) ? true : false,
***************
*** 4627,4633 ****
  		'S_TIMEZONE'			=> ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $board_config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], ''),
  		'S_DISPLAY_ONLINE_LIST'	=> ($l_online_time) ? 1 : 0,
! 		'S_DISPLAY_SEARCH'		=> (!$board_config['load_search']) ? 0 : (isset($auth) ? ($auth->acl_get('u_search') && $auth->acl_getf_global('f_search')) : 1),
! 		'S_DISPLAY_PM'			=> ($board_config['allow_privmsg'] && $user->data['is_registered'] && ($auth->acl_get('u_readpm') || $auth->acl_get('u_sendpm'))) ? true : false,
! 		'S_DISPLAY_MEMBERLIST'	=> (isset($auth)) ? $auth->acl_get('u_viewprofile') : 0,
  		'S_NEW_PM'				=> ($s_privmsg_new) ? 1 : 0,
  
--- 4627,4633 ----
  		'S_TIMEZONE'			=> ($user->data['user_dst'] || ($user->data['user_id'] == ANONYMOUS && $board_config['board_dst'])) ? sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], $user->lang['tz']['dst']) : sprintf($user->lang['ALL_TIMES'], $user->lang['tz'][$tz], ''),
  		'S_DISPLAY_ONLINE_LIST'	=> ($l_online_time) ? 1 : 0,
! 		'S_DISPLAY_SEARCH'		=> (!$board_config['load_search']) ? 0 : (isset($phpbb_auth) ? ($phpbb_auth->acl_get('u_search') && $phpbb_auth->acl_getf_global('f_search')) : 1),
! 		'S_DISPLAY_PM'			=> ($board_config['allow_privmsg'] && $user->data['is_registered'] && ($phpbb_auth->acl_get('u_readpm') || $phpbb_auth->acl_get('u_sendpm'))) ? true : false,
! 		'S_DISPLAY_MEMBERLIST'	=> (isset($phpbb_auth)) ? $phpbb_auth->acl_get('u_viewprofile') : 0,
  		'S_NEW_PM'				=> ($s_privmsg_new) ? 1 : 0,
  
***************
*** 4665,4669 ****
  function page_footer($run_cron = true)
  {
! 	global $db, $board_config, $template, $mx_user, $auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx;
  
  	// Output page creation time
--- 4665,4669 ----
  function page_footer($run_cron = true)
  {
! 	global $db, $board_config, $template, $mx_user, $phpbb_auth, $mx_cache, $starttime, $phpbb_root_path, $phpEx;
  
  	// Output page creation time
***************
*** 4673,4677 ****
  		$totaltime = $mtime[0] + $mtime[1] - $starttime;
  
! 		if (!empty($_REQUEST['explain']) && $auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report'))
  		{
  			$db->sql_report('display');
--- 4673,4677 ----
  		$totaltime = $mtime[0] + $mtime[1] - $starttime;
  
! 		if (!empty($_REQUEST['explain']) && $phpbb_auth->acl_get('a_') && defined('DEBUG_EXTRA') && method_exists($db, 'sql_report'))
  		{
  			$db->sql_report('display');
***************
*** 4680,4684 ****
  		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($board_config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
  
! 		if ($auth->acl_get('a_') && defined('DEBUG_EXTRA'))
  		{
  			if (function_exists('memory_get_usage'))
--- 4680,4684 ----
  		$debug_output = sprintf('Time : %.3fs | ' . $db->sql_num_queries() . ' Queries | GZIP : ' . (($board_config['gzip_compress']) ? 'On' : 'Off') . (($user->load) ? ' | Load : ' . $user->load : ''), $totaltime);
  
! 		if ($phpbb_auth->acl_get('a_') && defined('DEBUG_EXTRA'))
  		{
  			if (function_exists('memory_get_usage'))

[mxbb-commits] mx_kb db_install.php, 1.56, 1.57 db_upgrade.php, 1.47, 1.48 mx_install_readme.htm, 1.15, 1.16

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

Update of /cvsroot/mxbb/mx_kb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8566

Modified Files:
	db_install.php db_upgrade.php mx_install_readme.htm 
Log Message:
2.2.5 release

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/mx_install_readme.htm,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** mx_install_readme.htm	1 Jul 2008 21:49:21 -0000	1.15
--- mx_install_readme.htm	5 Jul 2008 22:12:16 -0000	1.16
***************
*** 221,225 ****
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              Knowledge Base <br>
!         <font size="2">v. 2.2.4</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />
--- 221,225 ----
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              Knowledge Base <br>
!         <font size="2">v. 2.2.5</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** db_install.php	1 Jul 2008 21:49:21 -0000	1.56
--- db_install.php	5 Jul 2008 22:12:15 -0000	1.57
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.4';
  $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon Ohlsson</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon Ohlsson</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** db_upgrade.php	3 Jun 2008 20:08:20 -0000	1.47
--- db_upgrade.php	5 Jul 2008 22:12:16 -0000	1.48
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.4';
  $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon Ohlsson</a> :: Adapted for Mx-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>Knowledge Base</i> MOD by <a href="http://www.phpbb.com/phpBB/viewtopic.php?t=89202" target="_phpbb" >wGEric/Jon Ohlsson</a> :: Adapted for Mx-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

[mxbb-commits] mx_pafiledb db_install.php, 1.37, 1.38 db_upgrade.php, 1.29, 1.30 mx_install_readme.htm, 1.11, 1.12

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

Update of /cvsroot/mxbb/mx_pafiledb
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv30560

Modified Files:
	db_install.php db_upgrade.php mx_install_readme.htm 
Log Message:
2.2.6 update

Index: mx_install_readme.htm
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/mx_install_readme.htm,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mx_install_readme.htm	1 Jul 2008 21:50:32 -0000	1.11
--- mx_install_readme.htm	5 Jul 2008 21:57:31 -0000	1.12
***************
*** 221,225 ****
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              File Manager (pafileDB)<br>
!         <font size="2">v. 2.2.5</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />
--- 221,225 ----
      <td colspan="2"><p><b><font size="5">MXP</font><font size="5"> Module -
              File Manager (pafileDB)<br>
!         <font size="2">v. 2.2.6</font></font></b></p>
        <p><span style="font-weight: bold"><span style="font-size: 16px; line-height: normal">Module</span></span>
          <br />

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/db_install.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** db_install.php	3 Jun 2008 20:21:56 -0000	1.37
--- db_install.php	5 Jul 2008 21:57:31 -0000	1.38
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.6';
  $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/db_upgrade.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** db_upgrade.php	3 Jun 2008 20:21:56 -0000	1.29
--- db_upgrade.php	5 Jul 2008 21:57:31 -0000	1.30
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.5';
  $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.6';
  $mx_module_copy = 'Original phpBB <i>pafileDB</i> MOD by Mohd/Jon Ohlsson/Orynider</a> based on <a href="http://www.phparena.net/" target="_blank">PHP Arena, pafileDB</a> :: Adapted for MX-Publisher by [Jon Ohlsson] <a href="http://www.mx-publisher.com" target="_blank">The MX-Publisher Development Team</a>';
  

[mxbb-commits] core/modules/mx_navmenu mx_menu_nav.php,1.33,1.34

[FlorinCB <ory...@us...>]

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

Modified Files:
	mx_menu_nav.php 
Log Message:
tplEx

Index: mx_menu_nav.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_navmenu/mx_menu_nav.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mx_menu_nav.php	3 Jun 2008 20:04:53 -0000	1.33
--- mx_menu_nav.php	5 Jul 2008 12:45:28 -0000	1.34
***************
*** 78,91 ****
  	{
  		case 'Horizontal':
! 			$template_tmp = 'mx_menu_horizontal.tpl';
  			break;
  		case 'Vertical':
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
  		case 'Overall_navigation':
! 			$template_tmp = 'mx_menu_overall_navigation.tpl';
  			break;
  		default:
! 			$template_tmp = 'mx_menu_vertical.tpl';
  			break;
  	}
--- 78,91 ----
  	{
  		case 'Horizontal':
! 			$template_tmp = "mx_menu_horizontal.$tplEx";
  			break;
  		case 'Vertical':
! 			$template_tmp = "mx_menu_vertical.$tplEx";
  			break;
  		case 'Overall_navigation':
! 			$template_tmp = "mx_menu_overall_navigation.$tplEx";
  			break;
  		default:
! 			$template_tmp = "mx_menu_vertical.$tplEx";
  			break;
  	}

[mxbb-commits] core/includes page_header.php,1.54,1.55

[FlorinCB <ory...@us...>]

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv8025

Modified Files:
	page_header.php 
Log Message:
fix

Index: page_header.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/page_header.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** page_header.php	21 Feb 2008 20:03:08 -0000	1.54
--- page_header.php	3 Jul 2008 17:52:09 -0000	1.55
***************
*** 355,358 ****
--- 355,359 ----
  		$u_viewonline = 'viewonline.'.$phpEx;
  		$u_group_cp = 'groupcp.'.$phpEx;
+ 		$u_sendpassword = mx3_append_sid("{$phpbb_root_path}profile.$phpEx", 'mode=sendpassword');
  		break;
  	case 'phpbb3':
***************
*** 367,370 ****
--- 368,372 ----
  		$u_viewonline = 'viewonline.'.$phpEx;
  		$u_group_cp = 'ucp.'.$phpEx.'?i=167';
+ 		$u_sendpassword = ($board_config['email_enable']) ? mx3_append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=sendpassword') : '';		
  		break;
  }
***************
*** 423,427 ****
  	'U_LOGIN_LOGOUT' => mx_append_sid(PORTAL_URL . $u_login_logout),
  	'U_GROUP_CP' => mx_append_sid(PHPBB_URL . $u_group_cp),
! 
  	'LOGO' => $images['mx_logo'],
  	'THEME_GRAPHICS' => $images['theme_graphics'],
--- 425,430 ----
  	'U_LOGIN_LOGOUT' => mx_append_sid(PORTAL_URL . $u_login_logout),
  	'U_GROUP_CP' => mx_append_sid(PHPBB_URL . $u_group_cp),
! 	'U_SEND_PASSWORD' => $u_sendpassword,
! 			
  	'LOGO' => $images['mx_logo'],
  	'THEME_GRAPHICS' => $images['theme_graphics'],

[mxbb-commits] core login.php,1.29,1.30

[FlorinCB <ory...@us...>]

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

Modified Files:
	login.php 
Log Message:
fix

Index: login.php
===================================================================
RCS file: /cvsroot/mxbb/core/login.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** login.php	16 Jun 2008 10:46:37 -0000	1.29
--- login.php	3 Jul 2008 17:51:45 -0000	1.30
***************
*** 126,130 ****
  			'L_SEND_PASSWORD' => PORTAL_BACKEND != 'internal' ? $lang['Forgotten_password'] : '',
  
! 			'U_SEND_PASSWORD' => mx3_append_sid($phpbb_root_path . "profile.$phpEx", "mode=sendpassword"),
  
  			'S_HIDDEN_FIELDS' => $s_hidden_fields)
--- 126,130 ----
  			'L_SEND_PASSWORD' => PORTAL_BACKEND != 'internal' ? $lang['Forgotten_password'] : '',
  
! 			//'U_SEND_PASSWORD' => mx3_append_sid($phpbb_root_path . "profile.$phpEx", "mode=sendpassword"),
  
  			'S_HIDDEN_FIELDS' => $s_hidden_fields)

[mxbb-commits] core/includes mx_functions_tools.php, 1.15.2.8, 1.15.2.9

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv14574

Modified Files:
      Tag: core28x
	mx_functions_tools.php 
Log Message:
A couple of commenting fixes

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.15.2.8
retrieving revision 1.15.2.9
diff -C2 -d -r1.15.2.8 -r1.15.2.9
*** mx_functions_tools.php	22 May 2008 21:08:00 -0000	1.15.2.8
--- mx_functions_tools.php	2 Jul 2008 22:02:52 -0000	1.15.2.9
***************
*** 3823,3826 ****
--- 3823,3834 ----
  
  			//
+ 			// Little temp fix for autogenerated comments, with newlines.
+ 			//
+ 			if ($this->allow_comment_wysiwyg)
+ 			{
+ 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
+ 			}
+ 
+ 			//
  			// Remove Images and/or links
  			//
***************
*** 3981,3984 ****
--- 3989,3997 ----
  
  		//
+ 		// Ensure Item data topic_id is valid
+ 		//
+ 		$this->validate_topic_id();
+ 
+ 		//
  		// Request vars
  		//
***************
*** 4055,4058 ****
--- 4068,4079 ----
  
  			//
+ 			// Little temp fix for autogenerated comments, with newlines.
+ 			//
+ 			if ($this->allow_comment_wysiwyg)
+ 			{
+ 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
+ 			}
+ 
+ 			//
  			// Remove Images and/or links
  			//

[mxbb-commits] core/modules/mx_phpbb2blocks mx_last_msg.php, 1.10, 1.11

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

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

Modified Files:
	mx_last_msg.php 
Log Message:
A couple of commenting fixes
Removed debug output in phpbb2 last message block

Index: mx_last_msg.php
===================================================================
RCS file: /cvsroot/mxbb/core/modules/mx_phpbb2blocks/mx_last_msg.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** mx_last_msg.php	25 Jun 2008 23:45:42 -0000	1.10
--- mx_last_msg.php	2 Jul 2008 22:02:16 -0000	1.11
***************
*** 55,59 ****
  //
  $auth_data_sql_msg = $phpbb_auth->get_auth_forum();
- die(var_export($auth_data_sql_msg));
  
  if ( empty($forum_lst_msg) )
--- 55,58 ----

[mxbb-commits] core/includes mx_functions_tools.php,1.33,1.34

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

Update of /cvsroot/mxbb/core/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv13831

Modified Files:
	mx_functions_tools.php 
Log Message:
A couple of commenting fixes
Removed debug output in phpbb2 last message block

Index: mx_functions_tools.php
===================================================================
RCS file: /cvsroot/mxbb/core/includes/mx_functions_tools.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mx_functions_tools.php	18 Jun 2008 11:05:28 -0000	1.33
--- mx_functions_tools.php	2 Jul 2008 22:02:02 -0000	1.34
***************
*** 132,136 ****
  	function display($text, $bbcode_uid = '')
  	{
- 		global $mx_root_path;
  		//
  		// strip html if reqd
--- 132,135 ----
***************
*** 144,170 ****
  		}
  
- 		if ((PORTAL_BACKEND !== 'phpbb3') && !function_exists('bbencode_second_pass'))
- 		{
- 			//mx_page::load_file('bbcode');
- 		}
- 
  		//
  		// BBCode if reqd
  		//
- 		if (PORTAL_BACKEND == 'phpbb3')
- 		{
- 			/*
- 			if (!class_exists('bbcode'))
- 			{
- 				mx_page::load_file('bbcode', 'phpbb3');
- 			}
- 
- 			if( !is_object($bbcode))
- 			{
- 				$bbcode = new bbcode();
- 			}
- 			*/
- 		}
- 
  		if ($text != '' && $bbcode_uid != '')
  		{
--- 143,149 ----
***************
*** 1214,1218 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql );
  		}
  	}
--- 1193,1197 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 1253,1257 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql );
  		}
  	}
--- 1232,1236 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Couldn't insert into $table ", "", __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 1274,1278 ****
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			message_die( GENERAL_ERROR, "Couldn't delete $table information", "", __LINE__, __FILE__, $sql );
  		}
  	}
--- 1253,1257 ----
  		if ( !$result = $db->sql_query( $sql ) )
  		{
! 			mx_message_die( GENERAL_ERROR, "Couldn't delete $table information", "", __LINE__, __FILE__, $sql );
  		}
  	}
***************
*** 3155,3159 ****
  		//
  		mx_page::load_file('functions_search', 'phpbb2');
- 		//include_once($phpbb_root_path . 'includes/functions_search.'.$phpEx);
  
  		//
--- 3134,3137 ----
***************
*** 3866,3869 ****
--- 3844,3855 ----
  
  			//
+ 			// Little temp fix for autogenerated comments, with newlines.
+ 			//
+ 			if ($this->allow_comment_wysiwyg)
+ 			{
+ 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
+ 			}
+ 
+ 			//
  			// Remove Images and/or links
  			//
***************
*** 3963,3967 ****
  					'L_COMMENT_EDIT' => $lang['Comment_edit'],
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['comments_id']),
! 					'EDIT_IMG' => $images[$this->images['icon_edit']],
  					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['comments_id'])),
  				));
--- 3949,3953 ----
  					'L_COMMENT_EDIT' => $lang['Comment_edit'],
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['comments_id']),
! 					'EDIT_IMG' => $this->images['icon_edit'],
  					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['comments_id'])),
  				));
***************
*** 3973,3977 ****
  					'L_COMMENT_DELETE' => $lang['Comment_delete'],
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['comments_id']),
! 					'DELETE_IMG' => $images[$this->images['icon_delpost']],
  					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['comments_id'])),
  				));
--- 3959,3963 ----
  					'L_COMMENT_DELETE' => $lang['Comment_delete'],
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['comments_id']),
! 					'DELETE_IMG' => $this->images['icon_delpost'],
  					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['comments_id'])),
  				));
***************
*** 3993,3997 ****
  				'L_COMMENT_ADD' => $lang['Comment_add'],
  				'U_COMMENT_POST' => $this->u_post(),
! 				'REPLY_IMG' => $images[$this->images['comment_post']],
  				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));
--- 3979,3983 ----
  				'L_COMMENT_ADD' => $lang['Comment_add'],
  				'U_COMMENT_POST' => $this->u_post(),
! 				'REPLY_IMG' => $this->images['comment_post'],
  				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));
***************
*** 4028,4031 ****
--- 4014,4022 ----
  
  		//
+ 		// Ensure Item data topic_id is valid
+ 		//
+ 		$this->validate_topic_id();
+ 
+ 		//
  		// Request vars
  		//
***************
*** 4103,4106 ****
--- 4094,4105 ----
  
  			//
+ 			// Little temp fix for autogenerated comments, with newlines.
+ 			//
+ 			if ($this->allow_comment_wysiwyg)
+ 			{
+ 				$comments_text = str_replace("\n", "\n<br />\n", $comments_text);
+ 			}
+ 
+ 			//
  			// Remove Images and/or links
  			//
***************
*** 4212,4216 ****
  					'L_COMMENT_EDIT' => $lang['Comment_edit'],
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['post_id']),
! 					'EDIT_IMG' => $images[$this->images['icon_edit']],
  					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['post_id'])),
  				));
--- 4211,4215 ----
  					'L_COMMENT_EDIT' => $lang['Comment_edit'],
  					'U_COMMENT_EDIT' => $this->u_edit($this->comments_row['post_id']),
! 					'EDIT_IMG' => $this->images['icon_edit'],
  					'B_EDIT_IMG' => $mx_user->create_button($this->images['icon_edit'], $lang['Comment_edit'], $this->u_edit($this->comments_row['post_id'])),
  				));
***************
*** 4222,4226 ****
  					'L_COMMENT_DELETE' => $lang['Comment_delete'],
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['post_id']),
! 					'DELETE_IMG' => $images[$this->images['icon_delpost']],
  					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['post_id'])),
  				));
--- 4221,4225 ----
  					'L_COMMENT_DELETE' => $lang['Comment_delete'],
  					'U_COMMENT_DELETE' => $this->u_delete($this->comments_row['post_id']),
! 					'DELETE_IMG' => $this->images['icon_delpost'],
  					'B_DELETE_IMG' => $mx_user->create_button($this->images['icon_delpost'], $lang['Comment_delete'], $this->u_delete($this->comments_row['post_id'])),
  				));
***************
*** 4234,4238 ****
  				'L_COMMENT_ADD' => $lang['Comment_add'],
  				'U_COMMENT_POST' => $this->u_post(),
! 				'REPLY_IMG' => $images[$this->images['comment_post']],
  				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));
--- 4233,4237 ----
  				'L_COMMENT_ADD' => $lang['Comment_add'],
  				'U_COMMENT_POST' => $this->u_post(),
! 				'REPLY_IMG' => $this->images['comment_post'],
  				'B_REPLY_IMG' => $mx_user->create_button($this->images['comment_post'], $lang['Comment_add'], $this->u_post()),
  			));

[mxbb-commits] mx_linkdb/templates/_core/admin linkdb_admin_settings.tpl, 1.2, 1.3

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

Update of /cvsroot/mxbb/mx_linkdb/templates/_core/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv497/admin

Modified Files:
	linkdb_admin_settings.tpl 
Log Message:
image buttons
minor bugfixes
cleanup

Index: linkdb_admin_settings.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/_core/admin/linkdb_admin_settings.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linkdb_admin_settings.tpl	28 Jan 2008 21:53:04 -0000	1.2
--- linkdb_admin_settings.tpl	1 Jul 2008 21:50:42 -0000	1.3
***************
*** 4,7 ****
--- 4,26 ----
  
  <form action="{S_ACTION}" method="post">
+ <table width="100%" cellpadding="4" cellspacing="1" border="0" align="center">
+ 	<tr>
+ 		<td>
+ 			<div id="admintabs">
+ 				<ul>
+ 				<li id="general_title_tab"><a href="javascript:selectPart('general_title')">{L_GENERAL_TITLE}</a></li>
+ 				<li id="link_title_tab"><a href="javascript:selectPart('link_title')">{L_LINK_TITLE}</a></li>
+ 				<li id="appearance_title_tab"><a href="javascript:selectPart('appearance_title')">{L_APPEARANCE_TITLE}</a></li>
+ 				<li id="comments_title_tab"><a href="javascript:selectPart('comments_title')">{L_COMMENTS_TITLE}</a></li>
+ 				<li id="ratings_title_tab"><a href="javascript:selectPart('ratings_title')">{L_RATINGS_TITLE}</a></li>
+ 				<li id="instructions_title_tab"><a href="javascript:selectPart('instructions_title')">{L_INSTRUCTIONS_TITLE}</a></li>
+ 				<li id="notifications_title_tab"><a href="javascript:selectPart('notifications_title')">{L_NOTIFICATIONS_TITLE}</a></li>
+ 				</ul>
+ 			</div>
+ 		</td>
+ 	</tr>
+ </table>
+ 
+ <fieldset id="general_title">
  <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
***************
*** 37,40 ****
--- 56,66 ----
  		<td class="row2"><input type="radio" name="lock_submit_site" value="1" {LOCK_SUBMIT_SITE_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="lock_submit_site" value="0" {LOCK_SUBMIT_SITE_NO} /> {L_NO}</td>
    	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="link_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 61,64 ****
--- 87,97 ----
  		<td class="row2"><input type="radio" name="split_links" value="1" {SPLIT_LINKS_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="split_links" value="0" {SPLIT_LINKS_NO} /> {L_NO}</td>
    	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="appearance_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 89,92 ****
--- 122,132 ----
  		<td class="row2"><input type="text" class="post" size="5" maxlength="5" name="settings_newdays" value="{SETTINGS_NEWDAYS}" /></td>
    	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="comments_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 173,176 ****
--- 213,223 ----
  		<td class="row2"><input type="text" class="post" size="50" name="max_comment_chars" value="{COMMENT_MAX_CHAR}" /></td>
    	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="ratings_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 189,192 ****
--- 236,246 ----
  		<td class="row2" width="50%"><input type="radio" name="votes_check_userid" value="1" {S_VOTES_CHECK_USERID_YES} /> {L_YES}&nbsp;&nbsp;<input type="radio" name="votes_check_userid" value="0" {S_VOTES_CHECK_USERID_NO} /> {L_NO}</td>
  	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="instructions_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 205,208 ****
--- 259,269 ----
  		<td class="row2" width="50%"><textarea name="pt_body" cols="40" rows="5">{L_PT_BODY}</textarea></td>
  	</tr>
+   	<tr>
+ 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
+   	</tr>
+ </table>
+ </fieldset>
+ <fieldset id="notifications_title">
+ <table width="100%" cellpadding="3" cellspacing="1" border="0" align="center" class="forumline">
  	<tr>
  		<!-- TITLE ------------------------------------------------------------------------------------------- -->
***************
*** 219,225 ****
  	</tr>
    	<tr>
! 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" />
! 		</td>
    	</tr>
  </table>
! </form>
\ No newline at end of file
--- 280,324 ----
  	</tr>
    	<tr>
! 		<td align="center" class="cat" colspan="2"><input class="liteoption" type="submit" value="{L_SUBMIT}" name="submit" />&nbsp;&nbsp;<input type="reset" value="{L_RESET}" class="liteoption" /></td>
    	</tr>
  </table>
! </fieldset>
! </form>
! 
! <br clear="all" />
! <script type="text/javascript">
! <!--
! function admingetObj(obj)
! {
! 	return ( document.getElementById ? document.getElementById(obj) : ( document.all ? document.all[obj] : null ) );
! }
! function adminsetNone(part)
! {
! 	admingetObj(part + '_tab').className = '';
! 	admingetObj(part).style.display = 'none';
! 
! }
! function adminsetBlock(part)
! {
! 	admingetObj(part + '_tab').className = 'activetab';
! 	admingetObj(part).style.display = 'block';
! 
! }
! function selectPart(part)
! {
! 	adminsetNone('general_title');
! 	adminsetNone('link_title');
! 	adminsetNone('appearance_title');
! 	adminsetNone('comments_title');
! 	adminsetNone('ratings_title');
! 	adminsetNone('instructions_title');
! 	adminsetNone('notifications_title');
! 
! 
! 	adminsetBlock(part);
! }
! 
! selectPart('general_title');
! 
! // -->
! </script>
\ No newline at end of file

[mxbb-commits] mx_linkdb/templates/_core _core.cfg, 1.3, 1.4 link_link_body.tpl, 1.1, 1.2

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

Update of /cvsroot/mxbb/mx_linkdb/templates/_core
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv497

Modified Files:
	_core.cfg link_link_body.tpl 
Log Message:
image buttons
minor bugfixes
cleanup

Index: link_link_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/_core/link_link_body.tpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** link_link_body.tpl	9 Sep 2007 20:09:50 -0000	1.1
--- link_link_body.tpl	1 Jul 2008 21:50:42 -0000	1.2
***************
*** 48,52 ****
  <tr>
  	<td class="row2" valign="middle"><span class="genmed">{use_ratings.L_RATING}:</span></td>
! 	<td class="row1" valign="middle"><span class="genmed">{use_ratings.RATING} ({use_ratings.FILE_VOTES} {use_ratings.L_VOTES})</span> <a href="{use_ratings.U_RATE}">[{use_ratings.L_RATE}]</a></td>
  </tr>
  <!-- END use_ratings -->
--- 48,52 ----
  <tr>
  	<td class="row2" valign="middle"><span class="genmed">{use_ratings.L_RATING}:</span></td>
! 	<td class="row1" valign="middle"><span class="genmed">{use_ratings.RATING} ({use_ratings.FILE_VOTES} {use_ratings.L_VOTES})</span> {use_ratings.B_RATE_IMG}</td>
  </tr>
  <!-- END use_ratings -->
***************
*** 99,106 ****
  					<td align="right">
  					<!-- BEGIN auth_edit -->
! 					<a href="{use_comments.text.auth_edit.U_COMMENT_EDIT}"><img src="{use_comments.text.auth_edit.EDIT_IMG}" alt="{use_comments.text.auth_edit.L_COMMENT_EDIT}" title="{use_comments.text.auth_edit.L_COMMENT_EDIT}" border="0"></a>
  					<!-- END auth_edit -->
  					<!-- BEGIN auth_delete -->
! 					<a href="{use_comments.text.auth_delete.U_COMMENT_DELETE}"><img src="{use_comments.text.auth_delete.DELETE_IMG}" alt="{use_comments.text.auth_delete.L_COMMENT_DELETE}" title="{use_comments.text.auth_delete.L_COMMENT_DELETE}" border="0"></a>
  					<!-- END auth_delete -->
  					</td>
--- 99,108 ----
  					<td align="right">
  					<!-- BEGIN auth_edit -->
! 					{use_comments.text.auth_edit.B_EDIT_IMG}
! 					<!-- <a href="{use_comments.text.auth_edit.U_COMMENT_EDIT}"><img src="{use_comments.text.auth_edit.EDIT_IMG}" alt="{use_comments.text.auth_edit.L_COMMENT_EDIT}" title="{use_comments.text.auth_edit.L_COMMENT_EDIT}" border="0"></a>-->
  					<!-- END auth_edit -->
  					<!-- BEGIN auth_delete -->
! 					{use_comments.text.auth_delete.B_DELETE_IMG}
! 					<!-- <a href="{use_comments.text.auth_delete.U_COMMENT_DELETE}"><img src="{use_comments.text.auth_delete.DELETE_IMG}" alt="{use_comments.text.auth_delete.L_COMMENT_DELETE}" title="{use_comments.text.auth_delete.L_COMMENT_DELETE}" border="0"></a>-->
  					<!-- END auth_delete -->
  					</td>
***************
*** 133,137 ****
  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
    	<tr>
! 		<td><a href="{use_comments.auth_post.U_COMMENT_POST}"><img src="{use_comments.auth_post.REPLY_IMG}" border="0" alt="{use_comments.auth_post.L_COMMENT_ADD}" align="middle" /></a></td>
    	</tr>
  </table>
--- 135,139 ----
  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
    	<tr>
! 		<td>{use_comments.auth_post.B_REPLY_IMG}</td>
    	</tr>
  </table>

Index: _core.cfg
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/_core/_core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** _core.cfg	3 Jun 2008 20:11:09 -0000	1.3
--- _core.cfg	1 Jul 2008 21:50:42 -0000	1.4
***************
*** 37,52 ****
  // Define images
  // -------------------------------------------------------------------------
! $mx_images['linkdb_comment_post'] 		= $images['reply_new'];
  
  // -------------------------------------------------------------------------
  // Redefine phpBB images
  // -------------------------------------------------------------------------
! $mx_images['linkdb_folder'] 			= $images['folder'];
! $mx_images['linkdb_folder_new'] 		= $images['folder_new'];
! $mx_images['linkdb_icon_latest_reply'] 	= $images['icon_latest_reply'];
! 
! $mx_images['linkdb_icon_minipost'] 		= $images['icon_minipost'];
! $mx_images['linkdb_icon_edit'] 			= $images['icon_edit'];
! $mx_images['linkdb_icon_delpost'] 		= $images['icon_delpost'];
  
  ?>
\ No newline at end of file
--- 37,60 ----
  // Define images
  // -------------------------------------------------------------------------
! $mx_images['linkdb_comment_post'] 					= $images['reply_new'];
! $mx_images['buttontype']['linkdb_comment_post'] 	= MX_BUTTON_IMAGE;
  
  // -------------------------------------------------------------------------
  // Redefine phpBB images
  // -------------------------------------------------------------------------
! $mx_images['linkdb_folder'] 						= $images['folder'];
! $mx_images['buttontype']['linkdb_folder'] 			= MX_BUTTON_IMAGE;
! $mx_images['linkdb_folder_new'] 					= $images['folder_new'];
! $mx_images['buttontype']['linkdb_folder_new'] 		= MX_BUTTON_IMAGE;
! $mx_images['linkdb_icon_latest_reply'] 				= $images['icon_latest_reply'];
! $mx_images['buttontype']['linkdb_icon_latest_reply']= MX_BUTTON_IMAGE;
  
+ $mx_images['linkdb_icon_minipost'] 					= $images['icon_minipost'];
+ $mx_images['buttontype']['linkdb_icon_minipost'] 	= MX_BUTTON_IMAGE;
+ $mx_images['linkdb_icon_edit'] 						= $images['icon_edit'];
+ $mx_images['buttontype']['linkdb_icon_edit'] 		= MX_BUTTON_IMAGE;
+ $mx_images['linkdb_icon_delpost'] 					= $images['icon_delpost'];
+ $mx_images['buttontype']['linkdb_icon_delpost'] 	= MX_BUTTON_IMAGE;
+ $mx_images['linkdb_rate'] 							= "$current_template_images/{LANG}/icon_linkdb_rate.gif";
+ $mx_images['buttontype']['linkdb_rate'] 				= MX_BUTTON_TEXT;
  ?>
\ No newline at end of file

[mxbb-commits] mx_linkdb/templates/_core/images/lang_english icon_linkdb_rate.gif, NONE, 1.1

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

Update of /cvsroot/mxbb/mx_linkdb/templates/_core/images/lang_english
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv497/images/lang_english

Added Files:
	icon_linkdb_rate.gif 
Log Message:
image buttons
minor bugfixes
cleanup

--- NEW FILE: icon_linkdb_rate.gif ---
(This appears to be a binary file; contents omitted.)