*** adm/admforum.php
--- adm/admforum.php	2005-10-14 00:53:40.000000000 -0600
***************
*** 32,40 ****
--- 32,42 ----
  	fud_use('cat.inc', true);
  	fud_use('widgets.inc', true);
  	fud_use('logaction.inc');
+ 	fud_use('icons_adm.inc', true);
  
  	$tbl = $GLOBALS['DBHOST_TBL_PREFIX'];
  	$max_upload_size = get_max_upload_size();
+ 	$icon = new fud_icons('forum_icons', 'frm_forum');
  
  	if (!$cat_id || ($cat_name = q_singleval('SELECT name FROM '.$tbl.'cat WHERE id='.$cat_id)) === NULL) {
  		exit('no such category');
***************
*** 49,55 ****
  		/* (int) $_POST['frm_anon_forum']  is unused */
  		$_POST['frm_forum_opt'] = (int) $_POST['frm_mod_attach'] | (int) $_POST['frm_moderated'] | (int) $_POST['frm_passwd_posting'] | (int) $_POST['frm_tag_style'];
  
! 		$frm = new fud_forum;
  
  		if (!$edit) {
  			fud_use('groups_adm.inc', true);
--- 51,58 ----
  		/* (int) $_POST['frm_anon_forum']  is unused */
  		$_POST['frm_forum_opt'] = (int) $_POST['frm_mod_attach'] | (int) $_POST['frm_moderated'] | (int) $_POST['frm_passwd_posting'] | (int) $_POST['frm_tag_style'];
  
! 		$icon_store = $icon->submit_icon();
! 		$frm = new fud_forum($icon_store);
  
  		if (!$edit) {
  			fud_use('groups_adm.inc', true);
***************
*** 64,78 ****
--- 67,86 ----
  			$edit = '';
  		}
  	}
+ 
  	if ($edit && ($c = db_arr_assoc('SELECT * FROM '.$tbl.'forum WHERE id='.$edit))) {
  		foreach ($c as $k => $v) {
+ 			if ($k == 'forum_icon') continue;
  			${'frm_'.$k} = $v;
  		}
+ 		$icon_name = $c['forum_icon'];
  	} else {
  		$c = get_class_vars('fud_forum');
  		foreach ($c as $k => $v) {
+ 			if ($k == 'forum_icon') continue;
  			${'frm_'.$k} = '';
  		}
+ 		$icon_name = '';
  
  		/* some default values for new forums */
  		$frm_pos = 'LAST';
***************
*** 108,113 ****
--- 116,124 ----
  			rebuild_forum_cat_order();
  		}
  	}
+ 	$icon->setup_icon($icon_name);
+ 	$icon_html = $icon->icon_html();
+ 	$upload_html = $icon->upload_html();
  
  	require($WWW_ROOT_DISK . 'adm/admpanel.php');
  ?>
***************
*** 117,192 ****
  ?>
  <a href="admcat.php?<?php echo __adm_rsidl; ?>">Back to categories</a><br>
  
! <form method="post" name="frm_forum" action="admforum.php">
! <?php echo _hs; ?>
! <table class="datatable">
! 	<tr class="field">
! 		<td>Forum Name:</td>
  		<td><input type="text" name="frm_name" value="<?php echo $frm_name; ?>" maxlength=100></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td valign=top>Description</td>
  		<td><textarea nowrap name="frm_descr" cols=28 rows=5><?php echo htmlspecialchars($frm_descr); ?></textarea>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Tag Style</td>
  		<td><?php draw_select('frm_tag_style', "FUD ML\nHTML\nNone", "16\n0\n8", ($frm_forum_opt & 8 ? 8 : ($frm_forum_opt & 16 ? 16 : 0))); ?></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Password Posting<br><font size=-2>Posting is only allowed with a knowledge of a password</font></td>
  		<td><?php draw_select('frm_passwd_posting', "No\nYes", "0\n4", $frm_forum_opt & 4); ?></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Posting Password</td>
  		<td><input type="passwd" maxLength=32 name="frm_post_passwd" value="<?php echo htmlspecialchars($frm_post_passwd); ?>"></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Moderated Forum</td>
  		<td><?php draw_select('frm_moderated', "No\nYes", "0\n2", $frm_forum_opt & 2); ?></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Max Attachment Size:<br><font size="-1">Your php's maximum file upload size is <b><?php echo floor($max_upload_size / 1024); ?></b> KB.<br />You cannot set the forum's attachment size limit higher than that.</font></td>
  		<td><input type="text" name="frm_max_attach_size" value="<?php echo $frm_max_attach_size; ?>" maxlength=100 size=5>kb</td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Max Number of file Attachments:</td>
  		<td><input type="text" name="frm_max_file_attachments" value="<?php echo $frm_max_file_attachments; ?>" maxlength=100 size=5></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Can moderator(s) bypass attachment limits:</td>
  		<td><?php draw_select('frm_mod_attach', "No\nYes", "0\n32", $frm_forum_opt & 32); ?></td>
! 	</tr>
  
! 	<tr class="field">
! 		<td>Message Threshold<br><font size=-1>Maximum size of the message DISPLAYED<br>without the reveal link (0 == unlimited) </font></td>
  		<td><input type="text" name="frm_message_threshold" value="<?php echo $frm_message_threshold; ?>" size=5> bytes</td>
! 	</tr>
  
! 	<tr class="field">
! 		<td><a name="frm_icon_pos">Forum Icon</a></td>
! 		<td><input type="text" name="frm_forum_icon" value="<?php echo $frm_forum_icon; ?>"> <a href="javascript://" onClick="javascript:window.open('admiconsel.php?<?php echo __adm_rsidl; ?>', 'admiconsel', 'menubar=false,scrollbars=yes,resizable=yes,height=300,width=500,screenX=100,screenY=100')">[SELECT ICON]</a></td>
! 	</tr>
  
  <?php if (!$edit) { ?>
  	<tr class="field">
! 		<td>Insert Position</td>
  		<td><?php draw_select('frm_pos', "Last\nFirst", "LAST\nFIRST", ''); ?></td>
  	</tr>
  <?php } ?>
  
  	<tr class="fieldaction">
! 		<td colspan=2 align=right>
  <?php
  	if ($edit) {
! 		echo '<input type="submit" value="Cancel" name="btn_cancel"> ';
  	}
  ?>
  			<input type="submit" value="<?php echo ($edit ? 'Update Forum' : 'Add Forum'); ?>" name="frm_submit">
--- 128,206 ----
  ?>
  <a href="admcat.php?<?php echo __adm_rsidl; ?>">Back to categories</a><br>
  
! <form method="post" name="frm_forum" action="admforum.php" enctype="multipart/form-data">
! <table class="datatable solidtable">
! <?php echo _hs.$upload_html; ?>
! <tr><td colspan=3>&nbsp;</td></tr>
! 
! <tr class="fieldtopic">
! 	<td colspan=3><a name="img"><b>Forum Management</b></a></td>
! </tr>
! 
! <tr class="field">
! 	<td colspan=2>Forum Name:</td>
  	<td><input type="text" name="frm_name" value="<?php echo $frm_name; ?>" maxlength=100></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2 valign=top>Description</td>
  	<td><textarea nowrap name="frm_descr" cols=28 rows=5><?php echo htmlspecialchars($frm_descr); ?></textarea>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Tag Style</td>
  	<td><?php draw_select('frm_tag_style', "FUD ML\nHTML\nNone", "16\n0\n8", ($frm_forum_opt & 8 ? 8 : ($frm_forum_opt & 16 ? 16 : 0))); ?></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Password Posting<br><font size=-2>Posting is only allowed with a knowledge of a password</font></td>
  	<td><?php draw_select('frm_passwd_posting', "No\nYes", "0\n4", $frm_forum_opt & 4); ?></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Posting Password</td>
  	<td><input type="passwd" maxLength=32 name="frm_post_passwd" value="<?php echo htmlspecialchars($frm_post_passwd); ?>"></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Moderated Forum</td>
  	<td><?php draw_select('frm_moderated', "No\nYes", "0\n2", $frm_forum_opt & 2); ?></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Max Attachment Size:<br><font size="-1">Your php's maximum file upload size is <b><?php echo floor($max_upload_size / 1024); ?></b> KB.<br />You cannot set the forum's attachment size limit higher than that.</font></td>
  	<td><input type="text" name="frm_max_attach_size" value="<?php echo $frm_max_attach_size; ?>" maxlength=100 size=5>kb</td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Max Number of file Attachments:</td>
  	<td><input type="text" name="frm_max_file_attachments" value="<?php echo $frm_max_file_attachments; ?>" maxlength=100 size=5></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Can moderator(s) bypass attachment limits:</td>
  	<td><?php draw_select('frm_mod_attach', "No\nYes", "0\n32", $frm_forum_opt & 32); ?></td>
! </tr>
  
! <tr class="field">
! 	<td colspan=2>Message Threshold<br><font size=-1>Maximum size of the message DISPLAYED<br>without the reveal link (0 == unlimited) </font></td>
  	<td><input type="text" name="frm_message_threshold" value="<?php echo $frm_message_threshold; ?>" size=5> bytes</td>
! </tr>
  
! <?php echo $icon_html ?>
  
  <?php if (!$edit) { ?>
  	<tr class="field">
! 		<td colspan=2>Insert Position</td>
  		<td><?php draw_select('frm_pos', "Last\nFirst", "LAST\nFIRST", ''); ?></td>
  	</tr>
  <?php } ?>
  
  	<tr class="fieldaction">
! 		<td colspan=3 align=right>
  <?php
  	if ($edit) {
! 		echo '<input type="reset" value="Cancel" name="btn_cancel"> ';
  	}
  ?>
  			<input type="submit" value="<?php echo ($edit ? 'Update Forum' : 'Add Forum'); ?>" name="frm_submit">