From 6b2304af934207af351d856bd94335e08ca4af1d Mon Sep 17 00:00:00 2001
From: Shish <shish@shishnet.org>
Date: Wed, 27 Nov 2019 12:13:04 +0000
Subject: [PATCH] format
---
core/database.php | 3 ++-
ext/artists/main.php | 4 ++--
ext/ipban/main.php | 12 +++++++++---
ext/not_a_tag/main.php | 2 +-
ext/notes/main.php | 5 +++--
ext/tagger_xml/main.php | 6 +++---
ext/wiki/main.php | 8 +++++---
7 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/core/database.php b/core/database.php
index 3ec090dd..10441027 100644
--- a/core/database.php
+++ b/core/database.php
@@ -347,7 +347,8 @@ class Database
}
}
- public function raw_db(): PDO {
+ public function raw_db(): PDO
+ {
return $this->db;
}
}
diff --git a/ext/artists/main.php b/ext/artists/main.php
index cd2ac084..7d67e6bc 100644
--- a/ext/artists/main.php
+++ b/ext/artists/main.php
@@ -902,8 +902,8 @@ class Artists extends Extension
LIMIT :offset, :limit
",
[
- "offset"=>$pageNumber * $artistsPerPage,
- "limit"=>$artistsPerPage
+ "offset"=>$pageNumber * $artistsPerPage,
+ "limit"=>$artistsPerPage
]
);
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index 0748a7e3..467dcf94 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -1,9 +1,15 @@
<?php
-use MicroCRUD\{StringColumn,DateColumn,TextColumn,EnumColumn,Table};
+use MicroCRUD\StringColumn;
+use MicroCRUD\DateColumn;
+use MicroCRUD\TextColumn;
+use MicroCRUD\EnumColumn;
+use MicroCRUD\Table;
-class IPBanTable extends Table {
- function __construct(\PDO $db, $token=null) {
+class IPBanTable extends Table
+{
+ public function __construct(\PDO $db, $token=null)
+ {
parent::__construct($db, $token);
$this->table = "bans";
diff --git a/ext/not_a_tag/main.php b/ext/not_a_tag/main.php
index bbfa9e5c..5d637f20 100644
--- a/ext/not_a_tag/main.php
+++ b/ext/not_a_tag/main.php
@@ -132,6 +132,6 @@ class NotATag extends Extension
LIMIT :limit
OFFSET :offset
"), $args);
- return $bans;
+ return $bans;
}
}
diff --git a/ext/notes/main.php b/ext/notes/main.php
index 3575ecba..1dbdc179 100644
--- a/ext/notes/main.php
+++ b/ext/notes/main.php
@@ -353,7 +353,8 @@ class Notes extends Extension
$notesPerPage = $config->get_int('notesNotesPerPage');
//$result = $database->get_all("SELECT * FROM pool_images WHERE pool_id=:pool_id", ['pool_id'=>$poolID]);
- $result = $database->execute("
+ $result = $database->execute(
+ "
SELECT DISTINCT image_id
FROM notes
WHERE enable = :enable
@@ -414,7 +415,7 @@ class Notes extends Extension
VALUES (:note_enable, :note_id, :review_id, :image_id, :user_id, :user_ip, now(), :x1, :y1, :height, :width, :note)
",
['note_enable'=>$noteEnable, 'note_id'=>$noteID, 'review_id'=>$reviewID, 'image_id'=>$imageID, 'user_id'=>$user->id, 'user_ip'=>$_SERVER['REMOTE_ADDR'],
- 'x1'=>$noteX1, 'y1'=>$noteY1, 'height'=>$noteHeight, 'width'=>$noteWidth, 'note'=>$noteText]
+ 'x1'=>$noteX1, 'y1'=>$noteY1, 'height'=>$noteHeight, 'width'=>$noteWidth, 'note'=>$noteText]
);
}
diff --git a/ext/tagger_xml/main.php b/ext/tagger_xml/main.php
index 8ead5708..e75cbadb 100644
--- a/ext/tagger_xml/main.php
+++ b/ext/tagger_xml/main.php
@@ -43,9 +43,9 @@ class TaggerXML extends Extension
$limit_rows = $config->get_int("ext_tagger_limit", 30);
$values = [
- 'p' => strlen($s) == 1 ? " " : "\_",
- 'sq' => "%".$p.sql_escape($s)."%"
- ];
+ 'p' => strlen($s) == 1 ? " " : "\_",
+ 'sq' => "%".$p.sql_escape($s)."%"
+ ];
// Match
$match = "concat(:p, tag) LIKE :sq";
diff --git a/ext/wiki/main.php b/ext/wiki/main.php
index e7ce556c..6f9537c3 100644
--- a/ext/wiki/main.php
+++ b/ext/wiki/main.php
@@ -188,11 +188,13 @@ class Wiki extends Extension
global $database;
$wpage = $event->wikipage;
try {
- $database->Execute("
+ $database->Execute(
+ "
INSERT INTO wiki_pages(owner_id, owner_ip, date, title, revision, locked, body)
VALUES (:owner_id, :owner_ip, now(), :title, :revision, :locked, :body)",
- ["owner_id"=>$event->user->id, "owner_ip"=>$_SERVER['REMOTE_ADDR'],
- "title"=>$wpage->title, "revision"=>$wpage->revision, "locked"=>$wpage->locked?'Y':'N', "body"=>$wpage->body]);
+ ["owner_id"=>$event->user->id, "owner_ip"=>$_SERVER['REMOTE_ADDR'],
+ "title"=>$wpage->title, "revision"=>$wpage->revision, "locked"=>$wpage->locked?'Y':'N', "body"=>$wpage->body]
+ );
} catch (Exception $e) {
throw new WikiUpdateException("Somebody else edited that page at the same time :-(");
}