owncloud view_contacts

diff --git a/etc/dbq/owncloud.php b/etc/dbq/owncloud.php
index ce93a28bd58919361bbf0d26f14494bf50cdd056..7b82f9a7b428a76950015f8282ad560e2ba26b8c 100644 (file)
--- a/etc/dbq/owncloud.php
+++ b/etc/dbq/owncloud.php
@@ -5,22 +5,23 @@ $DBQ['owncloud'] = [
   'type' => 'mysql',
   'host' => 'admin.izideal.vpn',
   #'default_table' => 'oc_users',
-  'default_table' => 'view_files',
+  #'default_table' => 'view_files',
+  'default_table' => 'view_contact',
   'tables' => [
     'view_contact' => [
-      #'sql' => "SELECT * FROM oc_contacts_cards_properties",
       'sql' => "SELECT c.id"
-        #.",org.value as org"
-        #.",name.value as name"
-        #.",tel.value as tel"
         .",TRIM(CONCAT("
-          ."COALESCE((SELECT value FROM oc_cards_properties p WHERE p.name='ORG' AND p.cardid=c.id AND p.addressbookid=c.addressbookid),'')"
+          ."REPLACE(COALESCE((SELECT value FROM oc_cards_properties p WHERE p.name='ORG' AND p.cardid=c.id AND p.addressbookid=c.addressbookid),''),';','')"
           .",' ',"
           ."COALESCE((SELECT value FROM oc_cards_properties p WHERE p.name='FN' AND p.cardid=c.id AND p.addressbookid=c.addressbookid),'')"
         .")) as name"
         .",COALESCE((SELECT value FROM oc_cards_properties p WHERE p.name='TEL' AND p.cardid=c.id AND p.addressbookid=c.addressbookid ORDER BY preferred DESC LIMIT 1),'') as tel"
         .",COALESCE((SELECT value FROM oc_cards_properties p WHERE p.name='EMAIL' AND p.cardid=c.id AND p.addressbookid=c.addressbookid ORDER BY preferred DESC LIMIT 1),'') as email"
-      . " FROM oc_cards c GROUP BY c.id HAVING name IS NOT NULL AND name<>''"
+      . " FROM oc_cards c"
+      . " WHERE EXISTS (SELECT 1 FROM oc_addressbooks WHERE c.addressbookid=oc_addressbooks.id AND principaluri='principals/users/nico')"
+      . " GROUP BY c.id"
+      . " HAVING name IS NOT NULL AND name<>''"
+      . " ORDER BY lower(name)"
       ,
       'row_parse_pre' => 'owncloud_row_parse',
     ],