Commit 6b3db126 authored by Jonny Bradley's avatar Jonny Bradley

[MRG] Automatic merge, branches/7.x 35038 to 35061

parent 1cb00e26
......@@ -61,9 +61,9 @@ if (isset($_REQUEST['send'])) {
die;
}
// Parse the to, cc and bcc fields into an array
$arr_to = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['to']);
$arr_cc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['cc']);
$arr_bcc = preg_split('/\s*(?<!\\\);\s*/', $_REQUEST['bcc']);
$arr_to = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['to']);
$arr_cc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['cc']);
$arr_bcc = preg_split('/\s*(?<!\\\)[;,]\s*/', $_REQUEST['bcc']);
if ($prefs['user_selector_realnames_messu'] == 'y') {
$groups = '';
$arr_to = $userlib->find_best_user($arr_to, $groups, 'login');
......
......@@ -34,7 +34,7 @@
<tr>
<td>
<label for="mess-composeto">{tr}To:{/tr}</label>
{help url="Inter-User+Messages#Composing_messages" desc="{tr}To:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}To:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
</td>
<td>
<input type="text" name="to" id="mess-composeto" value="{$to|escape}" class="username" size="80" />
......@@ -45,7 +45,7 @@
<tr>
<td>
<label for="mess-composecc">{tr}CC:{/tr}</label>
{help url="Inter-User+Messages#Composing_messages" desc="{tr}CC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}CC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
</td>
<td>
<input type="text" name="cc" id="mess-composecc" value="{$cc|escape}" class="username" size="80" />
......@@ -54,7 +54,7 @@
<tr>
<td>
<label for="mess-composebcc">{tr}BCC:{/tr}</label>
{help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr}"}
{help url="Inter-User+Messages#Composing_messages" desc="{tr}BCC:{/tr}{tr}Multiple addresses can be separated with semicolons (\";\"){/tr} {tr}or commas (\",\"){/tr}"}
</td>
<td>
<input type="text" name="bcc" id="mess-composebcc" value="{$bcc|escape}" class="username" size="80" />
......
......@@ -21,12 +21,13 @@
{jq}
$('.pref-reset')
.change( function() {
var c = $(this).attr('checked') === "checked";
var $el = $(this).closest('.adminoptionbox').find('input:not(:hidden),select,textarea')
.not('.system').attr( 'disabled', $(this).attr('checked') ? "disabled" : "" )
.css("opacity", $(this).attr('checked') ? .6 : 1 );
.not('.system').attr( 'disabled', c )
.css("opacity", c ? .6 : 1 );
var defval = $("#" + $(this).val() + "_default").val();
if ($el.attr("type") == "checkbox") {
$el.attr('checked', $(this).attr('checked') ? (defval == "y" ? "checked" : "") : ($el.attr('checked') ? "" : "checked" ));
$el.attr('checked', defval === "y" ? c : !c);
} else {
var temp = $("[name=" + $(this).val() + "]").val();
$el.val( defval );
......
......@@ -40,7 +40,7 @@
{initials_filter_links _initial='tr_initial'}
{/if}
{if $checkbox && $items|@count gt 0 && empty($tpl)}<form method="post" action="{if empty($checkbox.action)}#{else}$checkbox.action{/if}">{/if}
{if $checkbox && $items|@count gt 0 && empty($tpl)}<form method="post" action="{if empty($checkbox.action)}#{else}{$checkbox.action}{/if}">{/if}
{if $trackerlistmapview}
{wikiplugin _name="googlemap" name=$trackerlistmapname type="objectlist" width="400" height="400"}{/wikiplugin}
......
......@@ -444,48 +444,32 @@ foreach( $groupNames as $groupName ) {
}
}
$js .= <<< JS
\$('input[name="perm[$groupName][]"]').eachAsync({
$js .= "
\$('input[name=\"perm[$groupName][]\"]').eachAsync({
delay: 10,
bulk: 0,
JS;
";
if ($i == count($groupNames)-1) {
$js .= <<< JS
$js .= "
end: function () {
\$('#perms_busy').hide();
},
JS;
";
}
$js .= <<< JS
$js .= "
loop: function() { // each one of this group
if (\$(this).attr('checked')) {
\$('input[value="'+\$(this).val()+'"]'). // other checkboxes of same value (perm)
filter('$beneficiaries'). // which inherit from this
attr('checked',\$(this).attr('checked')). // check and disable
attr('disabled',\$(this).attr('checked') ? 'disabled' : '');
}
\$(this).change( function() { // bind click event
if (\$(this).attr('checked')) {
\$('input[value="'+\$(this).val()+'"]'). // same...
filter('$beneficiaries').
attr('checked','checked'). // check?
attr('disabled','disabled'); // disable
} else {
\$('input[value="'+\$(this).val()+'"]'). // same...
filter('$beneficiaries').
attr('checked',''). // check?
attr('disabled',''); // disable
}
});
}
var c = \$(this).attr('checked') === 'checked';
\$('input[value=\"'+\$(this).val()+'\"]'). // same...
filter('$beneficiaries').
attr('checked', c). // check?
attr('disabled', c); // disable
}).change();
}
});
JS;
";
$i++;
} // end of for $groupNames loop
......
......@@ -397,21 +397,13 @@ $headerlib->add_jq_onready(<<<JS
\$("input[name=newver]").each(function () {
ver2 = parseInt(\$(this).val(), 10);
if (ver2 == 0) { ver2 = $current_version; }
if (ver2 <= ver) {
\$(this).attr("disabled", "disabled");
} else {
\$(this).attr("disabled", "");
}
\$(this).attr("disabled", (ver2 <= ver));
});
} else if (\$(this).attr("name") == "newver") {
\$("input[name=oldver]").each(function () {
ver2 = parseInt(\$(this).val(), 10);
if (ver2 == 0) { ver2 = $current_version; }
if (ver2 >= ver) {
\$(this).attr("disabled", "disabled");
} else {
\$(this).attr("disabled", "");
}
\$(this).attr("disabled", (ver2 >= ver));
});
}
});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment