nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-08-31 18:46:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor scripts to allow operation with Content-Security-Policy: script-src 'self'

Browse Source
This commit is contained in:
Piotr Filip 2022-10-19 11:06:20 +02:00 committed by Andrew Ruthven
parent 43bda7a5ba
commit 35641b099a
7 changed files with 172 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/js/collection-edit.js Normal file
View File

@ -0,0 +1,24 @@
{
let element = document.getElementById("fld_is_calendar");
if (element != null ) {
element.addEventListener('click', function() {
toggle_enabled('fld_is_calendar','=fld_timezone','=fld_schedule_transp','!fld_is_addressbook');
});
}
element = document.getElementById("fld_is_addressbook");
if (element != null ) {
element.addEventListener('click', function() {
toggle_enabled('fld_is_addressbook','!fld_is_calendar');
});
}
element = document.getElementById("fld_use_default_privs");
if (element != null ) {
element.addEventListener('click', function() {
toggle_visible('fld_use_default_privs','!privileges_settings');
});
}
}
toggle_enabled('fld_is_calendar','=fld_timezone','=fld_schedule_transp','!fld_is_addressbook');
toggle_enabled('fld_is_addressbook','!fld_is_calendar');
toggle_visible('fld_use_default_privs','!privileges_settings');

73
htdocs/js/common.js Normal file
View File

@ -0,0 +1,73 @@
function toggle_visible() {
var argv = toggle_visible.arguments;
var argc = argv.length;
var fld_checkbox = document.getElementById(argv[0]);
if ( argc < 2 ) {
return;
}
for (var i = 1; i < argc; i++) {
var block_id = argv[i].substr(1);
var block_logical = argv[i].substr(0,1);
var b = document.getElementById(block_id);
if ( block_logical == '!' )
b.style.display = (fld_checkbox.checked ? 'none' : '');
else
b.style.display = (!fld_checkbox.checked ? 'none' : '');
}
}
function toggle_privileges() {
var argv = toggle_privileges.arguments;
var argc = argv.length;
if ( argc < 2 ) {
return;
}
var match_me = argv[0];
var set_to = -1;
if ( argv[1] == 'all' ) {
let fields = document.querySelectorAll('[id^=' + match_me + '_]');
fields.forEach((field) => {
if ( set_to == -1 ) {
set_to = ( field.checked ? 0 : 1 );
}
field.checked = set_to;
});
}
else {
for (var i = 1; i < argc; i++) {
var f = document.getElementById( match_me + '_' + argv[i]);
if ( f != null ) {
if ( set_to == -1 ) {
set_to = ( f.checked ? 0 : 1 );
}
f.checked = set_to;
}
}
}
}
function toggle_enabled() {
var argv = toggle_enabled.arguments;
var argc = argv.length;
var fld_checkbox = document.getElementById(argv[0]);
if ( argc < 2 ) {
return;
}
for (var i = 1; i < argc; i++) {
var fld_id = argv[i].substr(1);
var fld_logical = argv[i].substr(0,1);
var f = document.getElementById(fld_id);
if ( fld_logical == '=' )
f.disabled = !fld_checkbox.checked;
else
f.disabled = fld_checkbox.checked;
}
}

42
htdocs/js/edit.js Normal file
View File

@ -0,0 +1,42 @@
const privilege_types = ['grant_privileges', 'ticket_privileges', 'default_privileges'];
for (const fname of privilege_types) {
let element = document.getElementById("toggle_priv_"+fname+"_all");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'all');
});
}
element = document.getElementById("toggle_priv_"+fname+"_rw");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'read', 'write-properties', 'write-content', 'bind', 'unbind', 'read-free-busy', 'read-current-user-privilege-set',
'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy', 'schedule-send-invite', 'schedule-send-reply',
'schedule-send-freebusy' );
});
}
element = document.getElementById("toggle_priv_"+fname+"_read");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'read', 'read-free-busy', 'schedule-query-freebusy', 'read-current-user-privilege-set' );
});
}
element = document.getElementById("toggle_priv_"+fname+"_fb");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'read-free-busy', 'schedule-query-freebusy' );
});
}
element = document.getElementById("toggle_priv_"+fname+"_sd");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy' );
});
}
element = document.getElementById("toggle_priv_"+fname+"_ss");
if (element != null ) {
element.addEventListener('click', function() {
toggle_privileges(fname, 'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' );
});
}
}

8
htdocs/js/setup.js Normal file
View File

@ -0,0 +1,8 @@
{
let element = document.getElementById("fld_show_phpinfo");
if (element != null ) {
element.addEventListener('click', function() {
toggle_visible('fld_show_phpinfo','=phpinfo');
});
}
}

25
htdocs/setup.php
View File

@ -483,30 +483,11 @@ $content_config2
<p>$site_statistics_table</p>
<h2>$heading_php_info</h2>
<script language="javascript">
function toggle_visible() {
var argv = toggle_visible.arguments;
var argc = argv.length;
var fld_checkbox = document.getElementById(argv[0]);
if ( argc < 2 ) {
return;
}
for (var i = 1; i < argc; i++) {
var block_id = argv[i].substr(1);
var block_logical = argv[i].substr(0,1);
var b = document.getElementById(block_id);
if ( block_logical == '!' )
b.style.display = (fld_checkbox.checked ? 'none' : '');
else
b.style.display = (!fld_checkbox.checked ? 'none' : '');
}
}
</script><p><label>Show phpinfo() output:<input type="checkbox" value="1" id="fld_show_phpinfo" onclick="toggle_visible('fld_show_phpinfo','=phpinfo')"></label></p>
<p><label>Show phpinfo() output:<input type="checkbox" value="1" id="fld_show_phpinfo"></label></p>
<div style="display:none" id="phpinfo">$phpinfo</div>
EOBODY;
$c->scripts[] = 'js/common.js';
$c->scripts[] = 'js/setup.js';
include("page-footer.php");

118
inc/ui/collection-edit.php
View File

@ -17,12 +17,9 @@ $editor->AddAttribute('timezone', 'id', 'fld_timezone' );
$editor->AddAttribute('schedule_transp', 'id', 'fld_schedule_transp' );
$editor->AddAttribute('is_calendar', 'id', 'fld_is_calendar');
$editor->AddAttribute('is_addressbook', 'id', 'fld_is_addressbook');
$editor->AddAttribute('is_calendar', 'onclick', 'toggle_enabled(\'fld_is_calendar\',\'=fld_timezone\',\'=fld_schedule_transp\',\'!fld_is_addressbook\');');
$editor->AddAttribute('is_addressbook', 'onclick', 'toggle_enabled(\'fld_is_addressbook\',\'!fld_is_calendar\');');
$editor->AddField('use_default_privs','default_privileges IS NULL');
$editor->AddAttribute('use_default_privs', 'id', 'fld_use_default_privs');
$editor->AddAttribute('use_default_privs', 'onclick', 'toggle_visible(\'fld_use_default_privs\',\'!privileges_settings\');');
$editor->AddField('ics_file', "''");
$editor->AddAttribute('ics_file', 'title', translate('Upload an iCalendar file or VCard file to replace this collection.'));
@ -178,6 +175,9 @@ if ( $editor->Available() ) {
}
else {
$c->page_title = $editor->Title(translate('Create New Collection'));
$c->scripts[] = 'js/common.js';
$c->scripts[] = 'js/edit.js';
$c->scripts[] = 'js/collection-edit.js';
$privs = decbin(privilege_to_bits($c->default_privileges));
$editor->Assign('default_privileges', $privs);
$editor->Assign('username', $principal->username());
@ -270,15 +270,10 @@ $btn_ss = htmlspecialchars(translate('Schedule Send')); $btn_ss_title = htmls
if ($can_write_collection || ! $id > 0) {
$privileges_row = <<<EOPRIV
<input type="button" value="$btn_all" class="submit" title="$btn_all_title" onclick="toggle_privileges('default_privileges', 'all', 'form_editor_1');">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title"
onclick="toggle_privileges('default_privileges', 'read', 'write-properties', 'write-content', 'bind', 'unbind', 'read-free-busy',
'read-current-user-privilege-set', 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy',
'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' );">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title"
onclick="toggle_privileges('default_privileges', 'read', 'read-free-busy', 'schedule-query-freebusy', 'read-current-user-privilege-set' );">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title"
onclick="toggle_privileges('default_privileges', 'read-free-busy', 'schedule-query-freebusy' );">
<input type="button" value="$btn_all" class="submit" title="$btn_all_title" id="toggle_priv_default_privileges_all">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title" id="toggle_priv_default_privileges_rw">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title" id="toggle_priv_default_privileges_read">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title" id="toggle_priv_default_privileges_fb">
<br>$privileges_set
EOPRIV;
$submit_row = '<tr> <th class="right"></th> <td class="left" colspan="2">##submit##</td> </tr>';
@ -292,84 +287,6 @@ $csrf_field = getCsrfField();
$id = $editor->Value('collection_id');
$template = <<<EOTEMPLATE
##form##
<script language="javascript">
function toggle_privileges() {
var argv = toggle_privileges.arguments;
var argc = argv.length;
if ( argc < 2 ) {
return;
}
var match_me = argv[0];
var set_to = -1;
if ( argv[1] == 'all' ) {
var form = document.getElementById(argv[2]);
var fieldcount = form.elements.length;
var matching = '/^' + match_me + '/';
for (var i = 0; i < fieldcount; i++) {
var fieldname = form.elements[i].name;
if ( fieldname.match( match_me ) ) {
if ( set_to == -1 ) {
set_to = ( form.elements[i].checked ? 0 : 1 );
}
form.elements[i].checked = set_to;
}
}
}
else {
for (var i = 1; i < argc; i++) {
var f = document.getElementById( match_me + '_' + argv[i]);
if ( set_to == -1 ) {
set_to = ( f.checked ? 0 : 1 );
}
f.checked = set_to;
}
}
}
function toggle_enabled() {
var argv = toggle_enabled.arguments;
var argc = argv.length;
var fld_checkbox = document.getElementById(argv[0]);
if ( argc < 2 ) {
return;
}
for (var i = 1; i < argc; i++) {
var fld_id = argv[i].substr(1);
var fld_logical = argv[i].substr(0,1);
var f = document.getElementById(fld_id);
if ( fld_logical == '=' )
f.disabled = !fld_checkbox.checked;
else
f.disabled = fld_checkbox.checked;
}
}
function toggle_visible() {
var argv = toggle_visible.arguments;
var argc = argv.length;
var fld_checkbox = document.getElementById(argv[0]);
if ( argc < 2 ) {
return;
}
for (var i = 1; i < argc; i++) {
var block_id = argv[i].substr(1);
var block_logical = argv[i].substr(0,1);
var b = document.getElementById(block_id);
if ( block_logical == '!' )
b.style.display = (fld_checkbox.checked ? 'none' : '');
else
b.style.display = (!fld_checkbox.checked ? 'none' : '');
}
}
</script>
<style>
th.right, label.privilege {
white-space:nowrap;
@ -402,11 +319,6 @@ label.privilege {
</table>
$csrf_field
</form>
<script language="javascript">
toggle_enabled('fld_is_calendar','=fld_timezone','=fld_schedule_transp','!fld_is_addressbook');
toggle_enabled('fld_is_addressbook','!fld_is_calendar');
toggle_visible('fld_use_default_privs','!privileges_settings');
</script>
EOTEMPLATE;
@ -420,6 +332,9 @@ if ( $editor->Available() ) {
$c->stylesheets[] = 'css/browse.css';
$c->scripts[] = 'js/browse.js';
$c->scripts[] = 'js/common.js';
$c->scripts[] = 'js/edit.js';
$c->scripts[] = 'js/collection-edit.js';
$grantrow = new Editor("Grants", "grants");
@ -483,15 +398,10 @@ if ( $editor->Available() ) {
$csrf_field
<td class="left" colspan="2"><input type="hidden" name="id" value="$id"><input type="hidden" name="orig_to_id" value="$orig_to_id">##to_principal.select##</td>
<td class="left" colspan="2">
<input type="button" value="$btn_all" class="submit" title="$btn_all_title" onclick="toggle_privileges('grant_privileges', 'all', 'form_$form_id');">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title"
onclick="toggle_privileges('grant_privileges', 'read', 'write-properties', 'write-content', 'bind', 'unbind', 'read-free-busy',
'read-current-user-privilege-set', 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy',
'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' );">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title"
onclick="toggle_privileges('grant_privileges', 'read', 'read-free-busy', 'schedule-query-freebusy', 'read-current-user-privilege-set' );">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title"
onclick="toggle_privileges('grant_privileges', 'read-free-busy', 'schedule-query-freebusy' );">
<input type="button" value="$btn_all" class="submit" title="$btn_all_title" id="toggle_priv_grant_privileges_all">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title" id="toggle_priv_grant_privileges_rw">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title" id="toggle_priv_grant_privileges_read">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title" id="toggle_priv_grant_privileges_fb">
<br>$privileges_set
<td class="center">##$submit_label.submit##</td>
</form>

56
inc/ui/principal-edit.php
View File

@ -357,42 +357,6 @@ function principal_editor() {
$id = $editor->Value('principal_id');
$template = <<<EOTEMPLATE
##form##
<script language="javascript">
function toggle_privileges() {
var argv = toggle_privileges.arguments;
var argc = argv.length;
if ( argc < 2 ) {
return;
}
var match_me = argv[0];
var set_to = -1;
if ( argv[1] == 'all' ) {
var form = document.getElementById(argv[2]);
var fieldcount = form.elements.length;
var matching = '/^' + match_me + '/';
for (var i = 0; i < fieldcount; i++) {
var fieldname = form.elements[i].name;
if ( fieldname.match( match_me ) ) {
if ( set_to == -1 ) {
set_to = ( form.elements[i].checked ? 0 : 1 );
}
form.elements[i].checked = set_to;
}
}
}
else {
for (var i = 1; i < argc; i++) {
var f = document.getElementById( match_me + '_' + argv[i]);
if ( set_to == -1 ) {
set_to = ( f.checked ? 0 : 1 );
}
f.checked = set_to;
}
}
}
</script>
<style>
th.right, label.privilege {
white-space:nowrap;
@ -453,18 +417,12 @@ function build_privileges_html( $ed, $fname ) {
$form_id = $ed->Id();
$html = <<<EOTEMPLATE
<input type="button" value="$btn_all" class="submit" title="$btn_all_title"
onclick="toggle_privileges('$fname', 'all', 'form_$form_id');">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title"
onclick="toggle_privileges('$fname', 'read', 'write-properties', 'write-content', 'bind', 'unbind', 'read-free-busy', 'read-current-user-privilege-set', 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy', 'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' );">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title"
onclick="toggle_privileges('$fname', 'read', 'read-free-busy', 'schedule-query-freebusy', 'read-current-user-privilege-set' );">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title"
onclick="toggle_privileges('$fname', 'read-free-busy', 'schedule-query-freebusy' );">
<input type="button" value="$btn_sd" class="submit" title="$btn_sd_title"
onclick="toggle_privileges('$fname', 'schedule-deliver-invite', 'schedule-deliver-reply', 'schedule-query-freebusy' );">
<input type="button" value="$btn_ss" class="submit" title="$btn_ss_title"
onclick="toggle_privileges('$fname', 'schedule-send-invite', 'schedule-send-reply', 'schedule-send-freebusy' );">
<input type="button" value="$btn_all" class="submit" title="$btn_all_title" id="toggle_priv_${fname}_all">
<input type="button" value="$btn_rw" class="submit" title="$btn_rw_title" id="toggle_priv_${fname}_rw">
<input type="button" value="$btn_read" class="submit" title="$btn_read_title" id="toggle_priv_${fname}_read">
<input type="button" value="$btn_fb" class="submit" title="$btn_fb_title" id="toggle_priv_${fname}_fb">
<input type="button" value="$btn_sd" class="submit" title="$btn_sd_title" id="toggle_priv_${fname}_sd">
<input type="button" value="$btn_ss" class="submit" title="$btn_ss_title" id="toggle_priv_${fname}_ss">
<br>$privileges_set
EOTEMPLATE;
@ -1170,6 +1128,8 @@ $page_elements[] = $editor;
if ( isset($id) && $id > 0 ) {
$c->stylesheets[] = 'css/browse.css';
$c->scripts[] = 'js/browse.js';
$c->scripts[] = 'js/common.js';
$c->scripts[] = 'js/edit.js';
if ( isset($delete_principal_confirmation_required) )
$page_elements[] = confirm_delete_principal($delete_principal_confirmation_required, $editor->Value('displayname'));