[mxbb-commits] mx_faq db_install.php, 1.3, 1.4 db_upgrade.php, 1.3, 1.4 faq.php, 1.4, 1.5 rules.php, 1.4, 1.5

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

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

Modified Files:
	db_install.php db_upgrade.php faq.php rules.php 
Log Message:
updated...

Index: rules.php
===================================================================
RCS file: /cvsroot/mxbb/mx_faq/rules.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rules.php	1 Feb 2008 04:31:12 -0000	1.4
--- rules.php	9 Feb 2008 00:00:45 -0000	1.5
***************
*** 83,89 ****
  //+MOD: DHTML Collapsible FAQ MOD
  	'U_CFAQ_JSLIB' => $module_root_path . 'templates/collapsible_faq.js',
! 	'L_CFAQ_NOSCRIPT' => sprintf($lang['dhtml_faq_noscript'], ('<a href="'.append_sid("faq.$phpEx?dhtml=no".(isset($HTTP_GET_VARS['mode']) ? '&amp;mode='.$HTTP_GET_VARS['mode'] : '')).'">'), '</a>'),
  //-MOD: DHTML Collapsible FAQ MOD
! 	'L_FAQ_TITLE' => $l_title, 
  	'L_BACK_TO_TOP' => $lang['Back_to_top'])
  );
--- 83,89 ----
  //+MOD: DHTML Collapsible FAQ MOD
  	'U_CFAQ_JSLIB' => $module_root_path . 'templates/collapsible_faq.js',
! 	'L_CFAQ_NOSCRIPT' => sprintf($lang['dhtml_faq_noscript'], ('<a href="'.mx_append_sid("faq.$phpEx?dhtml=no".(isset($HTTP_GET_VARS['mode']) ? '&amp;mode='.$HTTP_GET_VARS['mode'] : '')).'">'), '</a>'),
  //-MOD: DHTML Collapsible FAQ MOD
! 	'L_FAQ_TITLE' => $l_title,
  	'L_BACK_TO_TOP' => $lang['Back_to_top'])
  );
***************
*** 96,100 ****
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
! 		$template->assign_block_vars('faq_block_link', array( 
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
--- 96,100 ----
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
! 		$template->assign_block_vars('faq_block_link', array(
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
***************
*** 108,113 ****
  				'ROW_COLOR'	=> '#' . $row_color,
  				'ROW_CLASS'	=> $row_class,
! 				'FAQ_QUESTION'	=> $faq_block[$i][$j]['question'], 
! 				'FAQ_ANSWER'	=> $faq_block[$i][$j]['answer'], 
  
  				'U_FAQ_ID'	=> $faq_block[$i][$j]['id'])
--- 108,113 ----
  				'ROW_COLOR'	=> '#' . $row_color,
  				'ROW_CLASS'	=> $row_class,
! 				'FAQ_QUESTION'	=> $faq_block[$i][$j]['question'],
! 				'FAQ_ANSWER'	=> $faq_block[$i][$j]['answer'],
  
  				'U_FAQ_ID'	=> $faq_block[$i][$j]['id'])
***************
*** 117,121 ****
  				'ROW_COLOR'	=> '#' . $row_color,
  				'ROW_CLASS'	=> $row_class,
! 				'FAQ_LINK'	=> $faq_block[$i][$j]['question'], 
  
  				'U_FAQ_LINK'	=> '#' . $faq_block[$i][$j]['id'])
--- 117,121 ----
  				'ROW_COLOR'	=> '#' . $row_color,
  				'ROW_CLASS'	=> $row_class,
! 				'FAQ_LINK'	=> $faq_block[$i][$j]['question'],
  
  				'U_FAQ_LINK'	=> '#' . $faq_block[$i][$j]['id'])
***************
*** 127,129 ****
  $template->pparse('body');
  
! ?>
--- 127,129 ----
  $template->pparse('body');
  
! ?>
\ No newline at end of file

Index: faq.php
===================================================================
RCS file: /cvsroot/mxbb/mx_faq/faq.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** faq.php	1 Feb 2008 04:31:12 -0000	1.4
--- faq.php	9 Feb 2008 00:00:45 -0000	1.5
***************
*** 31,43 ****
  $b_description = $mx_block->block_info['block_desc'];
  
! $page1 = intval($HTTP_GET_VARS['page']); 
! if ( $page1 > 0 ) 
! { 
!    $page = $page1; 
  
! } 
! else 
! { 
!    $page = 1; 
  
  }
--- 31,43 ----
  $b_description = $mx_block->block_info['block_desc'];
  
! $page1 = intval($HTTP_GET_VARS['page']);
! if ( $page1 > 0 )
! {
!    $page = $page1;
  
! }
! else
! {
!    $page = 1;
  
  }
***************
*** 138,154 ****
  
  $template->assign_vars(array(
! 	'U_PORTAL_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=portal", 
! 	'L_PORTAL_FAQ' => $lang['Mx_Portal_faq'], 
! 	'U_MODULE_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=module", 
! 	'L_MODULE_FAQ' => $lang['Mx_Module_faq'], 
! 	'U_FORUM_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=forum",  
! 	'L_FORUM_FAQ' => $lang['Forum_faq'], 
! 	'U_BBCODE_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=bbcode", 
! 	'L_BBCODE_FAQ' => $lang['BBcode_faq'], 
  //+MOD: DHTML Collapsible FAQ MOD
  	'U_CFAQ_JSLIB' => $module_root_path . 'templates/collapsible_faq.js',
! 	'L_CFAQ_NOSCRIPT' => sprintf($lang['dhtml_faq_noscript'], ('<a href="'.append_sid("faq.$phpEx?dhtml=no".(isset($HTTP_GET_VARS['mode']) ? '&amp;mode='.$HTTP_GET_VARS['mode'] : '')).'">'), '</a>'),
  //-MOD: DHTML Collapsible FAQ MOD
! 	'L_FAQ_TITLE' => $l_title, 
  	'L_BACK_TO_TOP' => $lang['Back_to_top'])
  );
--- 138,154 ----
  
  $template->assign_vars(array(
! 	'U_PORTAL_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=portal",
! 	'L_PORTAL_FAQ' => $lang['Mx_Portal_faq'],
! 	'U_MODULE_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=module",
! 	'L_MODULE_FAQ' => $lang['Mx_Module_faq'],
! 	'U_FORUM_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=forum",
! 	'L_FORUM_FAQ' => $lang['Forum_faq'],
! 	'U_BBCODE_FAQ' => $mx_root_path ."index.$phpEx?page=$page&mode=bbcode",
! 	'L_BBCODE_FAQ' => $lang['BBcode_faq'],
  //+MOD: DHTML Collapsible FAQ MOD
  	'U_CFAQ_JSLIB' => $module_root_path . 'templates/collapsible_faq.js',
! 	'L_CFAQ_NOSCRIPT' => sprintf($lang['dhtml_faq_noscript'], ('<a href="'.mx_append_sid("faq.$phpEx?dhtml=no".(isset($HTTP_GET_VARS['mode']) ? '&amp;mode='.$HTTP_GET_VARS['mode'] : '')).'">'), '</a>'),
  //-MOD: DHTML Collapsible FAQ MOD
! 	'L_FAQ_TITLE' => $l_title,
  	'L_BACK_TO_TOP' => $lang['Back_to_top'])
  );
***************
*** 161,165 ****
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
! 		$template->assign_block_vars('faq_block_link', array( 
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
--- 161,165 ----
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
! 		$template->assign_block_vars('faq_block_link', array(
  			'BLOCK_TITLE' => $faq_block_titles[$i])
  		);
***************
*** 173,178 ****
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_QUESTION' => $faq_block[$i][$j]['question'], 
! 				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'], 
  
  				'U_FAQ_ID' => $faq_block[$i][$j]['id'])
--- 173,178 ----
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_QUESTION' => $faq_block[$i][$j]['question'],
! 				'FAQ_ANSWER' => $faq_block[$i][$j]['answer'],
  
  				'U_FAQ_ID' => $faq_block[$i][$j]['id'])
***************
*** 182,186 ****
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_LINK' => $faq_block[$i][$j]['question'], 
  
  				'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])
--- 182,186 ----
  				'ROW_COLOR' => '#' . $row_color,
  				'ROW_CLASS' => $row_class,
! 				'FAQ_LINK' => $faq_block[$i][$j]['question'],
  
  				'U_FAQ_LINK' => '#' . $faq_block[$i][$j]['id'])

Index: db_install.php
===================================================================
RCS file: /cvsroot/mxbb/mx_faq/db_install.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_install.php	1 Feb 2008 04:21:24 -0000	1.3
--- db_install.php	9 Feb 2008 00:00:45 -0000	1.4
***************
*** 51,53 ****
  echo "</table><br />";
  
! ?>
--- 51,53 ----
  echo "</table><br />";
  
! ?>
\ No newline at end of file

Index: db_upgrade.php
===================================================================
RCS file: /cvsroot/mxbb/mx_faq/db_upgrade.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** db_upgrade.php	1 Feb 2008 04:21:24 -0000	1.3
--- db_upgrade.php	9 Feb 2008 00:00:45 -0000	1.4
***************
*** 51,53 ****
  echo "</table><br />";
  
! ?>
--- 51,53 ----
  echo "</table><br />";
  
! ?>
\ No newline at end of file