james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed key-generation process for cron upload so it doesn't endlessly generate new keys before the user first hits the same buttons in settings.

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-15 11:35:36 -05:00 committed by matthew
parent ed9bd5e788
commit ab9389007f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/cron_uploader/main.php
View File

@ -157,13 +157,14 @@ class CronUploader extends Extension
{ {
global $config; global $config;
// Set default values // Set default values
$config->set_default_int('cron_uploader_count', 1);
$this->set_dir();
$this->upload_key = $config->get_string("cron_uploader_key", ""); $this->upload_key = $config->get_string("cron_uploader_key", "");
if (strlen($this->upload_key) <= 0) { if (empty($this->upload_key)) {
$this->upload_key = $this->generate_key(); $this->upload_key = $this->generate_key();
$config->set_default_int('cron_uploader_count', 1); $config->set_string('cron_uploader_key', $this->upload_key);
$config->set_default_string('cron_uploader_key', $this->upload_key);
$this->set_dir();
} }
} }
@ -180,7 +181,7 @@ class CronUploader extends Extension
$sb->add_int_option("cron_uploader_count", "How many to upload each time"); $sb->add_int_option("cron_uploader_count", "How many to upload each time");
$sb->add_text_option("cron_uploader_dir", "<br>Set Cron Uploader root directory<br>"); $sb->add_text_option("cron_uploader_dir", "<br>Set Cron Uploader root directory<br>");
$sb->add_label("<br>Cron Command: <input type='text' size='60' value='$cron_cmd'><br> $sb->add_label("<br>Cron Command: <input type='text' size='60' readonly='readonly' value='".html_escape($cron_cmd)."'><br>
Create a cron job with the command above.<br/> Create a cron job with the command above.<br/>
<a href='$documentation_link'>Read the documentation</a> if you're not sure what to do."); <a href='$documentation_link'>Read the documentation</a> if you're not sure what to do.");