rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2024-12-11 12:24:10 +01:00
Code Issues Releases Activity

follow coding style and use single quotes in php

Browse Source
This commit is contained in:
Arthur Schiwon 2011-08-23 12:03:20 +02:00
parent 57433ca09e
commit 39561f6460
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ajax/updateList.php
View File

@ -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){
$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));