Sync upstream (3.3)

.htaccess

@@ -19,7 +19,13 @@
     # RewriteRule (.*) https://%{SERVER_NAME}/$1 [L,R=301]
 
     ##
-    ## Uncomment to redirect index.php/path/to/page to /path/to/page
+    ## Uncomment to redirect trailing slashes in URLs.
+    ##
+    # RewriteCond %{REQUEST_FILENAME} !-d
+    # RewriteRule ^(.*)/$ /$1 [L,R=301]
+
+    ##
+    ## Uncomment to redirect /index.php/path to /path
     ##
     # RewriteRule ^index\.php/(.*)$ /$1 [L,R=301]
 

composer.json

@@ -6,7 +6,7 @@
     "license": "proprietary",
     "require": {
         "php": "^8.0.2",
-        "october/rain": "^3.2",
+        "october/rain": "^3.3",
         "laravel/framework": "^9.0"
     },
     "require-dev": {
@@ -40,6 +40,7 @@
     },
     "autoload": {
         "psr-4": {
+            "App\\": "app",
             "System\\Console\\": "modules/system/console"
         }
     },

config/backend.php

@@ -31,7 +31,14 @@
     |--------------------------------------------------------------------------
     |
     | The default backend customization settings. These values are all optional
-    | and remember to set the enabled value to true.
+    | and remember to set the enabled value to true. Supported values:
+    |
+    | - menu_mode: inline, text, tile, collapse, icons, left
+    | - color_mode: light, dark, auto
+    | - color_palette: default, classic, oxford, console, valentino, punch
+    | - login_background_type: color, wallpaper
+    | - login_background_wallpaper_size: auto, cover
+    | - login_image_type: autumn_images, custom
     |
     */
 
@@ -40,8 +47,12 @@
         'app_name' => env('APP_NAME', 'October CMS'),
         'tagline' => 'Administration Panel',
         'menu_mode' => 'icons',
-        'favicon_path' => '~/app/assets/images/logo.png',
+        'color_mode' => 'light',
+        'color_palette' => 'default',
         'logo_path' => '~/app/assets/images/logo.png',
+        'favicon_path' => '~/app/assets/images/favicon.png',
+        'menu_logo_path' => '~/app/assets/images/menu_logo.png',
+        'dashboard_icon_path' => '~/app/assets/images/dashboard_icon.png',
         'stylesheet_path' => '~/app/assets/less/styles.less',
         'login_background_type' => 'color',
         'login_background_color' => '#fef6eb',

config/cms.php

@@ -202,4 +202,19 @@
 
     'security_policy_v1' => env('CMS_SECURITY_POLICY_V1', false),
 
+    /*
+    |--------------------------------------------------------------------------
+    | V1 Exception Policy
+    |--------------------------------------------------------------------------
+    |
+    | When debug mode is off, throwing exceptions in AJAX will display a generic
+    | message, except for specific exception types such as ApplicationException
+    | and ValidationException (allow-list). Instead, you may use V1, which is
+    | a more relaxed policy that allows all messages and blocks common exception
+    | types (block-list) but may still leak information in rare cases.
+    |
+    */
+
+    'exception_policy_v1' => env('CMS_EXCEPTION_POLICY_V1', false),
+
 ];

config/media.php

@@ -20,7 +20,9 @@
     | Automatically Rename Filenames
     |--------------------------------------------------------------------------
     |
-    | When a media file is uploaded, automatically transform its filename.
+    | When a media file is uploaded, automatically transform its filename to
+    | something consistent. The "slug" mode will slug the file name for all
+    | uploads.
     |
     | Supported: "null", "slug"
     |

modules/backend/lang/ar.json

@@ -111,5 +111,9 @@
   "Please enter your login to restore the password.": "أدخل اسم المستخدم",
   "Restore": "استرجاع",
   "Reset": "استعادة",
-  "Forgot password?": "نسيت كلمة المرور؟"
+  "Forgot password?": "نسيت كلمة المرور؟",
+  "Manage Widgets": "إدارة التطبيقات",
+  "please select": "من فضلك اختار",
+  "Width": "العرض",
+  "full width": "عرض كامل"
 }

modules/backend/lang/ar/lang.php

@@ -14,9 +14,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'لوحة الإدارة',
-    'widget_width' => 'العرض',
-    'full_width' => 'عرض كامل',
-    'manage_widgets' => 'إدارة التطبيقات',
     'status' => [
       'widget_title_default' => 'حالة النظام',
       'update_available' => '{0} تحديث متاح!|{1} تحديث متاح!|[2,Inf] تحديثات متاحة!',
@@ -93,7 +90,6 @@
     'select' => 'تحديد',
     'select_all' => 'اختر الكل',
     'select_none' => 'لا تختر شيء',
-    'select_placeholder' => 'من فضلك اختار',
     'insert_row' => 'إضافة سجل',
     'return_to_list' => 'عودة للقائمة',
   ],

modules/backend/lang/be.json

@@ -118,5 +118,15 @@
   "Password has been reset. You may now sign in.": "Пароль быў зменены, цяпер Вы можаце ўвайсці",
   "Restore": "Аднавіць",
   "Reset": "Скасаваць",
-  "Forgot password?": "Забыліся пароль?"
+  "Forgot password?": "Забыліся пароль?",
+  "Manage Widgets": "Кіраванне віджэтамі",
+  "Add Widget": "Дадаць віджэт",
+  "Set the current layout as the default?": "Зрабіць дадзены макет заходным?",
+  "Make Default": "Зрабіць зыходным",
+  "Reset layout back to default?": "Скасаваць макет да зыходных наладаў",
+  "Reset Layout": "Скасаваць макет",
+  "Widget": "Віджэт",
+  "please select": "Калі ласка, выберыце",
+  "Width": "Шырыня віджэта",
+  "full width": "Поўная шырыня"
 }

modules/backend/lang/be/lang.php

@@ -38,11 +38,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'Панэль кіравання',
-    'widget_label' => 'Віджэт',
-    'widget_width' => 'Шырыня віджэта',
-    'full_width' => 'Поўная шырыня',
-    'manage_widgets' => 'Кіраванне віджэтамі',
-    'add_widget' => 'Дадаць віджэт',
     'widget_inspector_title' => 'Канфігурацыя віджэта',
     'widget_inspector_description' => 'Налада адлюстравання віджэта',
     'widget_columns_label' => 'Шырыня :columns',
@@ -53,11 +48,7 @@
     'widget_new_row_description' => 'Размясціць віджэт на новым радку',
     'widget_title_label' => 'Назва віджэта',
     'widget_title_error' => 'Віджэт павінен мець назву',
-    'reset_layout' => 'Скасаваць макет',
-    'reset_layout_confirm' => 'Скасаваць макет да зыходных наладаў',
     'reset_layout_success' => 'Макет быў скасаваны',
-    'make_default' => 'Зрабіць зыходным',
-    'make_default_confirm' => 'Зрабіць дадзены макет заходным?',
     'make_default_success' => 'Гэты макет цяпер зыходны',
     'status' => [
       'widget_title_default' => 'Статус сістэмы',
@@ -222,7 +213,6 @@
     'select' => 'Выбраць',
     'select_all' => 'абраць усё',
     'select_none' => 'выбраць няма',
-    'select_placeholder' => 'Калі ласка, выберыце',
     'insert_row' => 'Уставіць радок',
     'insert_row_below' => 'Уставіць радок ніжэй',
     'delete_row' => 'Выдаліць радок',

modules/backend/lang/bg.json

@@ -118,5 +118,10 @@
   "Password has been reset. You may now sign in.": "Вашата парола е  успешно нулирана. Сега може да се логнете.",
   "Restore": "Възстановяване",
   "Reset": "Нулиране",
-  "Forgot password?": "Забравена парола?"
+  "Forgot password?": "Забравена парола?",
+  "Add Widget": "Добави джаджа",
+  "Widget": "Джаджа",
+  "please select": "моля изберете",
+  "Width": "Широчина",
+  "full width": "Пълна ширина"
 }

modules/backend/lang/bg/lang.php

@@ -32,10 +32,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'Табло',
-    'widget_label' => 'Джаджа',
-    'widget_width' => 'Широчина',
-    'full_width' => 'Пълна ширина',
-    'add_widget' => 'Добави джаджа',
     'widget_inspector_title' => 'Настойка на джаджи',
     'widget_inspector_description' => 'Конфигуриране на джаджите за доклад',
     'widget_columns_label' => 'Ширина :columns',
@@ -183,7 +179,6 @@
     'select' => 'Избери',
     'select_all' => 'Избери всички',
     'select_none' => 'изберете никой',
-    'select_placeholder' => 'моля изберете',
     'insert_row' => 'Вмъкни ред',
     'insert_row_below' => 'Вмъкни ред По-долу',
     'delete_row' => 'Изтрии ред',

modules/backend/lang/ca.json

@@ -120,5 +120,15 @@
   "Restore": "Restaurar",
   "Reset": "Reiniciar",
   "Stay logged in": "Recordar-me",
-  "Forgot password?": "Has oblidat la teva contrasenya?"
+  "Forgot password?": "Has oblidat la teva contrasenya?",
+  "Manage Widgets": "Gestionar widgets",
+  "Add Widget": "Afegir widget",
+  "Set the current layout as the default?": "Convertir la disposició actual en els valors per defecte?",
+  "Make Default": "Desar per defecte",
+  "Reset layout back to default?": "Reiniciar la disposició als valors per defecte?",
+  "Reset Layout": "Reiniciar disposició",
+  "Widget": "Widget",
+  "please select": "si us plau selecciona",
+  "Width": "Ample",
+  "full width": "ample complet"
 }

modules/backend/lang/ca/lang.php

@@ -42,11 +42,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'Escriptori',
-    'widget_label' => 'Widget',
-    'widget_width' => 'Ample',
-    'full_width' => 'ample complet',
-    'manage_widgets' => 'Gestionar widgets',
-    'add_widget' => 'Afegir widget',
     'widget_inspector_title' => 'Configuració de widget',
     'widget_inspector_description' => 'Configurar el widget',
     'widget_columns_label' => 'Ample :columns',
@@ -57,11 +52,7 @@
     'widget_new_row_description' => 'Posar el widget en una nova fila.',
     'widget_title_label' => 'Títol del widget',
     'widget_title_error' => 'El títol del widget és obligatori.',
-    'reset_layout' => 'Reiniciar disposició',
-    'reset_layout_confirm' => 'Reiniciar la disposició als valors per defecte?',
     'reset_layout_success' => 'La disposició s\'ha reiniciat',
-    'make_default' => 'Desar per defecte',
-    'make_default_confirm' => 'Convertir la disposició actual en els valors per defecte?',
     'make_default_success' => 'La disposició actual és ara la disposició per defecte.',
     'collapse_all' => 'Contraure tots',
     'expand_all' => 'Expandir tots',
@@ -251,7 +242,6 @@
     'select' => 'Seleccionar',
     'select_all' => 'seleccionar tot',
     'select_none' => 'no selecciona cap',
-    'select_placeholder' => 'si us plau selecciona',
     'insert_row' => 'Inserir fila',
     'insert_row_below' => 'Inserir fila a sota',
     'delete_row' => 'Eliminar fila',

modules/backend/lang/cs.json

@@ -119,5 +119,15 @@
   "Restore": "Obnovit",
   "Reset": "Resetovat",
   "Stay logged in": "Zůstat přihlášený",
-  "Forgot password?": "Zapomněli jste heslo?"
+  "Forgot password?": "Zapomněli jste heslo?",
+  "Manage Widgets": "Správa widgetů",
+  "Add Widget": "Přidat widget",
+  "Set the current layout as the default?": "Nastavit aktuální uspořádání jako výchozí?",
+  "Make Default": "Nastavit jako výchozí",
+  "Reset layout back to default?": "Skutečně obnovit výchozí uspořádání?",
+  "Reset Layout": "Obnovit výchozí uspořádání",
+  "Widget": "Widget",
+  "please select": "Prosím vyberte",
+  "Width": "Šířka",
+  "full width": "Plná šířka"
 }

modules/backend/lang/cs/lang.php

@@ -38,11 +38,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'Plocha',
-    'widget_label' => 'Widget',
-    'widget_width' => 'Šířka',
-    'full_width' => 'Plná šířka',
-    'manage_widgets' => 'Správa widgetů',
-    'add_widget' => 'Přidat widget',
     'widget_inspector_title' => 'Nastavení widgetu',
     'widget_inspector_description' => 'Zde si upravte všechna nastavení widgetu',
     'widget_columns_label' => 'Šířka :columns',
@@ -53,11 +48,7 @@
     'widget_new_row_description' => 'Vloží widget do nového řádku',
     'widget_title_label' => 'Název widgetu',
     'widget_title_error' => 'Musíte zadat název widgetu',
-    'reset_layout' => 'Obnovit výchozí uspořádání',
-    'reset_layout_confirm' => 'Skutečně obnovit výchozí uspořádání?',
     'reset_layout_success' => 'Výchozí uspořádání bylo obnoveno',
-    'make_default' => 'Nastavit jako výchozí',
-    'make_default_confirm' => 'Nastavit aktuální uspořádání jako výchozí?',
     'make_default_success' => 'Aktuální uspořádání je nyní nastaveno jako výchozí',
     'collapse_all' => 'Vše sbalit',
     'expand_all' => 'Vše rozbalit',
@@ -243,7 +234,6 @@
     'select' => 'Vybrat',
     'select_all' => 'vybrat vše',
     'select_none' => 'vyberte žádný',
-    'select_placeholder' => 'Prosím vyberte',
     'insert_row' => 'Vložit řádek',
     'insert_row_below' => 'Vložit řádek pod',
     'delete_row' => 'Smazat řádek',

modules/backend/lang/da.json

@@ -118,5 +118,15 @@
   "Password has been reset. You may now sign in.": "Adgangskoden er blevet nulstillet. Du kan nu logge ind.",
   "Restore": "Genopret",
   "Reset": "Reset",
-  "Forgot password?": "Glemt din adgangskode?"
+  "Forgot password?": "Glemt din adgangskode?",
+  "Manage Widgets": "Administrer widgets",
+  "Add Widget": "Tilføj widget",
+  "Set the current layout as the default?": "Sæt det nuværende layout som standardlayout",
+  "Make Default": "Gør til standard",
+  "Reset layout back to default?": "Nulstil layout?",
+  "Reset Layout": "Nulstil layout",
+  "Widget": "Widget",
+  "please select": "Vælg venligst",
+  "Width": "Bredde",
+  "full width": "Fuld bredde"
 }

modules/backend/lang/da/lang.php

@@ -37,11 +37,6 @@
   ],
   'dashboard' => [
     'menu_label' => 'Dashboard',
-    'widget_label' => 'Widget',
-    'widget_width' => 'Bredde',
-    'full_width' => 'Fuld bredde',
-    'manage_widgets' => 'Administrer widgets',
-    'add_widget' => 'Tilføj widget',
     'widget_inspector_title' => 'Widget konfiguration',
     'widget_inspector_description' => 'Konfigurer widgeten',
     'widget_columns_label' => 'Bredde :columns',
@@ -52,11 +47,7 @@
     'widget_new_row_description' => 'Læg widget på ny række.',
     'widget_title_label' => 'Widget titel',
     'widget_title_error' => 'Widget titlen er påkrævet.',
-    'reset_layout' => 'Nulstil layout',
-    'reset_layout_confirm' => 'Nulstil layout?',
     'reset_layout_success' => 'Layoutet er blevet nulstillet',
-    'make_default' => 'Gør til standard',
-    'make_default_confirm' => 'Sæt det nuværende layout som standardlayout',
     'make_default_success' => 'Nuværende layout er standardlayoutet',
     'status' => [
       'widget_title_default' => 'System status',
@@ -217,7 +208,6 @@
     'select' => 'Vælg',
     'select_all' => 'Vælg alle',
     'select_none' => 'vælg ingen',
-    'select_placeholder' => 'Vælg venligst',
     'insert_row' => 'Indsæt Række',
     'insert_row_below' => 'Indsæt Række Nedeunder',
     'delete_row' => 'Slet Række',
@@ -355,7 +345,7 @@
     'styles' => 'Styles',
     'custom_stylesheet' => 'Custom stylesheet',
     'navigation' => 'Navigation',
-    'menu_mode' => 'Menu style',
+    'menu_mode' => 'Menu Style',
     'menu_mode_inline' => 'På linie',
     'menu_mode_tile' => 'Stablet',
     'menu_mode_collapsed' => 'Kollapset',

modules/backend/lang/de.json

@@ -120,5 +120,15 @@
   "Restore": "Wiederherstellen",
   "Reset": "Zurücksetzen",
   "Stay logged in": "Angemeldet bleiben",
-  "Forgot password?": "Passwort vergessen?"
+  "Forgot password?": "Passwort vergessen?",
+  "Manage Widgets": "Widgets verwalten",
+  "Add Widget": "Neues Widget",
+  "Set the current layout as the default?": "Das aktuelle Layout and Standard setzen",
+  "Make Default": "Setze Standard",
+  "Reset layout back to default?": "Layout auf Ursprungszustand zurücksetzen",
+  "Reset Layout": "Layout zurücksetzen",
+  "Widget": "Widget",
+  "please select": "Bitte auswählen",
+  "Width": "Breite",
+  "full width": "ganze Breite"
 }