mxbb-commits — Internal Mailing List for CVS Commit Messages

[mxbb-commits] mx_bugsbt/bugsbt/includes functions_bugsbt.php, 1.7, 1.8

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

Update of /cvsroot/mxbb/mx_bugsbt/bugsbt/includes
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12825/bugsbt/includes

Modified Files:
	functions_bugsbt.php 
Log Message:
general updates...

Index: functions_bugsbt.php
===================================================================
RCS file: /cvsroot/mxbb/mx_bugsbt/bugsbt/includes/functions_bugsbt.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** functions_bugsbt.php	9 Sep 2007 19:35:11 -0000	1.7
--- functions_bugsbt.php	28 Jan 2008 21:44:43 -0000	1.8
***************
*** 90,96 ****
  				//
  				$this->comments[$cat_rowset[$i]['category_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($bugsbt_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false );
! 				$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($bugsbt_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments
! 				$this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($bugsbt_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated
! 				$this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($bugsbt_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments)
  
  				if ($this->comments[$cat_rowset[$i]['category_id']]['activated'] && !$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1)
--- 90,109 ----
  				//
  				$this->comments[$cat_rowset[$i]['category_id']]['activated'] = $cat_rowset[$i]['cat_allow_comments'] == -1 ? ($bugsbt_config['use_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['cat_allow_comments'] == 1 ? true : false );
! 
! 				switch($portal_config['portal_backend'])
! 				{
! 					case 'internal':
! 						$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = true; // phpBB or internal comments
! 						$this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = false; // autocreate comments when updated
! 						$this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = 0; // phpBB target forum (only used for phpBB comments)
! 						break;
! 
! 					default:
! 						$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] = $cat_rowset[$i]['internal_comments'] == -1 ? ($bugsbt_config['internal_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['internal_comments'] == 1 ? true : false ); // phpBB or internal comments
! 						$this->comments[$cat_rowset[$i]['category_id']]['autogenerate_comments'] = $cat_rowset[$i]['autogenerate_comments'] == -1 ? ($bugsbt_config['autogenerate_comments'] == 1 ? true : false ) : ( $cat_rowset[$i]['autogenerate_comments'] == 1 ? true : false ); // autocreate comments when updated
! 						$this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id'] = $cat_rowset[$i]['comments_forum_id'] < 1 ? ( intval($bugsbt_config['comments_forum_id']) ) : ( intval($cat_rowset[$i]['comments_forum_id']) ); // phpBB target forum (only used for phpBB comments)
! 						break;
! 				}
! 
  
  				if ($this->comments[$cat_rowset[$i]['category_id']]['activated'] && !$this->comments[$cat_rowset[$i]['category_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['category_id']]['comments_forum_id']) < 1)
***************
*** 1405,1409 ****
  	 *
  	 */
! 	function update_add_comment($bug_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false)
  	{
  		global $template, $mx_bugsbt_functions, $lang, $board_config, $phpEx, $bugsbt_config, $db, $images, $userdata;
--- 1418,1422 ----
  	 *
  	 */
! 	function update_add_comment($bug_data = '', $item_id, $cid, $subject = '', $message = '', $html_on = false, $bbcode_on = true, $smilies_on = false, $allow_wysiwyg = false)
  	{
  		global $template, $mx_bugsbt_functions, $lang, $board_config, $phpEx, $bugsbt_config, $db, $images, $userdata;
***************
*** 1447,1451 ****
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on);
! 		//$mx_text->allow_all_html_tags = $parameter_data['parameter_type'] = 'WysiwygTextBlock' ? true : false;
  
  		//
--- 1460,1464 ----
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on);
! 		$mx_text->allow_all_html_tags = $allow_wysiwyg;
  
  		//

[mxbb-commits] mx_blogs/admin admin_weblog_action.php, 1.1, 1.2 admin_weblog_mood.php, 1.1, 1.2

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

Update of /cvsroot/mxbb/mx_blogs/admin
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv12045

Modified Files:
	admin_weblog_action.php admin_weblog_mood.php 
Log Message:
probably nothing...but i got conflicts during update...

Index: admin_weblog_action.php
===================================================================
RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_action.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_weblog_action.php	7 Jun 2007 22:01:32 -0000	1.1
--- admin_weblog_action.php	28 Jan 2008 21:42:53 -0000	1.2
***************
*** 36,40 ****
  $module_root_path ="./../";
  //include($mx_root_path . 'extension.inc');
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  include($mx_root_path . 'admin/pagestart.' . $phpEx);
  include($module_root_path . 'includes/weblogs_constants.'.$phpEx);
--- 36,40 ----
  $module_root_path ="./../";
  //include($mx_root_path . 'extension.inc');
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  include($mx_root_path . 'admin/pagestart.' . $phpEx);
  include($module_root_path . 'includes/weblogs_constants.'.$phpEx);
***************
*** 74,78 ****
  while($file = @readdir($dir))
  {
! 	if( !@is_dir(phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) )
  	{
  		$img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file);
--- 74,78 ----
  while($file = @readdir($dir))
  {
! 	if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) )
  	{
  		$img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file);
***************
*** 117,124 ****
  		"L_RESET" => $lang['Reset'],
  
! 		"CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0], 
  
! 		"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"), 
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  		"S_FILENAME_OPTIONS" => $filename_list)
  	);
--- 117,124 ----
  		"L_RESET" => $lang['Reset'],
  
! 		"CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_images[0],
  
! 		"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"),
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields,
  		"S_FILENAME_OPTIONS" => $filename_list)
  	);
***************
*** 198,206 ****
  				"L_RESET" => $lang['Reset'],
  
! 				"CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_edit_img, 
  				"CURRENTLY_CURRENTLY" => $currently_data['action_text'],
  
  				"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"),
! 				"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  				"S_FILENAME_OPTIONS" => $filename_list)
  			);
--- 198,206 ----
  				"L_RESET" => $lang['Reset'],
  
! 				"CURRENTLY_IMG" => $module_root_path . 'images/weblogs/' . $currently_edit_img,
  				"CURRENTLY_CURRENTLY" => $currently_data['action_text'],
  
  				"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"),
! 				"S_HIDDEN_FIELDS" => $s_hidden_fields,
  				"S_FILENAME_OPTIONS" => $filename_list)
  			);
***************
*** 299,304 ****
  		"L_IMAGE" => $lang['Weblog_image'],
  		"L_CURRENTLY" => $lang['Weblog_currently'],
! 		
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  		"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"))
  	);
--- 299,304 ----
  		"L_IMAGE" => $lang['Weblog_image'],
  		"L_CURRENTLY" => $lang['Weblog_currently'],
! 
! 		"S_HIDDEN_FIELDS" => $s_hidden_fields,
  		"S_CURRENTLY_ACTION" => append_sid("admin_weblog_action.$phpEx"))
  	);
***************
*** 315,323 ****
  			"ROW_COLOR" => "#" . $row_color,
  			"ROW_CLASS" => $row_class,
! 			
! 			"CURRENTLY_IMG" =>  $module_root_path . 'images/weblogs/' . $action_data[$i]['action_url'], 
  			"CURRENTLY" => $action_data[$i]['action_text'],
! 			
! 			"U_CURRENTLY_EDIT" => append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']), 
  			"U_CURRENTLY_DELETE" => append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id']))
  		);
--- 315,323 ----
  			"ROW_COLOR" => "#" . $row_color,
  			"ROW_CLASS" => $row_class,
! 
! 			"CURRENTLY_IMG" =>  $module_root_path . 'images/weblogs/' . $action_data[$i]['action_url'],
  			"CURRENTLY" => $action_data[$i]['action_text'],
! 
! 			"U_CURRENTLY_EDIT" => append_sid("admin_weblog_action.$phpEx?mode=edit&id=" . $action_data[$i]['action_id']),
  			"U_CURRENTLY_DELETE" => append_sid("admin_weblog_action.$phpEx?mode=delete&id=" . $action_data[$i]['action_id']))
  		);

Index: admin_weblog_mood.php
===================================================================
RCS file: /cvsroot/mxbb/mx_blogs/admin/admin_weblog_mood.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** admin_weblog_mood.php	7 Jun 2007 22:01:32 -0000	1.1
--- admin_weblog_mood.php	28 Jan 2008 21:42:53 -0000	1.2
***************
*** 37,41 ****
  $module_root_path = "./../";
  //include($mx_root_path . 'extension.inc');
! $phpEx = substr(strrchr(__FILE__, '.'), 1); 
  include($mx_root_path . 'admin/pagestart.' . $phpEx);
  include($module_root_path . 'includes/weblogs_constants.'.$phpEx);
--- 37,41 ----
  $module_root_path = "./../";
  //include($mx_root_path . 'extension.inc');
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
  include($mx_root_path . 'admin/pagestart.' . $phpEx);
  include($module_root_path . 'includes/weblogs_constants.'.$phpEx);
***************
*** 83,87 ****
  while($file = @readdir($dir))
  {
! 	if( !@is_dir(phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) )
  	{
  		$img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file);
--- 83,87 ----
  while($file = @readdir($dir))
  {
! 	if( !@is_dir(phpBB2::phpbb_realpath($module_root_path . 'images/weblogs/' . $file)) )
  	{
  		$img_size = @getimagesize($module_root_path . 'images/weblogs/' . $file);
***************
*** 136,143 ****
  			"L_RESET" => $lang['Reset'],
  
! 			"MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0], 
  
! 			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"), 
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
--- 136,143 ----
  			"L_RESET" => $lang['Reset'],
  
! 			"MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_images[0],
  
! 			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"),
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
***************
*** 268,276 ****
  			"L_RESET" => $lang['Reset'],
  
! 			"MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_edit_img, 
  			"MOOD_MOOD" => $mood_data['mood_text'],
  
  			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"),
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
--- 268,276 ----
  			"L_RESET" => $lang['Reset'],
  
! 			"MOOD_IMG" => $module_root_path . 'images/weblogs/' . $mood_edit_img,
  			"MOOD_MOOD" => $mood_data['mood_text'],
  
  			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx"),
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
***************
*** 312,316 ****
  
  			"S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"),
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields, 
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
--- 312,316 ----
  
  			"S_MOOD_SET_ACTION" => append_sid("admin_weblog_mood.$phpEx"),
! 			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_FILENAME_OPTIONS" => $filename_list)
  		);
***************
*** 493,497 ****
  		// any options.
  		//
! 	
  		$template->set_filenames(array(
  			"body" => "admin/weblog_mood_list_body.tpl")
--- 493,497 ----
  		// any options.
  		//
! 
  		$template->set_filenames(array(
  			"body" => "admin/weblog_mood_list_body.tpl")
***************
*** 499,503 ****
  
  		$s_hidden_fields = '<input type="hidden" name="type" value="set" />';
! 	
  		$template->assign_vars(array(
  			"L_ACTION" => $lang['Action'],
--- 499,503 ----
  
  		$s_hidden_fields = '<input type="hidden" name="type" value="set" />';
! 
  		$template->assign_vars(array(
  			"L_ACTION" => $lang['Action'],
***************
*** 511,519 ****
  			"L_MOOD" => $lang['Weblog_mood'],
  			"L_MOOD_SET_ADD" => $lang['Weblog_mood_set_add'],
! 	
  			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx?mode=addset"))
  		);
! 	
  		// Organize Everything
  		for ( $i = 0; $i < count($mood_set_data); $i++)
--- 511,519 ----
  			"L_MOOD" => $lang['Weblog_mood'],
  			"L_MOOD_SET_ADD" => $lang['Weblog_mood_set_add'],
! 
  			"S_HIDDEN_FIELDS" => $s_hidden_fields,
  			"S_MOOD_ACTION" => append_sid("admin_weblog_mood.$phpEx?mode=addset"))
  		);
! 
  		// Organize Everything
  		for ( $i = 0; $i < count($mood_set_data); $i++)
***************
*** 521,541 ****
  			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 	
  			$template->assign_block_vars("mood_set", array(
  				"ROW_COLOR" => "#" . $row_color,
  				"ROW_CLASS" => $row_class,
! 	
  				"SET_NAME" => $mood_set_data[$i]['set_name'],
! 	
  				"U_SET_ADD" => append_sid("admin_weblog_mood.$phpEx?mode=addmood&amp;id=" . $mood_set_data[$i]['set_id']),
! 				"U_SET_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editset&amp;id=" . $mood_set_data[$i]['set_id']), 
  				"U_SET_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deleteset&amp;id=" . $mood_set_data[$i]['set_id']))
  			);
! 	
  			for ($j = 0; $j < count($mood_data); $j++)
  			{
  				$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 	
  				if ( $mood_data[$j]['mood_set'] == $mood_set_data[$i]['set_id'] )
  				{
--- 521,541 ----
  			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 
  			$template->assign_block_vars("mood_set", array(
  				"ROW_COLOR" => "#" . $row_color,
  				"ROW_CLASS" => $row_class,
! 
  				"SET_NAME" => $mood_set_data[$i]['set_name'],
! 
  				"U_SET_ADD" => append_sid("admin_weblog_mood.$phpEx?mode=addmood&amp;id=" . $mood_set_data[$i]['set_id']),
! 				"U_SET_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editset&amp;id=" . $mood_set_data[$i]['set_id']),
  				"U_SET_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deleteset&amp;id=" . $mood_set_data[$i]['set_id']))
  			);
! 
  			for ($j = 0; $j < count($mood_data); $j++)
  			{
  				$row_color = ( !($j % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
  				$row_class = ( !($j % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
! 
  				if ( $mood_data[$j]['mood_set'] == $mood_set_data[$i]['set_id'] )
  				{
***************
*** 543,551 ****
  						"ROW_COLOR" => "#" . $row_color,
  						"ROW_CLASS" => $row_class,
! 				
! 						"MOOD_IMG" =>  $module_root_path . 'images/weblogs/' . $mood_data[$j]['mood_url'], 
  						"MOOD" => $mood_data[$j]['mood_text'],
! 				
! 						"U_MOOD_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editmood&amp;id=" . $mood_data[$j]['mood_id']), 
  						"U_MOOD_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deletemood&amp;id=" . $mood_data[$j]['mood_id']))
  					);
--- 543,551 ----
  						"ROW_COLOR" => "#" . $row_color,
  						"ROW_CLASS" => $row_class,
! 
! 						"MOOD_IMG" =>  $module_root_path . 'images/weblogs/' . $mood_data[$j]['mood_url'],
  						"MOOD" => $mood_data[$j]['mood_text'],
! 
! 						"U_MOOD_EDIT" => append_sid("admin_weblog_mood.$phpEx?mode=editmood&amp;id=" . $mood_data[$j]['mood_id']),
  						"U_MOOD_DELETE" => append_sid("admin_weblog_mood.$phpEx?mode=deletemood&amp;id=" . $mood_data[$j]['mood_id']))
  					);

[mxbb-commits] mx_pafiledb/templates/subSilver/images icon_mini_download.gif, NONE, 1.1.2.1

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

Update of /cvsroot/mxbb/mx_pafiledb/templates/subSilver/images
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26466

Added Files:
      Tag: core28x
	icon_mini_download.gif 
Log Message:


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

[mxbb-commits] mx_pafiledb/pafiledb/images/icons avi_misc.gif, NONE, 1.1.2.1 cab.gif, NONE, 1.1.2.1 chm.gif, NONE, 1.1.2.1 htm.gif, NONE, 1.1.2.1 icon_clip.gif, NONE, 1.1.2.1 inf.gif, NONE, 1.1.2.1 install.gif, NONE, 1.1.2.1 mdb.gif, NONE, 1.1.2.1 movie.gif, NONE, 1.1.2.1 mrc.gif, NONE, 1.1.2.1 msi.gif, NONE, 1.1.2.1 mts.gif, NONE, 1.1.2.1 php.gif, NONE, 1.1.2.1

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv26026/icons

Added Files:
      Tag: core28x
	avi_misc.gif cab.gif chm.gif htm.gif icon_clip.gif inf.gif 
	install.gif mdb.gif movie.gif mrc.gif msi.gif mts.gif php.gif 
Log Message:


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

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

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

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

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

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

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

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

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

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

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

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

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

[mxbb-commits] mx_linkdb/templates/subSilver/images - New directory

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

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

Log Message:
Directory /cvsroot/mxbb/mx_linkdb/templates/subSilver/images added to the repository
--> Using per-directory sticky tag `core28x'

[mxbb-commits] mx_kb/templates/subSilver/images icon_mini_kb.gif, NONE, 1.1.2.1

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

Update of /cvsroot/mxbb/mx_kb/templates/subSilver/images
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv24395

Added Files:
      Tag: core28x
	icon_mini_kb.gif 
Log Message:


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

[mxbb-commits] mx_pafiledb/templates/subSilver pa_footer.tpl, 1.17, 1.17.2.1 pa_header.tpl, 1.11, 1.11.2.1 pa_lists.tpl, 1.8, 1.8.2.1 pa_main_body.tpl, 1.9, 1.9.2.1 pa_mini.tpl, 1.4, 1.4.2.1 pa_quickdl_cat_body.tpl, 1.10, 1.10.2.1

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

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

Modified Files:
      Tag: core28x
	pa_footer.tpl pa_header.tpl pa_lists.tpl pa_main_body.tpl 
	pa_mini.tpl pa_quickdl_cat_body.tpl 
Log Message:
phpBB2 switches

Index: pa_header.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_header.tpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** pa_header.tpl	1 Aug 2006 21:03:25 -0000	1.11
--- pa_header.tpl	28 Jan 2008 03:13:02 -0000	1.11.2.1
***************
*** 56,60 ****
  <!-- <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/ajax/ask.js"></script> -->
  
! <table width="100%" border="0" cellpadding="4" cellspacing="1" class="forumline" style="border-top:none;">
  	<tr>
  		<td align="center" class="row1">
--- 56,60 ----
  <!-- <script type="text/javascript" src="{MX_ROOT_PATH}modules/mx_shared/ajax/ask.js"></script> -->
  
! <table width="100%" border="0" cellpadding="4" cellspacing="1" class="forumline">
  	<tr>
  		<td align="center" class="row1">

Index: pa_quickdl_cat_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_quickdl_cat_body.tpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** pa_quickdl_cat_body.tpl	24 Aug 2006 21:13:32 -0000	1.10
--- pa_quickdl_cat_body.tpl	28 Jan 2008 03:13:02 -0000	1.10.2.1
***************
*** 1,3 ****
! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline" style="border-top:none;">
  	<tr>
  		<td>
--- 1,3 ----
! <table width="100%" cellpadding="0" cellspacing="1" border="0" class="forumline">
  	<tr>
  		<td>

Index: pa_lists.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_lists.tpl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** pa_lists.tpl	30 May 2007 21:33:28 -0000	1.8
--- pa_lists.tpl	28 Jan 2008 03:13:02 -0000	1.8.2.1
***************
*** 1,3 ****
! <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-top:none;"><tr><td>
  <!-- IF FILELIST -->
  <table width="100%" cellpadding="2" cellspacing="0">
--- 1,3 ----
! <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline"><tr><td>
  <!-- IF FILELIST -->
  <table width="100%" cellpadding="2" cellspacing="0">

Index: pa_main_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_main_body.tpl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** pa_main_body.tpl	15 Aug 2006 08:38:37 -0000	1.9
--- pa_main_body.tpl	28 Jan 2008 03:13:02 -0000	1.9.2.1
***************
*** 1,9 ****
  <!-- INCLUDE pa_header.tpl -->
! <table width="100%" cellpadding="2" cellspacing="2">
!   <tr>
! 	<td valign="bottom">
! 		<span class="nav"><a href="{U_DOWNLOAD}" class="nav ask target-block_{BLOCK_ID}">{DOWNLOAD}</a></span>
! 	</td>
!   </tr>
  </table>
  
--- 1,7 ----
  <!-- INCLUDE pa_header.tpl -->
! <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
! 	<tr>
! 		<td align="left" class="nav"><span class="nav"><a href="{MX_ROOT_PATH}" class="nav">{L_PORTAL}</a>  &nbsp;&raquo;&nbsp; <a href="{U_DOWNLOAD}" class="nav">{DOWNLOAD}</a></span>
! 	</tr>
  </table>
  

Index: pa_mini.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_mini.tpl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** pa_mini.tpl	9 Jul 2007 22:40:13 -0000	1.4
--- pa_mini.tpl	28 Jan 2008 03:13:02 -0000	1.4.2.1
***************
*** 1,3 ****
! <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline" style="border-top:none;"><tr><td>
  	<tr>
  		<td>
--- 1,3 ----
! <table width="100%" cellpadding="0" cellspacing="0" border="0" class="forumline"><tr><td>
  	<tr>
  		<td>

Index: pa_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/templates/subSilver/Attic/pa_footer.tpl,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -d -r1.17 -r1.17.2.1
*** pa_footer.tpl	15 Aug 2006 08:38:37 -0000	1.17
--- pa_footer.tpl	28 Jan 2008 03:13:02 -0000	1.17.2.1
***************
*** 23,27 ****
  <!-- BEGIN copy_footer -->
  <div align="center"><span class="copyright"><br />
! Powered by {L_MODULE_VERSION}, {L_MODULE_ORIG_AUTHOR} & <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a> © 2002-2005 <br /><a href="http://www.phpbb.com/phpBB/viewtopic.php?t=193124" target="_phpbb" class="copyright">PHPBB.com MOD</a>
  </span></div>
  <!-- END copy_footer -->
\ No newline at end of file
--- 23,27 ----
  <!-- BEGIN copy_footer -->
  <div align="center"><span class="copyright"><br />
! Powered by {L_MODULE_VERSION}, {L_MODULE_ORIG_AUTHOR} & <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a> &copy; 2002-2007 <br /><a href="http://www.phpbb.com/phpBB/viewtopic.php?t=193124" target="_phpbb" class="copyright">PHPBB.com MOD</a>
  </span></div>
  <!-- END copy_footer -->
\ No newline at end of file

[mxbb-commits] mx_pafiledb/pafiledb/images/icons avi.gif, 1.1, 1.1.2.1 bmp.gif, 1.1, 1.1.2.1 default.gif, 1.1, 1.1.2.1 doc.gif, 1.1, 1.1.2.1 exe.gif, 1.1, 1.1.2.1 flash.gif, 1.1, 1.1.2.1 gif.gif, 1.1, 1.1.2.1 html.gif, 1.1, 1.1.2.1 icon-lang-zip.gif, 1.1, 1.1.2.1 icon-style-zip.gif, 1.1, 1.1.2.1 icon_disk1.gif, 1.1, 1.1.2.1 icon_disk_gray.gif, 1.1, 1.1.2.1 icon_download1.gif, 1.1, 1.1.2.1 icon_zip.gif, 1.1, 1.1.2.1 jpg.gif, 1.1, 1.1.2.1 mid.gif, 1.1, 1.1.2.1 mov.gif, 1.1, 1.1.2.1 mp3.gif, 1.1, 1.1.2.1 mpg.gif, 1.1, 1.1.2.1 netscape.gif, 1.1, 1.1.2.1 pack.gif, 1.1, 1.1.2.1 pdf.gif, 1.1, 1.1.2.1 ppt.gif, 1.1, 1.1.2.1 rar.gif, 1.1, 1.1.2.1 txt.gif, 1.1, 1.1.2.1 wav.gif, 1.1, 1.1.2.1 wmp.gif, 1.1, 1.1.2.1 xls.gif, 1.1, 1.1.2.1 zip.gif, 1.1, 1.1.2.1

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

Update of /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23075/icons

Modified Files:
      Tag: core28x
	avi.gif bmp.gif default.gif doc.gif exe.gif flash.gif gif.gif 
	html.gif icon-lang-zip.gif icon-style-zip.gif icon_disk1.gif 
	icon_disk_gray.gif icon_download1.gif icon_zip.gif jpg.gif 
	mid.gif mov.gif mp3.gif mpg.gif netscape.gif pack.gif pdf.gif 
	ppt.gif rar.gif txt.gif wav.gif wmp.gif xls.gif zip.gif 
Log Message:
phpBB2 switches

Index: bmp.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/bmp.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsbQnXYJ and /tmp/cvsJGxdn9 differ

Index: exe.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/exe.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsZHT6OF and /tmp/cvsWj06n5 differ

Index: mov.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/mov.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsKKP6nF and /tmp/cvsMEgb14 differ

Index: html.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/html.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs1h88IH and /tmp/cvsGdmGq7 differ

Index: mp3.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/mp3.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsOlg4KJ and /tmp/cvs6AL4w9 differ

Index: default.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/default.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsrsZ7wM and /tmp/cvsJhyvoc differ

Index: icon_disk_gray.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon_disk_gray.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs6rXgRO and /tmp/cvs4ut7Me differ

Index: gif.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/gif.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsJuk6NQ and /tmp/cvsKjsXNg differ

Index: zip.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/zip.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvscMQ65U and /tmp/cvsr5o09k differ

Index: wav.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/wav.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsTuAe3W and /tmp/cvs4Ze9an differ

Index: xls.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/xls.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsygUzZY and /tmp/cvs1tDwbp differ

Index: pack.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/pack.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsjlaxXY and /tmp/cvsZQoXdp differ

Index: icon_zip.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon_zip.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsetPYT0 and /tmp/cvsklSqer differ

Index: icon_disk1.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon_disk1.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs7prde3 and /tmp/cvs38F8Ct differ

Index: avi.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/avi.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs6TBig5 and /tmp/cvsGJsHJv differ

Index: icon_download1.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon_download1.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsNw4Ez7 and /tmp/cvsskqx7x differ

Index: netscape.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/netscape.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsYCMcfc and /tmp/cvstPTyRC differ

Index: txt.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/txt.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsDESVMc and /tmp/cvsut74uD differ

Index: doc.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/doc.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvso9yx3g and /tmp/cvsSquKPH differ

Index: ppt.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/ppt.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsvzwInj and /tmp/cvsWh7oeK differ

Index: rar.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/rar.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsKxtVol and /tmp/cvsRjG5jM differ

Index: wmp.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/wmp.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsJ7mdJn and /tmp/cvsytPQIO differ

Index: pdf.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/pdf.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvscnOC2p and /tmp/cvsoOjK6Q differ

Index: jpg.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/jpg.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvstYssxs and /tmp/cvs3uYWGT differ

Index: flash.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/flash.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsWVzBQu and /tmp/cvsCL0B4V differ

Index: mid.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/mid.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvszgLLax and /tmp/cvsbp8ctY differ

Index: icon-lang-zip.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon-lang-zip.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs6PlwRw and /tmp/cvsTLbreY differ

Index: mpg.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/mpg.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvs5Dr3bz and /tmp/cvsuaOrD0 differ

Index: icon-style-zip.gif
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/images/icons/icon-style-zip.gif,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
Binary files /tmp/cvsHDOOCB and /tmp/cvsWst382 differ

[mxbb-commits] mx_pafiledb/pafiledb/modules pa_category.php, 1.19, 1.19.2.1 pa_download.php, 1.21, 1.21.2.1 pa_file.php, 1.22, 1.22.2.1 pa_rate.php, 1.18, 1.18.2.1 pa_stats.php, 1.23, 1.23.2.1

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

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

Modified Files:
      Tag: core28x
	pa_category.php pa_download.php pa_file.php pa_rate.php 
	pa_stats.php 
Log Message:
phpBB2 switches

Index: pa_download.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_download.php,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C2 -d -r1.21 -r1.21.2.1
*** pa_download.php	22 Feb 2007 10:12:06 -0000	1.21
--- pa_download.php	28 Jan 2008 03:12:08 -0000	1.21.2.1
***************
*** 34,46 ****
  		// Read language definition
  		// **********************************************************************
! 		if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
  		{
! 			include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx );
  		}
  		else
  		{
! 			include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
  		}
  
  		if ( isset( $_REQUEST['file_id'] ) )
  		{
--- 34,62 ----
  		// Read language definition
  		// **********************************************************************
! 
! 		if ( !MXBB_MODULE )
  		{
! 			if ( !file_exists( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
! 			{
! 				include( $module_root_path . 'pafiledb/language/lang_english/lang_main.' . $phpEx );
! 			}
! 			else
! 			{
! 				include( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
! 			}
  		}
  		else
  		{
! 			if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
! 			{
! 				include( $module_root_path . 'language/lang_english/lang_main.' . $phpEx );
! 			}
! 			else
! 			{
! 				include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
! 			}
  		}
  
+ 
  		if ( isset( $_REQUEST['file_id'] ) )
  		{
***************
*** 62,65 ****
--- 78,82 ----
  			mx_message_die( GENERAL_ERROR, 'Couldnt select download', '', __LINE__, __FILE__, $sql );
  		}
+ 
  		// =========================================================================
  		// Id doesn't match with any file in the database another nice error message

Index: pa_category.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_category.php,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** pa_category.php	13 Aug 2006 19:44:45 -0000	1.19
--- pa_category.php	28 Jan 2008 03:12:08 -0000	1.19.2.1
***************
*** 33,38 ****
  		// Request vars
  		// =======================================================
! 		$start = $mx_request_vars->request('start', MX_TYPE_INT, 0);
! 		$cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, '');
  
  		if ( empty( $cat_id ) )
--- 33,54 ----
  		// Request vars
  		// =======================================================
! 		if ( !MXBB_MODULE )
! 		{
! 			if ( isset( $_REQUEST['cat_id'] ) )
! 			{
! 				$cat_id = intval( $_REQUEST['cat_id'] );
! 			}
! 			else
! 			{
! 				message_die( GENERAL_MESSAGE, $lang['Cat_not_exist'] );
! 			}
! 
! 			$start = ( isset( $_REQUEST['start'] ) ) ? intval( $_REQUEST['start'] ) : 0;
! 		}
! 		else
! 		{
! 			$start = $mx_request_vars->request('start', MX_TYPE_INT, 0);
! 			$cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, '');
! 		}
  
  		if ( empty( $cat_id ) )

Index: pa_file.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_file.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** pa_file.php	13 Aug 2006 19:44:45 -0000	1.22
--- pa_file.php	28 Jan 2008 03:12:08 -0000	1.22.2.1
***************
*** 34,37 ****
--- 34,38 ----
  		// Request vars
  		// =======================================================
+ 
  		$start = $mx_request_vars->get('start', MX_TYPE_INT, 0);
  		$file_id = $mx_request_vars->request('file_id', MX_TYPE_INT, '');
***************
*** 128,131 ****
--- 129,143 ----
  		$file_poster .= ( $file_data['user_id'] != ANONYMOUS ) ? '</a>' : '';
  
+ 		if ( !MXBB_MODULE )
+ 		{
+ 			$server_protocol = ($board_config['cookie_secure']) ? 'https://' : 'http://';
+ 			$server_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['server_name']));
+ 			$server_port = ($board_config['server_port'] <> 80) ? ':' . trim($board_config['server_port']) : '';
+ 			$script_name = preg_replace('#^\/?(.*?)\/?$#', '\1', trim($board_config['script_path']));
+ 			$false_phpbb_url = $server_protocol . $server_name . $server_port . '/';
+ 			$false_phpbb_path = './';
+ 			$file_screenshot_url = str_replace($false_phpbb_url . $false_phpbb_path, PORTAL_URL, $file_screenshot_url);
+ 		}
+ 
  		$pafiledb_template->assign_vars( array(
  			'L_CLICK_HERE' => $lang['Click_here'],

Index: pa_rate.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_rate.php,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -C2 -d -r1.18 -r1.18.2.1
*** pa_rate.php	13 Aug 2006 19:44:45 -0000	1.18
--- pa_rate.php	28 Jan 2008 03:12:08 -0000	1.18.2.1
***************
*** 34,38 ****
  		// Request vars
  		// =======================================================
! 		$file_id = $mx_request_vars->request('file_id', MX_TYPE_INT, '');
  
  		if ( empty( $file_id ) )
--- 34,47 ----
  		// Request vars
  		// =======================================================
! 		if ( !MXBB_MODULE )
! 		{
! 			$file_id = ( isset( $_REQUEST['file_id'] ) ) ? intval( $_REQUEST['file_id'] ) : '';
! 			$rating = ( isset( $_REQUEST['rating'] ) ) ? intval( $_REQUEST['rating'] ) : 0;
! 		}
! 		else
! 		{
! 			$file_id = $mx_request_vars->request('file_id', MX_TYPE_INT, '');
! 			$rating = $mx_request_vars->request('rating', MX_TYPE_INT, 0);
! 		}
  
  		if ( empty( $file_id ) )
***************
*** 41,45 ****
  		}
  
- 		$rating = $mx_request_vars->request('rating', MX_TYPE_INT, 0);
  
  		$sql = 'SELECT file_name, file_catid
--- 50,53 ----

Index: pa_stats.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/modules/pa_stats.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** pa_stats.php	10 Jul 2007 21:49:25 -0000	1.23
--- pa_stats.php	28 Jan 2008 03:12:08 -0000	1.23.2.1
***************
*** 162,173 ****
  		$avgdls = @round( $totaldls / $num['files'] );
  
! 		if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
!       	{
!            	require( $module_root_path . 'language/lang_english/lang_main.' . $phpEx );
!       	}
!       	else
!       	{
!            	require(  $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
!       	}
  
  		$lang['Stats_text'] = str_replace( "{total_files}", $num['files'], $lang['Stats_text'] );
--- 162,166 ----
  		$avgdls = @round( $totaldls / $num['files'] );
  
! 		require( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
  
  		$lang['Stats_text'] = str_replace( "{total_files}", $num['files'], $lang['Stats_text'] );

[mxbb-commits] mx_pafiledb/pafiledb/includes functions.php, 1.38, 1.38.2.1 functions_comment.php, 1.25, 1.25.2.1 functions_pafiledb.php, 1.48.2.1, 1.48.2.2 pafiledb_constants.php, 1.20, 1.20.2.1

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

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

Modified Files:
      Tag: core28x
	functions.php functions_comment.php functions_pafiledb.php 
	pafiledb_constants.php 
Log Message:
phpBB2 switches

Index: functions.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions.php,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -C2 -d -r1.38 -r1.38.2.1
*** functions.php	6 Aug 2007 21:14:10 -0000	1.38
--- functions.php	28 Jan 2008 03:12:06 -0000	1.38.2.1
***************
*** 51,55 ****
  			if ( !$db->sql_query( $sql ) )
  			{
! 				mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  			}
  		}
--- 51,55 ----
  			if ( !$db->sql_query( $sql ) )
  			{
! 				//mx_message_die( GENERAL_ERROR, "Failed to update pafiledb configuration for $config_name", "", __LINE__, __FILE__, $sql );
  			}
  		}
***************
*** 310,313 ****
--- 310,314 ----
  
  				'MX_ROOT_PATH' => $mx_root_path,
+ 				'L_PORTAL' => "<<", 
  				'BLOCK_ID' => $mx_block->block_id,
  				)

Index: pafiledb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/pafiledb_constants.php,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -C2 -d -r1.20 -r1.20.2.1
*** pafiledb_constants.php	5 Jul 2006 22:50:22 -0000	1.20
--- pafiledb_constants.php	28 Jan 2008 03:12:08 -0000	1.20.2.1
***************
*** 81,85 ****
  if ( !MXBB_MODULE || MXBB_27x )
  {
! 	$pa_module_version = "pafileDB Download Manager v. 2.0.x";
  	$pa_module_author = "Haplo/Jon";
  	$pa_module_orig_author = "Mohd";
--- 81,85 ----
  if ( !MXBB_MODULE || MXBB_27x )
  {
! 	$pa_module_version = "pafileDB Download Manager v. 0.9.0";
  	$pa_module_author = "Haplo/Jon";
  	$pa_module_orig_author = "Mohd";

Index: functions_comment.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_comment.php,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -d -r1.25 -r1.25.2.1
*** functions_comment.php	12 Jul 2007 22:51:22 -0000	1.25
--- functions_comment.php	28 Jan 2008 03:12:07 -0000	1.25.2.1
***************
*** 135,139 ****
  	{
  		global $pafiledb_template, $pafiledb, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		//
--- 135,139 ----
  	{
  		global $pafiledb_template, $pafiledb, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $mx_mod_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		//
***************
*** 165,169 ****
  		// Instantiate the mx_text and mx_text_formatting classes
  		//
! 		include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx);
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above
--- 165,177 ----
  		// Instantiate the mx_text and mx_text_formatting classes
  		//
! 		if ( !MXBB_MODULE )
! 		{
! 			include_once( $mx_mod_path . 'includes/functions_tools.' . $phpEx );
! 		}
! 		else
! 		{
! 			include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
! 		}
! 
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above
***************
*** 335,339 ****
  	{
  		global $pafiledb_template, $pafiledb, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		if ( !isset($this->topic_id) || $this->topic_id < 0 )
--- 343,347 ----
  	{
  		global $pafiledb_template, $pafiledb, $lang, $board_config, $phpEx, $pafiledb_config, $db, $userdata, $images;
! 		global $mx_root_path, $module_root_path, $mx_mod_path, $phpbb_root_path, $is_block, $phpEx, $mx_request_vars;
  
  		if ( !isset($this->topic_id) || $this->topic_id < 0 )
***************
*** 370,374 ****
  		// Instantiate the mx_text and mx_text_formatting classes
  		//
! 		include_once($mx_root_path . 'includes/mx_functions_tools.'.$phpEx);
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above
--- 378,390 ----
  		// Instantiate the mx_text and mx_text_formatting classes
  		//
! 		if ( !MXBB_MODULE )
! 		{
! 			include_once( $mx_mod_path . 'includes/functions_tools.' . $phpEx );
! 		}
! 		else
! 		{
! 			include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
! 		}
! 
  		$mx_text = new mx_text();
  		$mx_text->init($html_on, $bbcode_on, $smilies_on); // Note: allowed_html_tags is altered above

Index: functions_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/includes/functions_pafiledb.php,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -C2 -d -r1.48.2.1 -r1.48.2.2
*** functions_pafiledb.php	23 Sep 2007 17:50:17 -0000	1.48.2.1
--- functions_pafiledb.php	28 Jan 2008 03:12:07 -0000	1.48.2.2
***************
*** 88,92 ****
  				if ($this->comments[$cat_rowset[$i]['cat_id']]['activated'] && !$this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']) < 1)
  				{
! 					mx_message_die(GENERAL_ERROR, 'Init Failure, phpBB comments with no target forum_id :( <br> Category: ' . $cat_rowset[$i]['cat_name'] . ' Forum_id: ' . $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']);
  				}
  
--- 88,92 ----
  				if ($this->comments[$cat_rowset[$i]['cat_id']]['activated'] && !$this->comments[$cat_rowset[$i]['cat_id']]['internal_comments'] && intval($this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']) < 1)
  				{
! 					//mx_message_die(GENERAL_ERROR, 'Init Failure, phpBB comments with no target forum_id :( <br> Category: ' . $cat_rowset[$i]['cat_name'] . ' Forum_id: ' . $this->comments[$cat_rowset[$i]['cat_id']]['comments_forum_id']);
  				}
  
***************
*** 1774,1783 ****
  		}
  
! 		$forbidden_ss_extensions = array('jpg', 'gif', 'png');
! 		$ss_file_extension = $pafiledb_functions->get_extension( $ss_name );
  
! 		if ( in_array( $ss_file_extension, $forbidden_ss_extensions ) )
  		{
! 			$this->error[] = 'You are not allowed to upload this type of screenshot image';
  		}
  
--- 1774,1787 ----
  		}
  
! 		$allowed_ss_extensions = array('jpg', 'gif', 'png');
  
! 		if ( !empty( $ss_name ) )
  		{
! 			$ss_file_extension = $pafiledb_functions->get_extension( $ss_name );
! 
! 			if ( !in_array( $ss_file_extension, $allowed_ss_extensions ) )
! 			{
! 				$this->error[] = 'You are not allowed to upload this type of screenshot image';
! 			}
  		}
  

[mxbb-commits] mx_pafiledb dload.php,1.23,1.23.2.1

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

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

Modified Files:
      Tag: core28x
	dload.php 
Log Message:
phpBB2 switches

Index: dload.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/dload.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -C2 -d -r1.23 -r1.23.2.1
*** dload.php	13 Aug 2006 19:44:45 -0000	1.23
--- dload.php	28 Jan 2008 03:11:06 -0000	1.23.2.1
***************
*** 9,34 ****
  */
  
! if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE
  {
- 	define( 'MXBB_MODULE', false );
- 	define( 'IN_PHPBB', true );
- 	define( 'IN_PORTAL', true );
- 	define( 'IN_DOWNLOAD', true );
  
! 	// When run as a phpBB mod these paths are identical ;)
! 	$phpbb_root_path = $module_root_path = $mx_root_path = './';
  
! 	$phpEx = substr(strrchr(__FILE__, '.'), 1);
! 	include( $phpbb_root_path . 'common.' . $phpEx );
  
! 	include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
! 	include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
  
! 	define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
  
! 	// Start session management
! 	$userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD );
! 	init_userprefs( $userdata );
! 	// End session management
  }
  else
--- 9,143 ----
  */
  
! $phpEx = substr(strrchr(__FILE__, '.'), 1);
! 
! if ( @file_exists("./viewtopic.$phpEx") ) // -------------------------------------------- phpBB MOD MODE
  {
  
! 	if ( file_exists("./modcp.$phpEx") )
! 	{
! 		define('PORTAL_BACKEND', 'phpbb2');
! 		define( 'MXBB_MODULE', false );
! 		define( 'IN_PHPBB', true );
! 		define( 'IN_PORTAL', true );
! 		define( 'IN_DOWNLOAD', true );
  
! 		// When run as a phpBB mod these paths are identical ;)
! 		$phpbb_root_path = $module_root_path = $mx_root_path = './';
! 		$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
! 		$tplEx = 'tpl';
  
! 		//Check for cash mod
! 		if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) 
! 		{
! 			define('IN_CASHMOD', true);
! 		}
! 	
! 		include( $phpbb_root_path . 'common.' . $phpEx );
  
! 		@ini_set( 'display_errors', '1' );
! 		error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 
! 		include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
! 		include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
! 		include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
! 		include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );
! 
! 		define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
! 
! 		// Start session management
! 		$userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD );
! 		init_userprefs( $userdata );
! 
! 		// End session management
! 		//
! 		// Instatiate the mx_cache class
! 		//
! 		$mx_cache = new mx_cache();
! 
! 		//
! 		// Get mxBB config settings
! 		//
! 		$portal_config = $mx_cache->obtain_mxbb_config();
! 
! 		//
! 		// instatiate the mx_request_vars class
! 		//
! 		$mx_request_vars = new mx_request_vars();
! 
! 		$is_block = false;
! 	}
! 	else if ( @file_exists("./mcp.$phpEx") )
! 	{
! 		define('PORTAL_BACKEND', 'phpbb3');
! 		define( 'MXBB_MODULE', false );
! 		define( 'IN_PHPBB', true );
! 		define( 'IN_PORTAL', true );
! 		define( 'IN_DOWNLOAD', true );
! 
! 		$tplEx = 'html';
! 
! 		// When run as a phpBB mod these paths are identical ;)
! 		$phpbb_root_path = $module_root_path = $mx_root_path = './';
! 		$mx_mod_path = $phpbb_root_path . 'mx_mod/';
! 
! 		//Check for cash mod
! 		if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) 
! 		{
! 			define('IN_CASHMOD', true);
! 		}
! 	
! 		include( $phpbb_root_path . 'common.' . $phpEx );
! 
! 		//
! 		// ERROR HANDLING
! 		//
! 		@ini_set( 'display_errors', '1' );
! 		//error_reporting( E_ALL );
! 		error_reporting (E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
! 
! 		//include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/bbcode.' . $phpEx );
! 		//include_once( $mx_mod_path . 'includes/shared/phpbb2/includes/functions_post.' . $phpEx );
! 		include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
! 		include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );
! 
! 		define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
! 
! 		//
! 		// Start session management
! 		//
! 		$user->session_begin();
! 		$userdata = $user->data;
! 		$user->setup();
! 		//
! 		// End session management
! 		//
! 
! 		//
! 		// Get phpBB config settings
! 		//
! 		$board_config = $config;
! 
! 		//
! 		// Instatiate the mx_cache class
! 		//
! 		$mx_cache = new mx_cache();
! 
! 		//
! 		// Get mxBB config settings
! 		//
! 		$portal_config = $mx_cache->obtain_mxbb_config();
! 
! 		//
! 		// instatiate the mx_request_vars class
! 		//
! 		$mx_request_vars = new mx_request_vars();
! 
! 		$is_block = false;
! 	}
! 	else
! 	{
! 		die('Copy this file in phpbb_root_path were is your viewtopic.php file!!!');
! 	}
  }
  else
***************
*** 76,84 ****
  		$title = $mx_block->block_info['block_title'];
  		$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
  
  		$is_block = true;
  		global $images;
  	}
! 	define( 'MXBB_27x', file_exists( $mx_root_path . 'mx_login.php' ) );
  }
  
--- 185,199 ----
  		$title = $mx_block->block_info['block_title'];
  		$block_size = ( isset( $block_size ) && !empty( $block_size ) ? $block_size : '100%' );
+ 		
+ 		//Check for cash mod
+ 		if (file_exists($phpbb_root_path . 'includes/functions_cash.'.$phpEx)) 
+ 		{
+ 			define('IN_CASHMOD', true);
+ 		}
  
  		$is_block = true;
  		global $images;
  	}
! 	define( 'MXBB_27x', @file_exists($mx_root_path . "mx_login.$phpEx") );
  }
  
***************
*** 95,98 ****
--- 210,214 ----
  $mx_script_name = preg_replace( '#^\/?(.*?)\/?$#', '\1', trim( $mx_script_name_temp ) );
  
+ 
  // ===================================================
  // Include the common file
***************
*** 104,113 ****
  // Get action variable otherwise set it to the main
  // ===================================================
! $action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'main');
  
  // ===================================================
  // Is admin?
  // ===================================================
! $is_admin = ( ( $userdata['user_level'] == ADMIN  ) && $userdata['session_logged_in'] ) ? true : 0;
  
  // ===================================================
--- 220,245 ----
  // Get action variable otherwise set it to the main
  // ===================================================
! if ( !MXBB_MODULE )
! {
! 	$action = ( isset( $_REQUEST['action'] ) ) ? htmlspecialchars( $_REQUEST['action'] ) : 'main';
! }
! else
! {
! 	$action = $mx_request_vars->request('action', MX_TYPE_NO_TAGS, 'main');
! }
  
  // ===================================================
  // Is admin?
  // ===================================================
! switch (PORTAL_BACKEND)
! {
! 	case 'internal':
! 	case 'phpbb2':
! 		$is_admin = ( ( $userdata['user_level'] == ADMIN  ) && $userdata['session_logged_in'] ) ? true : 0;
! 		break;
! 	case 'phpbb3':
! 		$is_admin = ( $userdata['user_type'] == USER_FOUNDER ) ? true : 0;
! 		break;
! }
  
  // ===================================================
***************
*** 162,164 ****
--- 294,297 ----
  	}
  }
+ 
  ?>
\ No newline at end of file

[mxbb-commits] mx_pafiledb/pafiledb pafiledb_common.php, 1.19, 1.19.2.1

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

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

Modified Files:
      Tag: core28x
	pafiledb_common.php 
Log Message:
phpBB2 switches

Index: pafiledb_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/pafiledb_common.php,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -C2 -d -r1.19 -r1.19.2.1
*** pafiledb_common.php	13 Aug 2006 19:44:46 -0000	1.19
--- pafiledb_common.php	28 Jan 2008 03:11:06 -0000	1.19.2.1
***************
*** 75,79 ****
  // - Class mx_text_formatting
  //
! include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
  
  include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx );
--- 75,192 ----
  // - Class mx_text_formatting
  //
! 
! if ( !MXBB_MODULE )
! {
! 	include_once( $mx_mod_path . 'includes/functions_tools.' . $phpEx );
! }
! else
! {
! 	include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
! }
! 
! // **********************************************************************
! // If phpBB mod read language definition
! // **********************************************************************
! 
! if ( !MXBB_MODULE )
! {
! 	if ( !file_exists( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'pafiledb/language/lang_english/lang_main.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
! 	}
! }
! 
! // **********************************************************************
! //  If phpBB mod read theme definition and language in theme definition
! // **********************************************************************
! if ( !MXBB_MODULE )
! {
! 	$sql = 'SELECT *
! 		FROM ' . THEMES_TABLE . '
! 		WHERE themes_id = ' . (int) $userdata['user_style'];
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 	}
! 
! 	if ( $row = $db->sql_fetchrow($result) )
! 	{
! 		$db->sql_freeresult($result);
! 		$template_name = $row['template_name'] ;
! 	}
! 	else
! 	{
! 		// We are trying to setup a style which does not exist in the database
! 		// Try to fallback to the board default (if the user had a custom style)
! 		// and then any users using this style to the default if it succeeds
! 		if ( $userdata['user_style'] != $board_config['default_style'])
! 		{
! 			$sql = 'SELECT *
! 				FROM ' . THEMES_TABLE . '
! 				WHERE themes_id = ' . (int) $board_config['default_style'];
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 			if ( $row = $db->sql_fetchrow($result) )
! 			{
! 				$db->sql_freeresult($result);
! 				$template_name = $row['template_name'] ;
! 			}
! 			else
! 			{
! 				message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 			}
! 		}
! 		else
! 		{
! 			message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 		}
! 	}
! 
! 	$template_path = 'templates/' ;
! 	//$template_name = $row['template_name'] ;
! 
! 	//$template = new Template($phpbb_root_path . $template_path . $template_name);
! 
! 	if ( $template )
! 	{
! 		$current_template_path = $template_path . $template_name;
! 	}
! 	else
! 	{
! 		$current_template_path = $template_path . 'subSilver';
! 	}
! 
! 	// -------------------------------------------------------------------------
! 	// Prefix with PORTAL_URL
! 	// -------------------------------------------------------------------------
! 	$current_template_images = PORTAL_URL . $current_template_path . "/images";
! 
! 	@include($phpbb_root_path . $template_path . $template_name . '/' . 'pafiledb.cfg');
! 
! 	$img_lang = ( file_exists($mx_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
! 
! 	while( list($key, $value) = @each($mx_images) )
! 	{
! 		if (is_array($value))
! 		{
! 			foreach( $value as $key2 => $val2 )
! 			{
! 				$images[$key][$key2] = $val2;
! 				$mx_images[$key][$key2] = $val2;
! 			}
! 			}
! 		else
! 		{
! 			$images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 			$mx_images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 		}
! 	}
! }
  
  include_once( $module_root_path . 'pafiledb/includes/functions.' . $phpEx );

[mxbb-commits] mx_pafiledb/admin admin_pafiledb.php,1.6,1.6.2.1

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

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

Modified Files:
      Tag: core28x
	admin_pafiledb.php 
Log Message:
phpBB2 switches

Index: admin_pafiledb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/admin/admin_pafiledb.php,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** admin_pafiledb.php	22 Aug 2006 20:23:24 -0000	1.6
--- admin_pafiledb.php	28 Jan 2008 03:11:06 -0000	1.6.2.1
***************
*** 20,23 ****
--- 20,24 ----
  	//
  	$phpbb_root_path = $module_root_path = $mx_root_path = "./../";
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
  	//
***************
*** 28,31 ****
--- 29,33 ----
  
  	require_once( $phpbb_root_path . 'extension.inc' );
+ 	require_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
  }
  else
***************
*** 76,88 ****
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
- 
  //
  // Get action variable other wise set it to the main
--- 78,103 ----
  // Read language definition
  // **********************************************************************
! if ( !MXBB_MODULE )
  {
! 	if ( !file_exists( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'pafiledb/language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'pafiledb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }
  else
  {
! 	if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }
  //
  // Get action variable other wise set it to the main

[mxbb-commits] mx_kb db_install.php, 1.52, 1.52.2.1 db_upgrade.php, 1.44, 1.44.2.1 kb.php, 1.42, 1.42.2.1

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

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

Modified Files:
      Tag: core28x
	db_install.php db_upgrade.php kb.php 
Log Message:
phpBB2 switches

Index: kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb.php,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -C2 -d -r1.42 -r1.42.2.1
*** kb.php	30 May 2007 21:32:24 -0000	1.42
--- kb.php	28 Jan 2008 03:09:27 -0000	1.42.2.1
***************
*** 9,13 ****
  */
  
! if ( file_exists( './viewtopic.' . $phpEx ) ) // -------------------------------------------- phpBB MOD MODE
  {
  	define( 'MXBB_MODULE', false );
--- 9,13 ----
  */
  
! if ( file_exists( './viewtopic.php' ) ) // -------------------------------------------- phpBB MOD MODE
  {
  	define( 'MXBB_MODULE', false );
***************
*** 17,25 ****
  	// When run as a phpBB mod these paths are identical ;)
  	$phpbb_root_path = $module_root_path = $mx_root_path = './';
  
  	$phpEx = substr(strrchr(__FILE__, '.'), 1);
  	include( $phpbb_root_path . 'common.' . $phpEx );
  
! 	define( 'PAGE_KB', -501 ); // If this id generates a conflict with other mods, change it ;)
  
  	// Start session management
--- 17,31 ----
  	// When run as a phpBB mod these paths are identical ;)
  	$phpbb_root_path = $module_root_path = $mx_root_path = './';
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
  	$phpEx = substr(strrchr(__FILE__, '.'), 1);
  	include( $phpbb_root_path . 'common.' . $phpEx );
  
! 	//include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
! 	//include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
! 	include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
! 	include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );
! 
! 	define( 'PAGE_KB', -503 ); // If this id generates a conflict with other mods, change it ;)
  
  	// Start session management
***************
*** 27,30 ****
--- 33,58 ----
  	init_userprefs( $userdata );
  	// End session management
+ 
+ 	//
+ 	// Instatiate the mx_cache class
+ 	//
+ 	$mx_cache = new mx_cache();
+ 
+ 	//
+ 	// Get mxBB config settings
+ 	//
+ 	$portal_config = $mx_cache->obtain_mxbb_config();
+ 
+ 	//
+ 	// instatiate the mx_request_vars class
+ 	//
+ 	$mx_request_vars = new mx_request_vars();
+ 	
+ 	//
+ 	// instatiate the mx_block class
+ 	//
+ 	$mx_block = new mx_block();
+ 
+ 	$is_block = false;
  }
  else // --------------------------------------------------------------------------------- mxBB Module MODE
***************
*** 123,127 ****
  
  		$is_block = true;
! 		global $images;
  	}
  }
--- 151,155 ----
  
  		$is_block = true;
! 		global $images, $mx_images;
  	}
  }
***************
*** 141,146 ****
  // Get mode variables, otherwise set it to the main
  // ===================================================
! $mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main');
! $print_version = $mx_request_vars->is_request('print', MX_TYPE_NO_TAGS, '');
  $kb_config['reader_mode'] = false;
  
--- 169,184 ----
  // Get mode variables, otherwise set it to the main
  // ===================================================
! if ( !MXBB_MODULE )
! {
! 	$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main');
! 	//$mode = ( isset( $_REQUEST['mode'] ) ) ? htmlspecialchars( $_REQUEST['mode'] ) : 'main';
! 	$print_version = ( isset( $_REQUEST['print'] ) ) ? htmlspecialchars( $_REQUEST['print'] ) : '';
! }
! else
! {
! 	$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, 'main');
! 	$print_version = $mx_request_vars->is_request('print', MX_TYPE_NO_TAGS, '');
! }
! 
  $kb_config['reader_mode'] = false;
  
***************
*** 179,182 ****
--- 217,230 ----
  $mx_kb->modules[$actions[$mode]]->main( $mode );
  
+ if ( !MXBB_MODULE )
+ {
+ 	$page_title = $lang['KB_title'];
+ }
+ 
+ if ( !$is_block && !$print_version )
+ {
+ 	include( $mx_root_path . 'includes/page_header.' . $phpEx );
+ }
+ 
  //
  // load module header
***************
*** 218,220 ****
--- 266,274 ----
  	$mx_kb_functions->page_footer();
  }
+ 
+ if ( !$is_block && !$print_version )
+ {
+ 	include( $mx_root_path . 'includes/page_tail.' . $phpEx );
+ }
+ 
  ?>
\ No newline at end of file

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_install.php,v
retrieving revision 1.52
retrieving revision 1.52.2.1
diff -C2 -d -r1.52 -r1.52.2.1
*** db_install.php	22 Jul 2007 21:05:45 -0000	1.52
--- db_install.php	28 Jan 2008 03:09:27 -0000	1.52.2.1
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.3';
  $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</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.2';
  $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</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/db_upgrade.php,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -C2 -d -r1.44 -r1.44.2.1
*** db_upgrade.php	22 Jul 2007 21:05:45 -0000	1.44
--- db_upgrade.php	28 Jan 2008 03:09:27 -0000	1.44.2.1
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.3';
  $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</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.2';
  $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</a> :: Adapted for mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
***************
*** 452,456 ****
  
  	$message .= mx_do_install_upgrade( $sql );
- 	$message .= "<b>...Now upgraded to v. $mx_module_version :-)</b><br/><br/>";
  
  	//
--- 452,455 ----

[mxbb-commits] mx_kb/templates/subSilver kb_footer.tpl, 1.11, 1.11.2.1 kb_header.tpl, 1.11, 1.11.2.1 kb_index_body.tpl, 1.8, 1.8.2.1 kb_post_body.tpl, 1.10, 1.10.2.1

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

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

Modified Files:
      Tag: core28x
	kb_footer.tpl kb_header.tpl kb_index_body.tpl kb_post_body.tpl 
Log Message:
phpBB2 switches

Index: kb_header.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/Attic/kb_header.tpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** kb_header.tpl	1 Aug 2006 21:00:39 -0000	1.11
--- kb_header.tpl	28 Jan 2008 03:09:28 -0000	1.11.2.1
***************
*** 1,3 ****
! <table width="100%" cellspacing="1" cellpadding="0" border="0" class="forumline" style="border-top:none;">
  	<tr>
  		<td>
--- 1,3 ----
! <table width="100%" cellspacing="1" cellpadding="0" border="0" class="forumline">
  	<tr>
  		<td>

Index: kb_footer.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/Attic/kb_footer.tpl,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** kb_footer.tpl	27 Jun 2006 18:13:45 -0000	1.11
--- kb_footer.tpl	28 Jan 2008 03:09:28 -0000	1.11.2.1
***************
*** 34,38 ****
  <!-- BEGIN copy_footer -->
  <div align="center"><span class="copyright"><br />
! Powered by {L_MODULE_VERSION}, {L_MODULE_ORIG_AUTHOR} & <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a> © 2002-2005 <br /><a href="http://www.phpbb.com/phpBB/viewtopic.php?t=200195" target="_phpbb" class="copyright">PHPBB.com MOD</a>
  </span></div>
  <!-- END copy_footer -->
--- 34,38 ----
  <!-- BEGIN copy_footer -->
  <div align="center"><span class="copyright"><br />
! Powered by {L_MODULE_VERSION}, {L_MODULE_ORIG_AUTHOR} & <a href="http://www.mx-system.com/" target="_phpbb" class="copyright">{L_MODULE_AUTHOR}</a> &copy; 2002-2007 <br /><a href="http://www.phpbb.com/phpBB/viewtopic.php?t=200195" target="_phpbb" class="copyright">PHPBB.com MOD</a>
  </span></div>
  <!-- END copy_footer -->

Index: kb_index_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/Attic/kb_index_body.tpl,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** kb_index_body.tpl	1 Aug 2006 21:00:39 -0000	1.8
--- kb_index_body.tpl	28 Jan 2008 03:09:28 -0000	1.8.2.1
***************
*** 1,5 ****
  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr>
! 		<td align="left" class="nav"><a href="{U_KB}" class="nav">{L_KB}</a></td>
  	</tr>
  </table>
--- 1,5 ----
  <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
  	<tr>
! 		<td align="left" class="nav"><a href="{U_PORTAL}" class="nav">{L_PORTAL}</a>  &nbsp;&raquo;&nbsp; <a href="{U_KB}" class="nav">{L_KB}</a></td>
  	</tr>
  </table>

Index: kb_post_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/templates/subSilver/Attic/kb_post_body.tpl,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** kb_post_body.tpl	4 Aug 2006 16:30:31 -0000	1.10
--- kb_post_body.tpl	28 Jan 2008 03:09:29 -0000	1.10.2.1
***************
*** 240,244 ****
  
  <!-- BEGIN tinyMCE -->
! <script language="javascript" type="text/javascript" src="modules/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
  <script language="javascript" type="text/javascript">
     tinyMCE.init({
--- 240,244 ----
  
  <!-- BEGIN tinyMCE -->
! <script language="javascript" type="text/javascript" src="mx_mod/mx_shared/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
  <script language="javascript" type="text/javascript">
     tinyMCE.init({

[mxbb-commits] mx_kb/kb/admin admin_auth_manage.php, 1.4, 1.4.2.1 admin_cat_manage.php, 1.4, 1.4.2.1 admin_custom_manage.php, 1.3, 1.3.2.1 admin_settings.php, 1.3, 1.3.2.1 admin_types_manage.php, 1.4, 1.4.2.1

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

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

Modified Files:
      Tag: core28x
	admin_auth_manage.php admin_cat_manage.php 
	admin_custom_manage.php admin_settings.php 
	admin_types_manage.php 
Log Message:
phpBB2 switches

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_cat_manage.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** admin_cat_manage.php	28 Apr 2007 19:59:04 -0000	1.4
--- admin_cat_manage.php	28 Jan 2008 03:09:27 -0000	1.4.2.1
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $mx_images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $_GET, $_POST;
  
  		//
***************
*** 25,29 ****
  		include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
! 		$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');
  
  		if ( empty($mode) )
--- 25,45 ----
  		include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
! 		if ( !MXBB_MODULE )
! 		{
! 			if ( isset( $_POST['mode'] ) || isset( $_GET['mode'] ) )
! 			{
! 				$mode = ( isset( $_POST['mode'] ) ) ? $_POST['mode'] : $_GET['mode'];
! 			}
! 			else
! 			{
! 				$mode = '';
! 			}
! 
! 		}
! 		else
! 		{
! 			$mode = $mx_request_vars->request('mode', MX_TYPE_NO_TAGS, '');
! 		}
! 
  
  		if ( empty($mode) )

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_settings.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** admin_settings.php	13 Aug 2006 19:43:07 -0000	1.3
--- admin_settings.php	28 Jan 2008 03:09:27 -0000	1.3.2.1
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $mx_images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//

Index: admin_auth_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_auth_manage.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** admin_auth_manage.php	28 Apr 2007 19:59:04 -0000	1.4
--- admin_auth_manage.php	28 Jan 2008 03:09:27 -0000	1.4.2.1
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $mx_images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $_GET, $_POST, $_REQUEST;
  
  		//
***************
*** 49,53 ****
  			if ( !isset( $_GET['cat_id'] ) )
  			{
! 				$cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, '');
  
  				$template->set_filenames( array( 'body' => 'admin/kb_cat_auth_body.tpl' ) );
--- 49,60 ----
  			if ( !isset( $_GET['cat_id'] ) )
  			{
! 				if ( !MXBB_MODULE )
! 				{
! 					$cat_id = ( isset( $_REQUEST['cat_id'] ) ) ? intval( $_REQUEST['cat_id'] ) : '';
! 				}
! 				else
! 				{
! 					$cat_id = $mx_request_vars->request('cat_id', MX_TYPE_INT, '');
! 				}
  
  				$template->set_filenames( array( 'body' => 'admin/kb_cat_auth_body.tpl' ) );

Index: admin_types_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_types_manage.php,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** admin_types_manage.php	28 Apr 2007 19:59:04 -0000	1.4
--- admin_types_manage.php	28 Jan 2008 03:09:27 -0000	1.4.2.1
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $mx_images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
***************
*** 231,239 ****
  					$type_name = $type['type'];
  
! 					$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit&cat=$type_id" );
! 					$edit = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" border="0" alt="' . $lang['Edit'] . '"></a>';
  
- 					$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete&amp;cat=$type_id" );
- 					$delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>';
  
  					$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];
--- 231,251 ----
  					$type_name = $type['type'];
  
! 					if ( !MXBB_MODULE )
! 					{
! 						$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit&amp;cat=$type_id" );
! 						$edit = '<a href="' . $temp_url . '"><img src="' . PHPBB_URL . $images['kb_icon_edit'] . '" border="0" alt="' . $lang['Edit'] . '"></a>';
! 
! 						$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete&amp;cat=$type_id" );
! 						$delete = '<a href="' . $temp_url . '"><img src="' . PHPBB_URL . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>';
! 					}
! 					else
! 					{
! 						$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=edit&amp;cat=$type_id" );
! 						$edit = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_edit'] . '" border="0" alt="' . $lang['Edit'] . '"></a>';
! 
! 						$temp_url = append_sid( "admin_kb.$phpEx?action=types_manage&mode=delete&amp;cat=$type_id" );
! 						$delete = '<a href="' . $temp_url . '"><img src="' . $images['kb_icon_delpost'] . '" border="0" alt="' . $lang['Delete'] . '"></a>';
! 					}
  
  
  					$row_color = ( !( $i % 2 ) ) ? $theme['td_color1'] : $theme['td_color2'];

Index: admin_custom_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/admin/admin_custom_manage.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** admin_custom_manage.php	13 Aug 2006 19:43:07 -0000	1.3
--- admin_custom_manage.php	28 Jan 2008 03:09:27 -0000	1.3.2.1
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $mx_images, $template, $lang, $phpEx, $mx_kb_functions, $mx_kb_cache, $kb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//

[mxbb-commits] mx_kb/kb/modules/tabs kb__tab-view.php,1.2,1.2.2.1

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

Update of /cvsroot/mxbb/mx_kb/kb/modules/tabs
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21661/kb/modules/tabs

Modified Files:
      Tag: core28x
	kb__tab-view.php 
Log Message:
phpBB2 switches

Index: kb__tab-view.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/tabs/kb__tab-view.php,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** kb__tab-view.php	22 Jul 2007 21:05:45 -0000	1.2
--- kb__tab-view.php	28 Jan 2008 03:09:28 -0000	1.2.2.1
***************
*** 34,37 ****
--- 34,38 ----
  // Load and instatiate page and block classes
  //
+ $mx_page = new mx_page();
  $mx_page->init( $page_id );
  $mx_block = new mx_block();

[mxbb-commits] mx_kb/kb kb_common.php,1.9,1.9.2.1

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

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

Modified Files:
      Tag: core28x
	kb_common.php 
Log Message:
phpBB2 switches

Index: kb_common.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/kb_common.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** kb_common.php	13 Aug 2006 19:43:07 -0000	1.9
--- kb_common.php	28 Jan 2008 03:09:28 -0000	1.9.2.1
***************
*** 75,79 ****
  // - Class mx_text_formatting
  //
! include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
  
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
--- 75,204 ----
  // - Class mx_text_formatting
  //
! 
! if ( !MXBB_MODULE )
! {
! 	include_once( $mx_mod_path . 'includes/functions_tools.' . $phpEx );
! }
! else
! {
! 	include_once( $mx_root_path . 'includes/mx_functions_tools.' . $phpEx );
! }
! 
! // **********************************************************************
! // If phpBB mod read language definition
! // **********************************************************************
! 
! if ( !MXBB_MODULE )
! {
! 	if ( !file_exists( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'kb/language/lang_english/lang_main.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_main.' . $phpEx );
! 	}
! }
! 
! // **********************************************************************
! //  If phpBB mod read theme definition and language in theme definition
! // **********************************************************************
! if ( !MXBB_MODULE )
! {
! 	$sql = 'SELECT *
! 		FROM ' . THEMES_TABLE . '
! 		WHERE themes_id = ' . (int) $userdata['user_style'];
! 	if ( !($result = $db->sql_query($sql)) )
! 	{
! 		message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 	}
! 
! 	if ( $row = $db->sql_fetchrow($result) )
! 	{
! 		$db->sql_freeresult($result);
! 		$template_name = $row['template_name'] ;
! 	}
! 	else
! 	{
! 		// We are trying to setup a style which does not exist in the database
! 		// Try to fallback to the board default (if the user had a custom style)
! 		// and then any users using this style to the default if it succeeds
! 		if ( $userdata['user_style'] != $board_config['default_style'])
! 		{
! 			$sql = 'SELECT *
! 				FROM ' . THEMES_TABLE . '
! 				WHERE themes_id = ' . (int) $board_config['default_style'];
! 			if ( !($result = $db->sql_query($sql)) )
! 			{
! 				message_die(CRITICAL_ERROR, 'Could not query database for theme info');
! 			}
! 
! 			if ( $row = $db->sql_fetchrow($result) )
! 			{
! 				$db->sql_freeresult($result);
! 				$template_name = $row['template_name'] ;
! 			}
! 			else
! 			{
! 				message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 			}
! 		}
! 		else
! 		{
! 			message_die(CRITICAL_ERROR, "Could not get theme data for themes_id [$style]");
! 		}
! 	}
! 
! 	$template_path = 'templates/' ;
! 	//$template_name = $row['template_name'] ;
! 
! 	//$template = new Template($phpbb_root_path . $template_path . $template_name);
! 
! 	if ( $template )
! 	{
! 		$current_template_path = $template_path . $template_name;
! 	}
! 	else
! 	{
! 		$current_template_path = $template_path . 'subSilver';
! 	}
! 
! 	// -------------------------------------------------------------------------
! 	// Prefix with PORTAL_URL
! 	// -------------------------------------------------------------------------
! 	$current_template_images = $phpbb_root_path . $current_template_path . "/images";
! }
! 
! if ( !(MXBB_MODULE) || ($images['kb_icon_edit'] == '') ) 
! {
! 	if (!MXBB_MODULE) 
! 	{
! 		@include($phpbb_root_path . $template_path . $template_name . '/' . 'kb.cfg');
! 	}
! 	else
! 	{
! 		include($module_root_path . $mx_user->current_template_path . '/' . $mx_user->template_name . '.cfg');
! 	}
! 	$img_lang = ( file_exists($phpbb_root_path . $current_template_path . '/images/lang_' . $board_config['default_lang']) ) ? $board_config['default_lang'] : 'english';
! 
! 	while( list($key, $value) = @each($mx_images) )
! 	{
! 		if (is_array($value))
! 		{
! 			foreach( $value as $key2 => $val2 )
! 			{
! 				$images[$key][$key2] = $val2;
! 				$mx_images[$key][$key2] = $val2;
! 			}
! 		}
! 		else
! 		{
! 			$images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 			$mx_images[$key] = str_replace('{LANG}', 'lang_' . $img_lang, $value);
! 			//$mx_images[$key] = str_replace('admin/templates/','templates/',$mx_images[$key]);
! 		}
! 
! 	}
! }
  
  include_once( $module_root_path . 'kb/includes/functions.' . $phpEx );
***************
*** 104,108 ****
  if ( $kb_config['wysiwyg'] ) // Html Textblock
  {
! 	if ( file_exists( $mx_root_path . 'modules/mx_shared/tinymce/jscripts/tiny_mce/blank.htm' ) )
  	{
  		$bbcode_on = false;
--- 229,233 ----
  if ( $kb_config['wysiwyg'] ) // Html Textblock
  {
! 	if ( @file_exists($mx_root_path . $kb_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/tiny_mce.js') )
  	{
  		$bbcode_on = false;

[mxbb-commits] mx_kb/kb/modules kb_post.php,1.12,1.12.2.1

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

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

Modified Files:
      Tag: core28x
	kb_post.php 
Log Message:
phpBB2 switches

Index: kb_post.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_post.php,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** kb_post.php	5 Aug 2007 22:08:47 -0000	1.12
--- kb_post.php	28 Jan 2008 03:09:28 -0000	1.12.2.1
***************
*** 170,174 ****
  		// wysiwyg
  		//
! 		if ( $kb_config['allow_wysiwyg'] && file_exists( $mx_root_path . $kb_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/blank.htm' ))
  		{
  			$allow_wysiwyg = true;
--- 170,174 ----
  		// wysiwyg
  		//
! 		if ( $kb_config['allow_wysiwyg'] && @file_exists( $mx_root_path . $kb_config['wysiwyg_path'] . 'tinymce/jscripts/tiny_mce/tiny_mce.js' ))
  		{
  			$allow_wysiwyg = true;

[mxbb-commits] mx_kb/kb/includes functions_admin.php, 1.8, 1.8.2.1 functions_mx.php, 1.5, 1.5.2.1 kb_constants.php, 1.7, 1.7.2.1

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

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

Modified Files:
      Tag: core28x
	functions_admin.php functions_mx.php kb_constants.php 
Log Message:
phpBB2 switches

Index: functions_admin.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_admin.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** functions_admin.php	1 Aug 2006 21:00:37 -0000	1.8
--- functions_admin.php	28 Jan 2008 03:09:27 -0000	1.8.2.1
***************
*** 51,55 ****
  	function admin_cat_main( $cat_parent = 0, $depth = 0 )
  	{
! 		global $phpbb_root_path, $template, $phpEx, $lang, $images, $module_root_path, $theme;
  
  		$pre = str_repeat( '        ', $depth );
--- 51,55 ----
  	function admin_cat_main( $cat_parent = 0, $depth = 0 )
  	{
! 		global $phpbb_root_path, $template, $phpEx, $lang, $images, $mx_images, $module_root_path, $theme;
  
  		$pre = str_repeat( '        ', $depth );

Index: kb_constants.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/kb_constants.php,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** kb_constants.php	28 Jun 2006 20:52:30 -0000	1.7
--- kb_constants.php	28 Jan 2008 03:09:27 -0000	1.7.2.1
***************
*** 33,37 ****
  // This file defines specific constants for the module
  // -------------------------------------------------------------------------
! define( 'PAGE_KB', -501 );
  define( 'KB_ARTICLES_TABLE', $mx_table_prefix . 'kb_articles' );
  define( 'KB_CATEGORIES_TABLE', $mx_table_prefix . 'kb_categories' );
--- 33,37 ----
  // This file defines specific constants for the module
  // -------------------------------------------------------------------------
! define( 'PAGE_KB', -503 );
  define( 'KB_ARTICLES_TABLE', $mx_table_prefix . 'kb_articles' );
  define( 'KB_CATEGORIES_TABLE', $mx_table_prefix . 'kb_categories' );
***************
*** 61,65 ****
  if ( !MXBB_MODULE || MXBB_27x )
  {
! 	$kb_module_version = "Knowledge Base MOD v. 2.0.x";
  	$kb_module_author = "Haplo/Jon";
  	$kb_module_orig_author = "wGEric";
--- 61,65 ----
  if ( !MXBB_MODULE || MXBB_27x )
  {
! 	$kb_module_version = "Knowledge Base MOD v. 2.1.0b";
  	$kb_module_author = "Haplo/Jon";
  	$kb_module_orig_author = "wGEric";
***************
*** 76,80 ****
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		$mx_user->extend();
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );
--- 76,80 ----
  		// - IMAGES: MX_IMAGES (default), MX_IMAGES_NONE
  		// -------------------------------------------------------------------------
! 		$mx_user->extend(MX_LANG_MAIN , MX_IMAGES);
  
  		$mx_page->add_copyright( 'mxBB Knowledge Base Module' );

Index: functions_mx.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/functions_mx.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** functions_mx.php	7 Jun 2006 20:28:54 -0000	1.5
--- functions_mx.php	28 Jan 2008 03:09:27 -0000	1.5.2.1
***************
*** 68,72 ****
  	function mx_message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
  	{
! 		global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images;
  		global $userdata, $user_ip, $session_length;
  		global $starttime;
--- 68,72 ----
  	function mx_message_die($msg_code, $msg_text = '', $msg_title = '', $err_line = '', $err_file = '', $sql = '')
  	{
! 		global $db, $template, $board_config, $theme, $lang, $phpEx, $phpbb_root_path, $nav_links, $gen_simple_header, $images, $mx_images;
  		global $userdata, $user_ip, $session_length;
  		global $starttime;

[mxbb-commits] mx_kb/kb/includes/js init_view.js,1.2,1.2.2.1

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

Update of /cvsroot/mxbb/mx_kb/kb/includes/js
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv21661/kb/includes/js

Modified Files:
      Tag: core28x
	init_view.js 
Log Message:
phpBB2 switches

Index: init_view.js
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/includes/js/init_view.js,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** init_view.js	6 Aug 2007 21:13:10 -0000	1.2
--- init_view.js	28 Jan 2008 03:09:27 -0000	1.2.2.1
***************
*** 34,37 ****
--- 34,56 ----
  		generateParentTOC('view');
  		dhtmlHistory.add( treeGetId(),  el(tree.active+"-text").innerHTML  );
+ 
+ 		//queryPath = tree.getActiveNode().id;
+ 		//tree.queryPath = queryPath.replace('tree-', "");
+ 		//tree.active = queryPath;
+ 		//tree.loadState();
+ 		//tree.updateHtml();
+ 
+ 		//if (tree.getActiveNode().childNodes) {
+ 			//for (var i = 0; i < tree.getActiveNode().childNodes.length; i++) {
+ 				//if (tree.getActiveNode().childNodes[i].isDocument()) {
+ 					//queryPath = tree.getActiveNode().childNodes[i].id;
+ 					//tree.queryPath = queryPath.replace('tree-', "");
+ 					//tree.active = queryPath;
+ 				  	//tree.loadState();
+ 				  	//tree.updateHtml();
+ 				  	//break;
+ 				//}
+ 			//}
+ 		//}
  	}
  });
***************
*** 54,58 ****
  	  	initialLocation = articlePath;
  	  }
- 
  	  // if no location specified, use the default
  	  else if ((initialLocation == '' || initialLocation == null) && tree.allNodes[0])
--- 73,76 ----
***************
*** 73,77 ****
  	  		queryPath = tree.allNodes[0].id;
  	  	}
- 
  		initialLocation = queryPath.replace('tree-', "");
  	  }
--- 91,94 ----

[mxbb-commits] mx_kb/admin admin_kb.php,1.5,1.5.2.1

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

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

Modified Files:
      Tag: core28x
	admin_kb.php 
Log Message:
phpBB2 switches

Index: admin_kb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/admin/admin_kb.php,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** admin_kb.php	22 Aug 2006 20:22:47 -0000	1.5
--- admin_kb.php	28 Jan 2008 03:09:27 -0000	1.5.2.1
***************
*** 20,23 ****
--- 20,24 ----
  	//
  	$phpbb_root_path = $module_root_path = $mx_root_path = "./../";
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
  	//
***************
*** 28,31 ****
--- 29,39 ----
  
  	require_once( $phpbb_root_path . 'extension.inc' );
+ 	require_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
+ 	require_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );
+ 	
+ 	//
+ 	// instatiate the mx_request_vars class
+ 	//
+ 	$mx_request_vars = new mx_request_vars();
  }
  else
***************
*** 38,42 ****
  	//
  	$mx_root_path = './../../../';
! 	$module_root_path = './../../../modules/mx_kb/';
  
  	//
--- 46,50 ----
  	//
  	$mx_root_path = './../../../';
! 	$module_root_path = $mx_root_path. 'modules/mx_kb/';
  
  	//
***************
*** 52,60 ****
  }
  
- 
  if ( !empty( $setmodules ) )
  {
- 	include_once( $setmodules_root_path . $setmodules_module_path . 'kb/includes/kb_constants.' . $phpEx );
- 
  	$filename = basename( __FILE__ );
  	$module['KB_title']['1_Configuration'] 	= $setmodules_admin_path . $filename . "?action=settings";
--- 60,65 ----
***************
*** 70,74 ****
  // Includes
  //
! require( $mx_root_path . '/admin/pagestart.' . $phpEx );
  include( $module_root_path . 'kb/kb_common.' . $phpEx );
  
--- 75,79 ----
  // Includes
  //
! require( $mx_root_path . 'admin/pagestart.' . $phpEx );
  include( $module_root_path . 'kb/kb_common.' . $phpEx );
  
***************
*** 76,86 ****
  // Read language definition
  // **********************************************************************
! if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
  {
! 	include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
  }
  else
  {
! 	include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
  }
  
--- 81,105 ----
  // Read language definition
  // **********************************************************************
! if ( !MXBB_MODULE )
  {
! 	if ( !file_exists( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'kb/language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'kb/language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }
  else
  {
! 	if ( !file_exists( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx ) )
! 	{
! 		include( $module_root_path . 'language/lang_english/lang_admin.' . $phpEx );
! 	}
! 	else
! 	{
! 		include( $module_root_path . 'language/lang_' . $board_config['default_lang'] . '/lang_admin.' . $phpEx );
! 	}
  }
  

[mxbb-commits] mx_linkdb/linkdb/modules link_link.php, 1.9, 1.9.2.1 link_lists.php, 1.3, 1.3.2.1 link_post_comment.php, 1.3, 1.3.2.1

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

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

Modified Files:
      Tag: core28x
	link_link.php link_lists.php link_post_comment.php 
Log Message:
phpBB2 switches

Index: link_link.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_link.php,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** link_link.php	13 Aug 2006 19:43:51 -0000	1.9
--- link_link.php	28 Jan 2008 03:08:25 -0000	1.9.2.1
***************
*** 27,31 ****
  	function main( $action )
  	{
! 		global $template, $lang, $board_config, $phpEx, $link_config, $db, $images, $user_ip;
  		global $phpbb_root_path, $userdata, $db, $linkdb_functions;
  		global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars;
--- 27,31 ----
  	function main( $action )
  	{
! 		global $template, $lang, $board_config, $phpEx, $link_config, $db, $images, $user_ip, $mx_images;
  		global $phpbb_root_path, $userdata, $db, $linkdb_functions;
  		global $mx_root_path, $module_root_path, $is_block, $phpEx, $mx_request_vars;


Index: link_lists.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb/modules/link_lists.php,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** link_lists.php	15 Aug 2006 19:43:28 -0000	1.3
--- link_lists.php	28 Jan 2008 03:08:25 -0000	1.3.2.1
***************
*** 125,129 ****
  		$filelist = false;
  
! 		$template->set_filenames( array( 'body' => 'link_lists.tpl' ) );
  
  		$sort_options_list = unserialize($toplist_config['toplist_display_options']);
--- 125,139 ----
  		$filelist = false;
  
! 		if ( !MXBB_MODULE )
! 		{
! 			$template->set_filenames( array( 'linkdb_lits_output' => 'link_lists.tpl' ) );
! 			$block_pagination = generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'link_start');
! 		}
! 		else
! 		{
! 			$template->set_filenames( array( 'body' => 'link_lists.tpl' ) );
! 			$block_pagination = mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'link_start');
! 		}
! 
  
  		$sort_options_list = unserialize($toplist_config['toplist_display_options']);
***************
*** 135,139 ****
  			'LINK' => $linkdb_config['module_name'],
  
! 			'BLOCK_PAGINATION' => mx_generate_pagination(append_sid( $this->this_mxurl( '', false, false ) ), $total_num_items, $toplist_config['toplist_pagination'], $start, true, true, true, false, 'link_start'),
  		));
  
--- 145,149 ----
  			'LINK' => $linkdb_config['module_name'],
  
! 			'BLOCK_PAGINATION' => $block_pagination,
  		));
  

[mxbb-commits] mx_linkdb/templates/subSilver link_header.tpl, 1.2, 1.2.2.1 link_main_body.tpl, 1.7, 1.7.2.1 subSilver.cfg, 1.5, 1.5.2.1

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

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

Modified Files:
      Tag: core28x
	link_header.tpl link_main_body.tpl subSilver.cfg 
Log Message:
phpBB2 switches

Index: subSilver.cfg
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/Attic/subSilver.cfg,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -C2 -d -r1.5 -r1.5.2.1
*** subSilver.cfg	4 Aug 2006 16:31:34 -0000	1.5
--- subSilver.cfg	28 Jan 2008 03:08:25 -0000	1.5.2.1
***************
*** 46,48 ****
--- 46,50 ----
  $mx_images['linkdb_icon_delpost'] 		= $images['icon_delpost'];
  
+ $images['linkdb_link_new']			= "$current_template_images/icon_link_new.gif";
+ 
  ?>
\ No newline at end of file

Index: link_main_body.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/Attic/link_main_body.tpl,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -C2 -d -r1.7 -r1.7.2.1
*** link_main_body.tpl	15 Aug 2006 08:37:48 -0000	1.7
--- link_main_body.tpl	28 Jan 2008 03:08:25 -0000	1.7.2.1
***************
*** 1,8 ****
  <table width="100%" cellpadding="2" cellspacing="0" border="0">
!   <tr>
! 	<td valign="bottom" colspan="2">
! 		<span class="nav"><a href="{U_LINK}" class="nav">{LINKS}</a></span>
! 	</td>
!   </tr>
  </table>
  
--- 1,8 ----
  <table width="100%" cellpadding="2" cellspacing="0" border="0">
! 	<tr>
! 		<td align="left" valign="bottom" colspan="2" class="nav">
! 			<a href="{U_PORTAL}" class="nav">{L_PORTAL}</a>  &nbsp;&raquo;&nbsp; <span class="nav"><a href="{U_LINK}" class="nav">{LINKS}</span></a>
! 		</td>
! 	</tr>
  </table>
  

Index: link_header.tpl
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/templates/subSilver/Attic/link_header.tpl,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -C2 -d -r1.2 -r1.2.2.1
*** link_header.tpl	1 Aug 2006 21:02:20 -0000	1.2
--- link_header.tpl	28 Jan 2008 03:08:25 -0000	1.2.2.1
***************
*** 3,7 ****
  	<td align="center" width="100%" height="100%" valign="top">
  
! 		<table width="100%" cellpadding="3" cellspacing="1" class="forumline" style="border-top:none;">
  		  <tr>
  			<td align="center" class="row1">
--- 3,7 ----
  	<td align="center" width="100%" height="100%" valign="top">
  
! 		<table width="100%" cellpadding="3" cellspacing="1" class="forumline">
  		  <tr>
  			<td align="center" class="row1">

[mxbb-commits] mx_linkdb db_install.php, 1.22, 1.22.2.1 db_upgrade.php, 1.25, 1.25.2.1 linkdb.php, 1.13, 1.13.2.1

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

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

Modified Files:
      Tag: core28x
	db_install.php db_upgrade.php linkdb.php 
Log Message:
phpBB2 switches

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/db_upgrade.php,v
retrieving revision 1.25
retrieving revision 1.25.2.1
diff -C2 -d -r1.25 -r1.25.2.1
*** db_upgrade.php	22 Jul 2007 21:06:05 -0000	1.25
--- db_upgrade.php	28 Jan 2008 03:08:24 -0000	1.25.2.1
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.3';
  $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 mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.2';
  $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 mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
***************
*** 212,216 ****
  
  	$message .= mx_do_install_upgrade( $sql );
- 	$message .= "<b>...Now upgraded to v. $mx_module_version :-)</b><br/><br/>";
  
  	//
--- 212,215 ----

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/db_install.php,v
retrieving revision 1.22
retrieving revision 1.22.2.1
diff -C2 -d -r1.22 -r1.22.2.1
*** db_install.php	22 Jul 2007 21:06:05 -0000	1.22
--- db_install.php	28 Jan 2008 03:08:24 -0000	1.22.2.1
***************
*** 30,34 ****
  }
  
! $mx_module_version = '2.2.3';
  $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 mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  
--- 30,34 ----
  }
  
! $mx_module_version = '2.2.2';
  $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 mxBB by <a href="http://www.mxbb.net" target="_blank">Jon</a>';
  

Index: linkdb.php
===================================================================
RCS file: /cvsroot/mxbb/mx_linkdb/linkdb.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -d -r1.13 -r1.13.2.1
*** linkdb.php	13 Aug 2006 19:43:51 -0000	1.13
--- linkdb.php	28 Jan 2008 03:08:24 -0000	1.13.2.1
***************
*** 15,21 ****
--- 15,23 ----
  	define( 'IN_PORTAL', true );
  	define( 'IN_DOWNLOAD', true );
+ 	define( 'IN_LINKS', true );
  
  	// When run as a phpBB mod these paths are identical ;)
  	$phpbb_root_path = $module_root_path = $mx_root_path = './';
+ 	$mx_mod_path = $phpbb_root_path . 'mx_mod/';
  
  	$phpEx = substr(strrchr(__FILE__, '.'), 1);
***************
*** 24,34 ****
  	include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
  	include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
  
! 	define( 'PAGE_DOWNLOAD', -501 ); // If this id generates a conflict with other mods, change it ;)
  
  	// Start session management
! 	$userdata = session_pagestart( $user_ip, PAGE_DOWNLOAD );
  	init_userprefs( $userdata );
  	// End session management
  }
  else
--- 26,55 ----
  	include_once( $phpbb_root_path . 'includes/bbcode.' . $phpEx );
  	include_once( $phpbb_root_path . 'includes/functions_post.' . $phpEx );
+ 	include_once( $mx_mod_path . 'includes/functions_required.' . $phpEx );
+ 	include_once( $mx_mod_path . 'includes/functions_core.' . $phpEx );
  
! 	define( 'PAGE_LINKS', -502 ); // If this id generates a conflict with other mods, change it ;)
  
  	// Start session management
! 	$userdata = session_pagestart( $user_ip, PAGE_LINKS );
  	init_userprefs( $userdata );
  	// End session management
+ 	//
+ 	// Instatiate the mx_cache class
+ 	//
+ 	$mx_cache = new mx_cache();
+ 
+ 	//
+ 	// Get mxBB config settings
+ 	//
+ 	$portal_config = $mx_cache->obtain_mxbb_config();
+ 
+ 	//
+ 	// instatiate the mx_request_vars class
+ 	//
+ 	$mx_request_vars = new mx_request_vars();
+ 
+ 	$is_block = false;
+ 	global $images, $mx_images;
  }
  else
***************
*** 135,138 ****
--- 156,164 ----
  	'main' => 'main' );
  
+ if ( !MXBB_MODULE )
+ {
+ 	$page_title = $lang['LinkDb_title'];
+ }
+ 
  //
  // Lets Build the page
***************
*** 153,156 ****
--- 179,189 ----
  $template->set_filenames( array( 'body' => $linkdb_tpl_name ) );
  
+ $template->assign_vars( array(
+ 	'U_PORTAL' => $mx_root_path,
+ 	'L_PORTAL' => "<<",
+ 	'U_KB' => append_sid( $linkdb->this_mxurl() ),
+ 	'L_KB' => $lang['LinkDb_title']  )
+ );
+ 
  $template->pparse( 'body' );