Resolve real .env path and escape APP_URL for sed replacement

PHP-FPM's clear_env default strips shell environment variables, so the exported ASSET_URL was never visible to Laravel. This persists it to .env where Dotenv can read it.

app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php

@@ -39,17 +39,13 @@ class CreateSchedule extends CreateRecord
             $data['server_id'] = $server->id;
         }
 
-        $timezone = $data['timezone'] ?? user()->timezone ?? 'UTC';
-        unset($data['timezone']);
-
         if (!isset($data['next_run_at'])) {
             $data['next_run_at'] = ScheduleResource::getNextRun(
                 $data['cron_minute'],
                 $data['cron_hour'],
                 $data['cron_day_of_month'],
                 $data['cron_month'],
-                $data['cron_day_of_week'],
-                $timezone
+                $data['cron_day_of_week']
             );
         }
 

app/Filament/Server/Resources/Schedules/Pages/EditSchedule.php

@@ -37,16 +37,12 @@ class EditSchedule extends EditRecord
 
     protected function mutateFormDataBeforeSave(array $data): array
     {
-        $timezone = $data['timezone'] ?? user()->timezone ?? 'UTC';
-        unset($data['timezone']);
-
         $data['next_run_at'] = ScheduleResource::getNextRun(
             $data['cron_minute'],
             $data['cron_hour'],
             $data['cron_day_of_month'],
             $data['cron_month'],
-            $data['cron_day_of_week'],
-            $timezone
+            $data['cron_day_of_week']
         );
 
         return $data;

app/Filament/Server/Resources/Schedules/ScheduleResource.php

@@ -100,15 +100,13 @@ class ScheduleResource extends Resource
                 Section::make('Cron')
                     ->label(trans('server/schedule.cron'))
                     ->description(function (Get $get) {
-                        $timezone = $get('timezone') ?? user()->timezone ?? 'UTC';
-
                         try {
-                            $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'), $timezone)->timezone($timezone);
+                            $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'))->timezone(user()->timezone ?? 'UTC');
                         } catch (Exception) {
                             $nextRun = trans('server/schedule.invalid');
                         }
 
-                        return new HtmlString(trans('server/schedule.cron_body', ['timezone' => $timezone]) . '<br>' . trans('server/schedule.cron_timezone', ['timezone' => $timezone, 'next_run' => $nextRun]));
+                        return new HtmlString(trans('server/schedule.cron_body') . '<br>' . trans('server/schedule.cron_timezone', ['timezone' => user()->timezone ?? 'UTC', 'next_run' => $nextRun]));
                     })
                     ->schema([
                         Actions::make([
@@ -297,13 +295,6 @@ class ScheduleResource extends Resource
                                 'default' => 4,
                                 'lg' => 5,
                             ]),
-                        Select::make('timezone')
-                            ->label(trans('server/schedule.timezone'))
-                            ->options(fn () => array_combine(timezone_identifiers_list(), timezone_identifiers_list()))
-                            ->default(user()->timezone ?? 'UTC')
-                            ->searchable()
-                            ->live()
-                            ->hiddenOn('view'),
                     ])
                     ->columnSpanFull(),
             ]);
@@ -388,10 +379,10 @@ class ScheduleResource extends Resource
         ];
     }
 
-    public static function getNextRun(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek, string $timezone = 'UTC'): Carbon
+    public static function getNextRun(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek): Carbon
     {
         try {
-            return Utilities::getScheduleNextRunDate($minute, $hour, $dayOfMonth, $month, $dayOfWeek, $timezone);
+            return Utilities::getScheduleNextRunDate($minute, $hour, $dayOfMonth, $month, $dayOfWeek);
         } catch (Exception) {
             Notification::make()
                 ->title(trans('server/schedule.notification_invalid_cron'))

app/Helpers/Utilities.php

@@ -38,11 +38,11 @@ class Utilities
      *
      * @throws Exception
      */
-    public static function getScheduleNextRunDate(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek, string $timezone = 'UTC'): Carbon
+    public static function getScheduleNextRunDate(string $minute, string $hour, string $dayOfMonth, string $month, string $dayOfWeek): Carbon
     {
         return Carbon::instance((new CronExpression(
             sprintf('%s %s %s %s %s', $minute, $hour, $dayOfMonth, $month, $dayOfWeek)
-        ))->getNextRunDate(now($timezone)))->setTimezone('UTC');
+        ))->getNextRunDate(now('UTC')));
     }
 
     public static function checked(string $name, mixed $default): string

app/Http/Controllers/Api/Client/Servers/ScheduleController.php

@@ -75,7 +75,7 @@ class ScheduleController extends ClientApiController
             'cron_minute' => $request->input('minute'),
             'is_active' => (bool) $request->input('is_active'),
             'only_when_online' => (bool) $request->input('only_when_online'),
-            'next_run_at' => $this->getNextRunAt($request, $request->user()->timezone ?? 'UTC'),
+            'next_run_at' => $this->getNextRunAt($request),
         ]);
 
         Activity::event('server:schedule.create')
@@ -131,7 +131,7 @@ class ScheduleController extends ClientApiController
             'cron_minute' => $request->input('minute'),
             'is_active' => $active,
             'only_when_online' => (bool) $request->input('only_when_online'),
-            'next_run_at' => $this->getNextRunAt($request, $request->user()->timezone ?? 'UTC'),
+            'next_run_at' => $this->getNextRunAt($request),
         ];
 
         // Toggle the processing state of the scheduled task when it is enabled or disabled so that an
@@ -188,7 +188,7 @@ class ScheduleController extends ClientApiController
      *
      * @throws DisplayException
      */
-    protected function getNextRunAt(Request $request, string $timezone = 'UTC'): Carbon
+    protected function getNextRunAt(Request $request): Carbon
     {
         try {
             return Utilities::getScheduleNextRunDate(
@@ -196,8 +196,7 @@ class ScheduleController extends ClientApiController
                 $request->input('hour'),
                 $request->input('day_of_month'),
                 $request->input('month'),
-                $request->input('day_of_week'),
-                $timezone
+                $request->input('day_of_week')
             );
         } catch (Exception) {
             throw new DisplayException('The cron data provided does not evaluate to a valid expression.');

docker/entrypoint.sh

@@ -65,6 +65,20 @@ if [ "${BEHIND_PROXY}" == "true" ]; then
   export PARSED_APP_URL=":80"
   export PARSED_AUTO_HTTPS="auto_https off"
   export ASSET_URL=${APP_URL}
+
+  # Write ASSET_URL to .env so PHP-FPM workers can read it (clear_env = yes by default)
+  ENV_FILE="/var/www/html/.env"
+  if [ -e "$ENV_FILE" ]; then
+    ENV_FILE="$(readlink -f "$ENV_FILE")"
+  else
+    ENV_FILE="/pelican-data/.env"
+  fi
+  ESCAPED_APP_URL="$(printf '%s' "$APP_URL" | sed 's/[&|]/\\&/g')"
+  if grep -q "^ASSET_URL=" "$ENV_FILE"; then
+    sed -i "s|^ASSET_URL=.*|ASSET_URL=${ESCAPED_APP_URL}|" "$ENV_FILE"
+  else
+    echo "ASSET_URL=${APP_URL}" >> "$ENV_FILE"
+  fi
 fi
 
 # disable caddy if SKIP_CADDY is set

lang/en/server/schedule.php

@@ -29,8 +29,7 @@ return [
     'enabled' => 'Enable Schedule?',
     'enabled_hint' => 'This schedule will be executed automatically if enabled.',
 
-    'timezone' => 'Timezone',
-    'cron_body' => 'The cron inputs below use your timezone (:timezone).',
+    'cron_body' => 'Please keep in mind that the cron inputs below always assume UTC.',
     'cron_timezone' => 'Next run in your timezone (:timezone): <b> :next_run </b>',
 
     'invalid' => 'Invalid',