[mxbb-commits] mx_pafiledb/pafiledb/admin admin_cat_manage.php, 1.4, 1.5 admin_settings.php, 1.5, 1.6

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

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

Modified Files:
	admin_cat_manage.php admin_settings.php 
Log Message:
general updates...
tinymce support updated

Index: admin_cat_manage.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_cat_manage.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** admin_cat_manage.php	9 Sep 2007 20:16:16 -0000	1.4
--- admin_cat_manage.php	28 Jan 2008 21:57:10 -0000	1.5
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config;
  
  		//
***************
*** 288,292 ****
  				'L_FORUM_ID' => $lang['Forum_id'],
  				'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 				'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ),
  
  				'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],
--- 288,293 ----
  				'L_FORUM_ID' => $lang['Forum_id'],
  				'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 				'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ) : 'not available',
! 				//'FORUM_LIST' => $this->get_forums( $comments_forum_id, true, 'comments_forum_id' ),
  
  				'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],

Index: admin_settings.php
===================================================================
RCS file: /cvsroot/mxbb/mx_pafiledb/pafiledb/admin/admin_settings.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** admin_settings.php	9 Sep 2007 20:16:17 -0000	1.5
--- admin_settings.php	28 Jan 2008 21:57:10 -0000	1.6
***************
*** 18,22 ****
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars;
  
  		//
--- 18,22 ----
  	function main( $action )
  	{
! 		global $db, $images, $template, $lang, $phpEx, $pafiledb_functions, $pafiledb_cache, $pafiledb_config, $phpbb_root_path, $module_root_path, $mx_root_path, $mx_request_vars, $portal_config;
  
  		//
***************
*** 200,213 ****
  		$use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : "";
  
! 		$internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : "";
! 		$internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : "";
  
! 		$comments_forum_id = $new['comments_forum_id'];
  
! 		$del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : "";
! 		$del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : "";
  
! 		$autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : "";
! 		$autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : "";
  
  		$allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : "";
--- 200,236 ----
  		$use_comments_no = ( !$new['use_comments'] ) ? "checked=\"checked\"" : "";
  
! 		switch ($portal_config['portal_backend'])
! 		{
! 			case 'internal':
! 				$internal_comments_internal = "checked=\"checked\"";
! 				$internal_comments_phpbb = "";
! 				$comments_forum_id = 0;
  
! 				$del_topic_yes = "";
! 				$del_topic_no = "checked=\"checked\"";
  
! 				$autogenerate_comments_yes = "";
! 				$autogenerate_comments_no = "checked=\"checked\"";
  
! 				$template->assign_vars( array(
! 					'S_READONLY' => "disabled=\"disabled\"" )
! 				);
! 				break;
! 
! 			default:
! 				$internal_comments_internal = ( $new['internal_comments'] ) ? "checked=\"checked\"" : "";
! 				$internal_comments_phpbb = ( !$new['internal_comments'] ) ? "checked=\"checked\"" : "";
! 				$comments_forum_id = $new['comments_forum_id'];
! 
! 				$del_topic_yes = ( $new['del_topic'] ) ? "checked=\"checked\"" : "";
! 				$del_topic_no = ( !$new['del_topic'] ) ? "checked=\"checked\"" : "";
! 
! 				$autogenerate_comments_yes = ( $new['autogenerate_comments'] ) ? "checked=\"checked\"" : "";
! 				$autogenerate_comments_no = ( !$new['autogenerate_comments'] ) ? "checked=\"checked\"" : "";
! 				$template->assign_vars( array(
! 					'S_READONLY' => "" )
! 				);
! 				break;
! 		}
  
  		$allow_comment_wysiwyg_yes = ( $new['allow_comment_wysiwyg'] ) ? "checked=\"checked\"" : "";
***************
*** 393,397 ****
  			'L_FORUM_ID' => $lang['Forum_id'],
  			'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 			'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ),
  
  			'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],
--- 416,421 ----
  			'L_FORUM_ID' => $lang['Forum_id'],
  			'L_FORUM_ID_EXPLAIN' => $lang['Forum_id_explain'],
! 			//'FORUM_LIST' => $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ),
! 			'FORUM_LIST' => $portal_config['portal_backend'] != 'internal' ? $this->get_forums( $comments_forum_id, false, 'comments_forum_id' ) : 'not available',
  
  			'L_AUTOGENERATE_COMMENTS' => $lang['Autogenerate_comments'],