[Xoops-cvs2] xoops-current/html/modules/system/admin/preferences preferences.php,1.10,1.11 main.php,1.6,1.7

[<on...@us...>]

Update of /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences
In directory usw-pr-cvs1:/tmp/cvs-serv1458

Modified Files:
	preferences.php main.php 
Log Message:
no message

Index: preferences.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/preferences.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** preferences.php	25 Sep 2002 18:46:38 -0000	1.10
--- preferences.php	26 Sep 2002 17:36:47 -0000	1.11
***************
*** 32,36 ****
  		$anonpost_radio = new XoopsFormRadioYN(_MD_AM_ANONPOST, "anonpost", $xoopsConfig['anonpost'], _MD_AM_YES,_MD_AM_NO);
  		//$allowsig_radio = new XoopsFormRadioYN(_MD_AM_ALLOWSIG, "allow_sig", $xoopsConfig['allow_sig'], _MD_AM_YES,_MD_AM_NO);
! 		$allowhtml_radio = new XoopsFormRadioYN(_MD_AM_ALLOWHTML, "allow_html", $xoopsConfig['allow_html'], _MD_AM_YES,_MD_AM_NO);
  		//$allowimage_radio = new XoopsFormRadioYN(_MD_AM_ALLOWIMAGE, "allow_image", $xoopsConfig['allow_image'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
--- 32,36 ----
  		$anonpost_radio = new XoopsFormRadioYN(_MD_AM_ANONPOST, "anonpost", $xoopsConfig['anonpost'], _MD_AM_YES,_MD_AM_NO);
  		//$allowsig_radio = new XoopsFormRadioYN(_MD_AM_ALLOWSIG, "allow_sig", $xoopsConfig['allow_sig'], _MD_AM_YES,_MD_AM_NO);
! 		//$allowhtml_radio = new XoopsFormRadioYN(_MD_AM_ALLOWHTML, "allow_html", $xoopsConfig['allow_html'], _MD_AM_YES,_MD_AM_NO);
  		//$allowimage_radio = new XoopsFormRadioYN(_MD_AM_ALLOWIMAGE, "allow_image", $xoopsConfig['allow_image'], _MD_AM_YES,_MD_AM_NO);
  		$newuser_radio = new XoopsFormRadioYN("", "new_user_notify", $xoopsConfig['new_user_notify'], _MD_AM_YES,_MD_AM_NO);
***************
*** 100,104 ****
  		$form->addElement($anonpost_radio);
  		//$form->addElement($allowsig_radio);
! 		$form->addElement($allowhtml_radio);
  		//$form->addElement($allowimage_radio);
  		$form->addElement($newuser_tray);
--- 100,104 ----
  		$form->addElement($anonpost_radio);
  		//$form->addElement($allowsig_radio);
! 		//$form->addElement($allowhtml_radio);
  		//$form->addElement($allowimage_radio);
  		$form->addElement($newuser_tray);
***************
*** 126,130 ****
  	}
  
! 	function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
  		global $xoopsConfig, $HTTP_COOKIE_VARS;
  		if (!xoopsfwrite()) {
--- 126,130 ----
  	}
  
! 	function save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize){
  		global $xoopsConfig, $HTTP_COOKIE_VARS;
  		if (!xoopsfwrite()) {
***************
*** 194,198 ****
  
  // "._MD_AM_ALLOWHTML." (1="._MD_AM_YES." 0="._MD_AM_NO.")
! \$xoopsConfig['allow_html'] = ".intval($allow_html).";
  
  // "._MD_AM_ACTVTYPE." (0="._MD_AM_AUTOACTV." 1="._MD_AM_USERACTV." 2="._MD_AM_ADMINACTV.")
--- 194,198 ----
  
  // "._MD_AM_ALLOWHTML." (1="._MD_AM_YES." 0="._MD_AM_NO.")
! \$xoopsConfig['allow_html'] = 0;
  
  // "._MD_AM_ACTVTYPE." (0="._MD_AM_AUTOACTV." 1="._MD_AM_USERACTV." 2="._MD_AM_ADMINACTV.")

Index: main.php
===================================================================
RCS file: /cvsroot/xoops/xoops-current/html/modules/system/admin/preferences/main.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** main.php	25 Sep 2002 18:46:39 -0000	1.6
--- main.php	26 Sep 2002 17:36:47 -0000	1.7
***************
*** 27,31 ****
  				}
  			}
! 			save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $allow_html, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
  			break;
  		case "default":
--- 27,31 ----
  				}
  			}
! 			save_pref($sitename, $slogan, $adminmail, $language, $startpage, $server_TZ, $default_TZ, $default_theme, $old_theme, $anonymous, $minpass, $anonpost, $new_user_notify, $new_user_notify_group, $activation_type, $activation_group, $self_delete, $display_loading_img, $gzip_compression, $uname_test_level, $usercookie, $sessioncookie, $old_sessioncookie, $sessionexpire, $banners, $tags, $my_ip, $com_mode, $com_order, $debug_mode, $avatar_allow_upload, $avatar_width, $avatar_height, $avatar_maxsize);
  			break;
  		case "default":