mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-12 06:18:52 +00:00
fix for bug #6728
git-svn-id: file:///svn/phpbb/trunk@6850 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
a643f85f6b
commit
09ce0caad6
3 changed files with 58 additions and 29 deletions
|
@ -2593,8 +2593,7 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
|
||||||
{
|
{
|
||||||
if ($errstr)
|
if ($errstr)
|
||||||
{
|
{
|
||||||
// convert possible localized errstr to utf8
|
$errstr = utf8_convert_message($errstr);
|
||||||
// $errstr = utf8_convert_message($errstr);
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -1,34 +1,62 @@
|
||||||
<!-- You should retain this javascript in your own template! -->
|
<!-- 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;
|
|
||||||
}
|
|
||||||
|
|
||||||
function insert_marked(users)
|
<!-- IF S_SEARCH_USER and S_FORM_NAME -->
|
||||||
{
|
<script type="text/javascript">
|
||||||
if (typeof(users.length) == "undefined")
|
<!--
|
||||||
{
|
function insert_user(user)
|
||||||
insert_user(users.value);
|
|
||||||
}
|
|
||||||
else if (users.length > 0)
|
|
||||||
{
|
|
||||||
for (i = 0; i < users.length; i++)
|
|
||||||
{
|
{
|
||||||
if (users[i].checked)
|
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[i].value);
|
insert_user(users.value);
|
||||||
|
}
|
||||||
|
else if (users.length > 0)
|
||||||
|
{
|
||||||
|
for (i = 0; i < users.length; i++)
|
||||||
|
{
|
||||||
|
if (users[i].checked)
|
||||||
|
{
|
||||||
|
insert_user(users[i].value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
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>
|
||||||
self.close();
|
|
||||||
}
|
|
||||||
|
|
||||||
//-->
|
|
||||||
</script>
|
|
||||||
<!-- ENDIF -->
|
<!-- ENDIF -->
|
||||||
|
|
||||||
<form method="post" action="{S_MODE_ACTION}" name="search">
|
<form method="post" action="{S_MODE_ACTION}" name="search">
|
||||||
|
|
|
@ -60,8 +60,10 @@ function find_username()
|
||||||
return false;
|
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)
|
function marklist(id, name, state)
|
||||||
{
|
{
|
||||||
var parent = document.getElementById(id);
|
var parent = document.getElementById(id);
|
||||||
|
|
Loading…
Add table
Reference in a new issue