Search for images that are approved/not approved.
+approved:yes+
Returns images that have been approved.
+approved:no+
Returns images that have not been approved.
+/home/bob/uploads/holiday/2008/ and point
diff --git a/ext/bulk_add_csv/info.php b/ext/bulk_add_csv/info.php
index a2e6af69..30a407eb 100644
--- a/ext/bulk_add_csv/info.php
+++ b/ext/bulk_add_csv/info.php
@@ -1,15 +1,5 @@
- * License: GPLv2
- * Description: Bulk add server-side images with metadata from CSV file
- * Documentation:
- *
- *
- */
-
class BulkAddCSVInfo extends ExtensionInfo
{
public const KEY = "bulk_add_csv";
diff --git a/ext/bulk_remove/info.php b/ext/bulk_remove/info.php
index 7f90b825..6a48ee2b 100644
--- a/ext/bulk_remove/info.php
+++ b/ext/bulk_remove/info.php
@@ -1,14 +1,5 @@
- * Link: http://www.drudexsoftware.com/
- * License: GPLv2
- * Description: Allows admin to delete many images at once through Board Admin.
- * Documentation:
- *
- */
class BulkRemoveInfo extends ExtensionInfo
{
public const KEY = "bulk_remove";
diff --git a/ext/bulk_remove/main.php b/ext/bulk_remove/main.php
index 1d2517b3..50ea8edb 100644
--- a/ext/bulk_remove/main.php
+++ b/ext/bulk_remove/main.php
@@ -123,7 +123,7 @@ class BulkRemove extends Extension
$page->add_block(new Block(
"Bulk Remove Error",
"Please use Board Admin to use bulk remove."
- ));
+ ));
}
//
diff --git a/ext/comment/info.php b/ext/comment/info.php
index 600d1eab..38191656 100644
--- a/ext/comment/info.php
+++ b/ext/comment/info.php
@@ -1,15 +1,5 @@
- * Link: http://code.shishnet.org/shimmie2/
- * License: GPLv2
- * Description: Allow users to make comments on images
- * Documentation:
- * Formatting is done with the standard formatting API (normally BBCode)
- */
-
class CommentListInfo extends ExtensionInfo
{
public const KEY = "comment";
diff --git a/ext/comment/main.php b/ext/comment/main.php
index 3791ea00..8dca6983 100644
--- a/ext/comment/main.php
+++ b/ext/comment/main.php
@@ -367,7 +367,6 @@ class CommentList extends Extension
}
}
- // page building {{{
private function build_page(int $current_page)
{
global $cache, $database, $user;
@@ -417,9 +416,7 @@ class CommentList extends Extension
$this->theme->display_comment_list($images, $current_page, $total_pages, $user->can(Permissions::CREATE_COMMENT));
}
- // }}}
- // get comments {{{
/**
* #return Comment[]
*/
@@ -488,9 +485,7 @@ class CommentList extends Extension
ORDER BY comments.id ASC
", ["image_id"=>$image_id]);
}
- // }}}
- // add / remove / edit comments {{{
private function is_comment_limit_hit(): bool
{
global $config, $database;
@@ -651,5 +646,4 @@ class CommentList extends Extension
throw new CommentPostingException("Akismet thinks that your comment is spam. Try rewriting the comment, or logging in.");
}
}
- // }}}
}
diff --git a/ext/cron_uploader/config.php b/ext/cron_uploader/config.php
new file mode 100644
index 00000000..aa6637dc
--- /dev/null
+++ b/ext/cron_uploader/config.php
@@ -0,0 +1,97 @@
+set_default_int(self::COUNT, 1);
+ $config->set_default_string(self::DIR, data_path(self::DEFAULT_PATH));
+
+ $upload_key = $config->get_string(self::KEY, "");
+ if (empty($upload_key)) {
+ $upload_key = self::generate_key();
+
+ $config->set_string(self::KEY, $upload_key);
+ }
+ }
+
+ public static function get_user(): int
+ {
+ global $config;
+ return $config->get_int(self::USER);
+ }
+
+ public static function set_user(int $value): void
+ {
+ global $config;
+ $config->set_int(self::USER, $value);
+ }
+
+
+ public static function get_key(): string
+ {
+ global $config;
+ return $config->get_string(self::KEY);
+ }
+
+ public static function set_key(string $value): void
+ {
+ global $config;
+ $config->set_string(self::KEY, $value);
+ }
+
+ public static function get_count(): int
+ {
+ global $config;
+ return $config->get_int(self::COUNT);
+ }
+
+ public static function set_count(int $value): int
+ {
+ global $config;
+ $config->get_int(self::COUNT, $value);
+ }
+
+ public static function get_dir(): string
+ {
+ global $config;
+ $value = $config->get_string(self::DIR);
+ if (empty($value)) {
+ $value = data_path("cron_uploader");
+ self::set_dir($value);
+ }
+ return $value;
+ }
+
+ public static function set_dir(string $value): void
+ {
+ global $config;
+ $config->set_string(self::DIR, $value);
+ }
+
+
+ /*
+ * Generates a unique key for the website to prevent unauthorized access.
+ */
+ private static function generate_key()
+ {
+ $length = 20;
+ $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+ $randomString = '';
+
+ for ($i = 0; $i < $length; $i++) {
+ $randomString .= $characters [rand(0, strlen($characters) - 1)];
+ }
+
+ return $randomString;
+ }
+}
diff --git a/ext/cron_uploader/main.php b/ext/cron_uploader/main.php
index 68a85635..49f4f171 100644
--- a/ext/cron_uploader/main.php
+++ b/ext/cron_uploader/main.php
@@ -1,43 +1,31 @@
parent=="system") {
+ $event->add_nav_link("cron_docs", new Link('cron_upload'), "Cron Upload");
+ }
+ }
/**
* Checks if the cron upload page has been accessed
@@ -45,308 +33,354 @@ class CronUploader extends Extension
*/
public function onPageRequest(PageRequestEvent $event)
{
- global $config, $user;
+ global $user;
if ($event->page_matches("cron_upload")) {
- $this->upload_key = $config->get_string(self::CONFIG_KEY, "");
-
- // If the key is in the url, upload
- if ($this->upload_key != "" && $event->get_arg(0) == $this->upload_key) {
- // log in as admin
- $this->set_dir();
-
- $lockfile = fopen($this->root_dir . "/.lock", "w");
- if (!flock($lockfile, LOCK_EX | LOCK_NB)) {
- throw new Exception("Cron upload process is already running");
- }
- try {
- $this->process_upload(); // Start upload
- } finally {
- flock($lockfile, LOCK_UN);
- fclose($lockfile);
- }
- } elseif ($user->can(Permissions::BULK_ADD)) {
- $this->set_dir();
+ $key = $event->get_arg(0);
+ if (!empty($key)) {
+ $this->process_upload($key); // Start upload
+ } elseif ($user->can(Permissions::CRON_ADMIN)) {
$this->display_documentation();
}
}
}
- private function display_documentation()
- {
- global $page;
- $this->set_dir(); // Determines path to cron_uploader_dir
-
-
- $queue_dir = $this->root_dir . "/" . self::QUEUE_DIR;
- $uploaded_dir = $this->root_dir . "/" . self::UPLOADED_DIR;
- $failed_dir = $this->root_dir . "/" . self::FAILED_DIR;
-
- $queue_dirinfo = $this->scan_dir($queue_dir);
- $uploaded_dirinfo = $this->scan_dir($uploaded_dir);
- $failed_dirinfo = $this->scan_dir($failed_dir);
-
- $cron_url = make_http(make_link("/cron_upload/" . $this->upload_key));
- $cron_cmd = "curl --silent $cron_url";
- $log_path = $this->root_dir . "/uploads.log";
-
- $info_html = "Information
- | Directory | -Files | -Size (MB) | -Directory Path | -
| Queue | -{$queue_dirinfo['total_files']} | -{$queue_dirinfo['total_mb']} | -- |
| Uploaded | -{$uploaded_dirinfo['total_files']} | -{$uploaded_dirinfo['total_mb']} | -- |
| Failed | -{$failed_dirinfo['total_files']} | -{$failed_dirinfo['total_mb']} | -- |
| Cron upload is currently running | |||
| Directory | +Files | +Size (MB) | +Directory Path | +
| Queue | +{$queue_dirinfo['total_files']} | +{$queue_dirinfo['total_mb']} | +{$queue_dirinfo['path']} | +
| Uploaded | +{$uploaded_dirinfo['total_files']} | +{$uploaded_dirinfo['total_mb']} | +{$uploaded_dirinfo['path']} | +
| Failed | +{$failed_dirinfo['total_files']} | +{$failed_dirinfo['total_mb']} | +{$failed_dirinfo['path']} | +
$cron_url+ +
| {$entry["date_sent"]} | {$entry["message"]} |
|---|
| Failed dir | |
|---|---|
| " + ." |
| " + ." |
| " + ." |