Merge branch 'develop' into feature/react-admin

app/Models/AuditLog.php

@@ -7,17 +7,17 @@ use Illuminate\Http\Request;
 use Illuminate\Container\Container;
 
 /**
- * @property int                             $id
- * @property string                          $uuid
- * @property bool                            $is_system
- * @property int|null                        $user_id
- * @property int|null                        $server_id
- * @property string                          $action
- * @property string|null                     $subaction
- * @property array                           $device
- * @property array                           $metadata
- * @property \Carbon\CarbonImmutable         $created_at
- * @property \Pterodactyl\Models\User|null   $user
+ * @property int $id
+ * @property string $uuid
+ * @property bool $is_system
+ * @property int|null $user_id
+ * @property int|null $server_id
+ * @property string $action
+ * @property string|null $subaction
+ * @property array $device
+ * @property array $metadata
+ * @property \Carbon\CarbonImmutable $created_at
+ * @property \Pterodactyl\Models\User|null $user
  * @property \Pterodactyl\Models\Server|null $server
  */
 class AuditLog extends Model
@@ -36,6 +36,8 @@ class AuditLog extends Model
     public const SERVER__BACKUP_COMPELTED = 'server:backup.completed';
     public const SERVER__BACKUP_DELETED = 'server:backup.deleted';
     public const SERVER__BACKUP_DOWNLOADED = 'server:backup.downloaded';
+    public const SERVER__BACKUP_LOCKED = 'server:backup.locked';
+    public const SERVER__BACKUP_UNLOCKED = 'server:backup.unlocked';
     public const SERVER__BACKUP_RESTORE_STARTED = 'server:backup.restore.started';
     public const SERVER__BACKUP_RESTORE_COMPLETED = 'server:backup.restore.completed';
     public const SERVER__BACKUP_RESTORE_FAILED = 'server:backup.restore.failed';

app/Models/Backup.php

@@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property int $server_id
  * @property string $uuid
  * @property bool $is_successful
+ * @property bool $is_locked
  * @property string $name
  * @property string[] $ignored_files
  * @property string $disk
@@ -46,6 +47,7 @@ class Backup extends Model
     protected $casts = [
         'id' => 'int',
         'is_successful' => 'bool',
+        'is_locked' => 'bool',
         'ignored_files' => 'array',
         'bytes' => 'int',
     ];
@@ -62,6 +64,7 @@ class Backup extends Model
      */
     protected $attributes = [
         'is_successful' => true,
+        'is_locked' => false,
         'checksum' => null,
         'bytes' => 0,
         'upload_id' => null,
@@ -79,6 +82,7 @@ class Backup extends Model
         'server_id' => 'bail|required|numeric|exists:servers,id',
         'uuid' => 'required|uuid',
         'is_successful' => 'boolean',
+        'is_locked' => 'boolean',
         'name' => 'required|string',
         'ignored_files' => 'array',
         'disk' => 'required|string',

app/Models/Schedule.php

@@ -18,6 +18,7 @@ use Pterodactyl\Contracts\Extensions\HashidsInterface;
  * @property string $cron_minute
  * @property bool $is_active
  * @property bool $is_processing
+ * @property bool $only_when_online
  * @property \Carbon\Carbon|null $last_run_at
  * @property \Carbon\Carbon|null $next_run_at
  * @property \Carbon\Carbon $created_at
@@ -63,6 +64,7 @@ class Schedule extends Model
         'cron_minute',
         'is_active',
         'is_processing',
+        'only_when_online',
         'last_run_at',
         'next_run_at',
     ];
@@ -75,6 +77,7 @@ class Schedule extends Model
         'server_id' => 'integer',
         'is_active' => 'boolean',
         'is_processing' => 'boolean',
+        'only_when_online' => 'boolean',
     ];
 
     /**
@@ -99,6 +102,7 @@ class Schedule extends Model
         'cron_minute' => '*',
         'is_active' => true,
         'is_processing' => false,
+        'only_when_online' => false,
     ];
 
     /**
@@ -114,6 +118,7 @@ class Schedule extends Model
         'cron_minute' => 'required|string',
         'is_active' => 'boolean',
         'is_processing' => 'boolean',
+        'only_when_online' => 'boolean',
         'last_run_at' => 'nullable|date',
         'next_run_at' => 'nullable|date',
     ];
@@ -122,6 +127,7 @@ class Schedule extends Model
      * Returns the schedule's execution crontab entry as a string.
      *
      * @return \Carbon\CarbonImmutable
+     *
      * @throws \Exception
      */
     public function getNextRunDate()

app/Models/Task.php

@@ -14,6 +14,7 @@ use Pterodactyl\Contracts\Extensions\HashidsInterface;
  * @property string $payload
  * @property int $time_offset
  * @property bool $is_queued
+ * @property bool $continue_on_failure
  * @property \Carbon\Carbon $created_at
  * @property \Carbon\Carbon $updated_at
  * @property string $hashid
@@ -30,6 +31,13 @@ class Task extends Model
      */
     public const RESOURCE_NAME = 'schedule_task';
 
+    /**
+     * The default actions that can exist for a task in Pterodactyl.
+     */
+    public const ACTION_POWER = 'power';
+    public const ACTION_COMMAND = 'command';
+    public const ACTION_BACKUP = 'backup';
+
     /**
      * The table associated with the model.
      *
@@ -56,6 +64,7 @@ class Task extends Model
         'payload',
         'time_offset',
         'is_queued',
+        'continue_on_failure',
     ];
 
     /**
@@ -69,6 +78,7 @@ class Task extends Model
         'sequence_id' => 'integer',
         'time_offset' => 'integer',
         'is_queued' => 'boolean',
+        'continue_on_failure' => 'boolean',
     ];
 
     /**
@@ -79,6 +89,7 @@ class Task extends Model
     protected $attributes = [
         'time_offset' => 0,
         'is_queued' => false,
+        'continue_on_failure' => false,
     ];
 
     /**
@@ -91,6 +102,7 @@ class Task extends Model
         'payload' => 'required_unless:action,backup|string',
         'time_offset' => 'required|numeric|between:0,900',
         'is_queued' => 'boolean',
+        'continue_on_failure' => 'boolean',
     ];
 
     /**