From a91e3d68b0727c4e3c93056b72161cfeaa3c09e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 16 Jun 2012 17:53:14 +0200 Subject: [PATCH 1/4] fixing syntax error --- 3rdparty/MDB2/Schema/Writer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/3rdparty/MDB2/Schema/Writer.php b/3rdparty/MDB2/Schema/Writer.php index 96dd2bed0f..3eaa39a207 100644 --- a/3rdparty/MDB2/Schema/Writer.php +++ b/3rdparty/MDB2/Schema/Writer.php @@ -80,6 +80,7 @@ class MDB2_Schema_Writer function __construct($valid_types = array()) { $this->valid_types = $valid_types; + } // }}} // {{{ raiseError() From 6642ef6a509417f61cffa51022a3192bdff69823 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sat, 16 Jun 2012 18:06:10 +0200 Subject: [PATCH 2/4] Fix string encoding probs. --- apps/contacts/ajax/contacts.php | 2 +- apps/contacts/ajax/editaddress.php | 13 ++++++++++- apps/contacts/index.php | 2 +- apps/contacts/templates/part.contacts.php | 2 +- .../templates/part.edit_address_dialog.php | 22 ++++++++----------- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php index 37d396cd83..dbc9be5ca5 100644 --- a/apps/contacts/ajax/contacts.php +++ b/apps/contacts/ajax/contacts.php @@ -13,7 +13,7 @@ OCP\JSON::checkAppEnabled('contacts'); $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser()); $contacts = OC_Contacts_VCard::all($ids); $tmpl = new OCP\Template("contacts", "part.contacts"); -$tmpl->assign('contacts', $contacts); +$tmpl->assign('contacts', $contacts, false); $page = $tmpl->fetchPage(); OCP\JSON::success(array('data' => array( 'page' => $page ))); diff --git a/apps/contacts/ajax/editaddress.php b/apps/contacts/ajax/editaddress.php index 969aeeba8f..2d7aba11b0 100644 --- a/apps/contacts/ajax/editaddress.php +++ b/apps/contacts/ajax/editaddress.php @@ -20,7 +20,18 @@ if($checksum) { $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum); $element = $vcard->children[$line]; $adr = OC_Contacts_VCard::structureProperty($element); - $tmpl->assign('adr',$adr); + $types = array(); + if(isset($adr['parameters']['TYPE'])) { + if(is_array($adr['parameters']['TYPE'])) { + $types = array_map('htmlspecialchars', $adr['parameters']['TYPE']); + $types = array_map('strtoupper', $types); + } else { + $types = array(strtoupper(htmlspecialchars($adr['parameters']['TYPE']))); + } + } + $tmpl->assign('types', $types, false); + $adr = array_map('htmlspecialchars', $adr['value']); + $tmpl->assign('adr', $adr, false); } $tmpl->assign('id',$id); diff --git a/apps/contacts/index.php b/apps/contacts/index.php index 74b7c43c55..bdb52c123c 100644 --- a/apps/contacts/index.php +++ b/apps/contacts/index.php @@ -66,7 +66,7 @@ $tmpl->assign('phone_types', $phone_types); $tmpl->assign('email_types', $email_types); $tmpl->assign('categories', $categories); $tmpl->assign('addressbooks', $addressbooks); -$tmpl->assign('contacts', $contacts); +$tmpl->assign('contacts', $contacts, false); $tmpl->assign('details', $details ); $tmpl->assign('id',$id); $tmpl->printPage(); diff --git a/apps/contacts/templates/part.contacts.php b/apps/contacts/templates/part.contacts.php index 00a61f72fd..5751750540 100644 --- a/apps/contacts/templates/part.contacts.php +++ b/apps/contacts/templates/part.contacts.php @@ -8,5 +8,5 @@ } } ?> -
    • +
    • diff --git a/apps/contacts/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php index 7684795f34..d5ea95ba46 100644 --- a/apps/contacts/templates/part.edit_address_dialog.php +++ b/apps/contacts/templates/part.edit_address_dialog.php @@ -1,13 +1,9 @@
    -
    @@ -22,43 +18,43 @@ foreach(isset($adr['parameters']['TYPE'])?array($adr['parameters']['TYPE']):arra
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    From 4cbdd59859af971549a77ab684a06e08ee5f46d7 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Sat, 16 Jun 2012 18:38:20 +0200 Subject: [PATCH 3/4] Fix char encoding. --- apps/contacts/ajax/editname.php | 5 +++-- apps/contacts/templates/part.edit_name_dialog.php | 10 +++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/contacts/ajax/editname.php b/apps/contacts/ajax/editname.php index d06d416b7e..62cae894b6 100644 --- a/apps/contacts/ajax/editname.php +++ b/apps/contacts/ajax/editname.php @@ -28,8 +28,9 @@ if($id) { $name = OC_Contacts_VCard::structureProperty($property); } } - $tmpl->assign('name',$name); - $tmpl->assign('id',$id); + $name = array_map('htmlspecialchars', $name['value']); + $tmpl->assign('name',$name, false); + $tmpl->assign('id',$id, false); } else { bailOut(OC_Contacts_App::$l10n->t('Contact ID is missing.')); } diff --git a/apps/contacts/templates/part.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php index be45f9a5b0..f984c232a3 100644 --- a/apps/contacts/templates/part.edit_name_dialog.php +++ b/apps/contacts/templates/part.edit_name_dialog.php @@ -22,7 +22,7 @@ $addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
    - +
    -
    +
    -
    +
    -
    +
    - +