Public/pics
2
2
Fork 2
Code Issues 5 Pull Requests Releases Wiki Activity

Merge pull request 'Rework DBA to use PDO' (#53) from pdo into master

Browse Source 
Reviewed-on: #53
Reviewed-by: Roflin <d.brentjes@gmail.com>
This commit is contained in:
Roflin 2025-05-17 15:31:38 +02:00
commit 609edf3332
17 changed files with 531 additions and 599 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/ManageUsers.php
View File

@ -62,6 +62,7 @@ class ManageUsers extends HTMLController
'type' => 'timestamp', 'type' => 'timestamp',
'pattern' => 'long', 'pattern' => 'long',
'value' => 'last_action_time', 'value' => 'last_action_time',
'if_null' => 'n/a',
], ],
'header' => 'Last activity', 'header' => 'Last activity',
'is_sortable' => true, 'is_sortable' => true,

6
controllers/ViewPhotoAlbum.php
View File

@ -289,10 +289,4 @@ class ViewPhotoAlbum extends HTMLController
$description = !empty($tag->description) ? $tag->description : ''; $description = !empty($tag->description) ? $tag->description : '';
return new AlbumHeaderBox($tag->tag, $description, $back_link, $back_link_title); return new AlbumHeaderBox($tag->tag, $description, $back_link, $back_link_title);
} }
public function __destruct()
{
if (isset($this->iterator))
$this->iterator->clean();
}
} }

6
controllers/ViewTimeline.php
View File

@ -54,10 +54,4 @@ class ViewTimeline extends HTMLController
// Set the canonical url. // Set the canonical url.
$this->page->setCanonicalUrl(BASEURL . '/timeline/'); $this->page->setCanonicalUrl(BASEURL . '/timeline/');
} }
public function __destruct()
{
if (isset($this->iterator))
$this->iterator->clean();
}
} }

196
models/Asset.php
View File

@ -24,7 +24,7 @@ class Asset
protected $tags; protected $tags;
protected $thumbnails; protected $thumbnails;
protected function __construct(array $data) public function __construct(array $data)
{ {
foreach ($data as $attribute => $value) foreach ($data as $attribute => $value)
{ {
@ -32,7 +32,7 @@ class Asset
$this->$attribute = $value; $this->$attribute = $value;
} }
if (isset($data['date_captured']) && $data['date_captured'] !== 'NULL' && !is_object($data['date_captured'])) if (isset($data['date_captured']) && $data['date_captured'] !== null && !is_object($data['date_captured']))
$this->date_captured = new DateTime($data['date_captured']); $this->date_captured = new DateTime($data['date_captured']);
} }
@ -56,7 +56,7 @@ class Asset
$row = Registry::get('db')->queryAssoc(' $row = Registry::get('db')->queryAssoc('
SELECT * SELECT *
FROM assets FROM assets
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ [
'id_asset' => $id_asset, 'id_asset' => $id_asset,
]); ]);
@ -69,7 +69,7 @@ class Asset
$row = Registry::get('db')->queryAssoc(' $row = Registry::get('db')->queryAssoc('
SELECT * SELECT *
FROM assets FROM assets
WHERE slug = {string:slug}', WHERE slug = :slug',
[ [
'slug' => $slug, 'slug' => $slug,
]); ]);
@ -85,7 +85,7 @@ class Asset
$row['meta'] = $db->queryPair(' $row['meta'] = $db->queryPair('
SELECT variable, value SELECT variable, value
FROM assets_meta FROM assets_meta
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ [
'id_asset' => $row['id_asset'], 'id_asset' => $row['id_asset'],
]); ]);
@ -94,16 +94,15 @@ class Asset
$row['thumbnails'] = $db->queryPair(' $row['thumbnails'] = $db->queryPair('
SELECT SELECT
CONCAT( CONCAT(
width, width, :x, height,
{string:x}, IF(mode != :empty1, CONCAT(:_, mode), :empty2)
height,
IF(mode != {string:empty}, CONCAT({string:_}, mode), {string:empty})
) AS selector, filename ) AS selector, filename
FROM assets_thumbs FROM assets_thumbs
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ [
'id_asset' => $row['id_asset'], 'id_asset' => $row['id_asset'],
'empty' => '', 'empty1' => '',
'empty2' => '',
'x' => 'x', 'x' => 'x',
'_' => '_', '_' => '_',
]); ]);
@ -121,14 +120,14 @@ class Asset
$res = $db->query(' $res = $db->query('
SELECT * SELECT *
FROM assets FROM assets
WHERE id_asset IN ({array_int:id_assets}) WHERE id_asset IN (@id_assets)
ORDER BY id_asset', ORDER BY id_asset',
[ [
'id_assets' => $id_assets, 'id_assets' => $id_assets,
]); ]);
$assets = []; $assets = [];
while ($asset = $db->fetch_assoc($res)) while ($asset = $db->fetchAssoc($res))
{ {
$assets[$asset['id_asset']] = $asset; $assets[$asset['id_asset']] = $asset;
$assets[$asset['id_asset']]['meta'] = []; $assets[$asset['id_asset']]['meta'] = [];
@ -138,7 +137,7 @@ class Asset
$metas = $db->queryRows(' $metas = $db->queryRows('
SELECT id_asset, variable, value SELECT id_asset, variable, value
FROM assets_meta FROM assets_meta
WHERE id_asset IN ({array_int:id_assets}) WHERE id_asset IN (@id_assets)
ORDER BY id_asset', ORDER BY id_asset',
[ [
'id_assets' => $id_assets, 'id_assets' => $id_assets,
@ -150,17 +149,16 @@ class Asset
$thumbnails = $db->queryRows(' $thumbnails = $db->queryRows('
SELECT id_asset, SELECT id_asset,
CONCAT( CONCAT(
width, width, :x, height,
{string:x}, IF(mode != :empty1, CONCAT(:_, mode), :empty2)
height,
IF(mode != {string:empty}, CONCAT({string:_}, mode), {string:empty})
) AS selector, filename ) AS selector, filename
FROM assets_thumbs FROM assets_thumbs
WHERE id_asset IN ({array_int:id_assets}) WHERE id_asset IN (@id_assets)
ORDER BY id_asset', ORDER BY id_asset',
[ [
'id_assets' => $id_assets, 'id_assets' => $id_assets,
'empty' => '', 'empty1' => '',
'empty2' => '',
'x' => 'x', 'x' => 'x',
'_' => '_', '_' => '_',
]); ]);
@ -169,7 +167,9 @@ class Asset
$assets[$thumb[0]]['thumbnails'][$thumb[1]] = $thumb[2]; $assets[$thumb[0]]['thumbnails'][$thumb[1]] = $thumb[2];
if ($return_format === 'array') if ($return_format === 'array')
{
return $assets; return $assets;
}
else else
{ {
$objects = []; $objects = [];
@ -262,10 +262,10 @@ class Asset
INSERT INTO assets INSERT INTO assets
(id_user_uploaded, subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority) (id_user_uploaded, subdir, filename, title, slug, mimetype, image_width, image_height, date_captured, priority)
VALUES VALUES
({int:id_user_uploaded}, {string:subdir}, {string:filename}, {string:title}, {string:slug}, {string:mimetype}, (:id_user_uploaded, :subdir, :filename, :title, :slug, :mimetype,
{int:image_width}, {int:image_height}, :image_width, :image_height,
IF({int:date_captured} > 0, FROM_UNIXTIME({int:date_captured}), NULL), IF(:date_captured > 0, FROM_UNIXTIME(:date_captured), NULL),
{int:priority})', :priority)',
[ [
'id_user_uploaded' => isset($id_user) ? $id_user : Registry::get('user')->getUserId(), 'id_user_uploaded' => isset($id_user) ? $id_user : Registry::get('user')->getUserId(),
'subdir' => $preferred_subdir, 'subdir' => $preferred_subdir,
@ -273,9 +273,9 @@ class Asset
'title' => $title, 'title' => $title,
'slug' => $slug, 'slug' => $slug,
'mimetype' => $mimetype, 'mimetype' => $mimetype,
'image_width' => isset($image_width) ? $image_width : 'NULL', 'image_width' => isset($image_width) ? $image_width : null,
'image_height' => isset($image_height) ? $image_height : 'NULL', 'image_height' => isset($image_height) ? $image_height : null,
'date_captured' => isset($date_captured) ? $date_captured : 'NULL', 'date_captured' => isset($date_captured) ? $date_captured : null,
'priority' => isset($priority) ? (int) $priority : 0, 'priority' => isset($priority) ? (int) $priority : 0,
]); ]);
@ -285,7 +285,7 @@ class Asset
return false; return false;
} }
$data['id_asset'] = $db->insert_id(); $data['id_asset'] = $db->insertId();
return $return_format === 'object' ? new self($data) : $data; return $return_format === 'object' ? new self($data) : $data;
} }
@ -324,7 +324,7 @@ class Asset
$posts = Registry::get('db')->queryValues(' $posts = Registry::get('db')->queryValues('
SELECT id_post SELECT id_post
FROM posts_assets FROM posts_assets
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
['id_asset' => $this->id_asset]); ['id_asset' => $this->id_asset]);
// TODO: fix empty post iterator. // TODO: fix empty post iterator.
@ -495,18 +495,18 @@ class Asset
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE assets UPDATE assets
SET SET
mimetype = {string:mimetype}, mimetype = :mimetype,
image_width = {int:image_width}, image_width = :image_width,
image_height = {int:image_height}, image_height = :image_height,
date_captured = {datetime:date_captured}, date_captured = :date_captured,
priority = {int:priority} priority = :priority
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ [
'id_asset' => $this->id_asset, 'id_asset' => $this->id_asset,
'mimetype' => $this->mimetype, 'mimetype' => $this->mimetype,
'image_width' => isset($this->image_width) ? $this->image_width : 'NULL', 'image_width' => isset($this->image_width) ? $this->image_width : null,
'image_height' => isset($this->image_height) ? $this->image_height : 'NULL', 'image_height' => isset($this->image_height) ? $this->image_height : null,
'date_captured' => isset($this->date_captured) ? $this->date_captured : 'NULL', 'date_captured' => isset($this->date_captured) ? $this->date_captured : null,
'priority' => $this->priority, 'priority' => $this->priority,
]); ]);
} }
@ -527,8 +527,8 @@ class Asset
if (!empty($to_remove)) if (!empty($to_remove))
$db->query(' $db->query('
DELETE FROM assets_meta DELETE FROM assets_meta
WHERE id_asset = {int:id_asset} AND WHERE id_asset = :id_asset AND
variable IN({array_string:variables})', variable IN(@variables)',
[ [
'id_asset' => $this->id_asset, 'id_asset' => $this->id_asset,
'variables' => array_keys($to_remove), 'variables' => array_keys($to_remove),
@ -559,63 +559,40 @@ class Asset
{ {
$db = Registry::get('db'); $db = Registry::get('db');
// First: delete associated metadata // Delete any and all thumbnails, if this is an image.
if ($this->isImage())
{
$image = $this->getImage();
$image->removeAllThumbnails();
}
// Delete all meta info for this asset.
$db->query(' $db->query('
DELETE FROM assets_meta DELETE FROM assets_meta
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ ['id_asset' => $this->id_asset]);
'id_asset' => $this->id_asset,
]);
// Second: figure out what tags to recount cardinality for // Figure out what tags to recount cardinality for
$recount_tags = $db->queryValues(' $recount_tags = $db->queryValues('
SELECT id_tag SELECT id_tag
FROM assets_tags FROM assets_tags
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ ['id_asset' => $this->id_asset]);
'id_asset' => $this->id_asset,
]);
// Delete asset association for these tags
$db->query(' $db->query('
DELETE FROM assets_tags DELETE FROM assets_tags
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ ['id_asset' => $this->id_asset]);
'id_asset' => $this->id_asset,
]);
Tag::recount($recount_tags); Tag::recount($recount_tags);
// Third: figure out what associated thumbs to delete
$thumbs_to_delete = $db->queryValues('
SELECT filename
FROM assets_thumbs
WHERE id_asset = {int:id_asset}',
[
'id_asset' => $this->id_asset,
]);
foreach ($thumbs_to_delete as $filename)
{
$thumb_path = THUMBSDIR . '/' . $this->subdir . '/' . $filename;
if (is_file($thumb_path))
unlink($thumb_path);
}
$db->query('
DELETE FROM assets_thumbs
WHERE id_asset = {int:id_asset}',
[
'id_asset' => $this->id_asset,
]);
// Reset asset ID for tags that use this asset for their thumbnail // Reset asset ID for tags that use this asset for their thumbnail
$rows = $db->query(' $rows = $db->queryValues('
SELECT id_tag SELECT id_tag
FROM tags FROM tags
WHERE id_asset_thumb = {int:id_asset}', WHERE id_asset_thumb = :id_asset',
[ ['id_asset' => $this->id_asset]);
'id_asset' => $this->id_asset,
]);
if (!empty($rows)) if (!empty($rows))
{ {
@ -632,10 +609,8 @@ class Asset
$return = $db->query(' $return = $db->query('
DELETE FROM assets DELETE FROM assets
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
[ ['id_asset' => $this->id_asset]);
'id_asset' => $this->id_asset,
]);
return $return; return $return;
} }
@ -664,7 +639,7 @@ class Asset
Registry::get('db')->query(' Registry::get('db')->query('
DELETE FROM assets_tags DELETE FROM assets_tags
WHERE id_asset = {int:id_asset} AND id_tag IN ({array_int:id_tags})', WHERE id_asset = :id_asset AND id_tag IN (@id_tags)',
[ [
'id_asset' => $this->id_asset, 'id_asset' => $this->id_asset,
'id_tags' => $id_tags, 'id_tags' => $id_tags,
@ -682,16 +657,17 @@ class Asset
public static function getOffset($offset, $limit, $order, $direction) public static function getOffset($offset, $limit, $order, $direction)
{ {
$order = $order . ($direction == 'up' ? ' ASC' : ' DESC');
return Registry::get('db')->queryAssocs(' return Registry::get('db')->queryAssocs('
SELECT a.id_asset, a.subdir, a.filename, SELECT a.id_asset, a.subdir, a.filename,
a.image_width, a.image_height, a.mimetype, a.image_width, a.image_height, a.mimetype,
u.id_user, u.first_name, u.surname u.id_user, u.first_name, u.surname
FROM assets AS a FROM assets AS a
LEFT JOIN users AS u ON a.id_user_uploaded = u.id_user LEFT JOIN users AS u ON a.id_user_uploaded = u.id_user
ORDER BY {raw:order} ORDER BY ' . $order . '
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'order' => $order . ($direction == 'up' ? ' ASC' : ' DESC'),
'offset' => $offset, 'offset' => $offset,
'limit' => $limit, 'limit' => $limit,
]); ]);
@ -704,18 +680,16 @@ class Asset
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE assets UPDATE assets
SET id_asset = {int:id_asset}, SET subdir = :subdir,
id_user_uploaded = {int:id_user_uploaded}, filename = :filename,
subdir = {string:subdir}, title = :title,
filename = {string:filename}, slug = :slug,
title = {string:title}, mimetype = :mimetype,
slug = {string:slug}, image_width = :image_width,
mimetype = {string:mimetype}, image_height = :image_height,
image_width = {int:image_width}, date_captured = :date_captured,
image_height = {int:image_height}, priority = :priority
date_captured = {datetime:date_captured}, WHERE id_asset = :id_asset',
priority = {int:priority}
WHERE id_asset = {int:id_asset}',
get_object_vars($this)); get_object_vars($this));
} }
@ -733,27 +707,27 @@ class Asset
// Direction depends on whether we're browsing a tag or timeline // Direction depends on whether we're browsing a tag or timeline
if (isset($tag)) if (isset($tag))
{ {
$where[] = 't.id_tag = {int:id_tag}'; $where[] = 't.id_tag = :id_tag';
$params['id_tag'] = $tag->id_tag; $params['id_tag'] = $tag->id_tag;
$params['where_op'] = $previous ? '<' : '>'; $where_op = $previous ? '<' : '>';
$params['order_dir'] = $previous ? 'DESC' : 'ASC'; $order_dir = $previous ? 'DESC' : 'ASC';
} }
else else
{ {
$params['where_op'] = $previous ? '>' : '<'; $where_op = $previous ? '>' : '<';
$params['order_dir'] = $previous ? 'ASC' : 'DESC'; $order_dir = $previous ? 'ASC' : 'DESC';
} }
// Take active filter into account as well // Take active filter into account as well
if (!empty($activeFilter) && ($user = Member::fromSlug($activeFilter)) !== false) if (!empty($activeFilter) && ($user = Member::fromSlug($activeFilter)) !== false)
{ {
$where[] = 'id_user_uploaded = {int:id_user_uploaded}'; $where[] = 'id_user_uploaded = :id_user_uploaded';
$params['id_user_uploaded'] = $user->getUserId(); $params['id_user_uploaded'] = $user->getUserId();
} }
// Use complete ordering when sorting the set // Use complete ordering when sorting the set
$where[] = '(a.date_captured, a.id_asset) {raw:where_op} ' . $where[] = '(a.date_captured, a.id_asset) ' . $where_op .
'({datetime:date_captured}, {int:id_asset})'; ' (:date_captured, :id_asset)';
// Stringify conditions together // Stringify conditions together
$where = '(' . implode(') AND (', $where) . ')'; $where = '(' . implode(') AND (', $where) . ')';
@ -765,7 +739,7 @@ class Asset
' . (isset($tag) ? ' ' . (isset($tag) ? '
INNER JOIN assets_tags AS t ON a.id_asset = t.id_asset' : '') . ' INNER JOIN assets_tags AS t ON a.id_asset = t.id_asset' : '') . '
WHERE ' . $where . ' WHERE ' . $where . '
ORDER BY a.date_captured {raw:order_dir}, a.id_asset {raw:order_dir} ORDER BY a.date_captured ' . $order_dir . ', a.id_asset ' . $order_dir . '
LIMIT 1', LIMIT 1',
$params); $params);

141
models/AssetIterator.php
View File

@ -1,42 +1,50 @@
<?php <?php
/***************************************************************************** /*****************************************************************************
* AssetIterator.php * AssetIterator.php
* Contains key class AssetIterator. * Contains model class AssetIterator.
* *
* Kabuki CMS (C) 2013-2015, Aaron van Geffen * Kabuki CMS (C) 2013-2025, Aaron van Geffen
*****************************************************************************/ *****************************************************************************/
class AssetIterator extends Asset class AssetIterator implements Iterator
{ {
private Database $db;
private $direction; private $direction;
private $return_format; private $return_format;
private $res_assets; private $rowCount;
private $res_meta;
private $res_thumbs;
protected function __construct($res_assets, $res_meta, $res_thumbs, $return_format, $direction) private $assets_iterator;
private $meta_iterator;
private $thumbs_iterator;
protected function __construct(PDOStatement $stmt_assets, PDOStatement $stmt_meta, PDOStatement $stmt_thumbs,
$return_format, $direction)
{ {
$this->db = Registry::get('db');
$this->direction = $direction; $this->direction = $direction;
$this->res_assets = $res_assets;
$this->res_meta = $res_meta;
$this->res_thumbs = $res_thumbs;
$this->return_format = $return_format; $this->return_format = $return_format;
$this->rowCount = $stmt_assets->rowCount();
$this->assets_iterator = new CachedPDOIterator($stmt_assets);
$this->assets_iterator->rewind();
$this->meta_iterator = new CachedPDOIterator($stmt_meta);
$this->thumbs_iterator = new CachedPDOIterator($stmt_thumbs);
} }
public function next() public static function all()
{ {
$row = $this->db->fetch_assoc($this->res_assets); return self::getByOptions();
}
// No more rows? public function current(): mixed
{
$row = $this->assets_iterator->current();
if (!$row) if (!$row)
return false; return $row;
// Looks up metadata. // Collect metadata
$row['meta'] = []; $row['meta'] = [];
while ($meta = $this->db->fetch_assoc($this->res_meta)) $this->meta_iterator->rewind();
foreach ($this->meta_iterator as $meta)
{ {
if ($meta['id_asset'] != $row['id_asset']) if ($meta['id_asset'] != $row['id_asset'])
continue; continue;
@ -44,54 +52,23 @@ class AssetIterator extends Asset
$row['meta'][$meta['variable']] = $meta['value']; $row['meta'][$meta['variable']] = $meta['value'];
} }
// Reset internal pointer for next asset. // Collect thumbnails
$this->db->data_seek($this->res_meta, 0);
// Looks up thumbnails.
$row['thumbnails'] = []; $row['thumbnails'] = [];
while ($thumbs = $this->db->fetch_assoc($this->res_thumbs)) $this->thumbs_iterator->rewind();
foreach ($this->thumbs_iterator as $thumb)
{ {
if ($thumbs['id_asset'] != $row['id_asset']) if ($thumb['id_asset'] != $row['id_asset'])
continue; continue;
$row['thumbnails'][$thumbs['selector']] = $thumbs['filename']; $row['thumbnails'][$thumb['selector']] = $thumb['filename'];
} }
// Reset internal pointer for next asset.
$this->db->data_seek($this->res_thumbs, 0);
if ($this->return_format === 'object') if ($this->return_format === 'object')
return new Asset($row); return new Asset($row);
else else
return $row; return $row;
} }
public function reset()
{
$this->db->data_seek($this->res_assets, 0);
$this->db->data_seek($this->res_meta, 0);
$this->db->data_seek($this->res_thumbs, 0);
}
public function clean()
{
if (!$this->res_assets)
return;
$this->db->free_result($this->res_assets);
$this->res_assets = null;
}
public function num()
{
return $this->db->num_rows($this->res_assets);
}
public static function all()
{
return self::getByOptions();
}
public static function getByOptions(array $options = [], $return_count = false, $return_format = 'object') public static function getByOptions(array $options = [], $return_count = false, $return_format = 'object')
{ {
$params = [ $params = [
@ -114,9 +91,9 @@ class AssetIterator extends Asset
{ {
$params['mime_type'] = $options['mime_type']; $params['mime_type'] = $options['mime_type'];
if (is_array($options['mime_type'])) if (is_array($options['mime_type']))
$where[] = 'a.mimetype IN({array_string:mime_type})'; $where[] = 'a.mimetype IN(@mime_type)';
else else
$where[] = 'a.mimetype = {string:mime_type}'; $where[] = 'a.mimetype = :mime_type';
} }
if (isset($options['id_user_uploaded'])) if (isset($options['id_user_uploaded']))
{ {
@ -129,7 +106,17 @@ class AssetIterator extends Asset
$where[] = 'id_asset IN( $where[] = 'id_asset IN(
SELECT l.id_asset SELECT l.id_asset
FROM assets_tags AS l FROM assets_tags AS l
WHERE l.id_tag = {int:id_tag})'; WHERE l.id_tag = :id_tag)';
}
elseif (isset($options['tag']))
{
$params['tag'] = $options['tag'];
$where[] = 'id_asset IN(
SELECT l.id_asset
FROM assets_tags AS l
INNER JOIN tags AS t
ON l.id_tag = t.id_tag
WHERE t.slug = :tag)';
} }
// Make it valid SQL. // Make it valid SQL.
@ -145,7 +132,7 @@ class AssetIterator extends Asset
FROM assets AS a FROM assets AS a
WHERE ' . $where . ' WHERE ' . $where . '
ORDER BY ' . $order . (!empty($params['limit']) ? ' ORDER BY ' . $order . (!empty($params['limit']) ? '
LIMIT {int:offset}, {int:limit}' : ''), LIMIT :offset, :limit' : ''),
$params); $params);
// Get a resource object for the asset meta. // Get a resource object for the asset meta.
@ -165,9 +152,9 @@ class AssetIterator extends Asset
SELECT id_asset, filename, SELECT id_asset, filename,
CONCAT( CONCAT(
width, width,
{string:x}, :x,
height, height,
IF(mode != {string:empty}, CONCAT({string:_}, mode), {string:empty}) IF(mode != :empty1, CONCAT(:_, mode), :empty2)
) AS selector ) AS selector
FROM assets_thumbs FROM assets_thumbs
WHERE id_asset IN( WHERE id_asset IN(
@ -177,7 +164,8 @@ class AssetIterator extends Asset
) )
ORDER BY id_asset', ORDER BY id_asset',
$params + [ $params + [
'empty' => '', 'empty1' => '',
'empty2' => '',
'x' => 'x', 'x' => 'x',
'_' => '_', '_' => '_',
]); ]);
@ -199,13 +187,38 @@ class AssetIterator extends Asset
return $iterator; return $iterator;
} }
public function isAscending() public function key(): mixed
{
return $this->assets_iterator->key();
}
public function isAscending(): bool
{ {
return $this->direction === 'asc'; return $this->direction === 'asc';
} }
public function isDescending() public function isDescending(): bool
{ {
return $this->direction === 'desc'; return $this->direction === 'desc';
} }
public function next(): void
{
$this->assets_iterator->next();
}
public function num(): int
{
return $this->rowCount;
}
public function rewind(): void
{
$this->assets_iterator->rewind();
}
public function valid(): bool
{
return $this->assets_iterator->valid();
}
} }

8
models/Authentication.php
View File

@ -23,7 +23,7 @@ class Authentication
$password_hash = Registry::get('db')->queryValue(' $password_hash = Registry::get('db')->queryValue('
SELECT password_hash SELECT password_hash
FROM users FROM users
WHERE emailaddress = {string:emailaddress}', WHERE emailaddress = :emailaddress',
[ [
'emailaddress' => $emailaddress, 'emailaddress' => $emailaddress,
]); ]);
@ -132,9 +132,9 @@ class Authentication
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE users UPDATE users
SET SET
password_hash = {string:hash}, password_hash = :hash,
reset_key = {string:blank} reset_key = :blank
WHERE id_user = {int:id_user}', WHERE id_user = :id_user',
[ [
'id_user' => $id_user, 'id_user' => $id_user,
'hash' => $hash, 'hash' => $hash,

56
models/CachedPDOIterator.php Normal file
View File

@ -0,0 +1,56 @@
<?php
/*****************************************************************************
* CachedPDOIterator.php
* Contains model class CachedPDOIterator.
*
* Based on https://gist.github.com/hakre/5152090
*
* Kabuki CMS (C) 2013-2021, Aaron van Geffen
*****************************************************************************/
class CachedPDOIterator extends CachingIterator
{
private $index;
public function __construct(PDOStatement $statement)
{
parent::__construct(new IteratorIterator($statement), self::FULL_CACHE);
}
public function rewind(): void
{
if ($this->index === null)
{
parent::rewind();
}
$this->index = 0;
}
public function current(): mixed
{
if ($this->offsetExists($this->index))
{
return $this->offsetGet($this->index);
}
return parent::current();
}
public function key(): mixed
{
return $this->index;
}
public function next(): void
{
$this->index++;
if (!$this->offsetExists($this->index))
{
parent::next();
}
}
public function valid(): bool
{
return $this->offsetExists($this->index) || parent::valid();
}
}

503
models/Database.php
View File

@ -1,39 +1,29 @@
<?php <?php
/***************************************************************************** /*****************************************************************************
* Database.php * Database.php
* Contains key class Database. * Contains model class Database.
* *
* Adapted from SMF 2.0's DBA (C) 2011 Simple Machines * Kabuki CMS (C) 2013-2025, Aaron van Geffen
* Used under BSD 3-clause license.
*
* Kabuki CMS (C) 2013-2015, Aaron van Geffen
*****************************************************************************/ *****************************************************************************/
/**
* The database model used to communicate with the MySQL server.
*/
class Database class Database
{ {
private $connection; private $connection;
private $query_count = 0; private $query_count = 0;
private $logged_queries = []; private $logged_queries = [];
private array $db_callback;
/** public function __construct($host, $user, $password, $name)
* Initialises a new database connection.
* @param server: server to connect to.
* @param user: username to use for authentication.
* @param password: password to use for authentication.
* @param name: database to select.
*/
public function __construct($server, $user, $password, $name)
{ {
try try
{ {
$this->connection = new mysqli($server, $user, $password, $name); $this->connection = new PDO("mysql:host=$host;dbname=$name;charset=utf8mb4", $user, $password, [
$this->connection->set_charset('utf8mb4'); PDO::ATTR_ERRMODE => PDO::ERRMODE_EXCEPTION,
PDO::ATTR_DEFAULT_FETCH_MODE => PDO::FETCH_ASSOC,
PDO::ATTR_EMULATE_PREPARES => false,
]);
} }
catch (mysqli_sql_exception $e) // Give up if we have a connection error.
catch (PDOException $e)
{ {
http_response_code(503); http_response_code(503);
echo '<h2>Database Connection Problems</h2><p>Our software could not connect to the database. We apologise for any inconvenience and ask you to check back later.</p>'; echo '<h2>Database Connection Problems</h2><p>Our software could not connect to the database. We apologise for any inconvenience and ask you to check back later.</p>';
@ -52,301 +42,178 @@ class Database
} }
/** /**
* Fetches a row from a given recordset, using field names as keys. * Fetches a row from a given statement/recordset, using field names as keys.
*/ */
public function fetch_assoc($resource) public function fetchAssoc($stmt)
{ {
return mysqli_fetch_assoc($resource); return $stmt->fetch(PDO::FETCH_ASSOC);
} }
/** /**
* Fetches a row from a given recordset, encapsulating into an object. * Fetches a row from a given statement/recordset, encapsulating into an object.
*/ */
public function fetch_object($resource, $class) public function fetchObject($stmt, $class)
{ {
return mysqli_fetch_object($resource, $class); return $stmt->fetchObject($class);
} }
/** /**
* Fetches a row from a given recordset, using numeric keys. * Fetches a row from a given statement/recordset, using numeric keys.
*/ */
public function fetch_row($resource) public function fetchNum($stmt)
{ {
return mysqli_fetch_row($resource); return $stmt->fetch(PDO::FETCH_NUM);
} }
/** /**
* Destroys a given recordset. * Destroys a given statement/recordset.
*/ */
public function free_result($resource) public function free($stmt)
{ {
return mysqli_free_result($resource); return $stmt->closeCursor();
}
public function data_seek($result, $row_num)
{
return mysqli_data_seek($result, $row_num);
} }
/** /**
* Returns the amount of rows in a given recordset. * Returns the amount of rows in a given statement/recordset.
*/ */
public function num_rows($resource) public function rowCount($stmt)
{ {
return mysqli_num_rows($resource); return $stmt->rowCount();
} }
/** /**
* Returns the amount of fields in a given recordset. * Returns the amount of fields in a given statement/recordset.
*/ */
public function num_fields($resource) public function columnCount($stmt)
{ {
return mysqli_num_fields($resource); return $stmt->columnCount();
}
/**
* Escapes a string.
*/
public function escape_string($string)
{
return mysqli_real_escape_string($this->connection, $string);
}
/**
* Unescapes a string.
*/
public function unescape_string($string)
{
return stripslashes($string);
}
/**
* Returns the last MySQL error.
*/
public function error()
{
return mysqli_error($this->connection);
}
public function server_info()
{
return mysqli_get_server_info($this->connection);
}
/**
* Selects a database on a given connection.
*/
public function select_db($database)
{
return mysqli_select_db($database, $this->connection);
}
/**
* Returns the amount of rows affected by the previous query.
*/
public function affected_rows()
{
return mysqli_affected_rows($this->connection);
} }
/** /**
* Returns the id of the row created by a previous query. * Returns the id of the row created by a previous query.
*/ */
public function insert_id() public function insertId($name = null)
{ {
return mysqli_insert_id($this->connection); return $this->connection->lastInsertId($name);
} }
/** /**
* Do a MySQL transaction. * Start a transaction.
*/ */
public function transaction($operation = 'commit') public function beginTransaction()
{ {
switch ($operation) return $this->connection->beginTransaction();
{
case 'begin':
case 'rollback':
case 'commit':
return @mysqli_query($this->connection, strtoupper($operation));
default:
return false;
}
} }
/** /**
* Function used as a callback for the preg_match function that parses variables into database queries. * Rollback changes in a transaction.
*/ */
private function replacement_callback($matches) public function rollback()
{ {
list ($values, $connection) = $this->db_callback; return $this->connection->rollBack();
}
if (!isset($matches[2])) /**
throw new UnexpectedValueException('Invalid value inserted or no type specified.'); * Commit changes in a transaction.
*/
public function commit()
{
return $this->connection->commit();
}
if (!isset($values[$matches[2]])) private function expandPlaceholders($db_string, array &$db_values)
throw new UnexpectedValueException('The database value you\'re trying to insert does not exist: ' . htmlspecialchars($matches[2])); {
foreach ($db_values as $key => &$value)
$replacement = $values[$matches[2]];
switch ($matches[1])
{ {
case 'int': if (str_contains($db_string, ':' . $key))
if ((!is_numeric($replacement) || (string) $replacement !== (string) (int) $replacement) && $replacement !== 'NULL') {
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Integer expected.'); if (is_array($value))
return $replacement !== 'NULL' ? (string) (int) $replacement : 'NULL';
break;
case 'string':
case 'text':
return $replacement !== 'NULL' ? sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $replacement)) : 'NULL';
break;
case 'array_int':
if (is_array($replacement))
{ {
if (empty($replacement)) throw new UnexpectedValueException('Array ' . $key .
throw new UnexpectedValueException('Database error, given array of integer values is empty.'); ' is used as a scalar placeholder. Did you mean to use \'@\' instead?');
foreach ($replacement as $key => $value)
{
if (!is_numeric($value) || (string) $value !== (string) (int) $value)
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Array of integers expected.');
$replacement[$key] = (string) (int) $value;
}
return implode(', ', $replacement);
} }
else
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Array of integers expected.');
break; // Prepare date/time values
if (is_a($value, 'DateTime'))
case 'array_string':
if (is_array($replacement))
{ {
if (empty($replacement)) $value = $value->format('Y-m-d H:i:s');
throw new UnexpectedValueException('Database error, given array of string values is empty.'); }
}
foreach ($replacement as $key => $value) elseif (str_contains($db_string, '@' . $key))
$replacement[$key] = sprintf('\'%1$s\'', mysqli_real_escape_string($connection, $value)); {
if (!is_array($value))
return implode(', ', $replacement); {
throw new UnexpectedValueException('Scalar value ' . $key .
' is used as an array placeholder. Did you mean to use \':\' instead?');
} }
else
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Array of strings expected.');
break;
case 'date': // Create placeholders for all array elements
if (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d)$~', $replacement, $date_matches) === 1) $placeholders = array_map(fn($num) => ':' . $key . $num, range(0, count($value) - 1));
return sprintf('\'%04d-%02d-%02d\'', $date_matches[1], $date_matches[2], $date_matches[3]); $db_string = str_replace('@' . $key, implode(', ', $placeholders), $db_string);
elseif ($replacement === 'NULL') }
return 'NULL'; else
else {
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Date expected.'); // throw new Exception('Warning: unused key in query: ' . $key);
break; }
case 'datetime':
if (is_a($replacement, 'DateTime'))
return $replacement->format('\'Y-m-d H:i:s\'');
elseif (preg_match('~^(\d{4})-([0-1]?\d)-([0-3]?\d) (\d{2}):(\d{2}):(\d{2})$~', $replacement, $date_matches) === 1)
return sprintf('\'%04d-%02d-%02d %02d:%02d:%02d\'', $date_matches[1], $date_matches[2], $date_matches[3], $date_matches[4], $date_matches[5], $date_matches[6]);
elseif ($replacement === 'NULL')
return 'NULL';
else
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. DateTime expected.');
break;
case 'float':
if (!is_numeric($replacement) && $replacement !== 'NULL')
throw new UnexpectedValueException('Wrong value type sent to the database for field: ' . $matches[2] . '. Floating point number expected.');
return $replacement !== 'NULL' ? (string) (float) $replacement : 'NULL';
break;
case 'identifier':
// Backticks inside identifiers are supported as of MySQL 4.1. We don't need them here.
return '`' . strtr($replacement, ['`' => '', '.' => '']) . '`';
break;
case 'raw':
return $replacement;
break;
case 'bool':
case 'boolean':
// In mysql this is a synonym for tinyint(1)
return (bool)$replacement ? 1 : 0;
break;
default:
throw new UnexpectedValueException('Undefined type <b>' . $matches[1] . '</b> used in the database query');
break;
} }
return $db_string;
} }
/** /**
* Escapes and quotes a string using values passed, and executes the query. * Escapes and quotes a string using values passed, and executes the query.
*/ */
public function query($db_string, $db_values = []) public function query($db_string, array $db_values = []): PDOStatement
{ {
// One more query.... // One more query...
$this->query_count ++; $this->query_count++;
// Overriding security? This is evil! // Error out if hardcoded strings are detected
$security_override = $db_values === 'security_override' || !empty($db_values['security_override']); if (strpos($db_string, '\'') !== false)
throw new UnexpectedValueException('Hack attempt: illegal character (\') used in query.');
// Please, just use new style queries. if (defined('DB_LOG_QUERIES') && DB_LOG_QUERIES)
if (strpos($db_string, '\'') !== false && !$security_override)
throw new UnexpectedValueException('Hack attempt!', 'Illegal character (\') used in query.');
if (!$security_override && !empty($db_values))
{
// Set some values for use in the callback function.
$this->db_callback = [$db_values, $this->connection];
// Insert the values passed to this function.
$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [&$this, 'replacement_callback'], $db_string);
// Save some memory.
$this->db_callback = [];
}
if (defined("DB_LOG_QUERIES") && DB_LOG_QUERIES)
$this->logged_queries[] = $db_string; $this->logged_queries[] = $db_string;
try try
{ {
$return = @mysqli_query($this->connection, $db_string, empty($this->unbuffered) ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // Preprocessing/checks: prepare any arrays for binding
$db_string = $this->expandPlaceholders($db_string, $db_values);
// Prepare query for execution
$statement = $this->connection->prepare($db_string);
// Bind parameters... the hard way, due to a limit/offset hack.
// NB: bindParam binds by reference, hence &$value here.
foreach ($db_values as $key => &$value)
{
// Assumption: both scalar and array values are preprocessed to use named ':' placeholders
if (!str_contains($db_string, ':' . $key))
continue;
if (!is_array($value))
{
$statement->bindParam(':' . $key, $value);
continue;
}
foreach (array_values($value) as $num => &$element)
{
$statement->bindParam(':' . $key . $num, $element);
}
}
$statement->execute();
return $statement;
} }
catch (Exception $e) catch (PDOException $e)
{ {
$clean_sql = implode("\n", array_map('trim', explode("\n", $db_string))); ob_start();
throw new UnexpectedValueException($this->error() . '<br>' . $clean_sql);
$debug = ob_get_clean();
throw new Exception($e->getMessage() . "\n" . var_export($e->errorInfo, true) . "\n" . var_export($db_values, true));
} }
return $return;
}
/**
* Escapes and quotes a string just like db_query, but does not execute the query.
* Useful for debugging purposes.
*/
public function quote($db_string, $db_values = [])
{
// Please, just use new style queries.
if (strpos($db_string, '\'') !== false)
throw new UnexpectedValueException('Hack attempt!', 'Illegal character (\') used in query.');
// Save some values for use in the callback function.
$this->db_callback = [$db_values, $this->connection];
// Insert the values passed to this function.
$db_string = preg_replace_callback('~{([a-z_]+)(?::([a-zA-Z0-9_-]+))?}~', [&$this, 'replacement_callback'], $db_string);
// Save some memory.
$this->db_callback = [];
return $db_string;
} }
/** /**
@ -356,11 +223,11 @@ class Database
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if (!$res || $this->rowCount($res) === 0)
return null; return null;
$object = $this->fetch_object($res, $class); $object = $this->fetchObject($res, $class);
$this->free_result($res); $this->free($res);
return $object; return $object;
} }
@ -372,14 +239,14 @@ class Database
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if (!$res || $this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($object = $this->fetch_object($res, $class)) while ($object = $this->fetchObject($res, $class))
$rows[] = $object; $rows[] = $object;
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -387,15 +254,15 @@ class Database
/** /**
* Executes a query, returning an array of all the rows it returns. * Executes a query, returning an array of all the rows it returns.
*/ */
public function queryRow($db_string, $db_values = []) public function queryRow($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$row = $this->fetch_row($res); $row = $this->fetchNum($res);
$this->free_result($res); $this->free($res);
return $row; return $row;
} }
@ -403,18 +270,18 @@ class Database
/** /**
* Executes a query, returning an array of all the rows it returns. * Executes a query, returning an array of all the rows it returns.
*/ */
public function queryRows($db_string, $db_values = []) public function queryRows($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($row = $this->fetch_row($res)) while ($row = $this->fetchNum($res))
$rows[] = $row; $rows[] = $row;
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -422,18 +289,18 @@ class Database
/** /**
* Executes a query, returning an array of all the rows it returns. * Executes a query, returning an array of all the rows it returns.
*/ */
public function queryPair($db_string, $db_values = []) public function queryPair($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($row = $this->fetch_row($res)) while ($row = $this->fetchNum($res))
$rows[$row[0]] = $row[1]; $rows[$row[0]] = $row[1];
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -441,21 +308,21 @@ class Database
/** /**
* Executes a query, returning an array of all the rows it returns. * Executes a query, returning an array of all the rows it returns.
*/ */
public function queryPairs($db_string, $db_values = []) public function queryPairs($db_string, $db_values = array())
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if (!$res || $this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($row = $this->fetch_assoc($res)) while ($row = $this->fetchAssoc($res))
{ {
$key_value = reset($row); $key_value = reset($row);
$rows[$key_value] = $row; $rows[$key_value] = $row;
} }
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -463,15 +330,15 @@ class Database
/** /**
* Executes a query, returning an associative array of all the rows it returns. * Executes a query, returning an associative array of all the rows it returns.
*/ */
public function queryAssoc($db_string, $db_values = []) public function queryAssoc($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$row = $this->fetch_assoc($res); $row = $this->fetchAssoc($res);
$this->free_result($res); $this->free($res);
return $row; return $row;
} }
@ -479,18 +346,18 @@ class Database
/** /**
* Executes a query, returning an associative array of all the rows it returns. * Executes a query, returning an associative array of all the rows it returns.
*/ */
public function queryAssocs($db_string, $db_values = [], $connection = null) public function queryAssocs($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($row = $this->fetch_assoc($res)) while ($row = $this->fetchAssoc($res))
$rows[] = $row; $rows[] = $row;
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -498,16 +365,16 @@ class Database
/** /**
* Executes a query, returning the first value of the first row. * Executes a query, returning the first value of the first row.
*/ */
public function queryValue($db_string, $db_values = []) public function queryValue($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
// If this happens, you're doing it wrong. // If this happens, you're doing it wrong.
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return null; return null;
list($value) = $this->fetch_row($res); list($value) = $this->fetchNum($res);
$this->free_result($res); $this->free($res);
return $value; return $value;
} }
@ -515,18 +382,18 @@ class Database
/** /**
* Executes a query, returning an array of the first value of each row. * Executes a query, returning an array of the first value of each row.
*/ */
public function queryValues($db_string, $db_values = []) public function queryValues($db_string, array $db_values = [])
{ {
$res = $this->query($db_string, $db_values); $res = $this->query($db_string, $db_values);
if (!$res || $this->num_rows($res) == 0) if ($this->rowCount($res) === 0)
return []; return [];
$rows = []; $rows = [];
while ($row = $this->fetch_row($res)) while ($row = $this->fetchNum($res))
$rows[] = $row[0]; $rows[] = $row[0];
$this->free_result($res); $this->free($res);
return $rows; return $rows;
} }
@ -544,35 +411,45 @@ class Database
if (!is_array($data[array_rand($data)])) if (!is_array($data[array_rand($data)]))
$data = [$data]; $data = [$data];
// Create the mold for a single row insert.
$insertData = '(';
foreach ($columns as $columnName => $type)
{
// Are we restricting the length?
if (strpos($type, 'string-') !== false)
$insertData .= sprintf('SUBSTRING({string:%1$s}, 1, ' . substr($type, 7) . '), ', $columnName);
else
$insertData .= sprintf('{%1$s:%2$s}, ', $type, $columnName);
}
$insertData = substr($insertData, 0, -2) . ')';
// Create an array consisting of only the columns.
$indexed_columns = array_keys($columns);
// Here's where the variables are injected to the query.
$insertRows = [];
foreach ($data as $dataRow)
$insertRows[] = $this->quote($insertData, array_combine($indexed_columns, $dataRow));
// Determine the method of insertion. // Determine the method of insertion.
$queryTitle = $method === 'replace' ? 'REPLACE' : ($method === 'ignore' ? 'INSERT IGNORE' : 'INSERT'); $method = $method == 'replace' ? 'REPLACE' : ($method == 'ignore' ? 'INSERT IGNORE' : 'INSERT');
// Do the insert. // What columns are we inserting?
return $this->query(' $columns = array_keys($data[0]);
' . $queryTitle . ' INTO ' . $table . ' (`' . implode('`, `', $indexed_columns) . '`)
VALUES // Start building the query.
' . implode(', $db_string = $method . ' INTO ' . $table . ' (' . implode(',', $columns) . ') VALUES ';
', $insertRows),
['security_override' => true]); // Create the mold for a single row insert.
$placeholders = '(' . substr(str_repeat('?, ', count($columns)), 0, -2) . '), ';
// Append it for every row we're to insert.
$values = [];
foreach ($data as $row)
{
$values = array_merge($values, array_values($row));
$db_string .= $placeholders;
}
// Get rid of the tailing comma.
$db_string = substr($db_string, 0, -2);
// Prepare for your impending demise!
$statement = $this->connection->prepare($db_string);
// Bind parameters... the hard way, due to a limit/offset hack.
foreach ($values as $key => $value)
$statement->bindValue($key + 1, $values[$key]);
// Handle errors.
try
{
$statement->execute();
return $statement;
}
catch (PDOException $e)
{
throw new Exception($e->getMessage() . '<br><br>' . $db_string . '<br><br>' . print_r($values, true));
}
} }
} }

10
models/ErrorLog.php
View File

@ -17,8 +17,8 @@ class ErrorLog
INSERT INTO log_errors INSERT INTO log_errors
(id_user, message, debug_info, file, line, request_uri, time, ip_address) (id_user, message, debug_info, file, line, request_uri, time, ip_address)
VALUES VALUES
({int:id_user}, {string:message}, {string:debug_info}, {string:file}, {int:line}, (:id_user, :message, :debug_info, :file, :line,
{string:request_uri}, CURRENT_TIMESTAMP, {string:ip_address})', :request_uri, CURRENT_TIMESTAMP, :ip_address)',
$data); $data);
} }
@ -37,14 +37,14 @@ class ErrorLog
public static function getOffset($offset, $limit, $order, $direction) public static function getOffset($offset, $limit, $order, $direction)
{ {
assert(in_array($order, ['id_entry', 'file', 'line', 'time', 'ipaddress', 'id_user'])); assert(in_array($order, ['id_entry', 'file', 'line', 'time', 'ipaddress', 'id_user']));
$order = $order . ($direction === 'up' ? ' ASC' : ' DESC');
return Registry::get('db')->queryAssocs(' return Registry::get('db')->queryAssocs('
SELECT * SELECT *
FROM log_errors FROM log_errors
ORDER BY {raw:order} ORDER BY ' . $order . '
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'order' => $order . ($direction === 'up' ? ' ASC' : ' DESC'),
'offset' => $offset, 'offset' => $offset,
'limit' => $limit, 'limit' => $limit,
]); ]);

4
models/GenericTable.php
View File

@ -226,8 +226,8 @@ class GenericTable
else else
$pattern = $options['pattern']; $pattern = $options['pattern'];
assert(isset($rowData[$options['value']])); assert(array_key_exists($options['value'], $rowData));
if (!is_numeric($rowData[$options['value']])) if (isset($rowData[$options['value']]) && !is_numeric($rowData[$options['value']]))
$timestamp = strtotime($rowData[$options['value']]); $timestamp = strtotime($rowData[$options['value']]);
else else
$timestamp = (int) $rowData[$options['value']]; $timestamp = (int) $rowData[$options['value']];

8
models/Image.php
View File

@ -165,7 +165,7 @@ class Image extends Asset
return Registry::get('db')->query(' return Registry::get('db')->query('
DELETE FROM assets_thumbs DELETE FROM assets_thumbs
WHERE id_asset = {int:id_asset}', WHERE id_asset = :id_asset',
['id_asset' => $this->id_asset]); ['id_asset' => $this->id_asset]);
} }
@ -183,9 +183,9 @@ class Image extends Asset
return Registry::get('db')->query(' return Registry::get('db')->query('
DELETE FROM assets_thumbs DELETE FROM assets_thumbs
WHERE id_asset = {int:id_asset} AND WHERE id_asset = :id_asset AND
width = {int:width} AND width = :width AND
height = {int:height}', height = :height',
[ [
'height' => $height, 'height' => $height,
'id_asset' => $this->id_asset, 'id_asset' => $this->id_asset,

44
models/Member.php
View File

@ -23,7 +23,7 @@ class Member extends User
return Registry::get('db')->queryObject(static::class, ' return Registry::get('db')->queryObject(static::class, '
SELECT * SELECT *
FROM users FROM users
WHERE emailaddress = {string:email_address}', WHERE emailaddress = :email_address',
['email_address' => $email_address]); ['email_address' => $email_address]);
} }
@ -32,7 +32,7 @@ class Member extends User
$row = Registry::get('db')->queryAssoc(' $row = Registry::get('db')->queryAssoc('
SELECT * SELECT *
FROM users FROM users
WHERE id_user = {int:id_user}', WHERE id_user = :id_user',
[ [
'id_user' => $id_user, 'id_user' => $id_user,
]); ]);
@ -49,7 +49,7 @@ class Member extends User
$row = Registry::get('db')->queryAssoc(' $row = Registry::get('db')->queryAssoc('
SELECT * SELECT *
FROM users FROM users
WHERE slug = {string:slug}', WHERE slug = :slug',
[ [
'slug' => $slug, 'slug' => $slug,
]); ]);
@ -77,6 +77,7 @@ class Member extends User
'creation_time' => time(), 'creation_time' => time(),
'ip_address' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '', 'ip_address' => isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '',
'is_admin' => empty($data['is_admin']) ? 0 : 1, 'is_admin' => empty($data['is_admin']) ? 0 : 1,
'reset_key' => '',
]; ];
if ($error) if ($error)
@ -92,12 +93,13 @@ class Member extends User
'creation_time' => 'int', 'creation_time' => 'int',
'ip_address' => 'string-45', 'ip_address' => 'string-45',
'is_admin' => 'int', 'is_admin' => 'int',
'reset_key' => 'string-16'
], $new_user, ['id_user']); ], $new_user, ['id_user']);
if (!$bool) if (!$bool)
return false; return false;
$new_user['id_user'] = $db->insert_id(); $new_user['id_user'] = $db->insertId();
$member = new Member($new_user); $member = new Member($new_user);
return $member; return $member;
@ -125,14 +127,14 @@ class Member extends User
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE users UPDATE users
SET SET
first_name = {string:first_name}, first_name = :first_name,
surname = {string:surname}, surname = :surname,
slug = {string:slug}, slug = :slug,
emailaddress = {string:emailaddress}, emailaddress = :emailaddress,
password_hash = {string:password_hash}, password_hash = :password_hash,
is_admin = {int:is_admin} is_admin = :is_admin
WHERE id_user = {int:id_user}', WHERE id_user = :id_user',
$params); get_object_vars($this));
} }
/** /**
@ -143,7 +145,7 @@ class Member extends User
{ {
return Registry::get('db')->query(' return Registry::get('db')->query('
DELETE FROM users DELETE FROM users
WHERE id_user = {int:id_user}', WHERE id_user = :id_user',
['id_user' => $this->id_user]); ['id_user' => $this->id_user]);
} }
@ -158,7 +160,7 @@ class Member extends User
$res = Registry::get('db')->queryValue(' $res = Registry::get('db')->queryValue('
SELECT id_user SELECT id_user
FROM users FROM users
WHERE emailaddress = {string:emailaddress}', WHERE emailaddress = :emailaddress',
[ [
'emailaddress' => $emailaddress, 'emailaddress' => $emailaddress,
]); ]);
@ -174,9 +176,9 @@ class Member extends User
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE users UPDATE users
SET SET
last_action_time = {int:now}, last_action_time = :now,
ip_address = {string:ip} ip_address = :ip
WHERE id_user = {int:id}', WHERE id_user = :id',
[ [
'now' => time(), 'now' => time(),
'id' => $this->id_user, 'id' => $this->id_user,
@ -199,14 +201,14 @@ class Member extends User
public static function getOffset($offset, $limit, $order, $direction) public static function getOffset($offset, $limit, $order, $direction)
{ {
assert(in_array($order, ['id_user', 'surname', 'first_name', 'slug', 'emailaddress', 'last_action_time', 'ip_address', 'is_admin'])); assert(in_array($order, ['id_user', 'surname', 'first_name', 'slug', 'emailaddress', 'last_action_time', 'ip_address', 'is_admin']));
$order = $order . ($direction === 'up' ? ' ASC' : ' DESC');
return Registry::get('db')->queryAssocs(' return Registry::get('db')->queryAssocs('
SELECT * SELECT *
FROM users FROM users
ORDER BY {raw:order} ORDER BY ' . $order . '
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'order' => $order . ($direction === 'up' ? ' ASC' : ' DESC'),
'offset' => $offset, 'offset' => $offset,
'limit' => $limit, 'limit' => $limit,
]); ]);
@ -221,7 +223,7 @@ class Member extends User
public static function getMemberMap() public static function getMemberMap()
{ {
return Registry::get('db')->queryPair(' return Registry::get('db')->queryPair('
SELECT id_user, CONCAT(first_name, {string:blank}, surname) AS full_name SELECT id_user, CONCAT(first_name, :blank, surname) AS full_name
FROM users FROM users
ORDER BY first_name, surname', ORDER BY first_name, surname',
[ [

22
models/PhotoMosaic.php
View File

@ -8,11 +8,11 @@
class PhotoMosaic class PhotoMosaic
{ {
private $descending; private bool $descending;
private AssetIterator $iterator; private AssetIterator $iterator;
private $layouts; private array $layouts;
private $processedImages = 0; private int $processedImages = 0;
private $queue = []; private array $queue = [];
const IMAGE_MASK_ALL = Image::TYPE_PORTRAIT | Image::TYPE_LANDSCAPE | Image::TYPE_PANORAMA; const IMAGE_MASK_ALL = Image::TYPE_PORTRAIT | Image::TYPE_LANDSCAPE | Image::TYPE_PANORAMA;
const NUM_DAYS_CUTOFF = 7; const NUM_DAYS_CUTOFF = 7;
@ -25,11 +25,6 @@ class PhotoMosaic
$this->descending = $iterator->isDescending(); $this->descending = $iterator->isDescending();
} }
public function __destruct()
{
$this->iterator->clean();
}
private function availableLayouts() private function availableLayouts()
{ {
static $layouts = [ static $layouts = [
@ -86,9 +81,14 @@ class PhotoMosaic
} }
} }
// Check whatever's next up! // Check whatever's up next!
while (($asset = $this->iterator->next()) && ($image = $asset->getImage())) // NB: not is not a `foreach` so as to not reset the iterator implicitly
while ($this->iterator->valid())
{ {
$asset = $this->iterator->current();
$image = $asset->getImage();
$this->iterator->next();
// Give up on the recordset once dates are too far apart // Give up on the recordset once dates are too far apart
if (isset($refDate) && abs(self::daysApart($image->getDateCaptured(), $refDate)) > self::NUM_DAYS_CUTOFF) if (isset($refDate) && abs(self::daysApart($image->getDateCaptured(), $refDate)) > self::NUM_DAYS_CUTOFF)
{ {

27
models/Setting.php
View File

@ -21,7 +21,7 @@ class Setting
REPLACE INTO settings REPLACE INTO settings
(id_user, variable, value, time_set) (id_user, variable, value, time_set)
VALUES VALUES
({int:id_user}, {string:key}, {string:value}, CURRENT_TIMESTAMP())', (:id_user, :key, :value, CURRENT_TIMESTAMP())',
[ [
'id_user' => $id_user, 'id_user' => $id_user,
'key' => $key, 'key' => $key,
@ -45,7 +45,7 @@ class Setting
$value = Registry::get('db')->queryValue(' $value = Registry::get('db')->queryValue('
SELECT value SELECT value
FROM settings FROM settings
WHERE id_user = {int:id_user} AND variable = {string:key}', WHERE id_user = :id_user AND variable = :key',
[ [
'id_user' => $id_user, 'id_user' => $id_user,
'key' => $key, 'key' => $key,
@ -63,11 +63,30 @@ class Setting
public static function remove($key, $id_user = null) public static function remove($key, $id_user = null)
{ {
$id_user = Registry::get('user')->getUserId(); // User setting or global setting?
if ($id_user === null)
$id_user = Registry::get('user')->getUserId();
$pairs = Registry::get('db')->queryPair('
SELECT variable, value
FROM settings
WHERE id_user = :id_user',
[
'id_user' => $id_user,
]);
return $pairs;
}
public static function remove($key, $id_user = 0)
{
// User setting or global setting?
if ($id_user === null)
$id_user = Registry::get('user')->getUserId();
if (Registry::get('db')->query(' if (Registry::get('db')->query('
DELETE FROM settings DELETE FROM settings
WHERE id_user = {int:id_user} AND variable = {string:key}', WHERE id_user = :id_user AND variable = :key',
[ [
'id_user' => $id_user, 'id_user' => $id_user,
'key' => $key, 'key' => $key,

84
models/Tag.php
View File

@ -36,7 +36,7 @@ class Tag
$row = $db->queryAssoc(' $row = $db->queryAssoc('
SELECT * SELECT *
FROM tags FROM tags
WHERE id_tag = {int:id_tag}', WHERE id_tag = :id_tag',
[ [
'id_tag' => $id_tag, 'id_tag' => $id_tag,
]); ]);
@ -55,7 +55,7 @@ class Tag
$row = $db->queryAssoc(' $row = $db->queryAssoc('
SELECT * SELECT *
FROM tags FROM tags
WHERE slug = {string:slug}', WHERE slug = :slug',
[ [
'slug' => $slug, 'slug' => $slug,
]); ]);
@ -73,7 +73,7 @@ class Tag
SELECT * SELECT *
FROM tags FROM tags
ORDER BY ' . ($limit > 0 ? 'count ORDER BY ' . ($limit > 0 ? 'count
LIMIT {int:limit}' : 'tag'), LIMIT :limit' : 'tag'),
[ [
'limit' => $limit, 'limit' => $limit,
]); ]);
@ -107,14 +107,14 @@ class Tag
$res = $db->query(' $res = $db->query('
SELECT * SELECT *
FROM tags FROM tags
WHERE id_user_owner = {int:id_user_owner} WHERE id_user_owner = :id_user_owner
ORDER BY tag', ORDER BY tag',
[ [
'id_user_owner' => $id_user_owner, 'id_user_owner' => $id_user_owner,
]); ]);
$objects = []; $objects = [];
while ($row = $db->fetch_assoc($res)) while ($row = $db->fetchAssoc($res))
$objects[$row['id_tag']] = new Tag($row); $objects[$row['id_tag']] = new Tag($row);
return $objects; return $objects;
@ -125,9 +125,9 @@ class Tag
$rows = Registry::get('db')->queryAssocs(' $rows = Registry::get('db')->queryAssocs('
SELECT * SELECT *
FROM tags FROM tags
WHERE id_parent = {int:id_parent} AND kind = {string:kind} WHERE id_parent = :id_parent AND kind = :kind
ORDER BY tag ASC ORDER BY tag ASC
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'id_parent' => $id_parent, 'id_parent' => $id_parent,
'kind' => 'Album', 'kind' => 'Album',
@ -153,7 +153,7 @@ class Tag
FROM assets_tags AS at FROM assets_tags AS at
LEFT JOIN assets AS a ON at.id_asset = a.id_asset LEFT JOIN assets AS a ON at.id_asset = a.id_asset
LEFT JOIN users AS u ON a.id_user_uploaded = u.id_user LEFT JOIN users AS u ON a.id_user_uploaded = u.id_user
WHERE at.id_tag = {int:id_tag} WHERE at.id_tag = :id_tag
GROUP BY a.id_user_uploaded GROUP BY a.id_user_uploaded
ORDER BY u.first_name, u.surname', ORDER BY u.first_name, u.surname',
[ [
@ -166,9 +166,9 @@ class Tag
$rows = Registry::get('db')->queryAssocs(' $rows = Registry::get('db')->queryAssocs('
SELECT * SELECT *
FROM tags FROM tags
WHERE id_parent = {int:id_parent} AND kind = {string:kind} WHERE id_parent = :id_parent AND kind = :kind
ORDER BY tag ASC ORDER BY tag ASC
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'id_parent' => $id_parent, 'id_parent' => $id_parent,
'kind' => 'Person', 'kind' => 'Person',
@ -195,7 +195,7 @@ class Tag
WHERE id_tag IN( WHERE id_tag IN(
SELECT id_tag SELECT id_tag
FROM assets_tags FROM assets_tags
WHERE id_asset = {int:id_asset} WHERE id_asset = :id_asset
) )
ORDER BY count DESC', ORDER BY count DESC',
[ [
@ -225,7 +225,7 @@ class Tag
WHERE id_tag IN( WHERE id_tag IN(
SELECT id_tag SELECT id_tag
FROM posts_tags FROM posts_tags
WHERE id_post = {int:id_post} WHERE id_post = :id_post
) )
ORDER BY count DESC', ORDER BY count DESC',
[ [
@ -255,7 +255,7 @@ class Tag
FROM `assets_tags` AS at FROM `assets_tags` AS at
WHERE at.id_tag = t.id_tag WHERE at.id_tag = t.id_tag
)' . (!empty($id_tags) ? ' )' . (!empty($id_tags) ? '
WHERE t.id_tag IN({array_int:id_tags})' : ''), WHERE t.id_tag IN(@id_tags)' : ''),
['id_tags' => $id_tags]); ['id_tags' => $id_tags]);
} }
@ -276,14 +276,14 @@ class Tag
INSERT IGNORE INTO tags INSERT IGNORE INTO tags
(id_parent, tag, slug, kind, description, count) (id_parent, tag, slug, kind, description, count)
VALUES VALUES
({int:id_parent}, {string:tag}, {string:slug}, {string:kind}, {string:description}, {int:count}) (:id_parent, :tag, :slug, :kind, :description, :count)
ON DUPLICATE KEY UPDATE count = count + 1', ON DUPLICATE KEY UPDATE count = count + 1',
$data); $data);
if (!$res) if (!$res)
throw new Exception('Could not create the requested tag.'); throw new Exception('Could not create the requested tag.');
$data['id_tag'] = $db->insert_id(); $data['id_tag'] = $db->insertId();
return $return_format === 'object' ? new Tag($data) : $data; return $return_format === 'object' ? new Tag($data) : $data;
} }
@ -297,14 +297,15 @@ class Tag
return Registry::get('db')->query(' return Registry::get('db')->query('
UPDATE tags UPDATE tags
SET SET
id_parent = {int:id_parent}, id_parent = :id_parent,
id_asset_thumb = {int:id_asset_thumb},' . (isset($this->id_user_owner) ? ' id_asset_thumb = :id_asset_thumb,' . (isset($this->id_user_owner) ? '
id_user_owner = {int:id_user_owner},' : '') . ' id_user_owner = :id_user_owner,' : '') . '
tag = {string:tag}, tag = :tag,
slug = {string:slug}, slug = :slug,
description = {string:description}, kind = :kind,
count = {int:count} description = :description,
WHERE id_tag = {int:id_tag}', count = :count
WHERE id_tag = :id_tag',
get_object_vars($this)); get_object_vars($this));
} }
@ -312,9 +313,10 @@ class Tag
{ {
$db = Registry::get('db'); $db = Registry::get('db');
// Unlink any tagged assets
$res = $db->query(' $res = $db->query('
DELETE FROM assets_tags DELETE FROM assets_tags
WHERE id_tag = {int:id_tag}', WHERE id_tag = :id_tag',
[ [
'id_tag' => $this->id_tag, 'id_tag' => $this->id_tag,
]); ]);
@ -322,9 +324,10 @@ class Tag
if (!$res) if (!$res)
return false; return false;
// Delete the actual tag
return $db->query(' return $db->query('
DELETE FROM tags DELETE FROM tags
WHERE id_tag = {int:id_tag}', WHERE id_tag = :id_tag',
[ [
'id_tag' => $this->id_tag, 'id_tag' => $this->id_tag,
]); ]);
@ -336,15 +339,15 @@ class Tag
$new_id = $db->queryValue(' $new_id = $db->queryValue('
SELECT MAX(id_asset) as new_id SELECT MAX(id_asset) as new_id
FROM assets_tags FROM assets_tags
WHERE id_tag = {int:id_tag}', WHERE id_tag = :id_tag',
[ [
'id_tag' => $this->id_tag, 'id_tag' => $this->id_tag,
]); ]);
return $db->query(' return $db->query('
UPDATE tags UPDATE tags
SET id_asset_thumb = {int:new_id} SET id_asset_thumb = :new_id
WHERE id_tag = {int:id_tag}', WHERE id_tag = :id_tag',
[ [
'new_id' => $new_id ?? 0, 'new_id' => $new_id ?? 0,
'id_tag' => $this->id_tag, 'id_tag' => $this->id_tag,
@ -359,7 +362,7 @@ class Tag
return Registry::get('db')->queryPair(' return Registry::get('db')->queryPair('
SELECT id_tag, tag SELECT id_tag, tag
FROM tags FROM tags
WHERE LOWER(tag) LIKE {string:tokens} WHERE LOWER(tag) LIKE :tokens
ORDER BY tag ASC', ORDER BY tag ASC',
['tokens' => '%' . strtolower(implode('%', $tokens)) . '%']); ['tokens' => '%' . strtolower(implode('%', $tokens)) . '%']);
} }
@ -389,7 +392,7 @@ class Tag
return Registry::get('db')->queryPair(' return Registry::get('db')->queryPair('
SELECT id_tag, tag SELECT id_tag, tag
FROM tags FROM tags
WHERE tag = {string:tag}', WHERE tag = :tag',
['tag' => $tag]); ['tag' => $tag]);
} }
@ -401,7 +404,7 @@ class Tag
return Registry::get('db')->queryValue(' return Registry::get('db')->queryValue('
SELECT id_tag SELECT id_tag
FROM tags FROM tags
WHERE slug = {string:slug}', WHERE slug = :slug',
['slug' => $slug]); ['slug' => $slug]);
} }
@ -410,7 +413,7 @@ class Tag
return Registry::get('db')->queryPair(' return Registry::get('db')->queryPair('
SELECT tag, id_tag SELECT tag, id_tag
FROM tags FROM tags
WHERE tag IN ({array_string:tags})', WHERE tag IN (:tags)',
['tags' => $tags]); ['tags' => $tags]);
} }
@ -422,7 +425,8 @@ class Tag
if (empty($kind)) if (empty($kind))
$kind = 'Album'; $kind = 'Album';
$where[] = 'kind {raw:operator} {string:kind}'; $operator = $isAlbum ? '=' : '!=';
$where[] = 'kind ' . $operator . ' :kind';
$where = implode(' AND ', $where); $where = implode(' AND ', $where);
return Registry::get('db')->queryValue(' return Registry::get('db')->queryValue('
@ -431,32 +435,32 @@ class Tag
WHERE ' . $where, WHERE ' . $where,
[ [
'kind' => $kind, 'kind' => $kind,
'operator' => $isAlbum ? '=' : '!=',
]); ]);
} }
public static function getOffset($offset, $limit, $order, $direction, $isAlbum = false) public static function getOffset($offset, $limit, $order, $direction, $isAlbum = false)
{ {
assert(in_array($order, ['id_tag', 'tag', 'slug', 'count'])); assert(in_array($order, ['id_tag', 'tag', 'slug', 'count']));
$order = $order . ($direction === 'up' ? ' ASC' : ' DESC');
$operator = $isAlbum ? '=' : '!=';
$db = Registry::get('db'); $db = Registry::get('db');
$res = $db->query(' $res = $db->query('
SELECT t.*, u.id_user, u.first_name, u.surname SELECT t.*, u.id_user, u.first_name, u.surname
FROM tags AS t FROM tags AS t
LEFT JOIN users AS u ON t.id_user_owner = u.id_user LEFT JOIN users AS u ON t.id_user_owner = u.id_user
WHERE kind {raw:operator} {string:album} WHERE kind ' . $operator . ' :album
ORDER BY id_parent, {raw:order} ORDER BY id_parent, ' . $order . '
LIMIT {int:offset}, {int:limit}', LIMIT :offset, :limit',
[ [
'order' => $order . ($direction === 'up' ? ' ASC' : ' DESC'),
'offset' => $offset, 'offset' => $offset,
'limit' => $limit, 'limit' => $limit,
'album' => 'Album', 'album' => 'Album',
'operator' => $isAlbum ? '=' : '!=',
]); ]);
$albums_by_parent = []; $albums_by_parent = [];
while ($row = $db->fetch_assoc($res)) while ($row = $db->fetchAssoc($res))
{ {
if (!isset($albums_by_parent[$row['id_parent']])) if (!isset($albums_by_parent[$row['id_parent']]))
$albums_by_parent[$row['id_parent']] = []; $albums_by_parent[$row['id_parent']] = [];

4
models/Thumbnail.php
View File

@ -335,7 +335,7 @@ class Thumbnail
if ($success) if ($success)
{ {
$thumb_selector = $this->width . 'x' . $this->height . $this->filename_suffix; $thumb_selector = $this->width . 'x' . $this->height . $this->filename_suffix;
$this->thumbnails[$thumb_selector] = $filename !== 'NULL' ? $filename : null; $this->thumbnails[$thumb_selector] = $filename ?? null;
// For consistency, write new thumbnail filename to parent Image object. // For consistency, write new thumbnail filename to parent Image object.
// TODO: there could still be an inconsistency if multiple objects exists for the same image asset. // TODO: there could still be an inconsistency if multiple objects exists for the same image asset.
@ -349,7 +349,7 @@ class Thumbnail
private function markAsQueued() private function markAsQueued()
{ {
$this->updateDb('NULL'); $this->updateDb(null);
} }
private function markAsGenerated($filename) private function markAsGenerated($filename)

10
templates/FeaturedThumbnailManager.php
View File

@ -8,12 +8,12 @@
class FeaturedThumbnailManager extends SubTemplate class FeaturedThumbnailManager extends SubTemplate
{ {
private $assets; private $iterator;
private $currentThumbnailId; private $currentThumbnailId;
public function __construct(AssetIterator $assets, $currentThumbnailId) public function __construct(AssetIterator $iterator, $currentThumbnailId)
{ {
$this->assets = $assets; $this->iterator = $iterator;
$this->currentThumbnailId = $currentThumbnailId; $this->currentThumbnailId = $currentThumbnailId;
} }
@ -25,7 +25,7 @@ class FeaturedThumbnailManager extends SubTemplate
<h2>Select thumbnail</h2> <h2>Select thumbnail</h2>
<ul id="featuredThumbnail">'; <ul id="featuredThumbnail">';
while ($asset = $this->assets->next()) foreach ($this->iterator as $asset)
{ {
$image = $asset->getImage(); $image = $asset->getImage();
echo ' echo '
@ -36,8 +36,6 @@ class FeaturedThumbnailManager extends SubTemplate
</li>'; </li>';
} }
$this->assets->clean();
echo ' echo '
</ul> </ul>
<input type="hidden" name="', Session::getSessionTokenKey(), '" value="', Session::getSessionToken(), '"> <input type="hidden" name="', Session::getSessionTokenKey(), '" value="', Session::getSessionToken(), '">