Merge pull request #471 from Exileum/bugfix/cron-jobs

Fix cron jobs fail without global config variable
This commit is contained in:
Yuriy Pikhtarev 2018-06-27 00:03:12 +03:00 committed by GitHub
commit 25d8a7fa56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,8 +20,11 @@ class Cron
* *
* @param array $jobs * @param array $jobs
*/ */
public static function run_jobs($jobs) public static function run_jobs($jobs): void
{ {
/** @noinspection PhpUnusedLocalVariableInspection */
global $bb_cfg, $datastore;
\define('IN_CRON', true); \define('IN_CRON', true);
$sql = "SELECT cron_script FROM " . BB_CRON . " WHERE cron_id IN ($jobs)"; $sql = "SELECT cron_script FROM " . BB_CRON . " WHERE cron_id IN ($jobs)";
@ -64,7 +67,7 @@ class Cron
* *
* @param array $jobs * @param array $jobs
*/ */
public static function delete_jobs($jobs) public static function delete_jobs($jobs): void
{ {
DB()->query("DELETE FROM " . BB_CRON . " WHERE cron_id IN ($jobs)"); DB()->query("DELETE FROM " . BB_CRON . " WHERE cron_id IN ($jobs)");
} }
@ -75,7 +78,7 @@ class Cron
* @param array $jobs * @param array $jobs
* @param string $cron_action * @param string $cron_action
*/ */
public static function toggle_active($jobs, $cron_action) public static function toggle_active($jobs, $cron_action): void
{ {
$active = ($cron_action == 'disable') ? 0 : 1; $active = ($cron_action == 'disable') ? 0 : 1;
DB()->query("UPDATE " . BB_CRON . " SET cron_active = $active WHERE cron_id IN ($jobs)"); DB()->query("UPDATE " . BB_CRON . " SET cron_active = $active WHERE cron_id IN ($jobs)");
@ -113,7 +116,7 @@ class Cron
* *
* @param array $cron_arr * @param array $cron_arr
*/ */
public static function insert_cron_job($cron_arr) public static function insert_cron_job($cron_arr): void
{ {
$row = DB()->fetch_row("SELECT cron_title, cron_script FROM " . BB_CRON . " WHERE cron_title = '" . $_POST['cron_title'] . "' or cron_script = '" . $_POST['cron_script'] . "' "); $row = DB()->fetch_row("SELECT cron_title, cron_script FROM " . BB_CRON . " WHERE cron_title = '" . $_POST['cron_title'] . "' or cron_script = '" . $_POST['cron_script'] . "' ");
@ -156,7 +159,7 @@ class Cron
* *
* @param array $cron_arr * @param array $cron_arr
*/ */
public static function update_cron_job($cron_arr) public static function update_cron_job($cron_arr): void
{ {
$cron_id = $cron_arr['cron_id']; $cron_id = $cron_arr['cron_id'];
$cron_active = $cron_arr['cron_active']; $cron_active = $cron_arr['cron_active'];