![avatar](\"https://www.gravatar.com/avatar/$hash.jpg?s=$s&d=$d&r=$r&cacheBreak=$cb\")
";
+ return "https://www.gravatar.com/avatar/$hash.jpg?s=$s&d=$d&r=$r&cacheBreak=$cb";
}
}
- return "";
+ return null;
}
/**
diff --git a/core/userclass.php b/core/userclass.php
index a68ebb1b..5e66256c 100644
--- a/core/userclass.php
+++ b/core/userclass.php
@@ -1,6 +1,13 @@
getConstants() as $k => $v) {
+ if ($this->can($v)) {
+ $perms[] = $v;
+ }
+ }
+ return $perms;
+ }
+
/**
* Determine if this class of user can perform an action or has ability.
*
@@ -58,7 +80,7 @@ class UserClass
}
$_all_false = [];
-foreach ((new ReflectionClass('Permissions'))->getConstants() as $k => $v) {
+foreach ((new \ReflectionClass('\Shimmie2\Permissions'))->getConstants() as $k => $v) {
$_all_false[$v] = false;
}
new UserClass("base", null, $_all_false);
@@ -86,6 +108,7 @@ new UserClass("user", "base", [
Permissions::CREATE_IMAGE_REPORT => true,
Permissions::EDIT_IMAGE_RATING => true,
Permissions::EDIT_FAVOURITES => true,
+ Permissions::CREATE_VOTE => true,
Permissions::SEND_PM => true,
Permissions::READ_PM => true,
Permissions::SET_PRIVATE_IMAGE => true,
@@ -161,6 +184,7 @@ new UserClass("admin", "base", [
Permissions::EDIT_FEATURE => true,
Permissions::BULK_EDIT_VOTE => true,
Permissions::EDIT_OTHER_VOTE => true,
+ Permissions::CREATE_VOTE => true,
Permissions::VIEW_SYSINTO => true,
Permissions::HELLBANNED => false,
diff --git a/core/util.php b/core/util.php
index ab60089b..84796074 100644
--- a/core/util.php
+++ b/core/util.php
@@ -1,7 +1,11 @@
formatted;
+ $event = send_event(new TextFormattingEvent($string));
+ return $event->formatted;
}
/**
@@ -258,7 +262,7 @@ function load_balance_url(string $tmpl, string $hash, int $n=0): string
if (isset($flexihashes[$opts])) {
$flexihash = $flexihashes[$opts];
} else {
- $flexihash = new Flexihash\Flexihash();
+ $flexihash = new \Flexihash\Flexihash();
foreach (explode(",", $opts) as $opt) {
$parts = explode("=", $opt);
$parts_count = count($parts);
@@ -354,10 +358,13 @@ function path_to_tags(string $path): string
$tags = explode(" ", $matches[1]);
}
- $path = dirname($path);
+ $path = str_replace("\\", "/", $path);
$path = str_replace(";", ":", $path);
$path = str_replace("__", " ", $path);
-
+ $path = dirname($path);
+ if ($path == "\\" || $path == "/" || $path == ".") {
+ $path = "";
+ }
$category = "";
foreach (explode("/", $path) as $dir) {
@@ -390,18 +397,6 @@ function path_to_tags(string $path): string
return implode(" ", $tags);
}
-
-function join_url(string $base, string ...$paths): string
-{
- $output = $base;
- foreach ($paths as $path) {
- $output = rtrim($output, "/");
- $path = ltrim($path, "/");
- $output .= "/".$path;
- }
- return $output;
-}
-
function get_dir_contents(string $dir): array
{
assert(!empty($dir));
@@ -486,18 +481,18 @@ function scan_dir(string $path): array
$bytestotal = 0;
$nbfiles = 0;
- $ite = new RecursiveDirectoryIterator(
+ $ite = new \RecursiveDirectoryIterator(
$path,
- FilesystemIterator::KEY_AS_PATHNAME |
- FilesystemIterator::CURRENT_AS_FILEINFO |
- FilesystemIterator::SKIP_DOTS
+ \FilesystemIterator::KEY_AS_PATHNAME |
+ \FilesystemIterator::CURRENT_AS_FILEINFO |
+ \FilesystemIterator::SKIP_DOTS
);
- foreach (new RecursiveIteratorIterator($ite) as $filename => $cur) {
+ foreach (new \RecursiveIteratorIterator($ite) as $filename => $cur) {
try {
$filesize = $cur->getSize();
$bytestotal += $filesize;
$nbfiles++;
- } catch (RuntimeException $e) {
+ } catch (\RuntimeException $e) {
// This usually just means that the file got eaten by the import
continue;
}
@@ -509,14 +504,20 @@ function scan_dir(string $path): array
}
+/**
+ * because microtime() returns string|float, and we only ever want float
+ */
+function ftime(): float
+{
+ return (float)microtime(true);
+}
+
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *\
* Debugging functions *
\* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-// SHIT by default this returns the time as a string. And it's not even a
-// string representation of a number, it's two numbers separated by a space.
-// What the fuck were the PHP developers smoking.
-$_shm_load_start = microtime(true);
+$_shm_load_start = ftime();
/**
* Collects some debug information (execution time, memory usage, queries, etc)
@@ -524,28 +525,39 @@ $_shm_load_start = microtime(true);
*/
function get_debug_info(): string
{
- global $cache, $config, $_shm_event_count, $database, $_shm_load_start;
+ $d = get_debug_info_arr();
- $i_mem = sprintf("%5.2f", ((memory_get_peak_usage(true)+512)/1024)/1024);
+ $debug = "Took {$d['time']} seconds (db:{$d['dbtime']}) and {$d['mem_mb']}MB of RAM"; + $debug .= "; Used {$d['files']} files and {$d['query_count']} queries"; + $debug .= "; Sent {$d['event_count']} events"; + $debug .= "; {$d['cache_hits']} cache hits and {$d['cache_misses']} misses"; + $debug .= "; Shimmie version {$d['version']}"; + + return $debug; +} + +function get_debug_info_arr(): array +{ + global $cache, $config, $_shm_event_count, $database, $_shm_load_start; if ($config->get_string("commit_hash", "unknown") == "unknown") { $commit = ""; } else { $commit = " (".$config->get_string("commit_hash").")"; } - $time = sprintf("%.2f", microtime(true) - $_shm_load_start); - $dbtime = sprintf("%.2f", $database->dbtime); - $i_files = count(get_included_files()); - $hits = $cache->get_hits(); - $miss = $cache->get_misses(); - $debug = "
Took $time seconds (db:$dbtime) and {$i_mem}MB of RAM"; - $debug .= "; Used $i_files files and {$database->query_count} queries"; - $debug .= "; Sent $_shm_event_count events"; - $debug .= "; $hits cache hits and $miss misses"; - $debug .= "; Shimmie version ". VERSION . $commit; - - return $debug; + return [ + "time" => round(ftime() - $_shm_load_start, 2), + "dbtime" => round($database->dbtime, 2), + "mem_mb" => round(((memory_get_peak_usage(true)+512)/1024)/1024, 2), + "files" => count(get_included_files()), + "query_count" => $database->query_count, + // "query_log" => $database->queries, + "event_count" => $_shm_event_count, + "cache_hits" => $cache->get("__etc_cache_hits"), + "cache_misses" => $cache->get("__etc_cache_misses"), + "version" => VERSION . $commit, + ]; } @@ -553,10 +565,6 @@ function get_debug_info(): string * Request initialisation stuff * \* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -/** @privatesection - * @noinspection PhpIncludeInspection - */ - function require_all(array $files): void { foreach ($files as $filename) { @@ -575,7 +583,9 @@ function _load_core_files() function _load_theme_files() { - require_all(_get_themelet_files(get_theme())); + $theme = get_theme(); + $files = _get_themelet_files($theme); + require_all($files); } function _set_up_shimmie_environment(): void @@ -617,13 +627,13 @@ function _get_themelet_files(string $_theme): array /** * Used to display fatal errors to the web user. */ -function _fatal_error(Exception $e): void +function _fatal_error(\Exception $e): void { $version = VERSION; $message = $e->getMessage(); $phpver = phpversion(); - $query = is_subclass_of($e, "SCoreException") ? $e->query : null; - $code = is_subclass_of($e, "SCoreException") ? $e->http_code : 500; + $query = is_subclass_of($e, "Shimmie2\SCoreException") ? $e->query : null; + $code = is_subclass_of($e, "Shimmie2\SCoreException") ? $e->http_code : 500; //$hash = exec("git rev-parse HEAD"); //$h_hash = $hash ? "
Hash: $hash" : "";
@@ -635,7 +645,7 @@ function _fatal_error(Exception $e): void
foreach ($t as $n => $f) {
$c = $f['class'] ?? '';
$t = $f['type'] ?? '';
- $a = implode(", ", array_map("stringer", $f['args']));
+ $a = implode(", ", array_map("Shimmie2\stringer", $f['args']));
print("$n: {$f['file']}({$f['line']}): {$c}{$t}{$f['function']}({$a})\n");
}
@@ -674,12 +684,18 @@ function _get_user(): User
{
global $config, $page;
$my_user = null;
- if ($page->get_cookie("user") && $page->get_cookie("session")) {
- $tmp_user = User::by_session($page->get_cookie("user"), $page->get_cookie("session"));
- if (!is_null($tmp_user)) {
- $my_user = $tmp_user;
+ if (isset($_SERVER['HTTP_AUTHORIZATION'])) {
+ $parts = explode(" ", $_SERVER['HTTP_AUTHORIZATION'], 2);
+ if (count($parts) == 2 && $parts[0] == "Bearer") {
+ $parts = explode(":", $parts[1], 2);
+ if (count($parts) == 2) {
+ $my_user = User::by_session($parts[0], $parts[1]);
+ }
}
}
+ if ($page->get_cookie("user") && $page->get_cookie("session")) {
+ $my_user = User::by_session($page->get_cookie("user"), $page->get_cookie("session"));
+ }
if (is_null($my_user)) {
$my_user = User::by_id($config->get_int("anon_id", 0));
}
diff --git a/ext/admin/info.php b/ext/admin/info.php
index 54751718..806d37d9 100644
--- a/ext/admin/info.php
+++ b/ext/admin/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class AdminPageInfo extends ExtensionInfo
{
public const KEY = "admin";
@@ -13,5 +15,5 @@ class AdminPageInfo extends ExtensionInfo
public string $license = self::LICENSE_GPLV2;
public string $description = "Provides a base for various small admin functions";
public bool $core = true;
- public string $visibility = self::VISIBLE_HIDDEN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN;
}
diff --git a/ext/admin/main.php b/ext/admin/main.php
index ad3bc67c..b06d0f7c 100644
--- a/ext/admin/main.php
+++ b/ext/admin/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
/**
* Sent when the admin page is ready to be added to
*/
@@ -115,7 +117,7 @@ class AdminPage extends Extension
$key = $event->args[1];
switch ($cmd) {
case "get":
- var_dump($cache->get($key));
+ var_export($cache->get($key));
break;
case "set":
$cache->set($key, $event->args[2], 60);
diff --git a/ext/admin/test.php b/ext/admin/test.php
index ae0583a3..a4cbfcae 100644
--- a/ext/admin/test.php
+++ b/ext/admin/test.php
@@ -1,6 +1,9 @@
0) {
$tmp = $_FILES['alias_file']['tmp_name'];
$contents = file_get_contents($tmp);
- $this->add_alias_csv($database, $contents);
+ $this->add_alias_csv($contents);
log_info("alias_editor", "Imported aliases from file", "Imported aliases"); # FIXME: how many?
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("alias/list"));
@@ -177,7 +179,7 @@ class AliasEditor extends Extension
return $csv;
}
- private function add_alias_csv(Database $database, string $csv): int
+ private function add_alias_csv(string $csv): int
{
$csv = str_replace("\r", "\n", $csv);
$i = 0;
diff --git a/ext/alias_editor/test.php b/ext/alias_editor/test.php
index d194fc31..78437026 100644
--- a/ext/alias_editor/test.php
+++ b/ext/alias_editor/test.php
@@ -1,6 +1,9 @@
get_arg(0)) {
//*************ARTIST SECTION**************
case "list":
- {
- $this->get_listing($page, $event);
- $this->theme->sidebar_options("neutral");
- break;
- }
+ {
+ $this->get_listing($event);
+ $this->theme->sidebar_options("neutral");
+ break;
+ }
case "new":
- {
- if (!$user->is_anonymous()) {
- $this->theme->new_artist_composer();
- } else {
- $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
- }
- break;
- }
- case "new_artist":
- {
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/new"));
- break;
- }
- case "create":
- {
- if (!$user->is_anonymous()) {
- $newArtistID = $this->add_artist();
- if ($newArtistID == -1) {
- $this->theme->display_error(400, "Error", "Error when entering artist data.");
+ {
+ if (!$user->is_anonymous()) {
+ $this->theme->new_artist_composer();
} else {
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$newArtistID));
+ $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
}
- } else {
- $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
+ break;
+ }
+ case "new_artist":
+ {
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/new"));
+ break;
+ }
+ case "create":
+ {
+ if (!$user->is_anonymous()) {
+ $newArtistID = $this->add_artist();
+ if ($newArtistID == -1) {
+ $this->theme->display_error(400, "Error", "Error when entering artist data.");
+ } else {
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$newArtistID));
+ }
+ } else {
+ $this->theme->display_error(401, "Error", "You must be registered and logged in to create a new artist.");
+ }
+ break;
}
- break;
- }
case "view":
- {
- $artistID = int_escape($event->get_arg(1));
- $artist = $this->get_artist($artistID);
- $aliases = $this->get_alias($artist['id']);
- $members = $this->get_members($artist['id']);
- $urls = $this->get_urls($artist['id']);
+ {
+ $artistID = int_escape($event->get_arg(1));
+ $artist = $this->get_artist($artistID);
+ $aliases = $this->get_alias($artist['id']);
+ $members = $this->get_members($artist['id']);
+ $urls = $this->get_urls($artist['id']);
- $userIsLogged = !$user->is_anonymous();
- $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
+ $userIsLogged = !$user->is_anonymous();
+ $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
- $images = Image::find_images(0, 4, Tag::explode($artist['name']));
+ $images = Image::find_images(0, 4, Tag::explode($artist['name']));
- $this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin);
- /*
- if ($userIsLogged) {
- $this->theme->show_new_alias_composer($artistID);
- $this->theme->show_new_member_composer($artistID);
- $this->theme->show_new_url_composer($artistID);
+ $this->theme->show_artist($artist, $aliases, $members, $urls, $images, $userIsLogged, $userIsAdmin);
+ /*
+ if ($userIsLogged) {
+ $this->theme->show_new_alias_composer($artistID);
+ $this->theme->show_new_member_composer($artistID);
+ $this->theme->show_new_url_composer($artistID);
+ }
+ */
+
+ $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
+
+ break;
}
- */
-
- $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
-
- break;
- }
case "edit":
- {
- $artistID = int_escape($event->get_arg(1));
- $artist = $this->get_artist($artistID);
- $aliases = $this->get_alias($artistID);
- $members = $this->get_members($artistID);
- $urls = $this->get_urls($artistID);
+ {
+ $artistID = int_escape($event->get_arg(1));
+ $artist = $this->get_artist($artistID);
+ $aliases = $this->get_alias($artistID);
+ $members = $this->get_members($artistID);
+ $urls = $this->get_urls($artistID);
- if (!$user->is_anonymous()) {
- $this->theme->show_artist_editor($artist, $aliases, $members, $urls);
+ if (!$user->is_anonymous()) {
+ $this->theme->show_artist_editor($artist, $aliases, $members, $urls);
- $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
- $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
- } else {
- $this->theme->display_error(401, "Error", "You must be registered and logged in to edit an artist.");
+ $userIsAdmin = $user->can(Permissions::ARTISTS_ADMIN);
+ $this->theme->sidebar_options("editor", $artistID, $userIsAdmin);
+ } else {
+ $this->theme->display_error(401, "Error", "You must be registered and logged in to edit an artist.");
+ }
+ break;
}
- break;
- }
case "edit_artist":
- {
- $artistID = $_POST['artist_id'];
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/edit/".$artistID));
- break;
- }
+ {
+ $artistID = $_POST['artist_id'];
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/edit/".$artistID));
+ break;
+ }
case "edited":
- {
- $artistID = int_escape($_POST['id']);
- $this->update_artist();
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
+ {
+ $artistID = int_escape($_POST['id']);
+ $this->update_artist();
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
case "nuke_artist":
- {
- $artistID = $_POST['artist_id'];
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/nuke/".$artistID));
- break;
- }
+ {
+ $artistID = $_POST['artist_id'];
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/nuke/".$artistID));
+ break;
+ }
case "nuke":
- {
- $artistID = int_escape($event->get_arg(1));
- $this->delete_artist($artistID); // this will delete the artist, its alias, its urls and its members
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/list"));
- break;
- }
+ {
+ $artistID = int_escape($event->get_arg(1));
+ $this->delete_artist($artistID); // this will delete the artist, its alias, its urls and its members
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/list"));
+ break;
+ }
case "add_alias":
- {
- $artistID = $_POST['artist_id'];
- $this->theme->show_new_alias_composer($artistID);
- break;
- }
+ {
+ $artistID = $_POST['artist_id'];
+ $this->theme->show_new_alias_composer($artistID);
+ break;
+ }
case "add_member":
- {
- $artistID = $_POST['artist_id'];
- $this->theme->show_new_member_composer($artistID);
- break;
- }
+ {
+ $artistID = $_POST['artist_id'];
+ $this->theme->show_new_member_composer($artistID);
+ break;
+ }
case "add_url":
- {
- $artistID = $_POST['artist_id'];
- $this->theme->show_new_url_composer($artistID);
- break;
- }
- //***********ALIAS SECTION ***********************
+ {
+ $artistID = $_POST['artist_id'];
+ $this->theme->show_new_url_composer($artistID);
+ break;
+ }
+ //***********ALIAS SECTION ***********************
case "alias":
- {
- switch ($event->get_arg(1)) {
- case "add":
- {
- $artistID = $_POST['artistID'];
- $this->add_alias();
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "delete":
- {
- $aliasID = int_escape($event->get_arg(2));
- $artistID = $this->get_artistID_by_aliasID($aliasID);
- $this->delete_alias($aliasID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "edit":
- {
- $aliasID = int_escape($event->get_arg(2));
- $alias = $this->get_alias_by_id($aliasID);
- $this->theme->show_alias_editor($alias);
- break;
- }
- case "edited":
- {
- $this->update_alias();
- $aliasID = int_escape($_POST['aliasID']);
- $artistID = $this->get_artistID_by_aliasID($aliasID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
+ {
+ switch ($event->get_arg(1)) {
+ case "add":
+ {
+ $artistID = $_POST['artistID'];
+ $this->add_alias();
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "delete":
+ {
+ $aliasID = int_escape($event->get_arg(2));
+ $artistID = $this->get_artistID_by_aliasID($aliasID);
+ $this->delete_alias($aliasID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "edit":
+ {
+ $aliasID = int_escape($event->get_arg(2));
+ $alias = $this->get_alias_by_id($aliasID);
+ $this->theme->show_alias_editor($alias);
+ break;
+ }
+ case "edited":
+ {
+ $this->update_alias();
+ $aliasID = int_escape($_POST['aliasID']);
+ $artistID = $this->get_artistID_by_aliasID($aliasID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
}
+ break; // case: alias
}
- break; // case: alias
- }
- //**************** URLS SECTION **********************
+ //**************** URLS SECTION **********************
case "url":
- {
- switch ($event->get_arg(1)) {
- case "add":
- {
- $artistID = $_POST['artistID'];
- $this->add_urls();
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "delete":
- {
- $urlID = int_escape($event->get_arg(2));
- $artistID = $this->get_artistID_by_urlID($urlID);
- $this->delete_url($urlID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "edit":
- {
- $urlID = int_escape($event->get_arg(2));
- $url = $this->get_url_by_id($urlID);
- $this->theme->show_url_editor($url);
- break;
- }
- case "edited":
- {
- $this->update_url();
- $urlID = int_escape($_POST['urlID']);
- $artistID = $this->get_artistID_by_urlID($urlID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
+ {
+ switch ($event->get_arg(1)) {
+ case "add":
+ {
+ $artistID = $_POST['artistID'];
+ $this->add_urls();
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "delete":
+ {
+ $urlID = int_escape($event->get_arg(2));
+ $artistID = $this->get_artistID_by_urlID($urlID);
+ $this->delete_url($urlID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "edit":
+ {
+ $urlID = int_escape($event->get_arg(2));
+ $url = $this->get_url_by_id($urlID);
+ $this->theme->show_url_editor($url);
+ break;
+ }
+ case "edited":
+ {
+ $this->update_url();
+ $urlID = int_escape($_POST['urlID']);
+ $artistID = $this->get_artistID_by_urlID($urlID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
}
+ break; // case: urls
}
- break; // case: urls
- }
- //******************* MEMBERS SECTION *********************
+ //******************* MEMBERS SECTION *********************
case "member":
- {
- switch ($event->get_arg(1)) {
- case "add":
- {
- $artistID = $_POST['artistID'];
- $this->add_members();
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "delete":
- {
- $memberID = int_escape($event->get_arg(2));
- $artistID = $this->get_artistID_by_memberID($memberID);
- $this->delete_member($memberID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
- }
- case "edit":
- {
- $memberID = int_escape($event->get_arg(2));
- $member = $this->get_member_by_id($memberID);
- $this->theme->show_member_editor($member);
- break;
- }
- case "edited":
- {
- $this->update_member();
- $memberID = int_escape($_POST['memberID']);
- $artistID = $this->get_artistID_by_memberID($memberID);
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("artist/view/".$artistID));
- break;
+ {
+ switch ($event->get_arg(1)) {
+ case "add":
+ {
+ $artistID = $_POST['artistID'];
+ $this->add_members();
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "delete":
+ {
+ $memberID = int_escape($event->get_arg(2));
+ $artistID = $this->get_artistID_by_memberID($memberID);
+ $this->delete_member($memberID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
+ case "edit":
+ {
+ $memberID = int_escape($event->get_arg(2));
+ $member = $this->get_member_by_id($memberID);
+ $this->theme->show_member_editor($member);
+ break;
+ }
+ case "edited":
+ {
+ $this->update_member();
+ $memberID = int_escape($_POST['memberID']);
+ $artistID = $this->get_artistID_by_memberID($memberID);
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("artist/view/".$artistID));
+ break;
+ }
}
+ break; //case: members
}
- break; //case: members
- }
}
}
}
@@ -845,7 +847,7 @@ class Artists extends Extension
/*
* HERE WE GET THE LIST OF ALL ARTIST WITH PAGINATION
*/
- private function get_listing(Page $page, PageRequestEvent $event)
+ private function get_listing(PageRequestEvent $event)
{
global $config, $database;
@@ -1048,7 +1050,8 @@ class Artists extends Extension
ORDER BY alias ASC
", ['artist_id'=>$artistID]);
- for ($i = 0 ; $i < count($result) ; $i++) {
+ $rc = count($result);
+ for ($i = 0 ; $i < $rc ; $i++) {
$result[$i]["alias_name"] = stripslashes($result[$i]["alias_name"]);
}
return $result;
diff --git a/ext/artists/test.php b/ext/artists/test.php
index fdebbce5..47f312bd 100644
--- a/ext/artists/test.php
+++ b/ext/artists/test.php
@@ -1,6 +1,9 @@
";
if (count($aliases) > 1) {
- for ($i = 1; $i < count($aliases); $i++) {
+ $ac = count($aliases);
+ for ($i = 1; $i < $ac; $i++) {
$aliasViewLink = str_replace("_", " ", $aliases[$i]['alias_name']); // no link anymore
$aliasEditLink = "Edit";
$aliasDeleteLink = "Delete";
@@ -479,7 +483,8 @@ class ArtistsTheme extends Themelet
$html .= "";
if (count($members) > 1) {
- for ($i = 1; $i < count($members); $i++) {
+ $mc = count($members);
+ for ($i = 1; $i < $mc; $i++) {
$memberViewLink = str_replace("_", " ", $members[$i]['name']); // no link anymore
$memberEditLink = "Edit";
$memberDeleteLink = "Delete";
@@ -524,7 +529,8 @@ class ArtistsTheme extends Themelet
$html .= "";
if (count($urls) > 1) {
- for ($i = 1; $i < count($urls); $i++) {
+ $uc = count($urls);
+ for ($i = 1; $i < $uc; $i++) {
$urlViewLink = "" . str_replace("_", " ", $urls[$i]['url']) . "";
$urlEditLink = "Edit";
$urlDeleteLink = "Delete";
diff --git a/ext/auto_tagger/config.php b/ext/auto_tagger/config.php
index 3dd8e478..6fd5ed8e 100644
--- a/ext/auto_tagger/config.php
+++ b/ext/auto_tagger/config.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
abstract class AutoTaggerConfig
{
public const VERSION = "ext_auto_tagger_ver";
diff --git a/ext/auto_tagger/info.php b/ext/auto_tagger/info.php
index a466d470..ad1a7969 100644
--- a/ext/auto_tagger/info.php
+++ b/ext/auto_tagger/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class AutoTaggerInfo extends ExtensionInfo
{
public const KEY = "auto_tagger";
diff --git a/ext/auto_tagger/main.php b/ext/auto_tagger/main.php
index 3ffd75ea..370cdac5 100644
--- a/ext/auto_tagger/main.php
+++ b/ext/auto_tagger/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
require_once 'config.php';
use MicroCRUD\ActionColumn;
@@ -110,7 +112,7 @@ class AutoTagger extends Extension
if (count($_FILES) > 0) {
$tmp = $_FILES['auto_tag_file']['tmp_name'];
$contents = file_get_contents($tmp);
- $count = $this->add_auto_tag_csv($database, $contents);
+ $count = $this->add_auto_tag_csv($contents);
log_info(AutoTaggerInfo::KEY, "Imported $count auto-tag definitions from file from file", "Imported $count auto-tag definitions");
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("auto_tag/list"));
@@ -142,7 +144,7 @@ class AutoTagger extends Extension
additional_tags VARCHAR(2000) NOT NULL
");
- if ($database->get_driver_name() == DatabaseDriver::PGSQL) {
+ if ($database->get_driver_id() == DatabaseDriverID::PGSQL) {
$database->execute('CREATE INDEX auto_tag_lower_tag_idx ON auto_tag ((lower(tag)))');
}
$this->set_version(AutoTaggerConfig::VERSION, 1);
@@ -189,7 +191,7 @@ class AutoTagger extends Extension
return $csv;
}
- private function add_auto_tag_csv(Database $database, string $csv): int
+ private function add_auto_tag_csv(string $csv): int
{
$csv = str_replace("\r", "\n", $csv);
$i = 0;
@@ -210,23 +212,23 @@ class AutoTagger extends Extension
private function add_auto_tag(string $tag, string $additional_tags)
{
global $database;
- $existing_tags = $database->get_one("SELECT additional_tags FROM auto_tag WHERE LOWER(tag)=LOWER(:tag)", ["tag"=>$tag]);
- if (!is_null($existing_tags)) {
- // Auto Tags already exist, so we will append new tags to the existing one
- $tag = Tag::sanitize($tag);
+ $existing_tags = $database->get_one("SELECT additional_tags FROM auto_tag WHERE LOWER(tag)=LOWER(:tag)", ["tag"=>$tag]);
+ if (!is_null($existing_tags)) {
+ // Auto Tags already exist, so we will append new tags to the existing one
+ $tag = Tag::sanitize($tag);
$additional_tags = Tag::explode($additional_tags);
- $existing_tags = Tag::explode($existing_tags);
- foreach ($additional_tags as $t) {
- if (!in_array(strtolower($t), $existing_tags)) {
- array_push($existing_tags, strtolower($t));
- }
- }
-
- $database->execute(
+ $existing_tags = Tag::explode($existing_tags);
+ foreach ($additional_tags as $t) {
+ if (!in_array(strtolower($t), $existing_tags)) {
+ $existing_tags[] = strtolower($t);
+ }
+ }
+
+ $database->execute(
"UPDATE auto_tag set additional_tags=:existing_tags where tag=:tag",
["tag"=>$tag, "existing_tags"=>Tag::implode($existing_tags)]
);
- log_info(
+ log_info(
AutoTaggerInfo::KEY,
"Updated auto-tag for {$tag} -> {".implode(" ", $additional_tags)."}"
);
@@ -244,39 +246,8 @@ class AutoTagger extends Extension
"Added auto-tag for {$tag} -> {".implode(" ", $additional_tags)."}"
);
}
- // Now we apply it to existing items
- $this->apply_new_auto_tag($tag);
- }
-
- private function update_auto_tag(string $tag, string $additional_tags): bool
- {
- global $database;
- $result = $database->get_row("SELECT * FROM auto_tag WHERE LOWER(tag)=LOWER(:tag)", ["tag"=>$tag]);
-
- if ($result===null) {
- throw new AutoTaggerException("Auto-tag not set for $tag, can't update");
- } else {
- $additional_tags = Tag::explode($additional_tags);
- $current_additional_tags = Tag::explode($result["additional_tags"]);
-
- if (!Tag::compare($additional_tags, $current_additional_tags)) {
- $database->execute(
- "UPDATE auto_tag SET additional_tags = :additional_tags WHERE LOWER(tag)=LOWER(:tag)",
- ["tag"=>$tag, "additional_tags"=>Tag::implode($additional_tags)]
- );
-
- log_info(
- AutoTaggerInfo::KEY,
- "Updated auto-tag for {$tag} -> {".implode(" ", $additional_tags)."}",
- "Updated Auto-Tag"
- );
-
- // Now we apply it to existing items
- $this->apply_new_auto_tag($tag);
- return true;
- }
- }
- return false;
+ // Now we apply it to existing items
+ $this->apply_new_auto_tag($tag);
}
private function apply_new_auto_tag(string $tag)
@@ -288,14 +259,11 @@ class AutoTagger extends Extension
foreach ($image_ids as $image_id) {
$image_id = (int) $image_id;
$image = Image::by_id($image_id);
- $event = new TagSetEvent($image, $image->get_tag_array());
- send_event($event);
+ send_event(new TagSetEvent($image, $image->get_tag_array()));
}
}
}
-
-
private function remove_auto_tag(String $tag)
{
global $database;
diff --git a/ext/auto_tagger/test.php b/ext/auto_tagger/test.php
index 419d72c9..e8ed6293 100644
--- a/ext/auto_tagger/test.php
+++ b/ext/auto_tagger/test.php
@@ -1,6 +1,9 @@
get($cache_key);
- if (!$res) {
+ if (is_null($res)) {
$res = $database->get_pairs(
"
SELECT tag, count
diff --git a/ext/autocomplete/test.php b/ext/autocomplete/test.php
index ec9d1ba4..8378e584 100644
--- a/ext/autocomplete/test.php
+++ b/ext/autocomplete/test.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class AutoCompleteTest extends ShimmiePHPUnitTestCase
{
public function testAuth()
diff --git a/ext/autocomplete/theme.php b/ext/autocomplete/theme.php
index d5fcbe8b..d2d17047 100644
--- a/ext/autocomplete/theme.php
+++ b/ext/autocomplete/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class AutoCompleteTheme extends Themelet
{
public function build_autocomplete(Page $page)
diff --git a/ext/ban_words/info.php b/ext/ban_words/info.php
index b1f84dcb..247ab304 100644
--- a/ext/ban_words/info.php
+++ b/ext/ban_words/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BanWordsInfo extends ExtensionInfo
{
public const KEY = "ban_words";
diff --git a/ext/ban_words/main.php b/ext/ban_words/main.php
index 39febc87..4e57b7b4 100644
--- a/ext/ban_words/main.php
+++ b/ext/ban_words/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BanWords extends Extension
{
public function onInitExt(InitExtEvent $event)
diff --git a/ext/ban_words/test.php b/ext/ban_words/test.php
index 69ec598b..a70f6a06 100644
--- a/ext/ban_words/test.php
+++ b/ext/ban_words/test.php
@@ -1,6 +1,9 @@
get_auth_html();
-
$html = SHM_SIMPLE_FORM(
- $post_url,
+ make_link("biography"),
TEXTAREA(["style"=>"width: 100%", "rows"=>"6", "name"=>"biography"], $bio),
SHM_SUBMIT("Save")
);
- $page->add_block(new Block("About Me", (string)$html, "main", 30));
+ $page->add_block(new Block("About Me", $html, "main", 30));
}
}
diff --git a/ext/blocks/info.php b/ext/blocks/info.php
index e42066b3..7dca5bd3 100644
--- a/ext/blocks/info.php
+++ b/ext/blocks/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BlocksInfo extends ExtensionInfo
{
public const KEY = "blocks";
diff --git a/ext/blocks/main.php b/ext/blocks/main.php
index f278dec0..ccf71069 100644
--- a/ext/blocks/main.php
+++ b/ext/blocks/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class Blocks extends Extension
{
/** @var BlocksTheme */
@@ -47,7 +49,7 @@ class Blocks extends Extension
global $cache, $database, $page, $user;
$blocks = $cache->get("blocks");
- if ($blocks === false) {
+ if (is_null($blocks)) {
$blocks = $database->get_all("SELECT * FROM blocks");
$cache->set("blocks", $blocks, 600);
}
diff --git a/ext/blocks/test.php b/ext/blocks/test.php
index b30ae863..15677c4f 100644
--- a/ext/blocks/test.php
+++ b/ext/blocks/test.php
@@ -1,6 +1,9 @@
theme->display_permission_denied();
} else {
$id = int_escape($_POST['id']);
- if (!isset($id)) {
- die("No ID!");
- }
$database->execute("DELETE FROM blotter WHERE id=:id", ["id"=>$id]);
log_info("blotter", "Removed Entry #$id");
$page->set_mode(PageMode::REDIRECT);
diff --git a/ext/blotter/test.php b/ext/blotter/test.php
index 1824a295..4bd3cfdb 100644
--- a/ext/blotter/test.php
+++ b/ext/blotter/test.php
@@ -1,6 +1,9 @@
action = $action;
@@ -173,7 +175,7 @@ class BulkActions extends Extension
if (empty($data)) {
throw new BulkActionException("No ids specified in bulk_selected_ids");
}
- if (is_array($data) && !empty($data)) {
+ if (is_array($data)) {
$items = $this->yield_items($data);
}
} elseif (isset($_POST['bulk_query']) && $_POST['bulk_query'] != "") {
@@ -201,7 +203,7 @@ class BulkActions extends Extension
}
}
- private function yield_items(array $data): Generator
+ private function yield_items(array $data): \Generator
{
foreach ($data as $id) {
if (is_numeric($id)) {
@@ -213,7 +215,7 @@ class BulkActions extends Extension
}
}
- private function yield_search_results(string $query): Generator
+ private function yield_search_results(string $query): \Generator
{
$tags = Tag::explode($query);
return Image::find_images_iterable(0, null, $tags);
@@ -231,7 +233,7 @@ class BulkActions extends Extension
$size = 0;
foreach ($posts as $post) {
try {
- if (class_exists("ImageBan") && isset($_POST['bulk_ban_reason'])) {
+ if (class_exists("Shimmie2\ImageBan") && isset($_POST['bulk_ban_reason'])) {
$reason = $_POST['bulk_ban_reason'];
if ($reason) {
send_event(new AddImageHashBanEvent($post->hash, $reason));
@@ -240,7 +242,7 @@ class BulkActions extends Extension
send_event(new ImageDeletionEvent($post));
$total++;
$size += $post->filesize;
- } catch (Exception $e) {
+ } catch (\Exception $e) {
$page->flash("Error while removing {$post->id}: " . $e->getMessage());
}
}
@@ -295,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());
}
}
diff --git a/ext/bulk_actions/theme.php b/ext/bulk_actions/theme.php
index e41a9764..777a7606 100644
--- a/ext/bulk_actions/theme.php
+++ b/ext/bulk_actions/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkActionsTheme extends Themelet
{
public function display_selector(Page $page, array $actions, string $query)
@@ -49,7 +51,7 @@ class BulkActionsTheme extends Themelet
public function render_ban_reason_input(): string
{
- if (class_exists("ImageBan")) {
+ if (class_exists("Shimmie2\ImageBan")) {
return "";
} else {
return "";
@@ -64,6 +66,6 @@ class BulkActionsTheme extends Themelet
public function render_source_input(): string
{
- return "";
+ return "";
}
}
diff --git a/ext/bulk_add/info.php b/ext/bulk_add/info.php
index dc5cfada..149c1b8e 100644
--- a/ext/bulk_add/info.php
+++ b/ext/bulk_add/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddInfo extends ExtensionInfo
{
public const KEY = "bulk_add";
diff --git a/ext/bulk_add/main.php b/ext/bulk_add/main.php
index 953b36d7..9aed87dd 100644
--- a/ext/bulk_add/main.php
+++ b/ext/bulk_add/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddEvent extends Event
{
public string $dir;
diff --git a/ext/bulk_add/test.php b/ext/bulk_add/test.php
index d99eb9b0..78c6e74c 100644
--- a/ext/bulk_add/test.php
+++ b/ext/bulk_add/test.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddTest extends ShimmiePHPUnitTestCase
{
public function testInvalidDir()
diff --git a/ext/bulk_add/theme.php b/ext/bulk_add/theme.php
index cc7135da..6a74b3ef 100644
--- a/ext/bulk_add/theme.php
+++ b/ext/bulk_add/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddTheme extends Themelet
{
private array $messages = [];
diff --git a/ext/bulk_add_csv/info.php b/ext/bulk_add_csv/info.php
index 4d13d45a..46d13192 100644
--- a/ext/bulk_add_csv/info.php
+++ b/ext/bulk_add_csv/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddCSVInfo extends ExtensionInfo
{
public const KEY = "bulk_add_csv";
diff --git a/ext/bulk_add_csv/main.php b/ext/bulk_add_csv/main.php
index 9ae858e9..6dfcb488 100644
--- a/ext/bulk_add_csv/main.php
+++ b/ext/bulk_add_csv/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddCSV extends Extension
{
/** @var BulkAddCSVTheme */
@@ -48,21 +50,11 @@ class BulkAddCSV extends Extension
*/
private function add_image(string $tmpname, string $filename, string $tags, string $source, string $rating, string $thumbfile)
{
- assert(file_exists($tmpname));
-
- $pathinfo = pathinfo($filename);
- $metadata = [];
- $metadata['filename'] = $pathinfo['basename'];
- if (array_key_exists('extension', $pathinfo)) {
- $metadata['extension'] = $pathinfo['extension'];
- }
- $metadata['tags'] = Tag::explode($tags);
- $metadata['source'] = $source;
- $event = send_event(new DataUploadEvent($tmpname, $metadata));
+ $event = add_image($tmpname, $filename, $tags, $source);
if ($event->image_id == -1) {
throw new UploadException("File type not recognised");
} else {
- if (class_exists("RatingSetEvent") && in_array($rating, ["s", "q", "e"])) {
+ if (class_exists("Shimmie2\RatingSetEvent") && in_array($rating, ["s", "q", "e"])) {
send_event(new RatingSetEvent(Image::by_id($event->image_id), $rating));
}
if (file_exists($thumbfile)) {
@@ -103,14 +95,13 @@ class BulkAddCSV extends Extension
$source = $csvdata[2];
$rating = $csvdata[3];
$thumbfile = $csvdata[4];
- $pathinfo = pathinfo($fullpath);
- $shortpath = $pathinfo["basename"];
+ $shortpath = pathinfo($fullpath, PATHINFO_BASENAME);
$list .= " Search items can be combined to search for posts which match both,
-or you can stick \"-\" in front of an item to search for things that don't
-match it.
- Metatags can be followed by \":\" rather than \"=\" if you prefer.
- Some search methods provided by extensions:
Search for posts by source Returns posts with a source of "http://google.com/". Returns posts with a source of "https://google.com/". Search for posts by date posted. Returns posts posted on or after 07-19-2019. Returns posts posted on or after 2019-07-19. Can use <, <=, >, >=, or =. Date format is mm-dd-yyyy. Date posted includes time component, so = will not work unless the time is exact. Can use <, <=, >, >=, or =. Date format is yyyy-mm-dd. Date posted includes time component, so = will not work unless the time is exact. For legal reasons, we need to point out that:"+
- " A) this site contains material not suitable for minors"+
- " Click here if you're an adult, and you're ok with that"+
+ " Cookies may be used. Please read our privacy policy for more information."+
+ " By accepting to enter you agree to our rules and terms of service."+
+ "
".html_escape("$shortpath (".str_replace(" ", ", ", $tags).")... ");
if (file_exists($csvdata[0]) && is_file($csvdata[0])) {
try {
- $this->add_image($fullpath, $pathinfo["basename"], $tags, $source, $rating, $thumbfile);
+ $this->add_image($fullpath, $shortpath, $tags, $source, $rating, $thumbfile);
$list .= "ok\n";
- } catch (Exception $ex) {
+ } catch (\Exception $ex) {
$list .= "failed:
". $ex->getMessage();
}
} else {
diff --git a/ext/bulk_add_csv/theme.php b/ext/bulk_add_csv/theme.php
index 0af200e2..2128e5ae 100644
--- a/ext/bulk_add_csv/theme.php
+++ b/ext/bulk_add_csv/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkAddCSVTheme extends Themelet
{
private array $messages = [];
diff --git a/ext/bulk_download/info.php b/ext/bulk_download/info.php
index 02745855..d5260459 100644
--- a/ext/bulk_download/info.php
+++ b/ext/bulk_download/info.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
class BulkDownloadInfo extends ExtensionInfo
{
diff --git a/ext/bulk_download/main.php b/ext/bulk_download/main.php
index 34eddfa6..64e38025 100644
--- a/ext/bulk_download/main.php
+++ b/ext/bulk_download/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkDownloadConfig
{
public const SIZE_LIMIT = "bulk_download_size_limit";
@@ -47,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);
diff --git a/ext/bulk_import_export/events.php b/ext/bulk_import_export/events.php
index 7a4d2c7a..89b4b00c 100644
--- a/ext/bulk_import_export/events.php
+++ b/ext/bulk_import_export/events.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class BulkExportEvent extends Event
{
public Image $image;
diff --git a/ext/bulk_import_export/info.php b/ext/bulk_import_export/info.php
index 78ebaf1d..6ad951b0 100644
--- a/ext/bulk_import_export/info.php
+++ b/ext/bulk_import_export/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
include_once "events.php";
class BulkImportExportInfo extends ExtensionInfo
diff --git a/ext/bulk_import_export/main.php b/ext/bulk_import_export/main.php
index 65d433a9..5f635784 100644
--- a/ext/bulk_import_export/main.php
+++ b/ext/bulk_import_export/main.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
class BulkImportExport extends DataHandlerExtension
{
@@ -16,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);
@@ -51,7 +52,7 @@ class BulkImportExport extends DataHandlerExtension
file_put_contents($tmpfile, $stream);
- $id = add_image($tmpfile, $item->filename, Tag::implode($item->tags));
+ $id = add_image($tmpfile, $item->filename, Tag::implode($item->tags))->image_id;
if ($id==-1) {
throw new SCoreException("Unable to import file $item->hash");
@@ -70,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());
@@ -117,23 +118,22 @@ 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);
- $export_event = new BulkExportEvent($image);
- send_event($export_event);
+ $export_event = send_event(new BulkExportEvent($image));
$data = $export_event->fields;
$data["hash"] = $image->hash;
$data["tags"] = $image->get_tag_array();
$data["filename"] = $image->filename;
$data["source"] = $image->source;
- array_push($json_data, $data);
+ $json_data[] = $data;
$zip->addFile($img_loc, $image->hash);
}
@@ -166,17 +166,17 @@ 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) {
try {
$json_string = stream_get_contents($info);
$json_data = json_decode($json_string);
+ return $json_data;
} finally {
fclose($info);
}
- return $json_data;
} else {
return null;
}
diff --git a/ext/comment/info.php b/ext/comment/info.php
index d3fd5951..840aae94 100644
--- a/ext/comment/info.php
+++ b/ext/comment/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class CommentListInfo extends ExtensionInfo
{
public const KEY = "comment";
diff --git a/ext/comment/main.php b/ext/comment/main.php
index e48c0bab..b6da4eed 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -2,6 +2,13 @@
declare(strict_types=1);
+namespace Shimmie2;
+
+use GQLA\Type;
+use GQLA\Field;
+use GQLA\Query;
+use GQLA\Mutation;
+
require_once "vendor/ifixit/php-akismet/akismet.class.php";
class CommentPostingEvent extends Event
@@ -39,6 +46,7 @@ class CommentPostingException extends SCoreException
{
}
+#[Type(name: "Comment")]
class Comment
{
public ?User $owner;
@@ -46,10 +54,13 @@ class Comment
public string $owner_name;
public ?string $owner_email;
public string $owner_class;
+ #[Field]
public string $comment;
+ #[Field]
public int $comment_id;
public int $image_id;
public string $poster_ip;
+ #[Field]
public string $posted;
public function __construct($row)
@@ -76,6 +87,7 @@ class Comment
", ["owner_id"=>$user->id]);
}
+ #[Field(name: "owner")]
public function get_owner(): User
{
if (empty($this->owner)) {
@@ -83,6 +95,20 @@ class Comment
}
return $this->owner;
}
+
+ #[Field(extends: "Post", name: "comments", type: "[Comment!]!")]
+ public static function get_comments(Image $post): array
+ {
+ return CommentList::get_comments($post->id);
+ }
+
+ #[Mutation(name: "create_comment")]
+ public static function create_comment(int $post_id, string $comment): bool
+ {
+ global $user;
+ send_event(new CommentPostingEvent($post_id, $user, $comment));
+ return true;
+ }
}
class CommentList extends Extension
@@ -171,11 +197,21 @@ class CommentList extends Extension
{
if ($event->page_matches("comment")) {
switch ($event->get_arg(0)) {
- case "add": $this->onPageRequest_add(); break;
- case "delete": $this->onPageRequest_delete($event); break;
- case "bulk_delete": $this->onPageRequest_bulk_delete(); break;
- case "list": $this->onPageRequest_list($event); break;
- case "beta-search": $this->onPageRequest_beta_search($event); break;
+ case "add":
+ $this->onPageRequest_add();
+ break;
+ case "delete":
+ $this->onPageRequest_delete($event);
+ break;
+ case "bulk_delete":
+ $this->onPageRequest_bulk_delete();
+ break;
+ case "list":
+ $this->onPageRequest_list($event);
+ break;
+ case "beta-search":
+ $this->onPageRequest_beta_search($event);
+ break;
}
}
}
@@ -186,8 +222,7 @@ class CommentList extends Extension
if (isset($_POST['image_id']) && isset($_POST['comment'])) {
try {
$i_iid = int_escape($_POST['image_id']);
- $cpe = new CommentPostingEvent(int_escape($_POST['image_id']), $user, $_POST['comment']);
- send_event($cpe);
+ send_event(new CommentPostingEvent(int_escape($_POST['image_id']), $user, $_POST['comment']));
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("post/view/$i_iid", null, "comment_on_$i_iid"));
} catch (CommentPostingException $ex) {
@@ -244,7 +279,7 @@ class CommentList extends Extension
$where = SPEED_HAX ? "WHERE posted > now() - interval '24 hours'" : "";
$total_pages = $cache->get("comment_pages");
- if (empty($total_pages)) {
+ if (is_null($total_pages)) {
$total_pages = (int)ceil($database->get_one("
SELECT COUNT(c1)
FROM (SELECT COUNT(image_id) AS c1 FROM comments $where GROUP BY image_id) AS s1
@@ -316,7 +351,7 @@ class CommentList extends Extension
$cc = $config->get_int("comment_count");
if ($cc > 0) {
$recent = $cache->get("recent_comments");
- if (empty($recent)) {
+ if (is_null($recent)) {
$recent = $this->get_recent_comments($cc);
$cache->set("recent_comments", $recent, 60);
}
@@ -415,7 +450,7 @@ class CommentList extends Extension
/**
* #return Comment[]
*/
- private function get_generic_comments(string $query, array $args): array
+ private static function get_generic_comments(string $query, array $args): array
{
global $database;
$rows = $database->get_all($query, $args);
@@ -429,9 +464,9 @@ class CommentList extends Extension
/**
* #return Comment[]
*/
- private function get_recent_comments(int $count): array
+ private static function get_recent_comments(int $count): array
{
- return $this->get_generic_comments("
+ return CommentList::get_generic_comments("
SELECT
users.id as user_id, users.name as user_name, users.email as user_email, users.class as user_class,
comments.comment as comment, comments.id as comment_id,
@@ -447,9 +482,9 @@ class CommentList extends Extension
/**
* #return Comment[]
*/
- private function get_user_comments(int $user_id, int $count, int $offset=0): array
+ private static function get_user_comments(int $user_id, int $count, int $offset=0): array
{
- return $this->get_generic_comments("
+ return CommentList::get_generic_comments("
SELECT
users.id as user_id, users.name as user_name, users.email as user_email, users.class as user_class,
comments.comment as comment, comments.id as comment_id,
@@ -464,11 +499,12 @@ class CommentList extends Extension
}
/**
+ * public just for Image::get_comments()
* #return Comment[]
*/
- private function get_comments(int $image_id): array
+ public static function get_comments(int $image_id): array
{
- return $this->get_generic_comments("
+ return CommentList::get_generic_comments("
SELECT
users.id as user_id, users.name as user_name, users.email as user_email, users.class as user_class,
comments.comment as comment, comments.id as comment_id,
@@ -486,14 +522,14 @@ class CommentList extends Extension
global $config, $database;
// sqlite fails at intervals
- if ($database->get_driver_name() === DatabaseDriver::SQLITE) {
+ if ($database->get_driver_id() === DatabaseDriverID::SQLITE) {
return false;
}
$window = $config->get_int('comment_window');
$max = $config->get_int('comment_limit');
- if ($database->get_driver_name() == DatabaseDriver::MYSQL) {
+ if ($database->get_driver_id() == DatabaseDriverID::MYSQL) {
$window_sql = "interval $window minute";
} else {
$window_sql = "interval '$window minute'";
@@ -540,15 +576,18 @@ class CommentList extends Extension
'user_agent' => $_SERVER['HTTP_USER_AGENT'] ?? 'none',
];
- $akismet = new Akismet(
+ // @phpstan-ignore-next-line
+ $akismet = new \Akismet(
$_SERVER['SERVER_NAME'],
$config->get_string('comment_wordpress_key'),
$comment
);
+ // @phpstan-ignore-next-line
if ($akismet->errorsExist()) {
return false;
} else {
+ // @phpstan-ignore-next-line
return $akismet->isSpam();
}
}
diff --git a/ext/comment/test.php b/ext/comment/test.php
index 0c60f0c0..4bafa098 100644
--- a/ext/comment/test.php
+++ b/ext/comment/test.php
@@ -1,6 +1,9 @@
comment);
- send_event($tfe);
+ $tfe = send_event(new TextFormattingEvent($comment->comment));
$i_uid = $comment->owner_id;
$h_name = html_escape($comment->owner_name);
diff --git a/ext/cron_uploader/config.php b/ext/cron_uploader/config.php
index f6b37e88..1c827049 100644
--- a/ext/cron_uploader/config.php
+++ b/ext/cron_uploader/config.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
abstract class CronUploaderConfig
{
diff --git a/ext/cron_uploader/info.php b/ext/cron_uploader/info.php
index 63379559..45d1635f 100644
--- a/ext/cron_uploader/info.php
+++ b/ext/cron_uploader/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
/*
* Name: Cron Uploader
* Authors: YaoiFox ";
$n = 1;
foreach ($list as $item) {
- $pathinfo = pathinfo($item);
- $name = $pathinfo["filename"];
+ $name = pathinfo($item, PATHINFO_FILENAME);
$html .= " :$name:
";
diff --git a/ext/eokm/info.php b/ext/eokm/info.php
index 254cdd94..673415b6 100644
--- a/ext/eokm/info.php
+++ b/ext/eokm/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class EokmInfo extends ExtensionInfo
{
public const KEY = "eokm";
diff --git a/ext/eokm/main.php b/ext/eokm/main.php
index 767679a1..83b98f32 100644
--- a/ext/eokm/main.php
+++ b/ext/eokm/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class Eokm extends Extension
{
public function get_priority(): int
diff --git a/ext/eokm/test.php b/ext/eokm/test.php
index 96fee799..b71e45e1 100644
--- a/ext/eokm/test.php
+++ b/ext/eokm/test.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class EokmTest extends ShimmiePHPUnitTestCase
{
public function testPass()
diff --git a/ext/et/info.php b/ext/et/info.php
index b2fcdef7..e641eee8 100644
--- a/ext/et/info.php
+++ b/ext/et/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ETInfo extends ExtensionInfo
{
public const KEY = "et";
diff --git a/ext/et/main.php b/ext/et/main.php
index a20e4f60..00d74a4e 100644
--- a/ext/et/main.php
+++ b/ext/et/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ET extends Extension
{
/** @var ETTheme */
@@ -71,7 +73,7 @@ class ET extends Extension
'shimmie' => VERSION,
'schema' => $config->get_int("db_version"),
'php' => phpversion(),
- 'db' => $database->get_driver_name() . " " . $database->get_version(),
+ 'db' => $database->get_driver_id()->value . " " . $database->get_version(),
'os' => php_uname(),
'server' => $_SERVER["SERVER_SOFTWARE"] ?? 'unknown',
],
@@ -111,7 +113,8 @@ class ET extends Extension
'branch' => $commitBranch,
'origin' => $commitOrigin,
];
- } catch (Exception $e) {
+ } catch (\Exception $e) {
+ // If we can't get git data, just skip it
}
}
diff --git a/ext/et/test.php b/ext/et/test.php
index e2cdeeb0..8e94f525 100644
--- a/ext/et/test.php
+++ b/ext/et/test.php
@@ -1,6 +1,9 @@
add_block(new Block("Information:", $this->build_data_form($yaml)));
}
- protected function build_data_form($yaml): string
+ protected function build_data_form($yaml): \MicroHTML\HTMLElement
{
- return (string)FORM(
+ return FORM(
["action"=>"https://shimmie.shishnet.org/register.php", "method"=>"POST"],
INPUT(["type"=>"hidden", "name"=>"registration_api", "value"=>"2"]),
P(
diff --git a/ext/et_server/info.php b/ext/et_server/info.php
index a19945b4..d5ad2aac 100644
--- a/ext/et_server/info.php
+++ b/ext/et_server/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ETServerInfo extends ExtensionInfo
{
public const KEY = "et_server";
@@ -13,5 +15,5 @@ class ETServerInfo extends ExtensionInfo
public string $license = self::LICENSE_GPLV2;
public string $description = "Keep track of shimmie registrations";
public ?string $documentation = "For internal use";
- public string $visibility = self::VISIBLE_HIDDEN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN;
}
diff --git a/ext/et_server/main.php b/ext/et_server/main.php
index 485e612c..2c3f2762 100644
--- a/ext/et_server/main.php
+++ b/ext/et_server/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
use function MicroHTML\{PRE};
class ETServer extends Extension
@@ -26,7 +28,7 @@ class ETServer extends Extension
foreach ($database->get_all("SELECT responded, data FROM registration ORDER BY responded DESC") as $row) {
$page->add_block(new Block(
$row["responded"],
- (string)PRE(["style"=>"text-align: left; overflow: scroll;"], $row["data"]),
+ PRE(["style"=>"text-align: left; overflow: scroll;"], $row["data"]),
"main",
$n++
));
diff --git a/ext/ext_manager/info.php b/ext/ext_manager/info.php
index 22242b86..78ffba3a 100644
--- a/ext/ext_manager/info.php
+++ b/ext/ext_manager/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ExtManagerInfo extends ExtensionInfo
{
public const KEY = "ext_manager";
@@ -11,7 +13,7 @@ class ExtManagerInfo extends ExtensionInfo
public string $url = self::SHIMMIE_URL;
public array $authors = self::SHISH_AUTHOR;
public string $license = self::LICENSE_GPLV2;
- public string $visibility = self::VISIBLE_ADMIN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::ADMIN;
public string $description = "A thing for point & click extension management";
public ?string $documentation = "Allows the admin to view a list of all extensions and enable or disable them; also allows users to view the list of activated extensions and read their documentation";
public bool $core = true;
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index 33958352..2fa7d5db 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b): int
{
@@ -115,9 +116,9 @@ class ExtManager extends Extension
{
$extensions = ExtensionInfo::get_all();
if (!$all) {
- $extensions = array_filter($extensions, "__extman_extactive");
+ $extensions = array_filter($extensions, "Shimmie2\__extman_extactive");
}
- usort($extensions, "__extman_extcmp");
+ usort($extensions, "Shimmie2\__extman_extcmp");
return $extensions;
}
diff --git a/ext/ext_manager/test.php b/ext/ext_manager/test.php
index 4ac9d0fb..acb56b77 100644
--- a/ext/ext_manager/test.php
+++ b/ext/ext_manager/test.php
@@ -1,6 +1,9 @@
visibility === ExtensionInfo::VISIBLE_ADMIN)
- || $extension->visibility === ExtensionInfo::VISIBLE_HIDDEN) {
+ if ((!$editable && $extension->visibility === ExtensionVisibility::ADMIN)
+ || $extension->visibility === ExtensionVisibility::HIDDEN) {
continue;
}
@@ -87,7 +89,7 @@ class ExtManagerTheme extends Themelet
$page->set_title("Extensions");
$page->set_heading("Extensions");
$page->add_block(new NavBlock());
- $page->add_block(new Block("Extension Manager", (string)$form));
+ $page->add_block(new Block("Extension Manager", $form));
}
public function display_doc(Page $page, ExtensionInfo $info)
@@ -119,6 +121,6 @@ class ExtManagerTheme extends Themelet
$page->set_title("Documentation for " . html_escape($info->name));
$page->set_heading(html_escape($info->name));
$page->add_block(new NavBlock());
- $page->add_block(new Block("Documentation", (string)$html));
+ $page->add_block(new Block("Documentation", $html));
}
}
diff --git a/ext/favorites/info.php b/ext/favorites/info.php
index b33c7fb0..d0db6ae5 100644
--- a/ext/favorites/info.php
+++ b/ext/favorites/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class FavoritesInfo extends ExtensionInfo
{
public const KEY = "favorites";
diff --git a/ext/favorites/main.php b/ext/favorites/main.php
index 778e7be3..8a6e72f9 100644
--- a/ext/favorites/main.php
+++ b/ext/favorites/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class FavoriteSetEvent extends Event
{
public int $image_id;
@@ -143,7 +145,7 @@ class Favorites extends Extension
public function onHelpPageBuilding(HelpPageBuildingEvent $event)
{
if ($event->key===HelpPages::SEARCH) {
- $event->add_block(new Block("Favorites", (string)$this->theme->get_help_html()));
+ $event->add_block(new Block("Favorites", $this->theme->get_help_html()));
}
}
diff --git a/ext/favorites/test.php b/ext/favorites/test.php
index 8b38926c..ed1247bc 100644
--- a/ext/favorites/test.php
+++ b/ext/favorites/test.php
@@ -1,6 +1,9 @@
get_int("featured_id");
if ($fid > 0) {
$image = $cache->get("featured_image_object:$fid");
- if ($image === false) {
+ if (is_null($image)) {
$image = Image::by_id($fid);
if ($image) { // make sure the object is fully populated before saving
$image->get_tag_array();
@@ -69,6 +71,15 @@ class Featured extends Extension
}
}
+ public function onImageDeletion(ImageDeletionEvent $event)
+ {
+ global $config;
+ if ($event->image->id == $config->get_int("featured_id")) {
+ $config->set_int("featured_id", 0);
+ $config->save();
+ }
+ }
+
public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event)
{
global $user;
diff --git a/ext/featured/test.php b/ext/featured/test.php
index ee27be17..ef0c4119 100644
--- a/ext/featured/test.php
+++ b/ext/featured/test.php
@@ -1,6 +1,9 @@
width, $image->height);
- return (string)DIV(
+ return DIV(
["style"=>"text-align: center;"],
A(
["href"=>make_link("post/view/{$image->id}", $query)],
diff --git a/ext/forum/info.php b/ext/forum/info.php
index 9e2d4e34..09021550 100644
--- a/ext/forum/info.php
+++ b/ext/forum/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ForumInfo extends ExtensionInfo
{
public const KEY = "forum";
diff --git a/ext/forum/main.php b/ext/forum/main.php
index 79c1026b..443af4ac 100644
--- a/ext/forum/main.php
+++ b/ext/forum/main.php
@@ -1,6 +1,9 @@
execute("UPDATE forum_threads SET uptodate=now() WHERE id=:id", ['id'=>$threadID]);
}
- private function retrieve_posts(int $threadID, int $pageNumber): array
- {
- global $database, $config;
- $postsPerPage = $config->get_int('forumPostsPerPage', 15);
-
- return $database->get_all(
- "SELECT p.id, p.date, p.message, u.name as user_name, u.email AS user_email, u.class AS user_class ".
- "FROM forum_posts AS p ".
- "INNER JOIN users AS u ".
- "ON p.user_id = u.id ".
- "WHERE thread_id = :thread_id ".
- "ORDER BY p.date ASC ".
- "LIMIT :limit OFFSET :offset ",
- ["thread_id"=>$threadID, "offset"=>($pageNumber - 1) * $postsPerPage, "limit"=>$postsPerPage]
- );
- }
-
private function delete_thread(int $threadID): void
{
global $database;
diff --git a/ext/forum/theme.php b/ext/forum/theme.php
index f3c316b2..9e7bab4e 100644
--- a/ext/forum/theme.php
+++ b/ext/forum/theme.php
@@ -1,6 +1,9 @@
formatted;
-
+ $message = send_event(new TextFormattingEvent($message))->formatted;
$message = str_replace('\n\r', '
', $message);
$message = str_replace('\r\n', '
', $message);
$message = str_replace('\n', '
', $message);
diff --git a/ext/four_oh_four/info.php b/ext/four_oh_four/info.php
index 943fe5ef..e40a5ffe 100644
--- a/ext/four_oh_four/info.php
+++ b/ext/four_oh_four/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class FourOhFourInfo extends ExtensionInfo
{
public const KEY = "four_oh_four";
@@ -11,7 +13,7 @@ class FourOhFourInfo extends ExtensionInfo
public string $url = self::SHIMMIE_URL;
public array $authors = self::SHISH_AUTHOR;
public string $license = self::LICENSE_GPLV2;
- public string $visibility = self::VISIBLE_HIDDEN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN;
public string $description = "If no other extension puts anything onto the page, show 404";
public bool $core = true;
}
diff --git a/ext/four_oh_four/main.php b/ext/four_oh_four/main.php
index 241a2967..836c8f24 100644
--- a/ext/four_oh_four/main.php
+++ b/ext/four_oh_four/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class FourOhFour extends Extension
{
public function onPageRequest(PageRequestEvent $event)
diff --git a/ext/four_oh_four/test.php b/ext/four_oh_four/test.php
index a6f2a1a1..5c71a839 100644
--- a/ext/four_oh_four/test.php
+++ b/ext/four_oh_four/test.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class FourOhFourTest extends ShimmiePHPUnitTestCase
{
public function test404Handler()
diff --git a/ext/google_analytics/info.php b/ext/google_analytics/info.php
index e0c4401a..af4f5c9d 100644
--- a/ext/google_analytics/info.php
+++ b/ext/google_analytics/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class GoogleAnalyticsInfo extends ExtensionInfo
{
public const KEY = "google_analytics";
diff --git a/ext/google_analytics/main.php b/ext/google_analytics/main.php
index 410ff0b4..a9759374 100644
--- a/ext/google_analytics/main.php
+++ b/ext/google_analytics/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class GoogleAnalytics extends Extension
{
# Add analytics to config
diff --git a/ext/graphql/info.php b/ext/graphql/info.php
new file mode 100644
index 00000000..c6bfce05
--- /dev/null
+++ b/ext/graphql/info.php
@@ -0,0 +1,17 @@
+tags;
+ $_POST['tag_edit__source'] = $metadata->source;
+ $image = Image::by_id($post_id);
+ if (!$image->is_locked() || $user->can(Permissions::EDIT_IMAGE_LOCK)) {
+ send_event(new ImageInfoSetEvent($image));
+ }
+ return Image::by_id($post_id);
+ }
+}
+
+class GraphQL extends Extension
+{
+ public static function get_schema(): Schema
+ {
+ global $_tracer;
+ $_tracer->begin("Create Schema");
+ $schema = new \GQLA\Schema();
+ $_tracer->end(null);
+ return $schema;
+ }
+
+ private function cors(): void
+ {
+ global $config;
+ $pat = $config->get_string("graphql_cors_pattern");
+
+ if ($pat && isset($_SERVER['HTTP_ORIGIN'])) {
+ if (preg_match("#$pat#", $_SERVER['HTTP_ORIGIN'])) {
+ header("Access-Control-Allow-Origin: {$_SERVER['HTTP_ORIGIN']}");
+ header('Access-Control-Allow-Credentials: true');
+ header('Access-Control-Max-Age: 86400');
+ }
+ }
+
+ if ($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+ if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_METHOD'])) {
+ header("Access-Control-Allow-Methods: GET, POST, OPTIONS");
+ }
+ if (isset($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
+ header("Access-Control-Allow-Headers: {$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']}");
+ }
+ exit(0);
+ }
+ }
+
+ public function onInitExt(InitExtEvent $event)
+ {
+ global $config;
+ $config->set_default_string('graphql_cors_pattern', "");
+ $config->set_default_bool('graphql_debug', false);
+ }
+
+ public function onPageRequest(PageRequestEvent $event)
+ {
+ global $config, $page;
+ if ($event->page_matches("graphql")) {
+ $this->cors();
+ $t1 = ftime();
+ $server = new StandardServer([
+ 'schema' => $this->get_schema(),
+ ]);
+ $t2 = ftime();
+ $resp = $server->executeRequest();
+ if ($config->get_bool("graphql_debug")) {
+ $debug = DebugFlag::INCLUDE_DEBUG_MESSAGE | DebugFlag::RETHROW_INTERNAL_EXCEPTIONS;
+ $body = $resp->toArray($debug);
+ } else {
+ $body = $resp->toArray();
+ }
+ $t3 = ftime();
+ $body['stats'] = get_debug_info_arr();
+ $body['stats']['graphql_schema_time'] = round($t2 - $t1, 2);
+ $body['stats']['graphql_execute_time'] = round($t3 - $t2, 2);
+ // sleep(1);
+ $page->set_mode(PageMode::DATA);
+ $page->set_mime("application/json");
+ $page->set_data(\json_encode($body, JSON_UNESCAPED_UNICODE));
+ }
+ if ($event->page_matches("graphql_upload")) {
+ $this->cors();
+ $page->set_mode(PageMode::DATA);
+ $page->set_mime("application/json");
+ $page->set_data(\json_encode(self::handle_uploads()));
+ }
+ }
+
+ private static function handle_uploads(): array
+ {
+ global $user;
+
+ if (!$user->can(Permissions::CREATE_IMAGE)) {
+ return ["error" => "User cannot create posts"];
+ }
+
+ $common_tags = $_POST['common_tags'];
+ $common_source = $_POST['common_source'];
+
+ $results = [];
+ for ($n=0; $n<100; $n++) {
+ if (empty($_POST["url$n"]) && empty($_FILES["data$n"])) {
+ break;
+ }
+ if (isset($_FILES["data$n"]) && ($_FILES["data$n"]["size"] == 0 || $_FILES["data$n"]["error"] == UPLOAD_ERR_NO_FILE)) {
+ break;
+ }
+ try {
+ $results[] = self::handle_upload($n, $common_tags, $common_source);
+ } catch(\Exception $e) {
+ $results[] = ["error" => $e->getMessage()];
+ }
+ }
+ return ["results" => $results];
+ }
+
+ private static function handle_upload(int $n, string $common_tags, string $common_source): array
+ {
+ if (!empty($_POST["url$n"])) {
+ return ["error" => "URLs not handled yet"];
+ $tmpname = "...";
+ $filename = "...";
+ } else {
+ $ec = $_FILES["data$n"]["error"];
+ switch($ec) {
+ case UPLOAD_ERR_OK:
+ $tmpname = $_FILES["data$n"]["tmp_name"];
+ $filename = $_FILES["data$n"]["name"];
+ break;
+ case UPLOAD_ERR_INI_SIZE:
+ return ["error" => "File larger than PHP can handle"];
+ default:
+ return ["error" => "Mystery error: $ec"];
+ }
+ }
+
+ $tags = trim($common_tags . " " . $_POST["tags$n"]);
+ $source = $common_source;
+ if (!empty($_POST["source$n"])) {
+ $source = $_POST["source$n"];
+ }
+ $event = send_event(new DataUploadEvent($tmpname, [
+ 'filename' => $filename,
+ 'tags' => Tag::explode($tags),
+ 'source' => $source,
+ ]));
+
+ return ["image_id" => $event->image_id];
+ }
+
+ public function onCommand(CommandEvent $event)
+ {
+ if ($event->cmd == "help") {
+ print "\tgraphql
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
I.E: \"posted:2014-01-01\", \"id:>=500\" etc.
+ public ?string $documentation = " etc.
'.$st.' ⓘ
'.$short_wiki_description;
$page->add_block(new Block(null, $short_wiki_description, "main", 0, "short-wiki-description"));
@@ -291,8 +292,8 @@ and of course start organising your images :-)
source=http://google.com/
- source=https:///google.com/
+ posted>=07-19-2019
- posted>=2019-07-19
+
diff --git a/ext/ipban/info.php b/ext/ipban/info.php
index 1c10f540..740e3915 100644
--- a/ext/ipban/info.php
+++ b/ext/ipban/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class IPBanInfo extends ExtensionInfo
{
public const KEY = "ipban";
diff --git a/ext/ipban/main.php b/ext/ipban/main.php
index 90a14e2f..e8c6c33b 100644
--- a/ext/ipban/main.php
+++ b/ext/ipban/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
use MicroCRUD\ActionColumn;
use MicroCRUD\InetColumn;
use MicroCRUD\StringColumn;
@@ -105,7 +107,7 @@ class IPBan extends Extension
// Get lists of banned IPs and banned networks
$ips = $cache->get("ip_bans");
$networks = $cache->get("network_bans");
- if ($ips === false || $networks === false) {
+ if (is_null($ips) || is_null($networks)) {
$rows = $database->get_pairs("
SELECT ip, id
FROM bans
@@ -168,7 +170,7 @@ class IPBan extends Extension
$event->user->class = $_shm_user_classes["ghost"];
}
} else {
- header("HTTP/1.0 403 Forbidden");
+ header("HTTP/1.1 403 Forbidden");
print "$msg";
exit;
}
diff --git a/ext/ipban/test.php b/ext/ipban/test.php
index bc2c2765..4dbb9f1e 100644
--- a/ext/ipban/test.php
+++ b/ext/ipban/test.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class IPBanTest extends ShimmiePHPUnitTestCase
{
# FIXME: test that the IP is actually banned
diff --git a/ext/ipban/theme.php b/ext/ipban/theme.php
index 392b0929..996b40a7 100644
--- a/ext/ipban/theme.php
+++ b/ext/ipban/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class IPBanTheme extends Themelet
{
public function display_bans(Page $page, $table, $paginator)
diff --git a/ext/link_image/info.php b/ext/link_image/info.php
index d87e3598..c0cedfe5 100644
--- a/ext/link_image/info.php
+++ b/ext/link_image/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class LinkImageInfo extends ExtensionInfo
{
public const KEY = "link_image";
diff --git a/ext/link_image/main.php b/ext/link_image/main.php
index 17033c96..315ed858 100644
--- a/ext/link_image/main.php
+++ b/ext/link_image/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class LinkImage extends Extension
{
/** @var LinkImageTheme */
diff --git a/ext/link_image/test.php b/ext/link_image/test.php
index 7d2a1b04..5681bf12 100644
--- a/ext/link_image/test.php
+++ b/ext/link_image/test.php
@@ -1,6 +1,9 @@
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);
}
diff --git a/ext/link_image/theme.php b/ext/link_image/theme.php
index 9ed66b2a..6491de24 100644
--- a/ext/link_image/theme.php
+++ b/ext/link_image/theme.php
@@ -1,6 +1,9 @@
set_default_bool("log_console_access", true);
+ $config->set_default_bool("log_console_colour", true);
+ $config->set_default_int("log_console_level", SCORE_LOG_INFO);
+ }
+
+ public function onPageRequest(PageRequestEvent $event)
+ {
+ global $config, $page;
+
+ if (
+ $config->get_bool("log_console_access") &&
+ isset($_SERVER['REQUEST_METHOD']) &&
+ isset($_SERVER['REQUEST_URI'])
+ ) {
+ $this->log(new LogEvent(
+ "access",
+ SCORE_LOG_INFO,
+ "{$_SERVER['REQUEST_METHOD']} {$_SERVER['REQUEST_URI']}"
+ ));
+ }
+
+ /*
+ if ($event->page_matches("log_test")) {
+ log_debug("log_console", "Hello debug!");
+ log_info("log_console", "Hello info!");
+ log_warning("log_console", "Hello warning!");
+ $page->set_mode(PageMode::DATA);
+ $page->set_data("You should see something in the log\n");
+ }
+ */
+ }
+
+ public function onLog(LogEvent $event)
+ {
+ global $config;
+ if ($event->priority >= $config->get_int("log_console_level")) {
+ $this->log($event);
+ }
+ }
+
+ private function log(LogEvent $event)
+ {
+ global $config, $user;
+ // TODO: colour based on event->priority
+ $username = ($user && $user->name) ? $user->name : "Anonymous";
+ $str = join(" ", [
+ date(DATE_ISO8601),
+ get_real_ip(),
+ $event->section,
+ $username,
+ $event->message
+ ]);
+ if ($config->get_bool("log_console_colour")) {
+ if ($event->priority >= SCORE_LOG_WARNING) {
+ // red
+ $COL = "\033[0;31m";
+ } elseif ($event->priority >= SCORE_LOG_INFO) {
+ // default
+ $COL = "";
+ } elseif ($event->priority >= SCORE_LOG_NOTSET) {
+ // blue
+ $COL = "\033[0;34m";
+ } else {
+ // priority < 0 ???
+ // magenta
+ $COL = "\033[0;35m";
+ }
+ $str = "$COL$str\033[0m\n";
+ } else {
+ $str = "$str\n";
+ }
+ if (!defined("UNITTEST") && PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') {
+ $fp = fopen("/dev/tty", "w");
+ if ($fp) {
+ fwrite($fp, $str);
+ fclose($fp);
+ }
+ }
+ }
+}
diff --git a/ext/log_db/info.php b/ext/log_db/info.php
index f221a1ab..0b0eeeb2 100644
--- a/ext/log_db/info.php
+++ b/ext/log_db/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class LogDatabaseInfo extends ExtensionInfo
{
public const KEY = "log_db";
@@ -11,5 +13,5 @@ class LogDatabaseInfo extends ExtensionInfo
public string $url = self::SHIMMIE_URL;
public array $authors = self::SHISH_AUTHOR;
public string $description = "Keep a record of SCore events (in the database).";
- public string $visibility = self::VISIBLE_ADMIN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::ADMIN;
}
diff --git a/ext/log_db/main.php b/ext/log_db/main.php
index 440f516f..e7848631 100644
--- a/ext/log_db/main.php
+++ b/ext/log_db/main.php
@@ -2,12 +2,15 @@
declare(strict_types=1);
+namespace Shimmie2;
+
use MicroHTML\HTMLElement;
use MicroCRUD\ActionColumn;
use MicroCRUD\Column;
use MicroCRUD\DateTimeColumn;
use MicroCRUD\TextColumn;
use MicroCRUD\Table;
+
use function MicroHTML\A;
use function MicroHTML\SPAN;
use function MicroHTML\emptyHTML;
@@ -47,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)))";
@@ -161,11 +164,21 @@ class MessageColumn extends Column
{
$c = "#000";
switch ($row['priority']) {
- case SCORE_LOG_DEBUG: $c = "#999"; break;
- case SCORE_LOG_INFO: $c = "#000"; break;
- case SCORE_LOG_WARNING: $c = "#800"; break;
- case SCORE_LOG_ERROR: $c = "#C00"; break;
- case SCORE_LOG_CRITICAL: $c = "#F00"; break;
+ case SCORE_LOG_DEBUG:
+ $c = "#999";
+ break;
+ case SCORE_LOG_INFO:
+ $c = "#000";
+ break;
+ case SCORE_LOG_WARNING:
+ $c = "#800";
+ break;
+ case SCORE_LOG_ERROR:
+ $c = "#C00";
+ break;
+ case SCORE_LOG_CRITICAL:
+ $c = "#F00";
+ break;
}
return SPAN(["style"=>"color: $c"], rawHTML($this->scan_entities($row[$this->name])));
}
diff --git a/ext/log_db/test.php b/ext/log_db/test.php
index 04a50040..6185d4c6 100644
--- a/ext/log_db/test.php
+++ b/ext/log_db/test.php
@@ -1,6 +1,9 @@
set_default_string("log_logstash_host", "127.0.0.1:1234");
+ }
+
public function onLog(LogEvent $event)
{
global $user;
@@ -26,7 +34,7 @@ class LogLogstash extends Extension
];
$this->send_data($data);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
// we can't log that logging is broken
}
}
@@ -50,7 +58,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
}
}
diff --git a/ext/log_net/info.php b/ext/log_net/info.php
index c9ed2e14..dca447e3 100644
--- a/ext/log_net/info.php
+++ b/ext/log_net/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class LogNetInfo extends ExtensionInfo
{
public const KEY = "log_net";
@@ -11,5 +13,5 @@ class LogNetInfo extends ExtensionInfo
public string $url = self::SHIMMIE_URL;
public array $authors = self::SHISH_AUTHOR;
public string $description = "Send log events to a network port.";
- public string $visibility = self::VISIBLE_ADMIN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::ADMIN;
}
diff --git a/ext/log_net/main.php b/ext/log_net/main.php
index b5b4d90a..7faa07ec 100644
--- a/ext/log_net/main.php
+++ b/ext/log_net/main.php
@@ -2,10 +2,18 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class LogNet extends Extension
{
private int $count = 0;
+ public function onInitExt(InitExtEvent $event)
+ {
+ global $config;
+ $config->set_default_string("log_net_host", "127.0.0.1:35353");
+ }
+
public function onLog(LogEvent $event)
{
global $user;
@@ -26,7 +34,7 @@ class LogNet extends Extension
private function msg($data)
{
global $config;
- $host = $config->get_string("log_net_host", "127.0.0.1:35353");
+ $host = $config->get_string("log_net_host");
if (!$host) {
return;
@@ -42,7 +50,7 @@ class LogNet extends Extension
}
fwrite($fp, "$data\n");
fclose($fp);
- } catch (Exception $e) {
+ } catch (\Exception $e) {
/* logging errors shouldn't break everything */
}
}
diff --git a/ext/media/config.php b/ext/media/config.php
index 3b795fa2..7427aded 100644
--- a/ext/media/config.php
+++ b/ext/media/config.php
@@ -1,6 +1,9 @@
image = $image;
- $this->file_name = warehouse_path(Image::IMAGE_DIR, $image->hash);
- $this->mime = strtolower($image->get_mime());
}
}
diff --git a/ext/media/info.php b/ext/media/info.php
index 749b8d99..5490639e 100644
--- a/ext/media/info.php
+++ b/ext/media/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class MediaInfo extends ExtensionInfo
{
public const KEY = "media";
@@ -13,5 +15,5 @@ class MediaInfo extends ExtensionInfo
public string $license = self::LICENSE_WTFPL;
public string $description = "Provides common functions and settings used for media operations.";
public bool $core = true;
- public string $visibility = self::VISIBLE_HIDDEN;
+ public ExtensionVisibility $visibility = ExtensionVisibility::HIDDEN;
}
diff --git a/ext/media/main.php b/ext/media/main.php
index 3fd8b3af..f7451f41 100644
--- a/ext/media/main.php
+++ b/ext/media/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
require_once "config.php";
require_once "events.php";
require_once "media_engine.php";
@@ -270,12 +272,12 @@ class Media extends Extension
{
if ($event->image->width && $event->image->height && $event->image->length) {
$s = ((int)($event->image->length / 100))/10;
- $event->replace('$size', "{$event->image->width}x{$event->image->height}, ${s}s");
+ $event->replace('$size', "{$event->image->width}x{$event->image->height}, {$s}s");
} elseif ($event->image->width && $event->image->height) {
$event->replace('$size', "{$event->image->width}x{$event->image->height}");
} elseif ($event->image->length) {
$s = ((int)($event->image->length / 100))/10;
- $event->replace('$size', "${s}s");
+ $event->replace('$size', "{$s}s");
}
}
@@ -573,7 +575,7 @@ class Media extends Extension
$input_ext = self::determine_ext($input_mime);
- $file_arg = "${input_ext}:\"${input_path}[0]\"";
+ $file_arg = "{$input_ext}:\"{$input_path}[0]\"";
if ($resize_type===Media::RESIZE_TYPE_FIT_BLUR_PORTRAIT) {
if ($new_height>$new_width) {
@@ -586,16 +588,16 @@ class Media extends Extension
switch ($resize_type) {
case Media::RESIZE_TYPE_FIT:
case Media::RESIZE_TYPE_STRETCH:
- $args .= "${file_arg} ${resize_arg} ${new_width}x${new_height}${resize_suffix} -background ${bg} -flatten ";
+ $args .= "{$file_arg} {$resize_arg} {$new_width}x{$new_height}{$resize_suffix} -background {$bg} -flatten ";
break;
case Media::RESIZE_TYPE_FILL:
- $args .= "${file_arg} ${resize_arg} ${new_width}x${new_height}\^ -background ${bg} -flatten -gravity center -extent ${new_width}x${new_height} ";
+ $args .= "{$file_arg} {$resize_arg} {$new_width}x{$new_height}\^ -background {$bg} -flatten -gravity center -extent {$new_width}x{$new_height} ";
break;
case Media::RESIZE_TYPE_FIT_BLUR:
$blur_size = max(ceil(max($new_width, $new_height) / 25), 5);
- $args .= "${file_arg} ".
- "\( -clone 0 -auto-orient -resize ${new_width}x${new_height}\^ -background ${bg} -flatten -gravity center -fill black -colorize 50% -extent ${new_width}x${new_height} -blur 0x${blur_size} \) ".
- "\( -clone 0 -auto-orient -resize ${new_width}x${new_height} \) ".
+ $args .= "{$file_arg} ".
+ "\( -clone 0 -auto-orient -resize {$new_width}x{$new_height}\^ -background {$bg} -flatten -gravity center -fill black -colorize 50% -extent {$new_width}x{$new_height} -blur 0x{$blur_size} \) ".
+ "\( -clone 0 -auto-orient -resize {$new_width}x{$new_height} \) ".
"-delete 0 -gravity center -compose over -composite";
break;
}
@@ -611,7 +613,7 @@ class Media extends Extension
}
- $args .= " -quality ${output_quality} ";
+ $args .= " -quality {$output_quality} ";
$output_ext = self::determine_ext($output_mime);
@@ -790,8 +792,7 @@ class Media extends Extension
imagedestroy($image_resized);
$image_resized = $new_image;
- break;
-
+ break;
}
switch ($output_mime) {
@@ -903,9 +904,9 @@ class Media extends Extension
if ($this->get_version(MediaConfig::VERSION) < 2) {
$database->execute("ALTER TABLE images ADD COLUMN image BOOLEAN NULL");
- switch ($database->get_driver_name()) {
- case DatabaseDriver::PGSQL:
- case DatabaseDriver::SQLITE:
+ switch ($database->get_driver_id()) {
+ case DatabaseDriverID::PGSQL:
+ case DatabaseDriverID::SQLITE:
$database->execute('CREATE INDEX images_image_idx ON images(image) WHERE image IS NOT NULL');
break;
default:
diff --git a/ext/media/media_engine.php b/ext/media/media_engine.php
index 3dff0e17..191d3259 100644
--- a/ext/media/media_engine.php
+++ b/ext/media/media_engine.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
abstract class MediaEngine
{
public const GD = "gd";
diff --git a/ext/media/theme.php b/ext/media/theme.php
index efb9506a..00ec1922 100644
--- a/ext/media/theme.php
+++ b/ext/media/theme.php
@@ -1,6 +1,9 @@
assertTrue(false, "Should've had an exception");
+ $this->fail("Should've had an exception");
} catch (TagSetException $e) {
$this->assertTrue(true);
}
diff --git a/ext/not_a_tag/theme.php b/ext/not_a_tag/theme.php
index 259d7c74..7c23a7a3 100644
--- a/ext/not_a_tag/theme.php
+++ b/ext/not_a_tag/theme.php
@@ -1,6 +1,9 @@
image_id);
+ }
+
+ #[Field]
+ public function user(): User
+ {
+ return User::by_id($this->user_id);
+ }
+
+ #[Field(extends: "Post")]
+ public static function score(Image $post): int
+ {
+ global $database;
+ if ($post->score ?? null) {
+ return $post->score;
+ }
+ return $database->get_one(
+ "SELECT sum(score) FROM numeric_score_votes WHERE image_id=:image_id",
+ ['image_id'=>$post->id]
+ ) ?? 0;
+ }
+
+ #[Field(extends: "Post", type: "[NumericScoreVote!]!")]
+ public static function votes(Image $post): array
+ {
+ global $database;
+ $rows = $database->get_all(
+ "SELECT * FROM numeric_score_votes WHERE image_id=:image_id",
+ ['image_id'=>$post->id]
+ );
+ $votes = [];
+ foreach ($rows as $row) {
+ $nsv = new NumericScoreVote();
+ $nsv->image_id = $row["image_id"];
+ $nsv->user_id = $row["user_id"];
+ $nsv->score = $row["score"];
+ $votes[] = $nsv;
+ }
+ return $votes;
+ }
+
+ #[Field(extends: "Post", type: "Int!")]
+ public static function my_vote(Image $post): int
+ {
+ global $database, $user;
+ return $database->get_one(
+ "SELECT score FROM numeric_score_votes WHERE image_id=:image_id AND user_id=:user_id",
+ ['image_id'=>$post->id, "user_id"=>$user->id]
+ ) ?? 0;
+ }
+
+ #[Mutation]
+ public static function create_vote(int $post_id, int $score): bool
+ {
+ global $user;
+ if ($user->can(Permissions::CREATE_VOTE)) {
+ assert($score == 0 || $score == -1 || $score == 1);
+ send_event(new NumericScoreSetEvent($post_id, $user, $score));
+ return true;
+ }
+ return false;
+ }
+}
+
class NumericScoreSetEvent extends Event
{
public int $image_id;
@@ -25,7 +107,7 @@ class NumericScore extends Extension
public function onDisplayingImage(DisplayingImageEvent $event)
{
global $user;
- if (!$user->is_anonymous()) {
+ if ($user->can(Permissions::CREATE_VOTE)) {
$this->theme->get_voter($event->image);
}
}
@@ -68,18 +150,10 @@ class NumericScore extends Extension
}
die($html);
} elseif ($event->page_matches("numeric_score_vote") && $user->check_auth_token()) {
- if (!$user->is_anonymous()) {
+ if ($user->can(Permissions::CREATE_VOTE)) {
$image_id = int_escape($_POST['image_id']);
- $char = $_POST['vote'];
- $score = null;
- if ($char == "up") {
- $score = 1;
- } elseif ($char == "null") {
- $score = 0;
- } elseif ($char == "down") {
- $score = -1;
- }
- if (!is_null($score) && $image_id>0) {
+ $score = int_escape($_POST['vote']);
+ if (($score == -1 || $score == 0 || $score == 1) && $image_id>0) {
send_event(new NumericScoreSetEvent($image_id, $user, $score));
}
$page->set_mode(PageMode::REDIRECT);
@@ -145,7 +219,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";
@@ -292,7 +366,7 @@ class NumericScore extends Extension
if (preg_match("/^vote[=|:](up|down|remove)$/", $event->term, $matches)) {
global $user;
$score = ($matches[1] == "up" ? 1 : ($matches[1] == "down" ? -1 : 0));
- if (!$user->is_anonymous()) {
+ if ($user->can(Permissions::CREATE_VOTE)) {
send_event(new NumericScoreSetEvent($event->image_id, $user, $score));
}
}
diff --git a/ext/numeric_score/test.php b/ext/numeric_score/test.php
index fe75ed16..44662acc 100644
--- a/ext/numeric_score/test.php
+++ b/ext/numeric_score/test.php
@@ -1,6 +1,9 @@
";
diff --git a/ext/ouroboros_api/info.php b/ext/ouroboros_api/info.php
index 664125eb..4c19d24a 100644
--- a/ext/ouroboros_api/info.php
+++ b/ext/ouroboros_api/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class OuroborosAPIInfo extends ExtensionInfo
{
public const KEY = "ouroboros_api";
diff --git a/ext/ouroboros_api/main.php b/ext/ouroboros_api/main.php
index 5d1b8884..07ec46c2 100644
--- a/ext/ouroboros_api/main.php
+++ b/ext/ouroboros_api/main.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
class _SafeOuroborosImage
{
@@ -111,7 +112,7 @@ class OuroborosPost extends _SafeOuroborosImage
* Mainly just acts as a wrapper and validation layer
* @noinspection PhpMissingParentConstructorInspection
*/
- public function __construct(array $post, string $md5 = '')
+ public function __construct(array $post)
{
if (array_key_exists('tags', $post)) {
// implode(explode()) to resolve aliases and sanitise
@@ -170,10 +171,7 @@ class OuroborosPost extends _SafeOuroborosImage
$this->is_note_locked = $post['is_note_locked'];
}
if (array_key_exists('parent_id', $post)) {
- $this->parent_id = filter_var(
- $post['parent_id'],
- FILTER_SANITIZE_NUMBER_INT
- );
+ $this->parent_id = int_escape($post['parent_id']);
}
}
}
@@ -385,8 +383,7 @@ class OuroborosAPI extends Extension
}
$meta['extension'] = pathinfo($meta['filename'], PATHINFO_EXTENSION);
try {
- $upload = new DataUploadEvent($meta['file'], $meta);
- send_event($upload);
+ send_event(new DataUploadEvent($meta['file'], $meta));
$image = Image::by_hash($meta['hash']);
if (!is_null($image)) {
$this->sendResponse(200, make_link('post/view/' . $image->id), true);
@@ -520,7 +517,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');
@@ -545,14 +542,14 @@ 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)) {
$xml->startElement($type . 's');
if ($type == 'post') {
- $xml->writeAttribute('count', count($data));
- $xml->writeAttribute('offset', $offset);
+ $xml->writeAttribute('count', (string)count($data));
+ $xml->writeAttribute('offset', (string)$offset);
}
if ($type == 'tag') {
$xml->writeAttribute('type', 'array');
@@ -571,7 +568,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) {
diff --git a/ext/pm/info.php b/ext/pm/info.php
index 99ad2c3b..567d7cfa 100644
--- a/ext/pm/info.php
+++ b/ext/pm/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PrivMsgInfo extends ExtensionInfo
{
public const KEY = "pm";
diff --git a/ext/pm/main.php b/ext/pm/main.php
index 4198b610..6d022eb3 100644
--- a/ext/pm/main.php
+++ b/ext/pm/main.php
@@ -2,6 +2,13 @@
declare(strict_types=1);
+namespace Shimmie2;
+
+use GQLA\Type;
+use GQLA\Field;
+use GQLA\Query;
+use GQLA\Mutation;
+
class SendPMEvent extends Event
{
public PM $pm;
@@ -13,40 +20,119 @@ class SendPMEvent extends Event
}
}
+#[Type(name: "PrivateMessage")]
class PM
{
- public int $id;
+ public int $id = -1;
public int $from_id;
public string $from_ip;
public int $to_id;
- /** @var mixed */
- public $sent_date;
+ public mixed $sent_date;
+ #[Field]
public string $subject;
+ #[Field]
public string $message;
+ #[Field]
public bool $is_read;
- public function __construct($from_id=0, string $from_ip="0.0.0.0", int $to_id=0, string $subject="A Message", string $message="Some Text", bool $read=false)
+ #[Field]
+ public function from(): User
{
- # PHP: the P stands for "really", the H stands for "awful" and the other P stands for "language"
- if (is_array($from_id)) {
- $a = $from_id;
- $this->id = (int)$a["id"];
- $this->from_id = (int)$a["from_id"];
- $this->from_ip = $a["from_ip"];
- $this->to_id = (int)$a["to_id"];
- $this->sent_date = $a["sent_date"];
- $this->subject = $a["subject"];
- $this->message = $a["message"];
- $this->is_read = bool_escape($a["is_read"]);
- } else {
- $this->id = -1;
- $this->from_id = $from_id;
- $this->from_ip = $from_ip;
- $this->to_id = $to_id;
- $this->subject = $subject;
- $this->message = $message;
- $this->is_read = $read;
+ return User::by_id($this->from_id);
+ }
+
+ #[Field(name: "pm_id")]
+ public function graphql_oid(): int
+ {
+ return $this->id;
+ }
+ #[Field(name: "id")]
+ public function graphql_guid(): string
+ {
+ return "pm:{$this->id}";
+ }
+
+ public function __construct(
+ int $from_id,
+ string $from_ip,
+ int $to_id,
+ string $subject,
+ string $message,
+ bool $is_read = false
+ ) {
+ $this->from_id = $from_id;
+ $this->from_ip = $from_ip;
+ $this->to_id = $to_id;
+ $this->subject = $subject;
+ $this->message = $message;
+ $this->is_read = $is_read;
+ }
+
+ public static function from_row(array $row): PM
+ {
+ $pm = new PM(
+ (int)$row["from_id"],
+ $row["from_ip"],
+ (int)$row["to_id"],
+ $row["subject"],
+ $row["message"],
+ bool_escape($row["is_read"]),
+ );
+ $pm->id = (int)$row["id"];
+ $pm->sent_date = $row["sent_date"];
+ return $pm;
+ }
+
+ #[Field(extends: "User", name: "private_messages", type: "[PrivateMessage!]")]
+ public static function get_pms(User $duser): ?array
+ {
+ global $database, $user;
+
+ if (!$user->can(Permissions::READ_PM)) {
+ return null;
}
+ if (($duser->id != $user->id) && !$user->can(Permissions::VIEW_OTHER_PMS)) {
+ return null;
+ }
+
+ $pms = [];
+ $arr = $database->get_all(
+ "SELECT * FROM private_message WHERE to_id = :to_id ORDER BY sent_date DESC",
+ ["to_id" => $duser->id]
+ );
+ foreach ($arr as $pm) {
+ $pms[] = PM::from_row($pm);
+ }
+ return $pms;
+ }
+
+ #[Field(extends: "User", name: "private_message_unread_count")]
+ public static function count_unread_pms(User $duser): ?int
+ {
+ global $database, $user;
+
+ if (!$user->can(Permissions::READ_PM)) {
+ return null;
+ }
+ if (($duser->id != $user->id) && !$user->can(Permissions::VIEW_OTHER_PMS)) {
+ return null;
+ }
+
+ return (int)$database->get_one(
+ "SELECT COUNT(*) FROM private_message WHERE to_id = :to_id AND is_read = :is_read",
+ ["is_read" => false, "to_id" => $duser->id]
+ );
+ }
+
+ #[Mutation(name: "create_private_message")]
+ public static function send_pm(int $to_user_id, string $subject, string $message): bool
+ {
+ global $user;
+ if (!$user->can(Permissions::SEND_PM)) {
+ return false;
+ }
+ send_event(new SendPMEvent(new PM($user->id, get_real_ip(), $to_user_id, $subject, $message)));
+ return true;
}
}
@@ -120,8 +206,9 @@ class PrivMsg extends Extension
global $page, $user;
$duser = $event->display_user;
if (!$user->is_anonymous() && !$duser->is_anonymous()) {
- if (($user->id == $duser->id) || $user->can(Permissions::VIEW_OTHER_PMS)) {
- $this->theme->display_pms($page, $this->get_pms($duser));
+ $pms = PM::get_pms($duser);
+ if (!is_null($pms)) {
+ $this->theme->display_pms($page, $pms);
}
if ($user->id != $duser->id) {
$this->theme->display_composer($page, $user, $duser);
@@ -146,7 +233,7 @@ class PrivMsg extends Extension
$database->execute("UPDATE private_message SET is_read=true WHERE id = :id", ["id" => $pm_id]);
$cache->delete("pm-count-{$user->id}");
}
- $this->theme->display_message($page, $from_user, $user, new PM($pm));
+ $this->theme->display_message($page, $from_user, $user, PM::from_row($pm));
} else {
$this->theme->display_permission_denied();
}
@@ -206,33 +293,12 @@ class PrivMsg extends Extension
log_info("pm", "Sent PM to User #{$event->pm->to_id}");
}
-
- private function get_pms(User $user): array
- {
- global $database;
-
- $arr = $database->get_all(
- "
- SELECT private_message.*,user_from.name AS from_name
- FROM private_message
- JOIN users AS user_from ON user_from.id=from_id
- WHERE to_id = :toid
- ORDER BY sent_date DESC",
- ["toid" => $user->id]
- );
- $pms = [];
- foreach ($arr as $pm) {
- $pms[] = new PM($pm);
- }
- return $pms;
- }
-
private function count_pms(User $user)
{
global $cache, $database;
$count = $cache->get("pm-count:{$user->id}");
- if (is_null($count) || $count === false) {
+ if (is_null($count)) {
$count = $database->get_one("
SELECT count(*)
FROM private_message
diff --git a/ext/pm/test.php b/ext/pm/test.php
index dd525430..7ad5595d 100644
--- a/ext/pm/test.php
+++ b/ext/pm/test.php
@@ -1,9 +1,12 @@
log_in_as_admin();
@@ -11,13 +14,10 @@ class PrivMsgTest extends ShimmiePHPUnitTestCase
User::by_name(self::$admin_name)->id,
"0.0.0.0",
User::by_name(self::$user_name)->id,
- "message demo to test"
+ "message demo to test",
+ "test body"
)));
- // Check that admin can see user's messages
- $this->get_page("user/" . self::$user_name);
- $this->assert_text("message demo to test");
-
// Check that user can see own messages
$this->log_in_as_user();
$this->get_page("user");
@@ -36,4 +36,21 @@ class PrivMsgTest extends ShimmiePHPUnitTestCase
// $this->get_page("pm/read/0");
// $this->assert_text("No such PM");
}
+
+ public function testAdminReadOtherMessage()
+ {
+ // Send from admin to user
+ $this->log_in_as_admin();
+ send_event(new SendPMEvent(new PM(
+ User::by_name(self::$admin_name)->id,
+ "0.0.0.0",
+ User::by_name(self::$user_name)->id,
+ "message demo to test",
+ "test body"
+ )));
+
+ // Check that admin can see user's messages
+ $this->get_page("user/" . self::$user_name);
+ $this->assert_text("message demo to test");
+ }
}
diff --git a/ext/pm/theme.php b/ext/pm/theme.php
index 119ee14d..283acace 100644
--- a/ext/pm/theme.php
+++ b/ext/pm/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PrivMsgTheme extends Themelet
{
public function display_pms(Page $page, $pms)
diff --git a/ext/pm_triggers/info.php b/ext/pm_triggers/info.php
index e5b287b9..a11d3a5a 100644
--- a/ext/pm_triggers/info.php
+++ b/ext/pm_triggers/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PMTriggerInfo extends ExtensionInfo
{
public const KEY = "pm_triggers";
diff --git a/ext/pm_triggers/main.php b/ext/pm_triggers/main.php
index 5b36eb1a..65e20512 100644
--- a/ext/pm_triggers/main.php
+++ b/ext/pm_triggers/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PMTrigger extends Extension
{
public function onImageDeletion(ImageDeletionEvent $event)
diff --git a/ext/pools/info.php b/ext/pools/info.php
index cc215aa4..a99ad94d 100644
--- a/ext/pools/info.php
+++ b/ext/pools/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PoolsInfo extends ExtensionInfo
{
public const KEY = "pools";
diff --git a/ext/pools/main.php b/ext/pools/main.php
index 90ee31ba..85fff391 100644
--- a/ext/pools/main.php
+++ b/ext/pools/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
abstract class PoolsConfig
{
public const MAX_IMPORT_RESULTS = "poolsMaxImportResults";
@@ -234,14 +236,12 @@ class Pools extends Extension
case "create": // ADD _POST
try {
$title = $_POST["title"];
- $event = new PoolCreationEvent(
+ $event = send_event(new PoolCreationEvent(
$title,
$user,
bool_escape($_POST["public"]),
$_POST["description"]
- );
-
- send_event($event);
+ ));
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("pool/view/" . $event->new_id));
} catch (PoolCreationException $e) {
@@ -325,37 +325,35 @@ class Pools extends Extension
}
}
break;
- case "reverse":
- if ($this->have_permission($user, $pool)) {
- $result = $database->execute(
- "SELECT image_id FROM pool_images WHERE pool_id=:pid ORDER BY image_order DESC",
- ["pid" => $pool_id]
- );
- $image_order = 1;
- try {
- $database->begin_transaction();
- while ($row = $result->fetch()) {
- $database->execute(
- "
- UPDATE pool_images
- SET image_order=:ord
+ case "reverse":
+ if ($this->have_permission($user, $pool)) {
+ $result = $database->execute(
+ "SELECT image_id FROM pool_images WHERE pool_id=:pid ORDER BY image_order DESC",
+ ["pid" => $pool_id]
+ );
+ $image_order = 1;
+ try {
+ $database->begin_transaction();
+ while ($row = $result->fetch()) {
+ $database->execute(
+ "
+ UPDATE pool_images
+ SET image_order=:ord
WHERE pool_id = :pid AND image_id = :iid",
- ["ord" => $image_order, "pid" => $pool_id, "iid" => (int)$row['image_id']]
- );
- $image_order = $image_order + 1;
- }
- $database->commit();
- }
- catch (Exception $e) {
- $database->rollback();
- }
- $page->set_mode(PageMode::REDIRECT);
- $page->set_redirect(make_link("pool/view/" . $pool_id));
- }
- else {
- $this->theme->display_error(403, "Permission Denied", "You do not have permission to access this page");
- }
- break;
+ ["ord" => $image_order, "pid" => $pool_id, "iid" => (int)$row['image_id']]
+ );
+ $image_order = $image_order + 1;
+ }
+ $database->commit();
+ } catch (\Exception $e) {
+ $database->rollback();
+ }
+ $page->set_mode(PageMode::REDIRECT);
+ $page->set_redirect(make_link("pool/view/" . $pool_id));
+ } else {
+ $this->theme->display_error(403, "Permission Denied", "You do not have permission to access this page");
+ }
+ break;
case "import":
if ($this->have_permission($user, $pool)) {
$images = Image::find_images(
@@ -441,8 +439,6 @@ class Pools extends Extension
* When displaying an image, optionally list all the pools that the
* image is currently a member of on a side panel, as well as a link
* to the Next image in the pool.
- *
- * @var DisplayingImageEvent $event
*/
public function onDisplayingImage(DisplayingImageEvent $event)
{
@@ -522,7 +518,6 @@ class Pools extends Extension
$poolID = str_replace("_", " ", $matches[1]);
$event->add_querylet(new Querylet("images.id IN (SELECT DISTINCT image_id FROM pool_images WHERE pool_id = $poolID)"));
}
-
}
public function onTagTermCheck(TagTermCheckEvent $event)
@@ -582,7 +577,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;
@@ -591,9 +586,8 @@ class Pools extends Extension
return;
}
$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)));
+ $pce = send_event(new PoolCreationEvent($new_pool_title));
+ send_event(new PoolAddPostsEvent($pce->new_id, iterator_map_to_array("Shimmie2\_image_to_id", $event->items)));
break;
}
}
@@ -919,9 +913,8 @@ class Pools extends Extension
if ($entry['action'] == 0) {
// READ ENTRIES
- foreach ($images as $image) {
- $imageID = $image;
- $this->add_post($poolID, $imageID);
+ foreach ($images as $imageID) {
+ $this->add_post($poolID, int_escape($imageID));
$imageArray .= " " . $imageID;
$newAction = 1;
diff --git a/ext/pools/test.php b/ext/pools/test.php
index 20500914..67da7b48 100644
--- a/ext/pools/test.php
+++ b/ext/pools/test.php
@@ -1,6 +1,9 @@
testCreate();
-
+ $this->testCreate();
$this->get_page("pool/list");
$this->assert_text("Pool");
}
@@ -121,7 +123,7 @@ class PoolsTest extends ShimmiePHPUnitTestCase
"pool_id" => $pool_id,
"check" => [(string)($image_ids[0]), (string)($image_ids[1])]
]);
- $this->assertEquals("redirect", $page->mode);
+ $this->assertEquals(PageMode::REDIRECT, $page->mode);
return [$pool_id, $image_ids];
}
@@ -135,7 +137,7 @@ class PoolsTest extends ShimmiePHPUnitTestCase
"pool_id" => $pool_id,
"check" => [(string)($image_ids[0]), (string)($image_ids[1])]
]);
- $this->assertEquals("redirect", $page->mode);
+ $this->assertEquals(PageMode::REDIRECT, $page->mode);
}
/** @depends testCreate */
@@ -147,7 +149,7 @@ class PoolsTest extends ShimmiePHPUnitTestCase
"pool_id" => $pool_id,
"description" => "Updated description"
]);
- $this->assertEquals("redirect", $page->mode);
+ $this->assertEquals(PageMode::REDIRECT, $page->mode);
return [$pool_id, $image_ids];
}
@@ -173,6 +175,6 @@ class PoolsTest extends ShimmiePHPUnitTestCase
$page = $this->post_page("pool/nuke", [
"pool_id" => "$pool_id",
]);
- $this->assertEquals("redirect", $page->mode);
+ $this->assertEquals(PageMode::REDIRECT, $page->mode);
}
}
diff --git a/ext/pools/theme.php b/ext/pools/theme.php
index 2a00f816..79f8c2ec 100644
--- a/ext/pools/theme.php
+++ b/ext/pools/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PoolsTheme extends Themelet
{
/**
@@ -142,8 +144,7 @@ class PoolsTheme extends Themelet
$this->sidebar_options($page, $pool, $check_all);
}
}
- $tfe = new TextFormattingEvent($pool->description);
- send_event($tfe);
+ $tfe = send_event(new TextFormattingEvent($pool->description));
$page->add_block(new Block(html_escape($pool->title), $tfe->formatted, "main", 10));
}
}
@@ -361,7 +362,7 @@ class PoolsTheme extends Themelet
} elseif ($history['action'] == 0) {
$prefix = "-";
} else {
- throw new RuntimeException("history['action'] not in {0, 1}");
+ throw new \RuntimeException("history['action'] not in {0, 1}");
}
$images = trim($history['images']);
diff --git a/ext/post_peek/info.php b/ext/post_peek/info.php
index fe7f9f29..fa08270f 100644
--- a/ext/post_peek/info.php
+++ b/ext/post_peek/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PostPeekInfo extends ExtensionInfo
{
public const KEY = "post_peek";
diff --git a/ext/post_peek/main.php b/ext/post_peek/main.php
index d7941b6a..88cf5e9c 100644
--- a/ext/post_peek/main.php
+++ b/ext/post_peek/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PostPeek extends Extension
{
}
diff --git a/ext/post_peek/theme.php b/ext/post_peek/theme.php
index b1924f21..077c111c 100644
--- a/ext/post_peek/theme.php
+++ b/ext/post_peek/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PostPeekTheme extends Themelet
{
}
diff --git a/ext/post_titles/config.php b/ext/post_titles/config.php
index e5ed3af3..a711e435 100644
--- a/ext/post_titles/config.php
+++ b/ext/post_titles/config.php
@@ -2,6 +2,7 @@
declare(strict_types=1);
+namespace Shimmie2;
abstract class PostTitlesConfig
{
diff --git a/ext/post_titles/events/post_title_set_event.php b/ext/post_titles/events/post_title_set_event.php
index 2ab3a0a2..b0fd8f8a 100644
--- a/ext/post_titles/events/post_title_set_event.php
+++ b/ext/post_titles/events/post_title_set_event.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PostTitleSetEvent extends Event
{
public Image $image;
diff --git a/ext/post_titles/info.php b/ext/post_titles/info.php
index 2174d80e..1c1c87b0 100644
--- a/ext/post_titles/info.php
+++ b/ext/post_titles/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class PostTitlesInfo extends ExtensionInfo
{
public const KEY = "post_titles";
diff --git a/ext/post_titles/main.php b/ext/post_titles/main.php
index f4e5df19..0088964f 100644
--- a/ext/post_titles/main.php
+++ b/ext/post_titles/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
require_once "config.php";
require_once "events/post_title_set_event.php";
@@ -79,8 +81,8 @@ class PostTitles extends Extension
}
public function onBulkImport(BulkImportEvent $event)
{
- if (property_exists($event->fields, "title") && $event->fields->title!=null) {
- $this->set_title($event->image->id, $event->fields->title);
+ if (array_key_exists("title", $event->fields) && $event->fields['title']!=null) {
+ $this->set_title($event->image->id, $event->fields['title']);
}
}
diff --git a/ext/post_titles/theme.php b/ext/post_titles/theme.php
index 96303d14..aa3c9d35 100644
--- a/ext/post_titles/theme.php
+++ b/ext/post_titles/theme.php
@@ -1,6 +1,9 @@
owner_id!=$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
- throw new SCoreException("Cannot set another user's image to private.");
+ throw new SCoreException("Cannot set another user's image to public.");
}
self::publicize_image($image_id);
@@ -112,7 +114,7 @@ class PrivateImage extends Extension
{
global $user, $page;
- if ($event->image->private===true && $event->image->owner_id!=$user->id && !$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
+ if ($event->image->private==true && $event->image->owner_id!=$user->id && !$user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
$page->set_mode(PageMode::REDIRECT);
$page->set_redirect(make_link("post/list"));
}
@@ -219,7 +221,7 @@ class PrivateImage extends Extension
public function onImageAdminBlockBuilding(ImageAdminBlockBuildingEvent $event)
{
global $user;
- if ($user->can(Permissions::SET_PRIVATE_IMAGE) && $user->id==$event->image->owner_id) {
+ if (($user->can(Permissions::SET_PRIVATE_IMAGE) && $user->id==$event->image->owner_id) || $user->can(Permissions::SET_OTHERS_PRIVATE_IMAGES)) {
$event->add_part($this->theme->get_image_admin_html($event->image));
}
}
diff --git a/ext/private_image/theme.php b/ext/private_image/theme.php
index 8be0f28f..9f63c7d2 100644
--- a/ext/private_image/theme.php
+++ b/ext/private_image/theme.php
@@ -1,13 +1,16 @@
private===false) {
+ if ($image->private==false) {
$html = SHM_SIMPLE_FORM(
'privatize_image/'.$image->id,
INPUT(["type"=>'hidden', "name"=>'image_id', "value"=>$image->id]),
diff --git a/ext/qr_code/info.php b/ext/qr_code/info.php
index 7dc69e0c..8e9d5fd5 100644
--- a/ext/qr_code/info.php
+++ b/ext/qr_code/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class QRImageInfo extends ExtensionInfo
{
public const KEY = "qr_code";
@@ -11,7 +13,7 @@ class QRImageInfo extends ExtensionInfo
public string $url = "http://seemslegit.com";
public array $authors = ["Zach Hall"=>"zach@sosguy.net"];
public string $license = self::LICENSE_GPLV2;
- public string $description = "Turns BBCode into HTML";
+ public string $description = "Shows a QR Code for downloading a post to cell phones";
public ?string $documentation =
"Shows a QR Code for downloading a post to cell phones.
Based on Artanis's Link to Post Extension
", $iabbe->parts);
$h_reportedimages .= "
";
diff --git a/themes/rule34v2/themelet.class.php b/themes/rule34v2/themelet.class.php
index 54836e5e..ef194c73 100644
--- a/themes/rule34v2/themelet.class.php
+++ b/themes/rule34v2/themelet.class.php
@@ -1,5 +1,9 @@
get("thumb-block:{$image->id}");
- if ($cached) {
+ if (!is_null($cached)) {
return $cached;
}
diff --git a/themes/rule34v2/upload.theme.php b/themes/rule34v2/upload.theme.php
index 42b2e903..d80d76ea 100644
--- a/themes/rule34v2/upload.theme.php
+++ b/themes/rule34v2/upload.theme.php
@@ -1,6 +1,11 @@
get_string("login_tac", "");
if ($config->get_bool("login_tac_bbcode")) {
- $tfe = new TextFormattingEvent($tac);
- send_event($tfe);
- $tac = $tfe->formatted;
+ $tac = send_event(new TextFormattingEvent($tac))->formatted;
}
$form = SHM_SIMPLE_FORM(
diff --git a/themes/warm/page.class.php b/themes/warm/page.class.php
index 40c168d4..3ffcbab4 100644
--- a/themes/warm/page.class.php
+++ b/themes/warm/page.class.php
@@ -1,6 +1,9 @@
{$image_link}
- Report by $userlink: $h_reason
+ Report by $userlink: $h_reason
".make_form(make_link("image_report/remove"))."
diff --git a/ext/res_limit/info.php b/ext/res_limit/info.php
index 6b48d2d1..c407f628 100644
--- a/ext/res_limit/info.php
+++ b/ext/res_limit/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ResolutionLimitInfo extends ExtensionInfo
{
public const KEY = "res_limit";
diff --git a/ext/res_limit/main.php b/ext/res_limit/main.php
index 4169a1ad..69c61f33 100644
--- a/ext/res_limit/main.php
+++ b/ext/res_limit/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ResolutionLimit extends Extension
{
public function get_priority(): int
@@ -42,8 +44,8 @@ class ResolutionLimit extends Extension
continue;
}
$valids++;
- $width = $parts[0];
- $height = $parts[1];
+ $width = (int)$parts[0];
+ $height = (int)$parts[1];
if ($image->width / $width == $image->height / $height) {
$ok = true;
break;
diff --git a/ext/res_limit/test.php b/ext/res_limit/test.php
index ba1ef5c0..7bb9ee49 100644
--- a/ext/res_limit/test.php
+++ b/ext/res_limit/test.php
@@ -1,6 +1,9 @@
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());
}
@@ -49,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());
}
@@ -66,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());
}
diff --git a/ext/resize/info.php b/ext/resize/info.php
index edc2c99d..b7703588 100644
--- a/ext/resize/info.php
+++ b/ext/resize/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
/*
* Notice:
* The image resize and resample code is based off of the "smart_resize_image"
diff --git a/ext/resize/main.php b/ext/resize/main.php
index 3d34237d..96ca6ec3 100644
--- a/ext/resize/main.php
+++ b/ext/resize/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
abstract class ResizeConfig
{
public const ENABLED = 'resize_enabled';
@@ -134,10 +136,8 @@ class ResizeImage extends Extension
if (is_null($image)) {
$this->theme->display_error(404, "Post not found", "No image in the database has the ID #$image_id");
} else {
-
/* Check if options were given to resize an image. */
if (isset($_POST['resize_width']) || isset($_POST['resize_height'])) {
-
/* get options */
$width = $height = 0;
@@ -192,15 +192,14 @@ class ResizeImage extends Extension
throw new ImageResizeException("Unable to save temporary image file.");
}
- $mre = new MediaResizeEvent(
+ send_event(new MediaResizeEvent(
$config->get_string(ResizeConfig::ENGINE),
$event->path,
$event->mime,
$tmp_filename,
$new_width,
$new_height
- );
- send_event($mre);
+ ));
if ($event->file_modified===true&&$event->path!=$event->image->get_image_filename()) {
// This means that we're dealing with a temp file that will need cleaned up
diff --git a/ext/resize/theme.php b/ext/resize/theme.php
index 63240826..44937b1f 100644
--- a/ext/resize/theme.php
+++ b/ext/resize/theme.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
class ResizeImageTheme extends Themelet
{
/*
diff --git a/ext/rotate/info.php b/ext/rotate/info.php
index e18462ed..51c530d4 100644
--- a/ext/rotate/info.php
+++ b/ext/rotate/info.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
/*
* Notice:
* The image resize and resample code is based off of the "smart_resize_image"
diff --git a/ext/rotate/main.php b/ext/rotate/main.php
index a5820b15..030a2ac2 100644
--- a/ext/rotate/main.php
+++ b/ext/rotate/main.php
@@ -2,6 +2,8 @@
declare(strict_types=1);
+namespace Shimmie2;
+
// TODO Add warning that rotate doesn't support lossless webp output
/**
@@ -65,10 +67,8 @@ class RotateImage extends Extension
if (is_null($image)) {
$this->theme->display_error(404, "Post not found", "No image in the database has the ID #$image_id");
} else {
-
/* Check if options were given to rotate an image. */
if (isset($_POST['rotate_deg'])) {
-
/* get options */
$deg = 0;
@@ -153,13 +153,23 @@ class RotateImage extends Extension
/* Output to the same format as the original image */
switch ($info[2]) {
- case IMAGETYPE_GIF: $result = imagegif($image_rotated, $tmp_filename); break;
- case IMAGETYPE_JPEG: $result = imagejpeg($image_rotated, $tmp_filename); break;
- case IMAGETYPE_PNG: $result = imagepng($image_rotated, $tmp_filename, 9); break;
- case IMAGETYPE_WEBP: $result = imagewebp($image_rotated, $tmp_filename); break;
- case IMAGETYPE_BMP: $result = imagebmp($image_rotated, $tmp_filename, true); break;
- default:
- throw new ImageRotateException("Unsupported image type.");
+ case IMAGETYPE_GIF:
+ $result = imagegif($image_rotated, $tmp_filename);
+ break;
+ case IMAGETYPE_JPEG:
+ $result = imagejpeg($image_rotated, $tmp_filename);
+ break;
+ case IMAGETYPE_PNG:
+ $result = imagepng($image_rotated, $tmp_filename, 9);
+ break;
+ case IMAGETYPE_WEBP:
+ $result = imagewebp($image_rotated, $tmp_filename);
+ break;
+ case IMAGETYPE_BMP:
+ $result = imagebmp($image_rotated, $tmp_filename, true);
+ break;
+ default:
+ throw new ImageRotateException("Unsupported image type.");
}
if ($result===false) {
diff --git a/ext/rotate/theme.php b/ext/rotate/theme.php
index 732f099f..a8a08a26 100644
--- a/ext/rotate/theme.php
+++ b/ext/rotate/theme.php
@@ -1,6 +1,9 @@
get("rss-item-image:{$image->id}");
- if ($cached) {
+ if (!is_null($cached)) {
return $cached;
}
diff --git a/ext/rss_images/test.php b/ext/rss_images/test.php
index 06f19e46..89dc8acc 100644
--- a/ext/rss_images/test.php
+++ b/ext/rss_images/test.php
@@ -1,6 +1,9 @@
set_timeout(DATABASE_TIMEOUT+15000); // deleting users can take a while
+ # Database might not be connected at this point...
+ #$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")) {
diff --git a/ext/rule34/script.js b/ext/rule34/script.js
index b7d780a6..9d22a5e6 100644
--- a/ext/rule34/script.js
+++ b/ext/rule34/script.js
@@ -1,13 +1,12 @@
document.addEventListener('DOMContentLoaded', () => {
- if(Cookies.get("ui-tnc-agreed") !== "true") {
+ if(Cookies.get("ui-tnc-agreed") !== "true" && window.location.href.indexOf("/wiki/") == -1) {
$("BODY").addClass("censored");
$("BODY").append("");
$("BODY").append(""+
"
B) cookies may be used"+
- "";
+ $list = new \MicroHTML\HTMLElement("list", [$props]);
foreach ($tags as $tag) {
- $result .= $this->tag_to_xml($tag);
+ $list->appendChild(new \MicroHTML\HTMLElement("tag", [["id"=>$tag["id"], "count"=>$tag["count"]], $tag["tag"]]));
}
- return $result."
";
- }
- private function tag_to_xml(PDORow $tag): string
- {
- return
- "".captcha_get_html()." ".captcha_get_html()."
Contact -";
- $main_links_html = empty($main_links) ? "" : preg_replace('data-clink-sel="" ', '', preg_replace('/shm-clink/', 'mdl-navigation__link', $main_links));
+ $main_links_html = empty($main_links) ? "" : preg_replace('/data-clink-sel="" /', '', preg_replace('/shm-clink/', 'mdl-navigation__link', $main_links));
$search_html = "
$sitename
+ $sitename
$main_links_html
$search_html
$message_html
@@ -66,9 +71,23 @@ EOD
+
+
+
$contact_link Serving $num_comma posts –
- Running Shimmie2
+ Running Shimmie2
".$block->get_html(false)." ";
break;
case "main":
+ if ($main_headings == 1) {
+ $block->header = null;
+ }
$main_block_html .= $block->get_html(false);
break;
case "subheading":
@@ -122,8 +135,7 @@ EOD;
Tags
-
+