From 91a1c3af901f51d79751b733e48e8bcddc81d263 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Mon, 7 Apr 2014 21:42:30 +0200
Subject: [PATCH] [ticket/12372] Rename JS function dE() to
 phpbb.toggleDisplay()

PHPBB3-12372
---
 phpBB/adm/style/acp_forums.html               | 44 +++++++++----------
 phpBB/adm/style/acp_modules.html              |  4 +-
 phpBB/adm/style/acp_ranks.html                |  4 +-
 phpBB/adm/style/acp_send_statistics.html      | 12 ++---
 phpBB/adm/style/acp_users_overview.html       |  4 +-
 phpBB/adm/style/acp_users_prefs.html          |  2 +-
 phpBB/adm/style/install_update.html           |  2 +-
 phpBB/adm/style/permissions.js                | 12 ++---
 phpBB/assets/javascript/core.js               |  2 +-
 phpBB/includes/functions_posting.php          |  2 +-
 .../prosilver/template/posting_buttons.html   |  2 +-
 .../template/ucp_prefs_personal.html          |  6 +--
 .../template/ucp_prefs_personal.html          |  2 +-
 13 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 0bb5e10f57..822d1c5f35 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -14,45 +14,45 @@
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				if (value == {FORUM_POST})
 				{
-					dE('type_actions', -1);
+					phpbb.toggleDisplay('type_actions', -1);
 				}
 				else
 				{
-					dE('type_actions', 1);
+					phpbb.toggleDisplay('type_actions', 1);
 				}
 			<!-- ENDIF -->
 
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				if (value == {FORUM_LINK})
 				{
-					dE('cat_to_link_actions', 1);
+					phpbb.toggleDisplay('cat_to_link_actions', 1);
 				}
 				else
 				{
-					dE('cat_to_link_actions', -1);
+					phpbb.toggleDisplay('cat_to_link_actions', -1);
 				}
 			<!-- ENDIF -->
 
 			if (value == {FORUM_POST})
 			{
-				dE('forum_post_options', 1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_post_options', 1);
+				phpbb.toggleDisplay('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_rules_options', 1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_LINK})
 			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', 1);
-				dE('forum_rules_options', -1);
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_link_options', 1);
+				phpbb.toggleDisplay('forum_rules_options', -1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			}
 			else if (value == {FORUM_CAT})
 			{
-				dE('forum_post_options', -1);
-				dE('forum_link_options', -1);
-				dE('forum_rules_options', 1);
-				dE('forum_cat_options', 1);
+				phpbb.toggleDisplay('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_rules_options', 1);
+				phpbb.toggleDisplay('forum_cat_options', 1);
 			}
 		}
 
@@ -64,30 +64,30 @@
 		{
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_POST -->
 				<!-- IF S_FORUM_POST -->
-					dE('type_actions', -1);
+					phpbb.toggleDisplay('type_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
 			<!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS -->
 				<!-- IF S_FORUM_CAT -->
-					dE('cat_to_link_actions', -1);
+					phpbb.toggleDisplay('cat_to_link_actions', -1);
 				<!-- ENDIF -->
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_POST -->
-				dE('forum_post_options', -1);
+				phpbb.toggleDisplay('forum_post_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_CAT -->
-				dE('forum_cat_options', -1);
+				phpbb.toggleDisplay('forum_cat_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF not S_FORUM_LINK -->
-				dE('forum_link_options', -1);
+				phpbb.toggleDisplay('forum_link_options', -1);
 			<!-- ENDIF -->
 
 			<!-- IF S_FORUM_LINK -->
-			dE('forum_rules_options', -1);
+			phpbb.toggleDisplay('forum_rules_options', -1);
 			<!-- ENDIF -->
 		}
 
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html
index c7688a610c..3c97706e6a 100644
--- a/phpBB/adm/style/acp_modules.html
+++ b/phpBB/adm/style/acp_modules.html
@@ -10,11 +10,11 @@
 		{
 			if (value == 'category')
 			{
-				dE('modoptions', -1);
+				phpbb.toggleDisplay('modoptions', -1);
 			}
 			else
 			{
-				dE('modoptions', 1);
+				phpbb.toggleDisplay('modoptions', 1);
 			}
 		}
 
diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html
index be68dda695..dd2d07a837 100644
--- a/phpBB/adm/style/acp_ranks.html
+++ b/phpBB/adm/style/acp_ranks.html
@@ -35,8 +35,8 @@
 	</dl>
 	<dl>
 		<dt><label for="special_rank">{L_RANK_SPECIAL}{L_COLON}</label></dt>
-		<dd><label><input onclick="dE('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
-			<label><input onclick="dE('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
+		<dd><label><input onclick="phpbb.toggleDisplay('posts', -1)" type="radio" class="radio" name="special_rank" value="1" id="special_rank"<!-- IF S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_YES}</label>
+			<label><input onclick="phpbb.toggleDisplay('posts', 1)" type="radio" class="radio" name="special_rank" value="0"<!-- IF not S_SPECIAL_RANK --> checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
 	</dl>
 	<!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF -->
 	<dl>
diff --git a/phpBB/adm/style/acp_send_statistics.html b/phpBB/adm/style/acp_send_statistics.html
index 2d6c4837fd..819d433c5e 100644
--- a/phpBB/adm/style/acp_send_statistics.html
+++ b/phpBB/adm/style/acp_send_statistics.html
@@ -17,8 +17,8 @@ function iframe_updated()
 		return;
 	}
 
-	dE('questionnaire-form', -1);
-	dE('questionnaire-thanks', 1);
+	phpbb.toggleDisplay('questionnaire-form', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', 1);
 }
 //]]>
 </script>
@@ -31,10 +31,10 @@ function iframe_updated()
 
 	<p>{L_EXPLAIN_SHOW_STATISTICS}</p>
 
-	<p id="show-button"><input type="button" class="button2" onclick="dE('configlist', 1); dE('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
+	<p id="show-button"><input type="button" class="button2" onclick="phpbb.toggleDisplay('configlist', 1); phpbb.toggleDisplay('show-button', -1);" value="{L_SHOW_STATISTICS}" /></p>
 
 	<div id="configlist">
-		<input type="button" class="button2" onclick="dE('show-button', 1); dE('configlist', -1);" value="{L_HIDE_STATISTICS}" />
+		<input type="button" class="button2" onclick="phpbb.toggleDisplay('show-button', 1); phpbb.toggleDisplay('configlist', -1);" value="{L_HIDE_STATISTICS}" />
 		<p class="submit-buttons">
 			<input class="button1" type="submit" id="submit" name="submit" value="{L_SEND_STATISTICS}" />
 		</p>
@@ -63,8 +63,8 @@ function iframe_updated()
 
 <script type="text/javascript">
 //<![CDATA[
-	dE('configlist', -1);
-	dE('questionnaire-thanks', -1);
+	phpbb.toggleDisplay('configlist', -1);
+	phpbb.toggleDisplay('questionnaire-thanks', -1);
 //]]>
 </script>
 
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
index 013be80465..506101c3f7 100644
--- a/phpBB/adm/style/acp_users_overview.html
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -86,11 +86,11 @@
 		{
 			if (option != 'banuser' && option != 'banemail' && option != 'banip')
 			{
-				dE('reasons', -1);
+				phpbb.toggleDisplay('reasons', -1);
 				return;
 			}
 
-			dE('reasons', 1);
+			phpbb.toggleDisplay('reasons', 1);
 
 			element = document.getElementById('user_quick_tools').ban_reason;
 
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
index 1092b25b04..d1e389ca04 100644
--- a/phpBB/adm/style/acp_users_prefs.html
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -50,7 +50,7 @@
 	<!-- INCLUDE timezone_option.html -->
 	<dl> 
 		<dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
-		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
+		<dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd>
 		<dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd>
 	</dl>
 	</fieldset>
diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html
index d746226753..f0df138641 100644
--- a/phpBB/adm/style/install_update.html
+++ b/phpBB/adm/style/install_update.html
@@ -224,7 +224,7 @@
 
 		<!-- IF .not_modified -->
 			<h2>{L_FILES_NOT_MODIFIED}</h2>
-			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="dE('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
+			<div style="float: {S_CONTENT_FLOW_END};">&raquo; <a href="#" onclick="phpbb.toggleDisplay('not_modified', 0); return false;">{L_TOGGLE_DISPLAY}</a></div>
 			<p>{L_FILES_NOT_MODIFIED_EXPLAIN}</p>
 
 			<fieldset id="not_modified" style="display: none;">
diff --git a/phpBB/adm/style/permissions.js b/phpBB/adm/style/permissions.js
index 1c85fbd9ef..9178adab50 100644
--- a/phpBB/adm/style/permissions.js
+++ b/phpBB/adm/style/permissions.js
@@ -177,7 +177,7 @@ function swap_options(pmask, fmask, cat, adv, view) {
 	var adv_block = document.getElementById('advanced' + pmask + fmask);
 
 	if (adv_block.style.display === 'block' && adv === true) {
-		dE('advanced' + pmask + fmask, -1);
+		phpbb.toggleDisplay('advanced' + pmask + fmask, -1);
 		reset_opacity(1);
 		display_checkboxes(false);
 		return;
@@ -207,11 +207,11 @@ function swap_options(pmask, fmask, cat, adv, view) {
 		return;
 	}
 
-	dE('options' + active_option, -1);
+	phpbb.toggleDisplay('options' + active_option, -1);
 
 	//hiding and showing the checkbox
 	if (document.getElementById('checkbox' + active_pmask + active_fmask)) {
-		dE('checkbox' + pmask + fmask, -1);
+		phpbb.toggleDisplay('checkbox' + pmask + fmask, -1);
 
 		if ((pmask + fmask) !== (active_pmask + active_fmask)) {
 			document.getElementById('checkbox' + active_pmask + active_fmask).style.display = 'inline';
@@ -219,13 +219,13 @@ function swap_options(pmask, fmask, cat, adv, view) {
 	}
 
 	if (!view) {
-		dE('advanced' + active_pmask + active_fmask, -1);
+		phpbb.toggleDisplay('advanced' + active_pmask + active_fmask, -1);
 	}
 
 	if (!view) {
-		dE('advanced' + pmask + fmask, 1);
+		phpbb.toggleDisplay('advanced' + pmask + fmask, 1);
 	}
-	dE('options' + id, 1);
+	phpbb.toggleDisplay('options' + id, 1);
 
 	active_pmask = pmask;
 	active_fmask = fmask;
diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index ccb031de24..9f89125a18 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1070,7 +1070,7 @@ phpbb.registerPalette = function(el) {
 * @param string	type	Display type that should be used, e.g. inline, block or
 *			other CSS "display" types
 */
-function dE(id, action, type) {
+phpbb.toggleDisplay = function(id, action, type) {
 	if (!type) {
 		type = 'block';
 	}
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index 6a0aedf8c6..063e28d323 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1153,7 +1153,7 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id
 			'S_HAS_ATTACHMENTS'	=> (!empty($attachments[$row['post_id']])) ? true : false,
 			'S_FRIEND'			=> ($row['friend']) ? true : false,
 			'S_IGNORE_POST'		=> ($row['foe']) ? true : false,
-			'L_IGNORE_POST'		=> ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), "<a href=\"{$u_show_post}\" onclick=\"dE('{$post_anchor}', 1); return false;\">", '</a>') : '',
+			'L_IGNORE_POST'		=> ($row['foe']) ? sprintf($user->lang['POST_BY_FOE'], get_username_string('full', $poster_id, $row['username'], $row['user_colour'], $row['post_username']), "<a href=\"{$u_show_post}\" onclick=\"phpbb.toggleDisplay('{$post_anchor}', 1); return false;\">", '</a>') : '',
 
 			'POST_SUBJECT'		=> $post_subject,
 			'MINI_POST_IMG'		=> $user->img('icon_post_target', $user->lang['POST']),
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 1164b2ffbe..3dad6606bb 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -34,7 +34,7 @@
 
 	function change_palette()
 	{
-		dE('colour_palette');
+		phpbb.toggleDisplay('colour_palette');
 		e = document.getElementById('colour_palette');
 
 		if (e.style.display == 'block')
diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
index a5b4852af8..d07aab1a89 100644
--- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html
+++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html
@@ -66,7 +66,7 @@
 	<dl>
 		<dt><label for="dateformat">{L_BOARD_DATE_FORMAT}{L_COLON}</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt>
 		<dd>
-			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
+			<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
 				{S_DATEFORMAT_OPTIONS}
 			</select>
 		</dd>
@@ -109,11 +109,11 @@
 		// Show/hide custom field
 		if (e.selectedIndex == e.length - 1)
 		{
-			dE('custom_date',1);
+			phpbb.toggleDisplay('custom_date',1);
 		}
 		else
 		{
-			dE('custom_date',-1);
+			phpbb.toggleDisplay('custom_date',-1);
 		}
 	}
 
diff --git a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
index 47e43cafba..93fcfac5b1 100644
--- a/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
+++ b/phpBB/styles/subsilver2/template/ucp_prefs_personal.html
@@ -56,7 +56,7 @@
 <tr>
 	<td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}{L_COLON}</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td>
 	<td class="row2">
-		<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
+		<select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){phpbb.toggleDisplay('custom_date',1);}else{phpbb.toggleDisplay('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = default_dateformat; } else { document.getElementById('dateformat').value = this.value; }">
 			{S_DATEFORMAT_OPTIONS}
 		</select>
 		<div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" class="post" style="margin-top: 3px;" /></div>