Skip to content
Snippets Groups Projects
Commit 3c3a859b authored by Arthur Schiwon's avatar Arthur Schiwon
Browse files

follow coding style and use single quotes in php

parent 72a4703d
No related branches found
No related tags found
No related merge requests found
...@@ -27,19 +27,19 @@ $RUNTIME_NOSETUPFS=true; ...@@ -27,19 +27,19 @@ $RUNTIME_NOSETUPFS=true;
require_once('../../../lib/base.php'); require_once('../../../lib/base.php');
// We send json data // We send json data
header( "Content-Type: application/jsonrequest" ); header( 'Content-Type: application/jsonrequest' );
// Check if we are a user // Check if we are a user
if( !OC_User::isLoggedIn()){ if( !OC_User::isLoggedIn()){
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); echo json_encode( array( 'status' => 'error', 'data' => array( 'message' => 'Authentication error' )));
exit(); exit();
} }
$params=array(OC_User::getUser()); $params=array(OC_User::getUser());
$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" ); $CONFIG_DBTYPE = OC_Config::getValue( 'dbtype', 'sqlite' );
//Filter for tag? //Filter for tag?
$filterTag = isset($_GET["tag"]) ? '%' . urldecode($_GET["tag"]) . '%' : false; $filterTag = isset($_GET['tag']) ? '%' . urldecode($_GET['tag']) . '%' : false;
if($filterTag){ if($filterTag){
$sqlFilterTag = 'HAVING tags LIKE ?'; $sqlFilterTag = 'HAVING tags LIKE ?';
$params[] = $filterTag; $params[] = $filterTag;
...@@ -47,27 +47,27 @@ if($filterTag){ ...@@ -47,27 +47,27 @@ if($filterTag){
$sqlFilterTag = ''; $sqlFilterTag = '';
} }
$offset = isset($_GET["page"]) ? intval($_GET["page"]) * 10 : 0; $offset = isset($_GET['page']) ? intval($_GET['page']) * 10 : 0;
$params[] = $offset; $params[] = $offset;
if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
$_gc_separator = ", ' '"; $_gc_separator = ', \' \'';
} else { } else {
$_gc_separator = "SEPARATOR ' '"; $_gc_separator = 'SEPARATOR \' \'';
} }
//FIXME: bookmarks without tags are not being retrieved //FIXME: bookmarks without tags are not being retrieved
$query = OC_DB::prepare(" $query = OC_DB::prepare('
SELECT url, title, description, GROUP_CONCAT( tag $_gc_separator ) AS tags SELECT url, title, description, GROUP_CONCAT( tag '.$_gc_separator.' ) AS tags
FROM *PREFIX*bookmarks, *PREFIX*bookmarks_tags FROM *PREFIX*bookmarks, *PREFIX*bookmarks_tags
WHERE *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id WHERE *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
AND *PREFIX*bookmarks.user_id = ? AND *PREFIX*bookmarks.user_id = ?
GROUP BY url GROUP BY url
$sqlFilterTag '.$sqlFilterTag.'
ORDER BY *PREFIX*bookmarks.id DESC ORDER BY *PREFIX*bookmarks.id DESC
LIMIT ?, 10"); LIMIT ?, 10');
$bookmarks = $query->execute($params)->fetchAll(); $bookmarks = $query->execute($params)->fetchAll();
echo json_encode( array( "status" => "success", "data" => $bookmarks)); echo json_encode( array( 'status' => 'success', 'data' => $bookmarks));
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment