diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-08-16 23:49:53 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2011-08-16 23:49:53 +0200 |
| commit | 48df7a2a7dc92e58cf23cf5c5ac27210b3abccd3 (patch) | |
| tree | 36ccad2612096c6215d76f71d41de787c815aab9 /apps/bookmarks | |
| parent | 0573695d05be46eac109f326d0ef04d8e019978e (diff) | |
| download | nextcloud-server-48df7a2a7dc92e58cf23cf5c5ac27210b3abccd3.tar.gz nextcloud-server-48df7a2a7dc92e58cf23cf5c5ac27210b3abccd3.zip | |
gain compatibility with sqlite3
Diffstat (limited to 'apps/bookmarks')
| -rw-r--r-- | apps/bookmarks/ajax/addBookmark.php | 14 | ||||
| -rw-r--r-- | apps/bookmarks/ajax/updateList.php | 9 |
2 files changed, 20 insertions, 3 deletions
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php index b0d1a730897..d3d23aad267 100644 --- a/apps/bookmarks/ajax/addBookmark.php +++ b/apps/bookmarks/ajax/addBookmark.php @@ -35,12 +35,21 @@ if( !OC_User::isLoggedIn()){ exit(); } +$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); +if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ + $_ut = "strftime('%s','now')"; +} else { + $_ut = "UNIX_TIMESTAMP()"; +} + +//FIXME: Detect when user adds a known URL $query = OC_DB::prepare(" - INSERT IGNORE INTO *PREFIX*bookmarks + INSERT INTO *PREFIX*bookmarks (url, title, description, user_id, public, added, lastmodified) - VALUES (?, ?, ?, ?, 0, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()) + VALUES (?, ?, ?, ?, 0, $_ut, $_ut) "); + $params=array( urldecode($_GET["url"]), urldecode($_GET["title"]), @@ -50,6 +59,7 @@ $params=array( $query->execute($params); $b_id = OC_DB::insertid(); + if($b_id !== false) { $query = OC_DB::prepare(" INSERT INTO *PREFIX*bookmarks_tags diff --git a/apps/bookmarks/ajax/updateList.php b/apps/bookmarks/ajax/updateList.php index d7cf05b7a60..1217a64c6e1 100644 --- a/apps/bookmarks/ajax/updateList.php +++ b/apps/bookmarks/ajax/updateList.php @@ -49,9 +49,16 @@ if($filterTag){ $offset = isset($_GET["page"]) ? intval($_GET["page"]) * 10 : 0; $params[] = $offset; +$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); +if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ + $_gc_separator = ", ' '"; +} else { + $_gc_separator = "SEPARATOR ' '"; +} + //FIXME: bookmarks without tags are not being retrieved $query = OC_DB::prepare(" - SELECT url, title, description, GROUP_CONCAT( tag SEPARATOR ' ' ) AS tags + SELECT url, title, description, GROUP_CONCAT( tag $_gc_separator ) AS tags FROM *PREFIX*bookmarks, *PREFIX*bookmarks_tags WHERE *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id AND *PREFIX*bookmarks.user_id = ? |