Version 4.1.19
This commit is contained in:
1 parent
28bd025b35
commit
2bd5025018
2674 files changed
+233518
-77766
No files matched your search
@@ -2,9 +2,9 @@
|
||||
/**
|
||||
* @brief Runs tasks
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - SVN_YYYY Invision Power Services, Inc.
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Social Suite
|
||||
* @package IPS Community Suite
|
||||
* @since 24 Jun 2013
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
@@ -22,7 +22,7 @@ if ( !isset( $_SERVER['argv'] ) )
|
||||
exit;
|
||||
}
|
||||
|
||||
/* Init IPS Social Suite */
|
||||
/* Init IPS Community Suite */
|
||||
require_once str_replace( 'applications/core/interface/task/task.php', 'init.php', str_replace( '\\', '/', __FILE__ ) );
|
||||
|
||||
/* Check key */
|
||||
@@ -31,7 +31,7 @@ if ( !\IPS\Settings::i()->task_use_cron )
|
||||
echo "Cron tasks not enabled.";
|
||||
exit;
|
||||
}
|
||||
if ( $_SERVER['argv'][1] !== \IPS\Settings::i()->task_cron_key )
|
||||
if ( !\IPS\CIC and $_SERVER['argv'][1] !== \IPS\Settings::i()->task_cron_key )
|
||||
{
|
||||
echo "Incorrect key\n";
|
||||
exit;
|
||||
@@ -40,6 +40,9 @@ if ( $_SERVER['argv'][1] !== \IPS\Settings::i()->task_cron_key )
|
||||
/* Execute */
|
||||
try
|
||||
{
|
||||
/* Ensure applications set up correctly before task is executed. Pages, for example, needs to set up spl autoloaders first */
|
||||
\IPS\Application::applications();
|
||||
|
||||
if( isset( $_SERVER['argv'][2] ) )
|
||||
{
|
||||
$task = \IPS\Task::load( $_SERVER['argv'][2] );
|
||||
@@ -61,6 +64,8 @@ try
|
||||
}
|
||||
catch ( \Exception $e )
|
||||
{
|
||||
\IPS\Log::log( $e, 'uncaught_exception' );
|
||||
|
||||
echo "Exception:\n";
|
||||
print_r( $e );
|
||||
exit;
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
<?php
|
||||
/**
|
||||
* @brief Runs tasks (web URL)
|
||||
* @author <a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
|
||||
* @copyright (c) 2001 - 2016 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/legal/standards/
|
||||
* @package IPS Community Suite
|
||||
* @since 17 Dec 2015
|
||||
* @version SVN_VERSION_NUMBER
|
||||
*/
|
||||
|
||||
/* Init IPS Community Suite */
|
||||
require_once str_replace( 'applications/core/interface/task/web.php', 'init.php', str_replace( '\\', '/', __FILE__ ) );
|
||||
|
||||
/* Set HTTP status */
|
||||
$http = ( isset( $_SERVER['SERVER_PROTOCOL'] ) and \strstr( $_SERVER['SERVER_PROTOCOL'], '/1.0' ) !== false ) ? '1.0' : '1.1';
|
||||
|
||||
/* Execute */
|
||||
try
|
||||
{
|
||||
/* Ensure applications set up correctly before task is executed. Pages, for example, needs to set up spl autoloaders first */
|
||||
\IPS\Application::applications();
|
||||
|
||||
if( \IPS\Settings::i()->task_use_cron != 'web' )
|
||||
{
|
||||
throw new \OutOfRangeException( "Invalid Task Method" );
|
||||
}
|
||||
|
||||
if( !\IPS\Login::compareHashes( (string) \IPS\Settings::i()->task_cron_key, (string) \IPS\Request::i()->key ) )
|
||||
{
|
||||
throw new \OutOfRangeException( "Invalid Key" );
|
||||
}
|
||||
|
||||
$task = \IPS\Task::queued();
|
||||
|
||||
if ( $task )
|
||||
{
|
||||
$task->runAndLog();
|
||||
}
|
||||
|
||||
@header( "HTTP/{$http} 200 OK" );
|
||||
print "Task Ran";
|
||||
}
|
||||
catch ( \Exception $e )
|
||||
{
|
||||
\IPS\Log::log( $e, 'uncaught_exception' );
|
||||
|
||||
@header( "HTTP/{$http} 500 Internal Server Error" );
|
||||
echo "Exception:\n";
|
||||
print $e->getMessage();
|
||||
}
|
||||
|
||||
/* Exit */
|
||||
exit;
|
||||
Reference in new issue
Block a user