[Phpbb-checkins] CVS: phpBB2/admin admin_board.php,1.30,1.31

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2/admin
In directory usw-pr-cvs1:/tmp/cvs-serv7862/admin

Modified Files:
	admin_board.php 
Log Message:
Added global PM disable + modded emailer to allow lang select + re-added back box limits my dumbness removed recently

Index: admin_board.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/admin/admin_board.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** admin_board.php	2001/11/05 07:15:05	1.30
--- admin_board.php	2001/11/13 16:07:42	1.31
***************
*** 63,90 ****
--- 63,106 ----
  
  $style_select = style_select($new['default_style'], 'default_style', "../templates");
+ 
  $admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates");
+ 
  $lang_select = language_select($new['default_lang'], 'default_lang', "../language");
+ 
  $timezone_select = tz_select($new['board_timezone'], 'board_timezone');
+ 
  $html_tags = $new['allow_html_tags'];
  
  $override_user_style_yes = ( $new['override_user_style'] ) ? "checked=\"checked\"" : "";
  $override_user_style_no = ( !$new['override_user_style'] ) ? "checked=\"checked\"" : "";
+ 
  $html_yes = ( $new['allow_html'] ) ? "checked=\"checked\"" : "";
  $html_no = ( !$new['allow_html'] ) ? "checked=\"checked\"" : "";
+ 
  $bbcode_yes = ( $new['allow_bbcode'] ) ? "checked=\"checked\"" : "";
  $bbcode_no = ( !$new['allow_bbcode'] ) ? "checked=\"checked\"" : "";
+ 
  $activation_none = ( $new['require_activation'] == USER_ACTIVATION_NONE ) ? "checked=\"checked\"" : "";
  $activation_user = ( $new['require_activation'] == USER_ACTIVATION_SELF ) ? "checked=\"checked\"" : "";
  $activation_admin = ( $new['require_activation'] == USER_ACTIVATION_ADMIN ) ? "checked=\"checked\"" : "";
+ 
  $gzip_yes = ( $new['gzip_compress'] ) ? "checked=\"checked\"" : "";
  $gzip_no = ( !$new['gzip_compress'] ) ? "checked=\"checked\"" : "";
+ 
+ $privmsg_on = ( !$new['privmsg_disable'] ) ? "checked=\"checked\"" : "";
+ $privmsg_off = ( $new['privmsg_disable'] ) ? "checked=\"checked\"" : "";
+ 
  $prune_yes = ( $new['prune_enable'] ) ? "checked=\"checked\"" : "";
  $prune_no = ( !$new['prune_enable'] ) ? "checked=\"checked\"" : "";
+ 
  $smile_yes = ( $new['allow_smilies'] ) ? "checked=\"checked\"" : "";
  $smile_no = ( !$new['allow_smilies'] ) ? "checked=\"checked\"" : "";
+ 
  $sig_yes = ( $new['allow_sig'] ) ? "checked=\"checked\"" : "";
  $sig_no = ( !$new['allow_sig'] ) ? "checked=\"checked\"" : "";
+ 
  $namechange_yes = ( $new['allow_namechange'] ) ? "checked=\"checked\"" : "";
  $namechange_no = ( !$new['allow_namechange'] ) ? "checked=\"checked\"" : "";
+ 
  $avatars_local_yes = ( $new['allow_avatar_local'] ) ? "checked=\"checked\"" : "";
  $avatars_local_no = ( !$new['allow_avatar_local'] ) ? "checked=\"checked\"" : "";
***************
*** 93,96 ****
--- 109,113 ----
  $avatars_upload_yes = ( $new['allow_avatar_upload'] ) ? "checked=\"checked\"" : "";
  $avatars_upload_no = ( !$new['allow_avatar_upload'] ) ? "checked=\"checked\"" : "";
+ 
  $smtp_yes = ( $new['smtp_delivery'] ) ? "checked=\"checked\"" : "";
  $smtp_no = ( !$new['smtp_delivery'] ) ? "checked=\"checked\"" : "";
***************
*** 110,114 ****
  	"L_SITE_NAME" => $lang['Site_name'],
  	"L_SITE_DESCRIPTION" => $lang['Site_desc'],
! 	"L_ACCT_ACTIVATION" => $lang['Acct_activation'],
  
  	"SITENAME" => $new['sitename'],
--- 127,138 ----
  	"L_SITE_NAME" => $lang['Site_name'],
  	"L_SITE_DESCRIPTION" => $lang['Site_desc'],
! 	"L_ACCT_ACTIVATION" => $lang['Acct_activation'], 
! 	"L_PRIVATE_MESSAGING" => $lang['Private_Messaging'], 
! 	"L_INBOX_LIMIT" => $lang['Inbox_limits'], 
! 	"L_SENTBOX_LIMIT" => $lang['Sentbox_limits'], 
! 	"L_SAVEBOX_LIMIT" => $lang['Savebox_limits'], 
! 	"L_DISABLE_PRIVATE_MESSAGING" => $lang['Disable_privmsg'], 
! 	"L_ENABLED" => $lang['Enabled'], 
! 	"L_DISABLED" => $lang['Disabled'], 
  
  	"SITENAME" => $new['sitename'],
***************
*** 119,123 ****
  	"ACTIVATION_USER_CHECKED" => $activation_user,
  	"ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, 
! 	"ACTIVATION_ADMIN_CHECKED" => $activation_admin,
  	"FLOOD_INTERVAL" => $new['flood_interval'],
  	"TOPICS_PER_PAGE" => $new['topics_per_page'],
--- 143,147 ----
  	"ACTIVATION_USER_CHECKED" => $activation_user,
  	"ACTIVATION_ADMIN" => USER_ACTIVATION_ADMIN, 
! 	"ACTIVATION_ADMIN_CHECKED" => $activation_admin, 
  	"FLOOD_INTERVAL" => $new['flood_interval'],
  	"TOPICS_PER_PAGE" => $new['topics_per_page'],
***************
*** 131,134 ****
--- 155,163 ----
  	"DEFAULT_DATEFORMAT" => $new['default_dateformat'],
  	"TIMEZONE_SELECT" => $timezone_select,
+ 	"S_PRIVMSG_ENABLED" => $privmsg_on, 
+ 	"S_PRIVMSG_DISABLED" => $privmsg_off, 
+ 	"INBOX_LIMIT" => $new['max_inbox_privmsgs'], 
+ 	"SENTBOX_LIMIT" => $new['max_sentbox_privmsgs'],
+ 	"SAVEBOX_LIMIT" => $new['max_savebox_privmsgs'],
  	"GZIP_YES" => $gzip_yes,
  	"GZIP_NO" => $gzip_no,