fix buix with dropbox

diff --git a/etc/dbq.php b/etc/dbq.php
index ddba5c4d5b82f3c64a91b1fe1dded099425fc919..12041bc8cdbf4349f8998d893ba97e446cd06640 100644 (file)
--- 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 2435a118e429589cbba65f438ec95f9988e50174..b98a6bb3740c0245d9f46344ed2c433ad941f4f8 100644 (file)
--- 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']);