[mxbb-commits] mx_kb/kb/modules kb_article.php, 1.14, 1.15 kb_search.php, 1.8, 1.9

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

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

Modified Files:
	kb_article.php kb_search.php 
Log Message:
Bugfixes...

Index: kb_search.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_search.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** kb_search.php	16 May 2007 19:37:44 -0000	1.8
--- kb_search.php	5 Jun 2007 21:21:51 -0000	1.9
***************
*** 31,47 ****
  		global $mx_root_path, $module_root_path, $is_block, $phpEx;
  
- 		/*
- 		if ( !$this->auth_global['auth_search'] )
- 		{
- 			if ( !$userdata['session_logged_in'] )
- 			{
- 				// mx_redirect(append_sid($mx_root_path . "login.$phpEx?redirect=".$this->this_mxurl("action=stats"), true));
- 			}
- 
- 			$message = sprintf( $lang['Sorry_auth_search'], $this->auth_global['auth_search_type'] );
- 			mx_message_die( GENERAL_MESSAGE, $message );
- 		}
- 		*/
- 
  		include_once( $phpbb_root_path . 'includes/functions_search.' . $phpEx );
  
--- 31,34 ----
***************
*** 97,112 ****
  					//$sort_method = 'article_rating';
  					break;
- 				/*
- 				case 'file_update_time':
- 					$sort_method = 'file_update_time';
- 					break;
- 				*/
  				default:
! 					$sort_method = $kb_config['sort_method'];
  			}
  		}
  		else
  		{
! 			$sort_method = $kb_config['sort_method'];
  		}
  
--- 84,134 ----
  					//$sort_method = 'article_rating';
  					break;
  				default:
! 					switch ( $kb_config['sort_method'] )
! 					{
! 						case 'Id':
! 						$sort_method = 'article_id';
! 							break;
! 						case 'Latest':
! 						$sort_method = 'article_date';
! 							break;
! 						case 'Toprated':
! 						$sort_method = 'rating';
! 							break;
! 						case 'Most_popular':
! 						$sort_method = 'views';
! 							break;
! 						case 'Userrank':
! 						$sort_method = 'user_rank';
! 							break;
! 						case 'Alphabetic':
! 						$sort_method = 'article_title';
! 							break;
! 					}
  			}
  		}
  		else
  		{
! 			switch ( $kb_config['sort_method'] )
! 			{
! 				case 'Id':
! 				$sort_method = 'article_id';
! 					break;
! 				case 'Latest':
! 				$sort_method = 'article_date';
! 					break;
! 				case 'Toprated':
! 				$sort_method = 'rating';
! 					break;
! 				case 'Most_popular':
! 				$sort_method = 'views';
! 					break;
! 				case 'Userrank':
! 				$sort_method = 'user_rank';
! 					break;
! 				case 'Alphabetic':
! 				$sort_method = 'article_title';
! 					break;
! 			}
  		}
  

Index: kb_article.php
===================================================================
RCS file: /cvsroot/mxbb/mx_kb/kb/modules/kb_article.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** kb_article.php	28 Apr 2007 19:59:05 -0000	1.14
--- kb_article.php	5 Jun 2007 21:21:51 -0000	1.15
***************
*** 30,33 ****
--- 30,34 ----
  		global $phpbb_root_path, $mx_root_path, $module_root_path, $is_block, $phpEx, $images;
  		global $mx_kb_custom_field, $mx_kb_functions, $print_version, $board_config, $mx_block;
+ 		global $page_id;
  
  		//
***************
*** 320,324 ****
  					$article_toc = trim($art_split[0]);
  
! 					//$article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed
  					$article_toc = $mx_text->display($article_toc, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS ));
  					$article_toc = strip_tags($article_toc);
--- 321,325 ----
  					$article_toc = trim($art_split[0]);
  
! 					$article_toc = preg_replace( "'\[[\/\!]*?[^\[\]]*?\]'si", "", $article_toc ); // Fixed
  					$article_toc = $mx_text->display($article_toc, $mx_block->get_parameters( 'Text', MX_GET_PAR_OPTIONS ));
  					$article_toc = strip_tags($article_toc);
***************
*** 326,330 ****
  					if( $page_num != $i )
  					{
! 						$temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&mode=pagination&page_num=$page_number" . $xtra_dynamic);
  						$page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>';
  					}
--- 327,331 ----
  					if( $page_num != $i )
  					{
! 						$temp_url = append_sid(PORTAL_URL . "index.php?page=$page_id&amp;mode=article&amp;k=$article_id&amp;page_num=$page_number" . $xtra_dynamic);
  						$page_link = '<a href="' . $temp_url . '" class="nav">' . $page_number . ' - ' . $article_toc . '</a>';
  					}