- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)

- fixed forum editing and parent id selection
- completely removed HTML support (it only creates security problems)
- changed cache_moderators() to reflect permission changes


git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/adm/index.php

@@ -15,7 +15,6 @@ define('NEED_SID', true);
 
 // Include files
 $phpbb_root_path = './../';
-$phpbb_admin_path = './';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 require($phpbb_root_path . 'common.'.$phpEx);
 require($phpbb_root_path . 'includes/functions_admin.'.$phpEx);
@@ -46,8 +45,9 @@ if (!$auth->acl_get('a_'))
 	trigger_error($user->lang['NO_ADMIN']);
 }
 
-// We define it now, because the user is now able to use the admin related features...
+// We define the admin variables now, because the user is now able to use the admin related features...
 define('IN_ADMIN', true);
+$phpbb_admin_path = './';
 
 // Some oft used variables
 $safe_mode		= (@ini_get('safe_mode') || @strtolower(ini_get('safe_mode')) == 'on') ? true : false;

phpBB/adm/style/acp_bbcodes.html

@@ -30,11 +30,20 @@
 		</dl>
 	</fieldset>
 
+	<fieldset>
+		<legend>{L_SETTINGS}</legend>
+		<dl>
+			<dt><label for="display_on_posting">{L_DISPLAY_ON_POSTING}</label></dt>
+			<dd><input type="checkbox" name="display_on_posting" id="display_on_posting" value="1"<!-- IF DISPLAY_ON_POSTING --> checked="checked"<!-- ENDIF --> /></dd>
+		</dl>
+	</fieldset>
+
 	<fieldset class="submit-buttons">
 		<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />&nbsp;
 		<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
 	</fieldset>
-
+	
+	<br />
 	<table cellspacing="1">
 	<thead>
 	<tr>

phpBB/adm/style/acp_forums.html

@@ -78,7 +78,7 @@
 	<!-- ENDIF -->
 	<dl>
 		<dt><label for="parent">{L_FORUM_PARENT}:</label></dt>
-		<dd><select id="parent" name="parent_id"><option value="0"<!-- IF not S_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
+		<dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd>
 	</dl>
 	<dl>
 		<dt><label for="forum_name">{L_FORUM_NAME}:</label></dt>

phpBB/adm/style/acp_users.html

@@ -362,10 +362,6 @@
 		<dt><label for="bbcode">{L_DEFAULT_BBCODE}:</label></dt>
 		<dd><input type="radio" class="radio" name="bbcode" value="1"<!-- IF BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="bbcode" value="0"<!-- IF not BBCODE --> id="bbcode" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
 	</dl>
-	<dl> 
-		<dt><label for="html">{L_DEFAULT_HTML}:</label></dt>
-		<dd><input type="radio" class="radio" name="html" value="1"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="html" value="0"<!-- IF HTML --> id="html" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
-	</dl>
 	<dl> 
 		<dt><label for="smilies">{L_DEFAULT_SMILIES}:</label></dt>
 		<dd><input type="radio" class="radio" name="smilies" value="1"<!-- IF SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_YES} &nbsp;<input type="radio" class="radio" name="smilies" value="0"<!-- IF not SMILIES --> id="smilies" checked="checked"<!-- ENDIF --> />&nbsp; {L_NO}</dd>
@@ -603,11 +599,10 @@
 			</dt>
 			<dd style="text-align: left; margin-left: 110px;"><textarea name="signature" rows="10" cols="60" onselect="storeCaret(this);" onclick="storeCaret(this);" onkeyup="storeCaret(this);">{SIGNATURE}</textarea></dd>
 			<dd style="text-align: left; margin-left: 110px;">
-				<!-- IF S_HTML_ALLOWED --><input type="checkbox" name="disable_html"{S_HTML_CHECKED} />&nbsp; {L_DISABLE_HTML} &nbsp;<!-- ENDIF -->
 				<!-- IF S_BBCODE_ALLOWED --><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} />&nbsp; {L_DISABLE_BBCODE} &nbsp;<!-- ENDIF -->
 				<!-- IF S_SMILIES_ALLOWED --><input type="checkbox" name="disable_smilies"{S_SMILIES_CHECKED} />&nbsp; {L_DISABLE_SMILIES} &nbsp;<!-- ENDIF -->
 				<input type="checkbox" name="disable_magic_url"{S_MAGIC_URL_CHECKED} />&nbsp; {L_DISABLE_MAGIC_URL} &nbsp;
-				<br /><br /><strong>{L_OPTIONS}: </strong>{HTML_STATUS} :: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS}
+				<br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {SMILIES_STATUS}
 			</dd>
 		</dl>
 	</fieldset>