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

nits

Browse source
This commit is contained in:
Shish 2023-01-11 11:15:26 +00:00
parent 91b354f6f8
commit 5a64e8729b
49 changed files with 99 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -60,8 +60,8 @@
"ext-memcache": "memcache caching",
"ext-memcached": "memcached caching",
"ext-apc": "apc caching",
"ext-apcu": "apc caching",
"ext-redis": "redis caching",
"ext-dom": "some extensions",
"ext-curl": "some extensions",
"ext-ctype": "some extensions",
"ext-json": "some extensions",

4
core/basethemelet.php
View file

@ -138,8 +138,8 @@ class BaseThemelet
$next_html = $at_end ? "Next" : $this->gen_page_link($base_url, $query, $next, "Next");
$last_html = $at_end ? "Last" : $this->gen_page_link($base_url, $query, $total_pages, "Last");
$start = $current_page-5 > 1 ? $current_page-5 : 1;
$end = $start+10 < $total_pages ? $start+10 : $total_pages;
$start = max($current_page - 5, 1);
$end = min($start + 10, $total_pages);
$pages = [];
foreach (range($start, $end) as $i) {

26
core/cacheengine.php
View file

@ -27,15 +27,15 @@ class NoCache implements CacheEngine
class MemcachedCache implements CacheEngine
{
public ?Memcached $memcache=null;
public ?\Memcached $memcache=null;
public function __construct(string $args)
{
$hp = explode(":", $args);
$this->memcache = new Memcached();
#$this->memcache->setOption(Memcached::OPT_COMPRESSION, False);
#$this->memcache->setOption(Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_PHP);
#$this->memcache->setOption(Memcached::OPT_PREFIX_KEY, phpversion());
$this->memcache = new \Memcached();
#$this->memcache->setOption(\Memcached::OPT_COMPRESSION, False);
#$this->memcache->setOption(\Memcached::OPT_SERIALIZER, Memcached::SERIALIZER_PHP);
#$this->memcache->setOption(\Memcached::OPT_PREFIX_KEY, phpversion());
$this->memcache->addServer($hp[0], (int)$hp[1]);
}
@ -46,9 +46,9 @@ class MemcachedCache implements CacheEngine
$val = $this->memcache->get($key);
$res = $this->memcache->getResultCode();
if ($res == Memcached::RES_SUCCESS) {
if ($res == \Memcached::RES_SUCCESS) {
return $val;
} elseif ($res == Memcached::RES_NOTFOUND) {
} elseif ($res == \Memcached::RES_NOTFOUND) {
return false;
} else {
error_log("Memcached error during get($key): $res");
@ -62,7 +62,7 @@ class MemcachedCache implements CacheEngine
$this->memcache->set($key, $val, $time);
$res = $this->memcache->getResultCode();
if ($res != Memcached::RES_SUCCESS) {
if ($res != \Memcached::RES_SUCCESS) {
error_log("Memcached error during set($key): $res");
}
}
@ -73,7 +73,7 @@ class MemcachedCache implements CacheEngine
$this->memcache->delete($key);
$res = $this->memcache->getResultCode();
if ($res != Memcached::RES_SUCCESS && $res != Memcached::RES_NOTFOUND) {
if ($res != \Memcached::RES_SUCCESS && $res != \Memcached::RES_NOTFOUND) {
error_log("Memcached error during delete($key): $res");
}
}
@ -104,15 +104,15 @@ class APCCache implements CacheEngine
class RedisCache implements CacheEngine
{
private Redis $redis;
private \Redis $redis;
public function __construct(string $args)
{
$this->redis = new Redis();
$this->redis = new \Redis();
$hp = explode(":", $args);
$this->redis->pconnect($hp[0], (int)$hp[1]);
$this->redis->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_PHP);
$this->redis->setOption(Redis::OPT_PREFIX, 'shm:');
$this->redis->setOption(\Redis::OPT_SERIALIZER, \Redis::SERIALIZER_PHP);
$this->redis->setOption(\Redis::OPT_PREFIX, 'shm:');
}
public function get(string $key)

4
core/captcha.php
View file

@ -27,7 +27,7 @@ function captcha_get_html(): string
<script type=\"text/javascript\" src=\"https://www.google.com/recaptcha/api.js\"></script>";
} else {
session_start();
$captcha = Securimage::getCaptchaHtml(['securimage_path' => './vendor/dapphp/securimage/']);
$captcha = \Securimage::getCaptchaHtml(['securimage_path' => './vendor/dapphp/securimage/']);
}
}
return $captcha;
@ -53,7 +53,7 @@ function captcha_check(): bool
}
} else {
session_start();
$securimg = new Securimage();
$securimg = new \Securimage();
if ($securimg->check($_POST['captcha_code']) === false) {
log_info("core", "Captcha failed (Securimage)");
return false;

2
core/command_builder.php
View file

@ -16,7 +16,7 @@ class CommandBuilder
public function __construct(String $executable)
{
if (empty($executable)) {
throw new InvalidArgumentException("executable cannot be empty");
throw new \InvalidArgumentException("executable cannot be empty");
}
$this->executable = $executable;

9
core/database.php
View file

@ -151,12 +151,17 @@ class Database
if (is_null($this->db)) {
$this->connect_db();
}
return $this->db->execute(
$ret = $this->db->execute(
"-- " . str_replace("%2F", "/", urlencode($_GET['q'] ?? '')). "\n" .
$query,
$args
);
} catch (PDOException $pdoe) {
if($ret === false) {
throw new SCoreException("Query failed", $query);
}
/** @noinspection PhpIncompatibleReturnTypeInspection */
return $ret;
} catch (\PDOException $pdoe) {
throw new SCoreException($pdoe->getMessage(), $query);
}
}

2
core/imageboard/image.php
View file

@ -746,7 +746,7 @@ class Image
VALUES(:iid, :tid)
", ["iid"=>$this->id, "tid"=>$id]);
array_push($written_tags, $id);
$written_tags[] = $id;
}
$database->execute(
"

6
core/install.php
View file

@ -34,7 +34,7 @@ function install()
// Pull in necessary files
require_once "vendor/autoload.php";
global $_tracer;
$_tracer = new EventTracer();
$_tracer = new \EventTracer();
require_once "core/exceptions.php";
require_once "core/cacheengine.php";
@ -102,7 +102,7 @@ function ask_questions()
";
}
$drivers = PDO::getAvailableDrivers();
$drivers = \PDO::getAvailableDrivers();
if (
!in_array(DatabaseDriverID::MYSQL->value, $drivers) &&
!in_array(DatabaseDriverID::PGSQL->value, $drivers) &&
@ -292,7 +292,7 @@ function create_tables(Database $db)
if ($db->is_transaction_open()) {
$db->commit();
}
} catch (PDOException $e) {
} catch (\PDOException $e) {
throw new InstallerException(
"PDO Error:",
"<p>An error occurred while trying to create the database tables necessary for Shimmie.</p>

5
core/sanitize_php.php
View file

@ -9,6 +9,9 @@ namespace Shimmie2;
* be included right at the very start of index.php and tests/bootstrap.php
*/
use JetBrains\PhpStorm\NoReturn;
#[NoReturn]
function die_nicely($title, $body, $code=0)
{
print("<!DOCTYPE html>
@ -48,7 +51,7 @@ set_error_handler(function ($errNo, $errStr) {
// Should we turn ALL notices into errors? PHP allows a lot of
// terrible things to happen by default...
if (str_starts_with($errStr, 'Use of undefined constant ')) {
throw new Exception("PHP Error#$errNo: $errStr");
throw new \Exception("PHP Error#$errNo: $errStr");
} else {
return false;
}

4
core/util.php
View file

@ -560,10 +560,6 @@ function get_debug_info(): string
* Request initialisation stuff *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** @privatesection
* @noinspection PhpIncludeInspection
*/
function require_all(array $files): void
{
foreach ($files as $filename) {

2
ext/auto_tagger/main.php
View file

@ -220,7 +220,7 @@ class AutoTagger extends Extension
$existing_tags = Tag::explode($existing_tags);
foreach ($additional_tags as $t) {
if (!in_array(strtolower($t), $existing_tags)) {
array_push($existing_tags, strtolower($t));
$existing_tags[] = strtolower($t);
}
}

2
ext/bulk_actions/main.php
View file

@ -297,7 +297,7 @@ class BulkActions extends Extension
try {
send_event(new SourceSetEvent($image, $source));
$total++;
} catch (Exception $e) {
} catch (\Exception $e) {
$page->flash("Error while setting source for {$image->id}: " . $e->getMessage());
}
}

2
ext/bulk_add_csv/main.php
View file

@ -112,7 +112,7 @@ class BulkAddCSV extends Extension
try {
$this->add_image($fullpath, $pathinfo["basename"], $tags, $source, $rating, $thumbfile);
$list .= "ok\n";
} catch (Exception $ex) {
} catch (\Exception $ex) {
$list .= "failed:<br>". $ex->getMessage();
}
} else {

4
ext/bulk_download/main.php
View file

@ -49,11 +49,11 @@ class BulkDownload extends Extension
($event->action == BulkDownload::DOWNLOAD_ACTION_NAME)) {
$download_filename = $user->name . '-' . date('YmdHis') . '.zip';
$zip_filename = tempnam(sys_get_temp_dir(), "shimmie_bulk_download");
$zip = new ZipArchive();
$zip = new \ZipArchive();
$size_total = 0;
$max_size = $config->get_int(BulkDownloadConfig::SIZE_LIMIT);
if ($zip->open($zip_filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE) === true) {
if ($zip->open($zip_filename, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE) === true) {
foreach ($event->items as $image) {
$img_loc = warehouse_path(Image::IMAGE_DIR, $image->hash, false);
$size_total += filesize($img_loc);

14
ext/bulk_import_export/main.php
View file

@ -17,7 +17,7 @@ class BulkImportExport extends DataHandlerExtension
if ($this->supported_mime($event->mime) &&
$user->can(Permissions::BULK_IMPORT)) {
$zip = new ZipArchive();
$zip = new \ZipArchive();
if ($zip->open($event->tmpname) === true) {
$json_data = $this->get_export_data($zip);
@ -71,11 +71,11 @@ class BulkImportExport extends DataHandlerExtension
$database->commit();
$total++;
} catch (Exception $ex) {
} catch (\Exception $ex) {
$failed++;
try {
$database->rollBack();
} catch (Exception $ex2) {
} catch (\Exception $ex2) {
log_error(BulkImportExportInfo::KEY, "Could not roll back transaction: " . $ex2->getMessage(), "Could not import " . $item->hash . ": " . $ex->getMessage());
}
log_error(BulkImportExportInfo::KEY, "Could not import " . $item->hash . ": " . $ex->getMessage(), "Could not import " . $item->hash . ": " . $ex->getMessage());
@ -118,11 +118,11 @@ class BulkImportExport extends DataHandlerExtension
($event->action == self::EXPORT_ACTION_NAME)) {
$download_filename = $user->name . '-' . date('YmdHis') . '.zip';
$zip_filename = tempnam(sys_get_temp_dir(), "shimmie_bulk_export");
$zip = new ZipArchive();
$zip = new \ZipArchive();
$json_data = [];
if ($zip->open($zip_filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE) === true) {
if ($zip->open($zip_filename, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE) === true) {
foreach ($event->items as $image) {
$img_loc = warehouse_path(Image::IMAGE_DIR, $image->hash, false);
@ -134,7 +134,7 @@ class BulkImportExport extends DataHandlerExtension
$data["filename"] = $image->filename;
$data["source"] = $image->source;
array_push($json_data, $data);
$json_data[] = $data;
$zip->addFile($img_loc, $image->hash);
}
@ -167,7 +167,7 @@ class BulkImportExport extends DataHandlerExtension
return false;
}
private function get_export_data(ZipArchive $zip): ?array
private function get_export_data(\ZipArchive $zip): ?array
{
$info = $zip->getStream(self::EXPORT_INFO_FILE_NAME);
if ($info !== false) {

2
ext/comment/main.php
View file

@ -552,7 +552,7 @@ class CommentList extends Extension
'user_agent' => $_SERVER['HTTP_USER_AGENT'] ?? 'none',
];
$akismet = new Akismet(
$akismet = new \Akismet(
$_SERVER['SERVER_NAME'],
$config->get_string('comment_wordpress_key'),
$comment

2
ext/et/main.php
View file

@ -113,7 +113,7 @@ class ET extends Extension
'branch' => $commitBranch,
'origin' => $commitOrigin,
];
} catch (Exception $e) {
} catch (\Exception $e) {
}
}

2
ext/handle_cbz/main.php
View file

@ -49,7 +49,7 @@ class CBZFileHandler extends DataHandlerExtension
{
$out = "data/comic-cover-FIXME.jpg"; // TODO: random
$za = new ZipArchive();
$za = new \ZipArchive();
$za->open($archive);
$names = [];
for ($i=0; $i<$za->numFiles;$i++) {

2
ext/handle_pixel/main.php
View file

@ -53,7 +53,7 @@ class PixelFileHandler extends DataHandlerExtension
log_warning("handle_pixel", "Insufficient memory while creating thumbnail: ".$e->getMessage());
imagestring($thumb, 5, 10, 24, "Image Too Large :(", $black);
return true;
} catch (Exception $e) {
} catch (\Exception $e) {
log_error("handle_pixel", "Error while creating thumbnail: ".$e->getMessage());
return false;
}

4
ext/handle_svg/main.php
View file

@ -96,7 +96,7 @@ class MiniSVGParser
xml_parser_free($xml_parser);
}
public function startElement($parser, $name, $attrs)
public function startElement($parser, $name, $attrs): void
{
if ($name == "SVG" && $this->xml_depth == 0) {
$this->width = int_escape($attrs["WIDTH"]);
@ -105,7 +105,7 @@ class MiniSVGParser
$this->xml_depth++;
}
public function endElement($parser, $name)
public function endElement($parser, $name): void
{
$this->xml_depth--;
}

2
ext/image_hash_ban/test.php
View file

@ -35,7 +35,7 @@ class ImageBanTest extends ShimmiePHPUnitTestCase
// Can't repost
try {
$this->post_image("tests/pbx_screenshot.jpg", "pbx");
$this->assertTrue(false);
$this->fail();
} catch (UploadException $e) {
$this->assertTrue(true);
}

2
ext/link_image/test.php
View file

@ -14,7 +14,7 @@ class LinkImageTest extends ShimmiePHPUnitTestCase
$matches = [];
preg_match("#value='https?://.*/(post/view/[0-9]+)'#", $this->page_to_text(), $matches);
$this->assertTrue(count($matches) > 0);
$this->assertNotEmpty($matches);
$page = $this->get_page($matches[1]);
$this->assertEquals("Post $image_id: pie", $page->title);
}

2
ext/livefeed/main.php
View file

@ -68,7 +68,7 @@ class LiveFeed extends Extension
}
fwrite($fp, "$data\n");
fclose($fp);
} catch (Exception $e) {
} catch (\Exception $e) {
/* logging errors shouldn't break everything */
}
}

2
ext/log_db/main.php
View file

@ -50,7 +50,7 @@ class ActorColumn extends Column
public function get_sql_filter(): string
{
$driver = $this->table->db->getAttribute(PDO::ATTR_DRIVER_NAME);
$driver = $this->table->db->getAttribute(\PDO::ATTR_DRIVER_NAME);
switch ($driver) {
case "pgsql":
return "((LOWER(username) = LOWER(:{$this->name}_0)) OR (address && cast(:{$this->name}_1 as inet)))";

4
ext/log_logstash/main.php
View file

@ -28,7 +28,7 @@ class LogLogstash extends Extension
];
$this->send_data($data);
} catch (Exception $e) {
} catch (\Exception $e) {
// we can't log that logging is broken
}
}
@ -52,7 +52,7 @@ class LogLogstash extends Extension
}
fwrite($fp, json_encode($data));
fclose($fp);
} catch (Exception $e) {
} catch (\Exception $e) {
// we can't log that logging is broken
}
}

2
ext/log_net/main.php
View file

@ -44,7 +44,7 @@ class LogNet extends Extension
}
fwrite($fp, "$data\n");
fclose($fp);
} catch (Exception $e) {
} catch (\Exception $e) {
/* logging errors shouldn't break everything */
}
}

2
ext/not_a_tag/test.php
View file

@ -28,7 +28,7 @@ class NotATagTest extends ShimmiePHPUnitTestCase
// Modified Bad as user - redirect
try {
send_event(new TagSetEvent($image, ["three", "face"]));
$this->assertTrue(false, "Should've had an exception");
$this->fail("Should've had an exception");
} catch (TagSetException $e) {
$this->assertTrue(true);
}

2
ext/numeric_score/main.php
View file

@ -147,7 +147,7 @@ class NumericScore extends Extension
$dte = [$totaldate, $year, "\\y\\e\\a\\r\=Y", "year"];
} else {
// this should never happen due to the fact that the page event is already matched against earlier.
throw new UnexpectedValueException("Error: Invalid page event.");
throw new \UnexpectedValueException("Error: Invalid page event.");
}
$sql .= " AND NOT numeric_score=0 ORDER BY numeric_score DESC LIMIT :limit OFFSET 0";

6
ext/ouroboros_api/main.php
View file

@ -521,7 +521,7 @@ class OuroborosAPI extends Extension
$response = json_encode($response);
} elseif ($this->type == 'xml') {
// Seriously, XML sucks...
$xml = new XMLWriter();
$xml = new \XMLWriter();
$xml->openMemory();
$xml->startDocument('1.0', 'utf-8');
$xml->startElement('response');
@ -546,7 +546,7 @@ class OuroborosAPI extends Extension
if ($this->type == 'json') {
$response = json_encode($data);
} elseif ($this->type == 'xml') {
$xml = new XMLWriter();
$xml = new \XMLWriter();
$xml->openMemory();
$xml->startDocument('1.0', 'utf-8');
if (array_key_exists(0, $data)) {
@ -572,7 +572,7 @@ class OuroborosAPI extends Extension
$page->set_data($response);
}
private function createItemXML(XMLWriter $xml, string $type, $item)
private function createItemXML(\XMLWriter $xml, string $type, $item)
{
$xml->startElement($type);
foreach ($item as $key => $val) {

6
ext/pools/main.php
View file

@ -347,7 +347,7 @@ class Pools extends Extension
$image_order = $image_order + 1;
}
$database->commit();
} catch (Exception $e) {
} catch (\Exception $e) {
$database->rollback();
}
$page->set_mode(PageMode::REDIRECT);
@ -581,7 +581,7 @@ class Pools extends Extension
if ($this->have_permission($user, $pool)) {
send_event(
new PoolAddPostsEvent($pool_id, iterator_map_to_array("_image_to_id", $event->items))
new PoolAddPostsEvent($pool_id, iterator_map_to_array("Shimmie2\_image_to_id", $event->items))
);
}
break;
@ -592,7 +592,7 @@ class Pools extends Extension
$new_pool_title = $_POST['bulk_pool_new'];
$pce = new PoolCreationEvent($new_pool_title);
send_event($pce);
send_event(new PoolAddPostsEvent($pce->new_id, iterator_map_to_array("_image_to_id", $event->items)));
send_event(new PoolAddPostsEvent($pce->new_id, iterator_map_to_array("Shimmie2\_image_to_id", $event->items)));
break;
}
}

2
ext/post_titles/main.php
View file

@ -81,7 +81,7 @@ class PostTitles extends Extension
}
public function onBulkImport(BulkImportEvent $event)
{
if (property_exists($event->fields, "title") && $event->fields->title!=null) {
if (array_key_exists("title", $event->fields) && $event->fields->title!=null) {
$this->set_title($event->image->id, $event->fields->title);
}
}

2
ext/random_list/main.php
View file

@ -45,7 +45,7 @@ class RandomList extends Extension
if (!$random_image) {
continue;
}
array_push($random_images, $random_image);
$random_images[] = $random_image;
}
$this->theme->set_page($search_terms);

17
ext/rating/main.php
View file

@ -28,18 +28,7 @@ class ImageRating
}
}
function clear_ratings()
{
global $_shm_ratings;
$keys = array_keys($_shm_ratings);
foreach ($keys as $key) {
if ($key != "?") {
unset($_shm_ratings[$key]);
}
}
}
function add_rating(ImageRating $rating)
function add_rating(ImageRating $rating): void
{
global $_shm_ratings;
if ($rating->code == "?" && array_key_exists("?", $_shm_ratings)) {
@ -97,7 +86,7 @@ class Ratings extends Extension
$codes = implode("", array_keys($_shm_ratings));
$search_terms = [];
foreach ($_shm_ratings as $key => $rating) {
array_push($search_terms, $rating->search_term);
$search_terms[] = $rating->search_term;
}
$this->search_regexp = "/^rating[=|:](?:(\*|[" . $codes . "]+)|(" .
implode("|", $search_terms) . "|".implode("|", self::UNRATED_KEYWORDS)."))$/D";
@ -193,7 +182,7 @@ class Ratings extends Extension
}
public function onBulkImport(BulkImportEvent $event)
{
if (property_exists($event->fields, "rating")
if (array_key_exists("rating", $event->fields)
&& $event->fields->rating != null
&& Ratings::rating_is_valid($event->fields->rating)) {
$this->set_rating($event->image->id, $event->fields->rating, "");

2
ext/regen_thumb/theme.php
View file

@ -44,7 +44,7 @@ class RegenThumbTheme extends Themelet
$mimes = [];
$results = $database->get_all("SELECT mime, count(*) count FROM images group by mime");
foreach ($results as $result) {
array_push($mimes, "<option value='".$result["mime"]."'>".$result["mime"]." (".$result["count"].")</option>");
$mimes[] = "<option value='" . $result["mime"] . "'>" . $result["mime"] . " (" . $result["count"] . ")</option>";
}
$html = "

6
ext/res_limit/test.php
View file

@ -35,7 +35,7 @@ class ResolutionLimitTest extends ShimmiePHPUnitTestCase
$this->log_in_as_user();
try {
$this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
$this->assertTrue(false, "Invalid-size image was allowed");
$this->fail("Invalid-size image was allowed");
} catch (UploadException $e) {
$this->assertEquals("Post too small", $e->getMessage());
}
@ -52,7 +52,7 @@ class ResolutionLimitTest extends ShimmiePHPUnitTestCase
try {
$this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
$this->assertTrue(false, "Invalid-size image was allowed");
$this->fail("Invalid-size image was allowed");
} catch (UploadException $e) {
$this->assertEquals("Post too large", $e->getMessage());
}
@ -69,7 +69,7 @@ class ResolutionLimitTest extends ShimmiePHPUnitTestCase
try {
$this->post_image("tests/pbx_screenshot.jpg", "pbx computer screenshot");
$this->assertTrue(false, "Invalid-size image was allowed");
$this->fail("Invalid-size image was allowed");
} catch (UploadException $e) {
$this->assertEquals("Post needs to be in one of these ratios: 16:9", $e->getMessage());
}

2
ext/rule34/main.php
View file

@ -108,7 +108,7 @@ class Rule34 extends Extension
$database->set_timeout(DATABASE_TIMEOUT+15000); // deleting users can take a while
if (function_exists("sd_notify_watchdog")) {
sd_notify_watchdog();
\sd_notify_watchdog();
}
if ($event->page_matches("rule34/comic_admin")) {

7
ext/statsd/main.php
View file

@ -6,11 +6,6 @@ namespace Shimmie2;
_d("STATSD_HOST", null);
function dstat($name, $val)
{
StatsDInterface::$stats["shimmie.$name"] = $val;
}
class StatsDInterface extends Extension
{
public static array $stats = [];
@ -115,7 +110,7 @@ class StatsDInterface extends Extension
fwrite($fp, "$stat:$value");
}
fclose($fp);
} catch (Exception $e) {
} catch (\Exception $e) {
// ignore any failures.
}
}

2
ext/tag_categories/main.php
View file

@ -156,7 +156,7 @@ class TagCategories extends Extension
return $h_tag_no_underscores;
}
public function page_update()
public function page_update(): bool
{
global $user, $database;

8
ext/tag_edit/main.php
View file

@ -70,7 +70,7 @@ class TagSetEvent extends Event
if ((!str_contains($tag, ':')) && (!str_contains($tag, '='))) {
//Tag doesn't contain : or =, meaning it can't possibly be a metatag.
//This should help speed wise, as it avoids running every single tag through a bunch of preg_match instead.
array_push($this->tags, $tag);
$this->tags[] = $tag;
continue;
}
@ -79,9 +79,9 @@ class TagSetEvent extends Event
//seperate tags from metatags
if (!$ttpe->metatag) {
array_push($this->tags, $tag);
$this->tags[] = $tag;
} else {
array_push($this->metatags, $tag);
$this->metatags[] = $tag;
}
}
}
@ -287,7 +287,7 @@ class TagEdit extends Extension
{
$tags = $event->image->get_tag_list();
$tags = str_replace("/", "", $tags);
$tags = preg_replace("/^\.+/", "", $tags);
$tags = ltrim($tags, ".");
$event->replace('$tags', $tags);
}

2
ext/tag_edit/test.php
View file

@ -30,7 +30,7 @@ class TagEditTest extends ShimmiePHPUnitTestCase
try {
send_event(new TagSetEvent($image, []));
$this->assertTrue(false);
$this->fail();
} catch (SCoreException $e) {
$this->assertEquals("Tried to set zero tags", $e->error);
}

4
ext/tag_editcloud/main.php
View file

@ -106,7 +106,7 @@ class TagEditCloud extends Extension
SELECT tag, FLOOR(LN(LN(count - :tag_min1 + 1)+1)*150)/200 AS scaled, count
FROM tags
WHERE count >= :tag_min2
ORDER BY SUM(count) OVER (PARTITION BY SUBSTRING_INDEX(tag, ':', 1)) DESC, CASE
ORDER BY SUM(count) OVER (PARTITION BY SUBSTRING_INDEX(tag, ':', 1)) DESC, CASE
WHEN tag LIKE '%:%' THEN 1
ELSE 2
END, tag
@ -159,7 +159,7 @@ class TagEditCloud extends Extension
$size = sprintf("%.2f", max($row['scaled'], 0.5));
$js = html_escape('tageditcloud_toggle_tag(this,'.json_encode($full_tag).')'); //Ugly, but it works
if (array_search($row['tag'], $image->get_tag_array()) !== false) {
if (in_array($row['tag'], $image->get_tag_array())) {
if ($used_first) {
if ($last_used_cat !== $current_cat && $last_used_cat !== null) {
$precloud .= "</span><span class='tag-category'>\n";

4
ext/tagger_xml/main.php
View file

@ -97,7 +97,7 @@ class TaggerXML extends Extension
return $this->list_to_xml($tags, "image", (string)$image_id);
}
private function list_to_xml(PDOStatement $tags, string $type, string $query, ?array$misc=null): string
private function list_to_xml(\FFSPHP\PDOStatement $tags, string $type, string $query, ?array$misc=null): string
{
$r = $tags->_numOfRows;
@ -115,7 +115,7 @@ class TaggerXML extends Extension
return $result."</list>";
}
private function tag_to_xml(PDORow $tag): string
private function tag_to_xml(\PDORow $tag): string
{
return
"<tag ".

6
ext/transcode/main.php
View file

@ -182,7 +182,7 @@ class TranscodeImage extends Extension
$new_image = $this->transcode_image($event->tmpname, $mime, $target_mime);
$event->set_mime($target_mime);
$event->set_tmpname($new_image);
} catch (Exception $e) {
} catch (\Exception $e) {
log_error("transcode", "Error while performing upload transcode: ".$e->getMessage());
// We don't want to interfere with the upload process,
// so if something goes wrong the untranscoded image jsut continues
@ -295,11 +295,11 @@ class TranscodeImage extends Extension
$database->commit();
$total++;
$size_difference += ($before_size - $new_image->filesize);
} catch (Exception $e) {
} catch (\Exception $e) {
log_error("transcode", "Error while bulk transcode on item {$image->id} to $mime: ".$e->getMessage());
try {
$database->rollback();
} catch (Exception $e) {
} catch (\Exception $e) {
// is this safe? o.o
}
}

4
ext/transcode_video/main.php
View file

@ -166,11 +166,11 @@ class TranscodeVideo extends Extension
if ($output_image!=$image) {
$total++;
}
} catch (Exception $e) {
} catch (\Exception $e) {
log_error("transcode_video", "Error while bulk transcode on item {$image->id} to $format: ".$e->getMessage());
try {
$database->rollback();
} catch (Exception $e) {
} catch (\Exception $e) {
// is this safe? o.o
}
}

2
ext/update/main.php
View file

@ -95,7 +95,7 @@ class Update extends Extension
/** TODO: Backup all folders (except /data, /images, /thumbs) before attempting this?
Either that or point to https://github.com/shish/shimmie2/blob/master/README.txt -> Upgrade from 2.3.X **/
$zip = new ZipArchive();
$zip = new \ZipArchive();
if ($zip->open("./data/update_$commitSHA.zip") === true) {
for ($i = 1; $i < $zip->numFiles; $i++) {
$filename = $zip->getNameIndex($i);

2
ext/upload/test.php
View file

@ -107,7 +107,7 @@ class UploadTest extends ShimmiePHPUnitTestCase
file_put_contents("data/huge.jpg", file_get_contents("tests/pbx_screenshot.jpg") . str_repeat("U", 1024*1024*3));
try {
$this->post_image("data/huge.jpg", "test");
$this->assertTrue(false, "Uploading huge.jpg didn't fail...");
$this->fail("Uploading huge.jpg didn't fail...");
} catch (UploadException $e) {
$this->assertEquals("File too large (3.0MB > 1.0MB)", $e->error);
}

4
ext/wiki/main.php
View file

@ -376,7 +376,7 @@ class Wiki extends Extension
return new WikiPage($row);
}
public static function format_tag_wiki_page(WikiPage $page)
public static function format_tag_wiki_page(WikiPage $page): string
{
global $database, $config;
@ -434,7 +434,7 @@ class Wiki extends Extension
", ["title"=>$a_tag]);
$tag_html = $tag_list_t->return_tag($a_row, $tag_category_dict ?? []);
array_push($f_auto_tags, $tag_html[1]);
$f_auto_tags[] = $tag_html[1];
}
$template = str_replace("{autotags}", implode(", ", $f_auto_tags), $template);

3
tests/bootstrap.php
View file

@ -191,8 +191,7 @@ abstract class ShimmiePHPUnitTestCase extends TestCase
} elseif ($page->mode == PageMode::DATA) {
return $page->data;
} else {
$this->assertTrue(false, "Page mode is not PAGE or DATA");
return "";
$this->fail("Page mode is not PAGE or DATA");
}
}

2
themes/material/page.class.php
View file

@ -198,7 +198,7 @@ EOD;
$b = $block->body;
$i = $block->id;
$dom = new DomDocument();
$dom = new \DomDocument();
$dom->loadHTML($b);
// $output = [];
$html = "<section id='$i'>\n<nav class='mdl-navigation'>\n";