From a4fb847cdeb04af05b944b1bec29674a2e1c03f0 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 12 Oct 2016 11:03:42 +0200
Subject: [PATCH] fix buix with dropbox

---
 etc/dbq.php          | 2 ++
 etc/dbq/owncloud.php | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/etc/dbq.php b/etc/dbq.php
index ddba5c4d..12041bc8 100644
--- a/etc/dbq.php
+++ b/etc/dbq.php
@@ -44,6 +44,8 @@ foreach ($DBQ as $id => $db) {
 if ($DIR_SQLITE) {
   foreach (nb::ls_dir($DIR_SQLITE,'\.db$') as $file) {
 
+    if (strpos($file,'_conflict-')) continue;
+
     if (isset($host_already_exists["$DIR_SQLITE/$file"])) {
       $DBQ[$host_already_exists["$DIR_SQLITE/$file"]]['sql_pre'][] = 'PRAGMA journal_mode=OFF';
       continue;
diff --git a/etc/dbq/owncloud.php b/etc/dbq/owncloud.php
index 2435a118..b98a6bb3 100644
--- a/etc/dbq/owncloud.php
+++ b/etc/dbq/owncloud.php
@@ -5,9 +5,9 @@ $DBQ['owncloud'] = [
   'type' => 'mysql',
   'host' => 'admin.izideal.vpn',
   #'default_table' => 'oc_users',
-  'default_table' => 'oc_last_files',
+  'default_table' => 'view_files',
   'tables' => [
-    'oc_contact' => [
+    'view_contact' => [
       #'sql' => "SELECT * FROM oc_contacts_cards_properties",
       'sql' => "SELECT c.id"
         #.",org.value as org"
@@ -24,7 +24,7 @@ $DBQ['owncloud'] = [
       ,
       'row_parse_pre' => 'owncloud_row_parse',
     ],
-    'oc_last_files' => [
+    'view_files' => [
       'sql' => "SELECT path,mtime FROM oc_filecache WHERE path NOT LIKE 'files_versions/%' ORDER BY fileid DESC LIMIT 10",
       'row_parse_pre' => function(&$r) {
         $r['mtime'] = date ("Y-m-d H:i:s",$r['mtime']);
-- 
2.47.3