diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-07 11:58:28 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-01-07 11:58:28 +0000 |
| commit | 09ce0caad6cf62214b56387697afb9fb2f2cc4d8 (patch) | |
| tree | d6beb28864bfed12d73bad74ceefee611d536685 /phpBB | |
| parent | a643f85f6b33f8e0a8a30b5eb6696a40b78e2abd (diff) | |
| download | forums-09ce0caad6cf62214b56387697afb9fb2f2cc4d8.tar forums-09ce0caad6cf62214b56387697afb9fb2f2cc4d8.tar.gz forums-09ce0caad6cf62214b56387697afb9fb2f2cc4d8.tar.bz2 forums-09ce0caad6cf62214b56387697afb9fb2f2cc4d8.tar.xz forums-09ce0caad6cf62214b56387697afb9fb2f2cc4d8.zip | |
fix for bug #6728
git-svn-id: file:///svn/phpbb/trunk@6850 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/memberlist_search.html | 72 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/overall_header.html | 6 |
3 files changed, 55 insertions, 26 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index f1d51c8d71..cb31e3567a 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2593,8 +2593,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port { if ($errstr) { - // convert possible localized errstr to utf8 - // $errstr = utf8_convert_message($errstr); + $errstr = utf8_convert_message($errstr); return false; } else diff --git a/phpBB/styles/subSilver/template/memberlist_search.html b/phpBB/styles/subSilver/template/memberlist_search.html index b602ab8aa6..99c509e550 100644 --- a/phpBB/styles/subSilver/template/memberlist_search.html +++ b/phpBB/styles/subSilver/template/memberlist_search.html @@ -1,34 +1,62 @@ <!-- You should retain this javascript in your own template! --> + <!-- IF S_SEARCH_USER and S_FORM_NAME --> -<script language="javascript" type="text/javascript"> -<!-- -function insert_user(user) -{ - opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user; -} + <script type="text/javascript"> + <!-- + function insert_user(user) + { + opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value = ( opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value.length && opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.type == "textarea" ) ? opener.document.forms['{S_FORM_NAME}'].{S_FIELD_NAME}.value + "\n" + user : user; + } -function insert_marked(users) -{ - if (typeof(users.length) == "undefined") - { - insert_user(users.value); - } - else if (users.length > 0) - { - for (i = 0; i < users.length; i++) + function insert_marked(users) { - if (users[i].checked) + if (typeof(users.length) == "undefined") + { + insert_user(users.value); + } + else if (users.length > 0) { - insert_user(users[i].value); + for (i = 0; i < users.length; i++) + { + if (users[i].checked) + { + insert_user(users[i].value); + } + } } + + self.close(); } - } - self.close(); -} + /** + * Mark/unmark checklist + * id = ID of parent container, name = name prefix, state = state [true/false] + */ + function marklist(id, name, state) + { + var parent = document.getElementById(id); + if (!parent) + { + eval('parent = document.' + id); + } + + if (!parent) + { + return; + } -//--> -</script> + var rb = parent.getElementsByTagName('input'); + + for (var r = 0; r < rb.length; r++) + { + if (rb[r].name.substr(0, name.length) == name) + { + rb[r].checked = state; + } + } + } + //--> + </script> <!-- ENDIF --> <form method="post" action="{S_MODE_ACTION}" name="search"> diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index 4fb03306c2..cb7feca620 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -60,8 +60,10 @@ function find_username() return false; } -// Mark/unmark checkboxes -// id = ID of parent container, name = name prefix, state = state [true/false] +/** +* Mark/unmark checklist +* id = ID of parent container, name = name prefix, state = state [true/false] +*/ function marklist(id, name, state) { var parent = document.getElementById(id); |