sydney/IPB
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 5.0.0 beta 1

Browse Source
This commit is contained in:
Neo committed 2025-12-19 16:27:35 -08:00
1 parent 25ddeb65d6
commit 15c7beabc5
6736 files changed
+627902 -497943
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

applications/core/tasks/s3Delete.php
+30 -20
View File
@@ -11,16 +11,26 @@
namespace IPS\core\tasks;
/* To prevent PHP errors (extending class does not exist) revealing path */
if ( !\defined( '\IPS\SUITE_UNIQUE_KEY' ) )
use IPS\Db;
use IPS\File;
use IPS\File\Amazon;
use IPS\Task;
use IPS\Task\Exception;
use UnderflowException;
use function count;
use function defined;
if ( !defined( '\IPS\SUITE_UNIQUE_KEY' ) )
{
header( ( isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0' ) . ' 403 Forbidden' );
header( ( $_SERVER['SERVER_PROTOCOL'] ?? 'HTTP/1.0' ) . ' 403 Forbidden' );
exit;
}
/**
* s3Delete Task
* s3_delete Task
*/
class _s3Delete extends \IPS\Task
class s3Delete extends Task
{
/**
* Execute
@@ -31,30 +41,30 @@ class _s3Delete extends \IPS\Task
* Tasks should execute within the time of a normal HTTP request.
*
* @return mixed Message to log or NULL
* @throws \IPS\Task\Exception
* @throws Exception
*/
public function execute()
public function execute() : mixed
{
try
{
$s3 = \IPS\Db::i()->select( '*', 'core_s3_deletions' )->first();
$s3 = Db::i()->select( '*', 'core_s3_deletions' )->first();
$obj = \IPS\File::getClass('core_Theme');
$obj = File::getClass('core_Theme');
if ( !( $obj instanceof \IPS\File\Amazon ) )
if ( !( $obj instanceof Amazon ) )
{
/* Class is not Amazon, so just stop here and truncate the table as there's nothing we can really do now. */
\IPS\Db::i()->delete( 'core_s3_deletions' );
\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 's3Delete' ) );
Db::i()->delete( 'core_s3_deletions' );
Db::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 's3Delete' ) );
return NULL;
}
$keys = $obj->getContainerKeys( $s3['s3_container'], 101, '', $s3['s3_marker'] );
$keys = $obj->getContainerKeys( $s3['s3_container'], 101, '', ( $s3['s3_marker'] ?? '' ) );
if ( \count( $keys ) )
if ( count( $keys ) )
{
/* Get the 51st key, which will be the marker for the next iteration if we have 51 keys, otherwise, make marker null so it's removed in the next iteration */
if ( \count( $keys ) < 101 )
if ( count( $keys ) < 101 )
{
$marker = NULL;
}
@@ -70,31 +80,31 @@ class _s3Delete extends \IPS\Task
{
if ( $time <= $s3['s3_added'] )
{
\IPS\File::getClass('core_Theme')->deleteByKey( $key );
File::getClass('core_Theme')->deleteByKey( $key );
}
}
if ( $marker )
{
/* Update the marker, there may be more to go */
\IPS\Db::i()->update( 'core_s3_deletions', array( 's3_marker' => $marker ), array( 's3_container=?', $s3['s3_container'] ) );
Db::i()->update( 'core_s3_deletions', array( 's3_marker' => $marker ), array( 's3_container=?', $s3['s3_container'] ) );
}
else
{
/* Last batch, possible some keys not deleted if time didn't match */
\IPS\Db::i()->delete( 'core_s3_deletions', array( 's3_container=?', $s3['s3_container'] ) );
Db::i()->delete( 'core_s3_deletions', array( 's3_container=?', $s3['s3_container'] ) );
}
}
else
{
/* If no keys, delete container row from s3_deletions */
\IPS\Db::i()->delete( 'core_s3_deletions', array( 's3_container=?', $s3['s3_container'] ) );
Db::i()->delete( 'core_s3_deletions', array( 's3_container=?', $s3['s3_container'] ) );
}
}
catch( \UnderflowException $ex )
catch( UnderflowException $ex )
{
/* Nothing to do, so switch off the task */
\IPS\Db::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 's3Delete' ) );
Db::i()->update( 'core_tasks', array( 'enabled' => 0 ), array( '`key`=?', 's3Delete' ) );
}
return NULL;