nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-28 03:04:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use htmlspecialchars rather than htmlentities, which screws up translations.

Browse Source
This commit is contained in:
Andrew McMillan 2010-02-18 22:06:51 +13:00
parent 9338bf48ac
commit 87816b2a05
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,27 +138,27 @@ for( $i=0; $i<count($privilege_names); $i++ ) {
} }
$privileges_set .= '</div>'; $privileges_set .= '</div>';
$prompt_collection_id = htmlentities(translate('Collection ID')); $prompt_collection_id = translate('Collection ID');
$value_id = ( $editor->Available() ? '##collection_id.hidden####collection_id.value##' : htmlentities(translate('New Collection'))); $value_id = ( $editor->Available() ? '##collection_id.hidden####collection_id.value##' : translate('New Collection'));
$prompt_dav_name = htmlentities(translate('DAV Path')); $prompt_dav_name = translate('DAV Path');
$value_dav_name = ( $editor->Available() ? '##dav_name.value##' : '/##user_no.hidden####username.value##/ ##collection_name.input.30##' ); $value_dav_name = ( $editor->Available() ? '##dav_name.value##' : '/##user_no.hidden####username.value##/ ##collection_name.input.30##' );
$prompt_load_file = htmlentities(translate('Load From File')); $prompt_load_file = translate('Load From File');
$prompt_displayname = htmlentities(translate('Displayname')); $prompt_displayname = translate('Displayname');
$prompt_public = htmlentities(translate('Publicly Readable')); $prompt_public = translate('Publicly Readable');
$prompt_calendar = htmlentities(translate('Is a Calendar')); $prompt_calendar = translate('Is a Calendar');
$prompt_addressbook = htmlentities(translate('Is an Addressbook')); $prompt_addressbook = translate('Is an Addressbook');
$prompt_use_default_privs = htmlentities(translate('Specific Privileges')); $prompt_use_default_privs = translate('Specific Privileges');
$prompt_privileges = htmlentities(translate('Default Privileges')); $prompt_privileges = translate('Default Privileges');
$prompt_description = htmlentities(translate('Description')); $prompt_description = translate('Description');
$prompt_schedule_transp = htmlentities(translate('Schedule Transparency')); $prompt_schedule_transp = translate('Schedule Transparency');
$prompt_timezone = htmlentities(translate('Calendar Timezone')); $prompt_timezone = translate('Calendar Timezone');
$btn_all = htmlentities(translate('All')); $btn_all_title = htmlentities(translate('Toggle all privileges')); $btn_all = htmlspecialchars(translate('All')); $btn_all_title = htmlspecialchars(translate('Toggle all privileges'));
$btn_rw = htmlentities(translate('Read/Write')); $btn_rw_title = htmlentities(translate('Set read+write privileges')); $btn_rw = htmlspecialchars(translate('Read/Write')); $btn_rw_title = htmlspecialchars(translate('Set read+write privileges'));
$btn_read = htmlentities(translate('Read')); $btn_read_title = htmlentities(translate('Set read privileges')); $btn_read = htmlspecialchars(translate('Read')); $btn_read_title = htmlspecialchars(translate('Set read privileges'));
$btn_fb = htmlentities(translate('Free/Busy')); $btn_fb_title = htmlentities(translate('Set free/busy privileges')); $btn_fb = htmlspecialchars(translate('Free/Busy')); $btn_fb_title = htmlspecialchars(translate('Set free/busy privileges'));
$btn_sd = htmlentities(translate('Schedule Deliver')); $btn_sd_title = htmlentities(translate('Set schedule-deliver privileges')); $btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
$btn_ss = htmlentities(translate('Schedule Send')); $btn_ss_title = htmlentities(translate('Set schedule-deliver privileges')); $btn_ss = htmlspecialchars(translate('Schedule Send')); $btn_ss_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
$id = $editor->Value('collection_id'); $id = $editor->Value('collection_id');
@ -390,7 +390,7 @@ EOTEMPLATE;
if ( $can_write_collection ) { if ( $can_write_collection ) {
$del_link = "<a href=\"/admin.php?action=edit&t=collection&id=$id&delete_grant=##to_principal##\" class=\"submit\">Delete</a>"; $del_link = "<a href=\"/admin.php?action=edit&t=collection&id=$id&delete_grant=##to_principal##\" class=\"submit\">Delete</a>";
$edit_link = "<a href=\"/admin.php?action=edit&t=collection&id=$id&edit_grant=##to_principal##\" class=\"submit\">Edit</a>"; $edit_link = "<a href=\"/admin.php?action=edit&t=collection&id=$id&edit_grant=##to_principal##\" class=\"submit\">Edit</a>";
$browser->AddColumn( 'action', 'Action', 'center', '', "'$edit_link&nbsp;$del_link'" ); $browser->AddColumn( 'action', translate('Action'), 'center', '', "'$edit_link&nbsp;$del_link'" );
} }
$browser->SetOrdering( 'displayname', 'A' ); $browser->SetOrdering( 'displayname', 'A' );

2
inc/ui/principal-browse.php
View File

@ -34,7 +34,7 @@ if ( isset($principal_type) ) {
$c->page_title = $browser->Title(); $c->page_title = $browser->Title();
if ( $c->enable_row_linking ) { if ( $c->enable_row_linking ) {
$browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.translate('Click to display user details').'" class="r%d">', '</tr>', '#even' ); $browser->RowFormat( '<tr onMouseover="LinkHref(this,1);" title="'.htmlspecialchars(translate('Click to display user details')).'" class="r%d">', '</tr>', '#even' );
} }
else { else {
$browser->RowFormat( '<tr class="r%d">', '</tr>', '#even' ); $browser->RowFormat( '<tr class="r%d">', '</tr>', '#even' );

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

@ -170,24 +170,24 @@ for( $i=0; $i<count($privilege_names); $i++ ) {
} }
$privileges_set .= '</div>'; $privileges_set .= '</div>';
$prompt_principal_id = htmlentities(translate('Principal ID')); $prompt_principal_id = translate('Principal ID');
$prompt_username = htmlentities(translate('Username')); $prompt_username = translate('Username');
$prompt_password_1 = htmlentities(translate('Change Password')); $prompt_password_1 = translate('Change Password');
$prompt_password_1 = htmlentities(translate('Confirm Password')); $prompt_password_1 = translate('Confirm Password');
$prompt_fullname = htmlentities(translate('Fullname')); $prompt_fullname = translate('Fullname');
$prompt_email = htmlentities(translate('Email Address')); $prompt_email = translate('Email Address');
$prompt_date_format = htmlentities(translate('Date Format Style')); $prompt_date_format = translate('Date Format Style');
$prompt_admin = htmlentities(translate('Administrator')); $prompt_admin = translate('Administrator');
$prompt_locale = htmlentities(translate('Locale')); $prompt_locale = translate('Locale');
$prompt_type = htmlentities(translate('Principal Type')); $prompt_type = translate('Principal Type');
$prompt_privileges = htmlentities(translate('Default Privileges')); $prompt_privileges = translate('Default Privileges');
$btn_all = htmlentities(translate('All')); $btn_all_title = htmlentities(translate('Toggle all privileges')); $btn_all = htmlspecialchars(translate('All')); $btn_all_title = htmlspecialchars(translate('Toggle all privileges'));
$btn_rw = htmlentities(translate('Read/Write')); $btn_rw_title = htmlentities(translate('Set read+write privileges')); $btn_rw = htmlspecialchars(translate('Read/Write')); $btn_rw_title = htmlspecialchars(translate('Set read+write privileges'));
$btn_read = htmlentities(translate('Read')); $btn_read_title = htmlentities(translate('Set read privileges')); $btn_read = htmlspecialchars(translate('Read')); $btn_read_title = htmlspecialchars(translate('Set read privileges'));
$btn_fb = htmlentities(translate('Free/Busy')); $btn_fb_title = htmlentities(translate('Set free/busy privileges')); $btn_fb = htmlspecialchars(translate('Free/Busy')); $btn_fb_title = htmlspecialchars(translate('Set free/busy privileges'));
$btn_sd = htmlentities(translate('Schedule Deliver')); $btn_sd_title = htmlentities(translate('Set schedule-deliver privileges')); $btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
$btn_ss = htmlentities(translate('Schedule Send')); $btn_ss_title = htmlentities(translate('Set schedule-deliver privileges')); $btn_ss = htmlspecialchars(translate('Schedule Send')); $btn_ss_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
$admin_row_entry = ''; $admin_row_entry = '';
$delete_principal_button = ''; $delete_principal_button = '';