'==' and '!=' are discouraged
This commit is contained in:
parent
e5eb15cbc5
commit
86fb4ead72
54
lib/db.php
54
lib/db.php
@ -12,23 +12,23 @@
|
|||||||
namespace OCA\Richdocuments;
|
namespace OCA\Richdocuments;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generic DB class
|
* Generic DB class
|
||||||
*/
|
*/
|
||||||
|
|
||||||
abstract class Db {
|
abstract class Db {
|
||||||
|
|
||||||
protected $data;
|
protected $data;
|
||||||
|
|
||||||
protected $tableName;
|
protected $tableName;
|
||||||
|
|
||||||
protected $insertStatement;
|
protected $insertStatement;
|
||||||
|
|
||||||
protected $loadStatement;
|
protected $loadStatement;
|
||||||
|
|
||||||
public function __construct($data = array()){
|
public function __construct($data = array()){
|
||||||
$this->setData($data);
|
$this->setData($data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Insert current object data into database
|
* Insert current object data into database
|
||||||
* @return mixed
|
* @return mixed
|
||||||
@ -37,7 +37,7 @@ abstract class Db {
|
|||||||
$result = $this->execute($this->insertStatement);
|
$result = $this->execute($this->insertStatement);
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get id of the recently inserted record
|
* Get id of the recently inserted record
|
||||||
* @return mixed
|
* @return mixed
|
||||||
@ -45,7 +45,7 @@ abstract class Db {
|
|||||||
public function getLastInsertId(){
|
public function getLastInsertId(){
|
||||||
return \OC::$server->getDatabaseConnection()->lastInsertId($this->tableName);
|
return \OC::$server->getDatabaseConnection()->lastInsertId($this->tableName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get single record by primary key
|
* Get single record by primary key
|
||||||
* @param int $value primary key value
|
* @param int $value primary key value
|
||||||
@ -55,7 +55,7 @@ abstract class Db {
|
|||||||
if (!is_array($value)){
|
if (!is_array($value)){
|
||||||
$value = array($value);
|
$value = array($value);
|
||||||
}
|
}
|
||||||
|
|
||||||
$result = $this->execute($this->loadStatement, $value);
|
$result = $this->execute($this->loadStatement, $value);
|
||||||
$data = $result->fetch();
|
$data = $result->fetch();
|
||||||
if (!is_array($data)){
|
if (!is_array($data)){
|
||||||
@ -64,7 +64,7 @@ abstract class Db {
|
|||||||
$this->data = $data;
|
$this->data = $data;
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get single record matching condition
|
* Get single record matching condition
|
||||||
* @param string $field for WHERE condition
|
* @param string $field for WHERE condition
|
||||||
@ -80,12 +80,12 @@ abstract class Db {
|
|||||||
$data = $result->fetchAll();
|
$data = $result->fetchAll();
|
||||||
if (!is_array($data) || !count($data)){
|
if (!is_array($data) || !count($data)){
|
||||||
$this->data = array();
|
$this->data = array();
|
||||||
} elseif (count($data)!=1) {
|
} elseif (count($data) !== 1) {
|
||||||
throw new Exception('Duplicate ' . $value . ' for the filed ' . $field);
|
throw new Exception('Duplicate ' . $value . ' for the filed ' . $field);
|
||||||
} else {
|
} else {
|
||||||
$this->data = $data[0];
|
$this->data = $data[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -108,7 +108,7 @@ abstract class Db {
|
|||||||
$this->execute('DELETE FROM ' . $this->tableName . ' WHERE ' . $stmt, $value);
|
$this->execute('DELETE FROM ' . $this->tableName . ' WHERE ' . $stmt, $value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get all records from the table
|
* Get all records from the table
|
||||||
* @return array
|
* @return array
|
||||||
@ -121,7 +121,7 @@ abstract class Db {
|
|||||||
}
|
}
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get array of matching records
|
* Get array of matching records
|
||||||
* @param string $field for WHERE condition
|
* @param string $field for WHERE condition
|
||||||
@ -141,14 +141,14 @@ abstract class Db {
|
|||||||
$stmt = $this->buildInQuery($field, $value);
|
$stmt = $this->buildInQuery($field, $value);
|
||||||
$result = $this->execute('SELECT * FROM ' . $this->tableName . ' WHERE '. $stmt , $value);
|
$result = $this->execute('SELECT * FROM ' . $this->tableName . ' WHERE '. $stmt , $value);
|
||||||
}
|
}
|
||||||
|
|
||||||
$data = $result->fetchAll();
|
$data = $result->fetchAll();
|
||||||
if (!is_array($data)){
|
if (!is_array($data)){
|
||||||
$data = array();
|
$data = array();
|
||||||
}
|
}
|
||||||
return $data;
|
return $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get object data
|
* Get object data
|
||||||
* @return Array
|
* @return Array
|
||||||
@ -156,7 +156,7 @@ abstract class Db {
|
|||||||
public function getData(){
|
public function getData(){
|
||||||
return $this->data;
|
return $this->data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set object data
|
* Set object data
|
||||||
* @param array $data
|
* @param array $data
|
||||||
@ -164,17 +164,17 @@ abstract class Db {
|
|||||||
public function setData($data){
|
public function setData($data){
|
||||||
$this->data = $data;
|
$this->data = $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if there are any data in current object
|
* Check if there are any data in current object
|
||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function hasData(){
|
public function hasData(){
|
||||||
return count($this->data)>0;
|
return count($this->data)>0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build placeholders for the query with variable input data
|
* Build placeholders for the query with variable input data
|
||||||
* @param string $field field name
|
* @param string $field field name
|
||||||
* @param Array $array data
|
* @param Array $array data
|
||||||
* @return String `field` IN (?, ?...) placeholders matching the number of elements in array
|
* @return String `field` IN (?, ?...) placeholders matching the number of elements in array
|
||||||
@ -185,17 +185,17 @@ abstract class Db {
|
|||||||
$stmt = implode(', ', $placeholders);
|
$stmt = implode(', ', $placeholders);
|
||||||
return '`' . $field . '` IN (' . $stmt . ')';
|
return '`' . $field . '` IN (' . $stmt . ')';
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute a query on database
|
* Execute a query on database
|
||||||
* @param string $statement query to be executed
|
* @param string $statement query to be executed
|
||||||
* @param mixed $args value(s) for the query.
|
* @param mixed $args value(s) for the query.
|
||||||
* If omited the query will be run on the current object $data
|
* If omited the query will be run on the current object $data
|
||||||
* @return mixed (array/false)
|
* @return mixed (array/false)
|
||||||
*/
|
*/
|
||||||
protected function execute($statement, $args = null){
|
protected function execute($statement, $args = null){
|
||||||
$query = \OC::$server->getDatabaseConnection()->prepare($statement);
|
$query = \OC::$server->getDatabaseConnection()->prepare($statement);
|
||||||
|
|
||||||
if (!is_null($args)){
|
if (!is_null($args)){
|
||||||
$result = $query->execute($args);
|
$result = $query->execute($args);
|
||||||
} elseif (count($this->data)){
|
} elseif (count($this->data)){
|
||||||
@ -203,10 +203,10 @@ abstract class Db {
|
|||||||
} else {
|
} else {
|
||||||
$result = $query->execute();
|
$result = $query->execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result ? $query : false;
|
return $result ? $query : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function __call($name, $arguments){
|
public function __call($name, $arguments){
|
||||||
if (substr($name, 0, 3) === 'get'){
|
if (substr($name, 0, 3) === 'get'){
|
||||||
$requestedProperty = substr($name, 3);
|
$requestedProperty = substr($name, 3);
|
||||||
|
@ -61,7 +61,7 @@ class Wopi extends \OCA\Richdocuments\Db{
|
|||||||
$wopi = new Wopi();
|
$wopi = new Wopi();
|
||||||
$row = $wopi->loadBy('token', $token)->getData();
|
$row = $wopi->loadBy('token', $token)->getData();
|
||||||
\OC::$server->getLogger()->debug('Loaded WOPI Token record: {row}.', [ 'row' => $row ]);
|
\OC::$server->getLogger()->debug('Loaded WOPI Token record: {row}.', [ 'row' => $row ]);
|
||||||
if (count($row) == 0)
|
if (count($row) === 0)
|
||||||
{
|
{
|
||||||
// Invalid token.
|
// Invalid token.
|
||||||
http_response_code(401);
|
http_response_code(401);
|
||||||
@ -75,7 +75,7 @@ class Wopi extends \OCA\Richdocuments\Db{
|
|||||||
//$wopi->deleteBy('id', $row['id']);
|
//$wopi->deleteBy('id', $row['id']);
|
||||||
//return false;
|
//return false;
|
||||||
}
|
}
|
||||||
if ($row['fileid'] != $fileId || $row['version'] != $version){
|
if ($row['fileid'] !== $fileId || $row['version'] !== $version){
|
||||||
// File unknown / user unauthorized (for the requested file).
|
// File unknown / user unauthorized (for the requested file).
|
||||||
http_response_code(404);
|
http_response_code(404);
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user