From 5b9d9e04a8c2087064f4c2ad656fb0e331589685 Mon Sep 17 00:00:00 2001 From: oricgn Date: Mon, 17 Aug 2015 15:57:48 +0200 Subject: [PATCH] Issue 917: id and name attribute value mismatch #919 - Unifying id and name attribute values - Unifying order of id and name attributes --- include/admin/message_prune.php | 4 +-- .../templates/emerald/disable_option.tpl | 4 +-- .../templates/emerald/disable_option.tpl | 4 +-- pm.php | 14 ++++---- search.php | 6 ++-- templates/classic/pm_post.tpl | 4 +-- templates/classic/posting.tpl | 2 +- templates/classic/posting_messageform.tpl | 32 +++++++++---------- templates/classic/search.tpl | 4 +-- templates/emerald/cc_subscriptions.tpl | 2 +- templates/emerald/cc_usersettings.tpl | 2 +- templates/emerald/follow.tpl | 2 +- templates/emerald/pm_buddies.tpl | 2 +- templates/emerald/pm_list_incoming.tpl | 2 +- templates/emerald/pm_list_outgoing.tpl | 2 +- templates/emerald/pm_post.tpl | 8 ++--- templates/emerald/posting.tpl | 28 ++++++++-------- templates/emerald/search.tpl | 4 +-- templates/lightweight/cc_subscriptions.tpl | 4 +-- templates/lightweight/cc_usersettings.tpl | 2 +- templates/lightweight/follow.tpl | 2 +- templates/lightweight/pm_buddies.tpl | 2 +- templates/lightweight/pm_list_incoming.tpl | 2 +- templates/lightweight/pm_list_outgoing.tpl | 2 +- templates/lightweight/pm_post.tpl | 8 ++--- templates/lightweight/posting.tpl | 28 ++++++++-------- templates/lightweight/search.tpl | 4 +-- 27 files changed, 88 insertions(+), 92 deletions(-) diff --git a/include/admin/message_prune.php b/include/admin/message_prune.php index 9353c41f1..e3a23600d 100644 --- a/include/admin/message_prune.php +++ b/include/admin/message_prune.php @@ -522,7 +522,7 @@ function prepare_filter_date($meta, $field, $match, $query) onsubmit="filter.getFilterDescription()"> - +
checked="checked" @@ -998,7 +998,7 @@ function delete_selected_messages() action=""> - meta->disable_bbcode} checked="checked"{/IF} /> - + diff --git a/mods/smileys/templates/emerald/disable_option.tpl b/mods/smileys/templates/emerald/disable_option.tpl index 36109f144..81a2bba78 100644 --- a/mods/smileys/templates/emerald/disable_option.tpl +++ b/mods/smileys/templates/emerald/disable_option.tpl @@ -1,3 +1,3 @@ -meta->disable_smileys} checked="checked"{/IF} /> - + diff --git a/pm.php b/pm.php index 015ad47c2..180f2c1ea 100644 --- a/pm.php +++ b/pm.php @@ -259,7 +259,7 @@ function phorum_pm_folder_exists($foldername) $folder_id = $_POST["delete_folder_target"]; if (!empty($folder_id)) { $PHORUM['DB']->pm_delete_folder($folder_id); - + /** * [hook] * pm_delete_folder @@ -353,9 +353,9 @@ function phorum_pm_folder_exists($foldername) * return $pm_id; * } * - */ - if (isset($PHORUM['hooks']['pm_delete'])) { - phorum_api_hook('pm_delete', $pm_id); + */ + if (isset($PHORUM['hooks']['pm_delete'])) { + phorum_api_hook('pm_delete', $pm_id); } } } @@ -1235,9 +1235,9 @@ function phorum_sort_buddy_list($a,$b) { $PHORUM["DATA"]["SHOW_USERSELECTION"] = true; // Determine what input element gets the focus. - $focus_id = 'userselection'; + $focus_id = 'to_id'; if ($PHORUM["DATA"]["RECIPIENT_COUNT"]) $focus_id = 'subject'; - if (!empty($msg["subject"])) $focus_id = 'body'; + if (!empty($msg["subject"])) $focus_id = 'message'; $PHORUM["DATA"]["FOCUS_TO_ID"] = $focus_id; // Create data for a user dropdown list, if configured. @@ -1292,7 +1292,7 @@ function phorum_sort_buddy_list($a,$b) { if (isset($PHORUM['hooks']['pm_before_editor'])) { $msg = phorum_api_hook('pm_before_editor', $msg, $action); } - + $PHORUM["DATA"]["PMLOCATION"] = $PHORUM["DATA"]["LANG"]["SendPM"]; $template = "pm_post"; break; diff --git a/search.php b/search.php index c5602c15b..f4420d6ac 100644 --- a/search.php +++ b/search.php @@ -294,7 +294,7 @@ function phorum_search_check_valid_vars() $page = $offset + 1; $pages_shown = (isset($PHORUM["TMP"]["search_pages_shown"])) ? $PHORUM["TMP"]["search_pages_shown"] : 5; - + // first $pages_shown pages if($page - floor($pages_shown/2) <= 0 || $page < $pages_shown){ $page_start=1; @@ -349,12 +349,12 @@ function phorum_search_check_valid_vars() }else{ $PHORUM["DATA"]["SEARCH"]["noresults"] = true; - $PHORUM["DATA"]["FOCUS_TO_ID"] = 'phorum_search_message'; + $PHORUM["DATA"]["FOCUS_TO_ID"] = 'search'; } } else { // Set cursor focus to message search entry. - $PHORUM["DATA"]["FOCUS_TO_ID"] = 'phorum_search_message'; + $PHORUM["DATA"]["FOCUS_TO_ID"] = 'search'; if (isset($PHORUM["hooks"]["search_start"])) $PHORUM['args'] = phorum_api_hook('search_start',$PHORUM['args']); diff --git a/templates/classic/pm_post.tpl b/templates/classic/pm_post.tpl index fa482cac8..cc719c3c0 100644 --- a/templates/classic/pm_post.tpl +++ b/templates/classic/pm_post.tpl @@ -34,14 +34,14 @@ {IF SHOW_USERSELECTION}
{IF USERS} - {LOOP USERS} {/LOOP USERS} {ELSE} - + {/IF} {! Always show recipient list on a separate line} diff --git a/templates/classic/posting.tpl b/templates/classic/posting.tpl index 82e5b741c..d48fd0fd6 100644 --- a/templates/classic/posting.tpl +++ b/templates/classic/posting.tpl @@ -5,7 +5,7 @@ {INCLUDE "posting_preview"} {/IF} {IF NOT PRINTVIEW} -
+ {POST_VARS} {INCLUDE "posting_menu"} {INCLUDE "posting_messageform"} diff --git a/templates/classic/posting_messageform.tpl b/templates/classic/posting_messageform.tpl index 5090c6010..50b874001 100644 --- a/templates/classic/posting_messageform.tpl +++ b/templates/classic/posting_messageform.tpl @@ -38,7 +38,7 @@ {! Subject ================================================================== } {LANG->Subject}:  - + {HOOK "tpl_editor_after_subject"} {! Moderator only fields ==================================================== } @@ -47,9 +47,9 @@ {LANG->Special}:  {IF SHOW_SPECIALOPTIONS}{IF OPTION_ALLOWED->sticky} - special "sticky"}checked="checked"{/IF} /> - + {/IF}{/IF} {IF OPTION_ALLOWED->allow_reply} allow_reply} checked="checked"{/IF}> {LANG->AllowReplies} @@ -59,31 +59,31 @@ {/IF} {! Follow topic ============================================================= } {IF POSTING->user_id} - + {IF OPTION_ALLOWED->subscribe} - + - - subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
- + + subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
+ {IF OPTION_ALLOWED->subscribe_mail} -
+
- subscription "message"}checked="checked"{/IF} /> + subscription "message"}checked="checked"{/IF} />
- + {LANG->Delete} diff --git a/templates/emerald/cc_usersettings.tpl b/templates/emerald/cc_usersettings.tpl index 4cfbd9fa1..866c56993 100644 --- a/templates/emerald/cc_usersettings.tpl +++ b/templates/emerald/cc_usersettings.tpl @@ -17,7 +17,7 @@ {IF PROFILE->SIGSETTINGS}
{LANG->Signature}: 
-
+
{/IF} {IF PROFILE->MAILSETTINGS}
{LANG->Email}: * 
diff --git a/templates/emerald/follow.tpl b/templates/emerald/follow.tpl index 0f8e27b34..4b75f4652 100644 --- a/templates/emerald/follow.tpl +++ b/templates/emerald/follow.tpl @@ -18,7 +18,7 @@
{LANG->FollowExplanationMail}
-

+

{/IF}

diff --git a/templates/emerald/pm_buddies.tpl b/templates/emerald/pm_buddies.tpl index 28700c707..a457d2e6a 100644 --- a/templates/emerald/pm_buddies.tpl +++ b/templates/emerald/pm_buddies.tpl @@ -17,7 +17,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/emerald/pm_list_incoming.tpl b/templates/emerald/pm_list_incoming.tpl index 051b0f4da..b6f435071 100644 --- a/templates/emerald/pm_list_incoming.tpl +++ b/templates/emerald/pm_list_incoming.tpl @@ -13,7 +13,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/emerald/pm_list_outgoing.tpl b/templates/emerald/pm_list_outgoing.tpl index 2263fc9ec..27447747e 100644 --- a/templates/emerald/pm_list_outgoing.tpl +++ b/templates/emerald/pm_list_outgoing.tpl @@ -14,7 +14,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/emerald/pm_post.tpl b/templates/emerald/pm_post.tpl index 74c049c7f..006d92787 100644 --- a/templates/emerald/pm_post.tpl +++ b/templates/emerald/pm_post.tpl @@ -43,14 +43,14 @@ {IF SHOW_USERSELECTION}
{IF USERS} - {LOOP USERS} {/LOOP USERS} {ELSE} - + {/IF} {! Always show recipient list on a separate line} @@ -68,7 +68,7 @@
{LANG->Subject}:
-
+

{LANG->Options}:
@@ -79,7 +79,7 @@ {LANG->Message}:
- +
diff --git a/templates/emerald/posting.tpl b/templates/emerald/posting.tpl index 8ef2d8319..253feb16e 100644 --- a/templates/emerald/posting.tpl +++ b/templates/emerald/posting.tpl @@ -53,7 +53,7 @@
- + {POST_VARS} @@ -65,14 +65,12 @@ {LANG->Special}:
{IF OPTION_ALLOWED->sticky} - special "sticky"}checked="checked"{/IF} /> - + special "sticky"}checked="checked"{/IF} /> +
{/IF} - allow_reply} checked="checked"{/IF} /> + allow_reply} checked="checked"{/IF} />
{/IF} @@ -112,7 +110,7 @@ {/IF} {LANG->Subject}:
-
+

{HOOK "tpl_editor_after_subject"} @@ -124,21 +122,21 @@ {IF OPTION_ALLOWED->subscribe} - subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
+ subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
{IF OPTION_ALLOWED->subscribe_mail} -
+
tree-L - subscription "message"}checked="checked"{/IF} /> + subscription "message"}checked="checked"{/IF} />
{LANG->Delete} @@ -46,7 +46,7 @@ {VAR altclass "alt"} {ELSE} {VAR altclass ""} - {/IF} + {/IF} diff --git a/templates/lightweight/cc_usersettings.tpl b/templates/lightweight/cc_usersettings.tpl index f9c0afd4f..83b5072c2 100644 --- a/templates/lightweight/cc_usersettings.tpl +++ b/templates/lightweight/cc_usersettings.tpl @@ -14,7 +14,7 @@ {IF PROFILE->SIGSETTINGS}
{LANG->Signature}: 
-
+
{/IF} {IF PROFILE->MAILSETTINGS}
{LANG->Email}: * 
diff --git a/templates/lightweight/follow.tpl b/templates/lightweight/follow.tpl index 4afe9cdf0..396a365fb 100644 --- a/templates/lightweight/follow.tpl +++ b/templates/lightweight/follow.tpl @@ -12,7 +12,7 @@ {LANG->StartedBy} {AUTHOR}

{LANG->FollowExplanation}

-

+

diff --git a/templates/lightweight/pm_buddies.tpl b/templates/lightweight/pm_buddies.tpl index 92f492e19..4e298a87e 100644 --- a/templates/lightweight/pm_buddies.tpl +++ b/templates/lightweight/pm_buddies.tpl @@ -16,7 +16,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/lightweight/pm_list_incoming.tpl b/templates/lightweight/pm_list_incoming.tpl index 2b8f47cea..8901af6f1 100644 --- a/templates/lightweight/pm_list_incoming.tpl +++ b/templates/lightweight/pm_list_incoming.tpl @@ -12,7 +12,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/lightweight/pm_list_outgoing.tpl b/templates/lightweight/pm_list_outgoing.tpl index bdbd5a3b2..a4a9d7bc3 100644 --- a/templates/lightweight/pm_list_outgoing.tpl +++ b/templates/lightweight/pm_list_outgoing.tpl @@ -13,7 +13,7 @@ } } } - document.write ( '' ); + document.write ( '' ); diff --git a/templates/lightweight/pm_post.tpl b/templates/lightweight/pm_post.tpl index f25a66923..641f8613f 100644 --- a/templates/lightweight/pm_post.tpl +++ b/templates/lightweight/pm_post.tpl @@ -42,14 +42,14 @@ {IF SHOW_USERSELECTION}
{IF USERS} - {LOOP USERS} {/LOOP USERS} {ELSE} - + {/IF} {! Always show recipient list on a separate line} @@ -67,7 +67,7 @@
{LANG->Subject}:
-
+

{LANG->Options}:
@@ -78,7 +78,7 @@ {LANG->Message}:
- +
diff --git a/templates/lightweight/posting.tpl b/templates/lightweight/posting.tpl index 858c387a1..4bb097d5a 100644 --- a/templates/lightweight/posting.tpl +++ b/templates/lightweight/posting.tpl @@ -48,7 +48,7 @@
-
+ {POST_VARS} @@ -60,14 +60,12 @@ {LANG->Special}:
{IF OPTION_ALLOWED->sticky} - special "sticky"}checked="checked"{/IF} /> - + special "sticky"}checked="checked"{/IF} /> +
{/IF} - allow_reply} checked="checked"{/IF} /> + allow_reply} checked="checked"{/IF} />
{/IF} @@ -107,7 +105,7 @@ {/IF} {LANG->Subject}:
-
+

{HOOK "tpl_editor_after_subject"} @@ -119,21 +117,21 @@ {IF OPTION_ALLOWED->subscribe} - subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
+ subscription}checked="checked"{/IF} {IF OPTION_ALLOWED->subscribe_mail}onclick="phorum_subscription_displaystate()"{/IF} />
{IF OPTION_ALLOWED->subscribe_mail} -
+
tree-L - subscription "message"}checked="checked"{/IF} /> + subscription "message"}checked="checked"{/IF} />