From d756b5fbaa6286a1d7f2569f98dfe176a1a52a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Wed, 28 Aug 2013 15:24:41 +0200 Subject: [PATCH] minor reformatting of sql --- lib/download.php | 2 +- lib/invite.php | 9 ++++++--- lib/member.php | 26 ++++++++++++++++++++------ lib/op.php | 20 +++++++++++++++++--- lib/session.php | 25 ++++++++++++++++++++++--- 5 files changed, 66 insertions(+), 16 deletions(-) diff --git a/lib/download.php b/lib/download.php index d77d18c9..b06cec7c 100644 --- a/lib/download.php +++ b/lib/download.php @@ -36,7 +36,7 @@ class Download { $this->filepath = $filepath; $this->view = $view; - if (isset($_SERVER['HTTP_RANGE'])) { + if (isset($_SERVER['HTTP_RANGE'])) { $this->instance = new Download\Range($view, $filepath); } else { $this->instance = new Download\Simple($view, $filepath); diff --git a/lib/invite.php b/lib/invite.php index cce3de0a..ff4934a0 100644 --- a/lib/invite.php +++ b/lib/invite.php @@ -18,7 +18,10 @@ class Invite { const STATUS_ACCEPTED = 2; public static function add($esId, $userId){ - $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_invite` (`es_id`, `uid`, `status`, `sent_on`) VALUES (?, ?, ?, ?) '); + $query = \OCP\DB::prepare(' + INSERT INTO `*PREFIX*documents_invite` (`es_id`, `uid`, `status`, `sent_on`) + VALUES (?, ?, ?, ?) + '); $query->execute(array( $esId, $userId, @@ -30,7 +33,7 @@ class Invite { } public static function accept($esId){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); + $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); $query->execute(array( self::STATUS_ACCEPTED, $esId, @@ -39,7 +42,7 @@ class Invite { } public static function decline($esId){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); + $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_invite` SET `status`=? WHERE `es_id`=? AND `uid`=?'); $query->execute(array( self::STATUS_DECLINED, $esId, diff --git a/lib/member.php b/lib/member.php index 500eef1c..e3fc8df8 100644 --- a/lib/member.php +++ b/lib/member.php @@ -20,7 +20,10 @@ class Member { const MEMBER_STATUS_INACTIVE = 2; public static function add($esId, $displayname, $color){ - $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_member` (`es_id`, `uid`, `color`, `last_activity`) VALUES (?, ?, ?, ?) '); + $query = \OCP\DB::prepare(' + INSERT INTO `*PREFIX*documents_member` (`es_id`, `uid`, `color`, `last_activity`) + VALUES (?, ?, ?, ?) + '); $query->execute(array( $esId, \OCP\User::getUser(), @@ -45,13 +48,13 @@ class Member { $placeholders = array_fill(0, $memberCount, '?'); $stmt = implode(', ', $placeholders); - $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id`IN (' . $stmt . ')'); + $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `member_id` IN (' . $stmt . ')'); $result = $query->execute($ids); return $result->fetchAll(); } public static function updateMemberActivity($memberId){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `last_activity`=? WHERE `member_id`=?'); + $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `last_activity`=? WHERE `member_id`=?'); $query->execute(array( time(), $memberId @@ -65,7 +68,7 @@ class Member { $activeSince = $lastActivity; } - $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `es_id`= ? and `last_activity` > ?'); + $query = \OCP\DB::prepare('SELECT * FROM `*PREFIX*documents_member` WHERE `es_id`= ? AND `last_activity` > ?'); $result = $query->execute(array($esId, $activeSince)); return $result->fetchAll(); } @@ -78,7 +81,13 @@ class Member { public static function cleanSession($esId){ $time = self::getInactivityPeriod(); - $query = \OCP\DB::prepare('SELECT `member_id` FROM `*PREFIX*documents_member` WHERE `es_id`= ? AND `last_activity`execute(array( $esId, $time, @@ -97,7 +106,12 @@ class Member { * @param timestamp $time */ protected static function deactivate($esId, $time){ - $query = \OCP\DB::prepare('UPDATE `*PREFIX*documents_member` SET `status`=? WHERE `es_id`=? AND `last_activity`execute(array( self::MEMBER_STATUS_INACTIVE, $esId, diff --git a/lib/op.php b/lib/op.php index bf331e5f..df19f63f 100644 --- a/lib/op.php +++ b/lib/op.php @@ -14,7 +14,10 @@ namespace OCA\Documents; class Op { public static function add($esId, $memberId, $opspec){ - $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_op` (`es_id`, `member`, `opspec`) VALUES (?, ?, ?) '); + $query = \OCP\DB::prepare(' + INSERT INTO `*PREFIX*documents_op` (`es_id`, `member`, `opspec`) + VALUES (?, ?, ?) + '); $query->execute(array( $esId, $memberId, @@ -38,7 +41,12 @@ class Op { * @returns "" when there are no Ops, or the seq of the last Op */ public static function getHeadSeq($esId){ - $query = \OCP\DB::prepare('SELECT `seq` FROM `*PREFIX*documents_op` WHERE `es_id`=? ORDER BY `seq` DESC LIMIT 1'); + $query = \OCP\DB::prepare(' + SELECT `seq` + FROM `*PREFIX*documents_op` + WHERE `es_id`=? + ORDER BY `seq` DESC + ', 1); $result = $query->execute(array( $esId )) @@ -67,7 +75,13 @@ class Op { if ($seq == ""){ $seq = -1; } - $query = \OCP\DB::prepare('SELECT `opspec` FROM `*PREFIX*documents_op` WHERE `es_id`=? AND `seq`>? ORDER BY `seq` ASC'); + $query = \OCP\DB::prepare(' + SELECT `opspec` + FROM `*PREFIX*documents_op` + WHERE `es_id`=? + AND `seq`>? + ORDER BY `seq` ASC + '); $result = $query->execute(array($esId, $seq)); return $result->fetchAll(); } diff --git a/lib/session.php b/lib/session.php index 2ae5447f..8c9d76d1 100644 --- a/lib/session.php +++ b/lib/session.php @@ -14,7 +14,10 @@ namespace OCA\Documents; class Session { public static function add($genesis, $hash, $fileId){ - $query = \OCP\DB::prepare('INSERT INTO `*PREFIX*documents_session` (`es_id`, `genesis_url`, `genesis_hash`, `owner`, `file_id`) VALUES (?, ?, ?, ?, ?) '); + $query = \OCP\DB::prepare(' + INSERT INTO `*PREFIX*documents_session` (`es_id`, `genesis_url`, `genesis_hash`, `owner`, `file_id`) + VALUES (?, ?, ?, ?, ?) + '); $data = array( 'es_id' => self::getUniqueSessionId(), @@ -45,7 +48,15 @@ class Session { public static function getInfo($esId){ - $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`es_id` = ? GROUP BY `m`.`es_id`'); + $query = \OCP\DB::prepare(' + SELECT `s`.*, COUNT(`m`.`member_id`) AS `users` + FROM `*PREFIX*documents_session` AS `s` + LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id` + AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' + AND `m`.`uid` != ? + WHERE `s`.`es_id` = ? + GROUP BY `m`.`es_id` + '); $result = $query->execute( array( \OCP\User::getUser(), @@ -74,7 +85,15 @@ class Session { $placeholders = array_fill(0, $fileIdCount, '?'); $stmt = implode(', ', $placeholders); - $query = \OCP\DB::prepare('SELECT s.*, COUNT(`m`.`member_id`) AS users FROM `*PREFIX*documents_session` AS s LEFT JOIN `*PREFIX*documents_member` AS m ON `s`.`es_id`=`m`.`es_id` AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' AND `m`.`uid` != ? WHERE `s`.`file_id` IN (' . $stmt .') GROUP BY `m`.`es_id`'); + $query = \OCP\DB::prepare(' + SELECT `s`.*, COUNT(`m`.`member_id`) AS `users` + FROM `*PREFIX*documents_session` AS `s` + LEFT JOIN `*PREFIX*documents_member` AS `m` ON `s`.`es_id`=`m`.`es_id` + AND `m`.`status`='. Member::MEMBER_STATUS_ACTIVE .' + AND `m`.`uid` != ? + WHERE `s`.`file_id` IN (' . $stmt .') + GROUP BY `m`.`es_id` + '); $result = $query->execute( array_merge(array(\OCP\User::getUser()), $fileIds) );