badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format

Browse source
This commit is contained in:
Shish 2019-11-27 12:13:04 +00:00
parent 21b983ac85
commit 6b2304af93
7 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/database.php
View file

@ -347,7 +347,8 @@ class Database
} }
} }
public function raw_db(): PDO { public function raw_db(): PDO
{
return $this->db; return $this->db;
} }
} }

4
ext/artists/main.php
View file

@ -902,8 +902,8 @@ class Artists extends Extension
LIMIT :offset, :limit LIMIT :offset, :limit
", ",
[ [
"offset"=>$pageNumber * $artistsPerPage, "offset"=>$pageNumber * $artistsPerPage,
"limit"=>$artistsPerPage "limit"=>$artistsPerPage
] ]
); );

12
ext/ipban/main.php
View file

@ -1,9 +1,15 @@
<?php <?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 { class IPBanTable extends Table
function __construct(\PDO $db, $token=null) { {
public function __construct(\PDO $db, $token=null)
{
parent::__construct($db, $token); parent::__construct($db, $token);
$this->table = "bans"; $this->table = "bans";

2
ext/not_a_tag/main.php
View file

@ -132,6 +132,6 @@ class NotATag extends Extension
LIMIT :limit LIMIT :limit
OFFSET :offset OFFSET :offset
"), $args); "), $args);
return $bans; return $bans;
} }
} }

5
ext/notes/main.php
View file

@ -353,7 +353,8 @@ class Notes extends Extension
$notesPerPage = $config->get_int('notesNotesPerPage'); $notesPerPage = $config->get_int('notesNotesPerPage');
//$result = $database->get_all("SELECT * FROM pool_images WHERE pool_id=:pool_id", ['pool_id'=>$poolID]); //$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 SELECT DISTINCT image_id
FROM notes FROM notes
WHERE enable = :enable 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) 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'], ['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]
); );
} }

6
ext/tagger_xml/main.php
View file

@ -43,9 +43,9 @@ class TaggerXML extends Extension
$limit_rows = $config->get_int("ext_tagger_limit", 30); $limit_rows = $config->get_int("ext_tagger_limit", 30);
$values = [ $values = [
'p' => strlen($s) == 1 ? " " : "\_", 'p' => strlen($s) == 1 ? " " : "\_",
'sq' => "%".$p.sql_escape($s)."%" 'sq' => "%".$p.sql_escape($s)."%"
]; ];
// Match // Match
$match = "concat(:p, tag) LIKE :sq"; $match = "concat(:p, tag) LIKE :sq";

8
ext/wiki/main.php
View file

@ -188,11 +188,13 @@ class Wiki extends Extension
global $database; global $database;
$wpage = $event->wikipage; $wpage = $event->wikipage;
try { try {
$database->Execute(" $database->Execute(
"
INSERT INTO wiki_pages(owner_id, owner_ip, date, title, revision, locked, body) INSERT INTO wiki_pages(owner_id, owner_ip, date, title, revision, locked, body)
VALUES (:owner_id, :owner_ip, now(), :title, :revision, :locked, :body)", VALUES (:owner_id, :owner_ip, now(), :title, :revision, :locked, :body)",
["owner_id"=>$event->user->id, "owner_ip"=>$_SERVER['REMOTE_ADDR'], ["owner_id"=>$event->user->id, "owner_ip"=>$_SERVER['REMOTE_ADDR'],
"title"=>$wpage->title, "revision"=>$wpage->revision, "locked"=>$wpage->locked?'Y':'N', "body"=>$wpage->body]); "title"=>$wpage->title, "revision"=>$wpage->revision, "locked"=>$wpage->locked?'Y':'N', "body"=>$wpage->body]
);
} catch (Exception $e) { } catch (Exception $e) {
throw new WikiUpdateException("Somebody else edited that page at the same time :-("); throw new WikiUpdateException("Somebody else edited that page at the same time :-(");
} }