From eddad8bedbea4ec655d6835b9a8d0678a81eb850 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sat, 9 Jun 2012 16:15:25 +0200 Subject: [PATCH 1/7] Calendar: remove unused markup from #controls --- apps/calendar/templates/calendar.php | 38 +++++++++++----------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php index 832194f0fe..b0cb20f2f1 100644 --- a/apps/calendar/templates/calendar.php +++ b/apps/calendar/templates/calendar.php @@ -34,29 +34,21 @@ });
-
-
-
- - -    - -
-
-
-
- "/> - " onclick="Calendar.UI.Calendar.overview();" /> -
-
-
-
- - - -
-
-
+
+ + +    + +
+
+ "/> + " onclick="Calendar.UI.Calendar.overview();" /> +
+
+ + + +
From 0eee140eafd128190aab6fce85ae4fb357e18f73 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sat, 9 Jun 2012 16:45:53 +0200 Subject: [PATCH 2/7] Gallery: remove extra include of lib/base.php --- apps/gallery/lib/managers.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php index 9a2dbd3bae..d4d978dbdd 100644 --- a/apps/gallery/lib/managers.php +++ b/apps/gallery/lib/managers.php @@ -2,8 +2,6 @@ namespace OC\Pictures; -require_once('lib/base.php'); - class DatabaseManager { private static $instance = null; const TAG = 'DatabaseManager'; From 759ddcbf32d4b6b9149b9c03259408933448c129 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Mon, 11 Jun 2012 17:38:40 +0200 Subject: [PATCH 3/7] Tasks: Fix resizing of the content part --- apps/tasks/js/tasks.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js index d1e3a9969b..6547b80981 100644 --- a/apps/tasks/js/tasks.js +++ b/apps/tasks/js/tasks.js @@ -310,8 +310,11 @@ OC.Tasks = { }; $(document).ready(function(){ - fillHeight($('#tasks_lists')); - fillWindow($('#tasks_list')); + $(window).resize(function () { + fillHeight($('#tasks_lists')); + fillWindow($('#tasks_list')); + }); + $(window).trigger('resize'); /*------------------------------------------------------------------------- * Actions for startup From 8af53829d572fd1796304a33fc3dbfe9bce84305 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 11 Jun 2012 22:00:06 +0200 Subject: [PATCH 4/7] Contacts: Fix encoding errors, import errors, developer headache, paint cute kittens and pink clouds ;-) --- apps/contacts/lib/vcard.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php index 20a9e4afc9..168e8af3e5 100644 --- a/apps/contacts/lib/vcard.php +++ b/apps/contacts/lib/vcard.php @@ -131,7 +131,7 @@ class OC_Contacts_VCard{ foreach($property->parameters as $key=>&$parameter){ if(strtoupper($parameter->name) == 'ENCODING') { if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used? - $property->value = quoted_printable_decode($property->value); + $property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto')); unset($property->parameters[$key]); } } elseif(strtoupper($parameter->name) == 'CHARSET') { From c75f9f9397a3b21a5165a4f2632882fdc1d894c3 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 11 Jun 2012 22:05:15 +0200 Subject: [PATCH 5/7] Encoding conversion moved to OC_Contacts_VCard::decodeProperty in commit 95cc9730aa49963a69e46154b0cba19232219d2e --- apps/contacts/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 9d5504563f..0ee35f9fd8 100644 --- a/apps/contacts/import.php +++ b/apps/contacts/import.php @@ -63,13 +63,13 @@ foreach($lines as $line){ if(strtoupper(trim($line)) == 'BEGIN:VCARD'){ $inelement = true; } elseif (strtoupper(trim($line)) == 'END:VCARD') { - $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line)); + $card[] = $line; $parts[] = implode($nl, $card); $card = array(); $inelement = false; } if ($inelement === true && trim($line) != '') { - $card[] = str_replace('=0D=0A', '\n', iconv(mb_detect_encoding($line, 'UTF-8, ISO-8859-1'), 'utf-8', $line)); + $card[] = $line; } } //import the contacts From 4b86cbcb6f36b1ee545b00695c01817eb1780157 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 11 Jun 2012 22:12:06 +0200 Subject: [PATCH 6/7] Quick fix for index errors when not importing from files. --- apps/contacts/import.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/contacts/import.php b/apps/contacts/import.php index 0ee35f9fd8..c95fd970fe 100644 --- a/apps/contacts/import.php +++ b/apps/contacts/import.php @@ -15,7 +15,7 @@ session_write_close(); $nl = "\n"; global $progresskey; -$progresskey = 'contacts.import-' . $_GET['progresskey']; +$progresskey = 'contacts.import-' . (isset($_GET['progresskey'])?$_GET['progresskey']:''); if (isset($_GET['progress']) && $_GET['progress']) { echo OC_Cache::get($progresskey); From ac11647d7a3e45b8eea08c4883375c095018e509 Mon Sep 17 00:00:00 2001 From: Thomas Tanghus Date: Mon, 11 Jun 2012 22:13:45 +0200 Subject: [PATCH 7/7] Fix js for missing address fields. --- apps/contacts/js/contacts.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js index a241856300..6b83504c9c 100644 --- a/apps/contacts/js/contacts.js +++ b/apps/contacts/js/contacts.js @@ -839,22 +839,22 @@ Contacts={ $('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']); var adrarray = this.data.ADR[adr]['value']; var adrtxt = ''; - if(adrarray[0].length > 0) { + if(adrarray[0] && adrarray[0].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[0].strip_tags() + '
    • '; } - if(adrarray[1].length > 0) { + if(adrarray[1] && adrarray[1].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[1].strip_tags() + '
    • '; } - if(adrarray[2].length > 0) { + if(adrarray[2] && adrarray[2].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[2].strip_tags() + '
    • '; } - if(adrarray[3].length > 0 || adrarray[5].length > 0) { + if((adrarray[3] && adrarray[5]) && adrarray[3].length > 0 || adrarray[5].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '
    • '; } - if(adrarray[4].length > 0) { + if(adrarray[4] && adrarray[4].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[4].strip_tags() + '
    • '; } - if(adrarray[6].length > 0) { + if(adrarray[6] && adrarray[6].length > 0) { adrtxt = adrtxt + '
  • ' + adrarray[6].strip_tags() + '
    • '; } $('#addressdisplay dl').last().find('.addresslist').html(adrtxt);