mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Issue #5079 Warnings when running cron.php

Browse Source
This commit is contained in:
camer0n
2023-11-01 13:12:32 -07:00
parent f037d6e688
commit 1c452038fb
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cron.php
View File

@@ -34,8 +34,9 @@ $_E107['no_menus'] = true;
$_E107['allow_guest'] = true; // allow crons to run while in members-only mode. $_E107['allow_guest'] = true; // allow crons to run while in members-only mode.
$_E107['no_maintenance'] = true; $_E107['no_maintenance'] = true;
if (php_sapi_name() !== "cli" && $_E107['debug'] === false) if ((PHP_SAPI === "apache" || PHP_SAPI === "litespeed") && $_E107['debug'] === false)
{ {
error_log("e107: cron.php was blocked from executing with PHP_SAPI: ".php_sapi_name(), E_USER_NOTICE);
header('HTTP/1.0 403 Forbidden'); header('HTTP/1.0 403 Forbidden');
echo "<h1>Access Denied</h1>"; echo "<h1>Access Denied</h1>";
exit; exit;

36
e107_handlers/cron_class.php
View File

@@ -273,17 +273,16 @@ class _system_cron
function procEmailBounce() function procEmailBounce()
{ {
//global $pref; //global $pref;
if (CRON_MAIL_DEBUG) if (defset('CRON_MAIL_DEBUG'))
{ {
$e107 = e107::getInstance(); e107::getLog()->addEvent(10,debug_backtrace(),'DEBUG','CRON Bounce','Bounce processing started',FALSE,LOG_TO_ROLLING);
$e107->admin_log->addEvent(10,debug_backtrace(),'DEBUG','CRON Bounce','Bounce processing started',FALSE,LOG_TO_ROLLING);
} }
require_once(e_HANDLER.'pop_bounce_handler.php'); require_once(e_HANDLER.'pop_bounce_handler.php');
$mailBounce = new pop3BounceHandler(); $mailBounce = new pop3BounceHandler();
$mailBounce->processBounces(); $mailBounce->processBounces();
if (CRON_MAIL_DEBUG) if (defset('CRON_MAIL_DEBUG'))
{ {
$e107->admin_log->addEvent(10,debug_backtrace(),'DEBUG','CRON Bounce','Bounce processing completed',FALSE,LOG_TO_ROLLING); e107::getLog()->addEvent(10,debug_backtrace(),'DEBUG','CRON Bounce','Bounce processing completed',FALSE,LOG_TO_ROLLING);
} }
} }
@@ -461,6 +460,8 @@ class CronParser
*/ */
function expand_ranges($str) function expand_ranges($str)
{ {
$ret = [];
if (strpos($str, ",") !== false) if (strpos($str, ",") !== false)
{ {
$arParts = explode(',', $str); $arParts = explode(',', $str);
@@ -809,7 +810,7 @@ class CronParser
{ {
if ($arr[$i] < $low) if ($arr[$i] < $low)
{ {
$this->debug("Remove out of range element. {$arr[$i]} is outside $low - $high"); $this->debug("Remove out of range element. $arr[$i] is outside $low - $high");
unset($arr[$i]); unset($arr[$i]);
} }
else else
@@ -822,7 +823,7 @@ class CronParser
{ {
if ($arr[$i] > $high) if ($arr[$i] > $high)
{ {
$this->debug("Remove out of range element. {$arr[$i]} is outside $low - $high"); $this->debug("Remove out of range element. $arr[$i] is outside $low - $high");
unset ($arr[$i]); unset ($arr[$i]);
} }
else else
@@ -1130,7 +1131,7 @@ class cronScheduler
if(empty($job['active'])) if(empty($job['active']))
{ {
return $status; return false;
} }
// Calculate the last due time before this moment. // Calculate the last due time before this moment.
@@ -1144,12 +1145,12 @@ class cronScheduler
if($due <= (time() - 45)) if($due <= (time() - 45))
{ {
return $status; return false;
} }
if($job['path'] != '_system' && !is_readable(e_PLUGIN . $job['path'] . "/e_cron.php")) if($job['path'] != '_system' && !is_readable(e_PLUGIN . $job['path'] . "/e_cron.php"))
{ {
return $status; return false;
} }
if($this->debug) if($this->debug)
@@ -1202,7 +1203,7 @@ class cronScheduler
catch(Exception $e) catch(Exception $e)
{ {
$msg = $e->getFile() . ' ' . $e->getLine(); $msg = $e->getFile() . ' ' . $e->getLine();
$msg .= "\n\n" . $e->getCode() . '' . $e->getMessage(); $msg .= "\n\n" . $e->getCode() . ' ' . $e->getMessage();
$msg .= "\n\n" . implode("\n", $e->getTrace()); $msg .= "\n\n" . implode("\n", $e->getTrace());
$mail = array( $mail = array(
@@ -1223,7 +1224,7 @@ class cronScheduler
{ {
if($this->debug) if($this->debug)
{ {
echo "<br />Method returned message: [{$class}::" . $job['function'] . '] ' . $status; echo "<br />Method returned message: [$class::" . $job['function'] . '] ' . $status;
} }
$msg = 'Method returned message: [{' . $class . '}::' . $job['function'] . '] ' . $status; $msg = 'Method returned message: [{' . $class . '}::' . $job['function'] . '] ' . $status;
@@ -1257,7 +1258,16 @@ class cronScheduler
*/ */
public function validateToken() public function validateToken()
{ {
$pwd = ($this->debug && $_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : trim($_SERVER['argv'][1]); $pwd = '';
if($this->debug && !empty($_SERVER['QUERY_STRING']))
{
$pwd = $_SERVER['QUERY_STRING'];
}
elseif(!empty($_SERVER['argv'][1]))
{
$pwd = trim($_SERVER['argv'][1]);
}
if(!empty($_GET['token'])) if(!empty($_GET['token']))
{ {