[pull] master from LycheeOrg:master

.editorconfig

@@ -8,9 +8,19 @@ indent_style = tab
 indent_size = 4
 trim_trailing_whitespace = true
 
+[composer.json]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+
 [*.md]
 trim_trailing_whitespace = false
 
 [*.js]
 indent_style = tab
 indent_size = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2

.env.example

@@ -2,12 +2,37 @@ APP_NAME=Lychee
 APP_ENV=production
 APP_KEY=
 APP_DEBUG=false
+# This MUST contain the host name up to the Top Level Domain (tld) e.g. .com, .org etc.
 APP_URL=http://localhost
+APP_FORCE_HTTPS=false
+
+# If using Lychee in a sub folder, specify the path after the tld here.
+# For example for https://lychee.test/path/to/lychee
+# Set APP_URL=https://lychee.test
+# and APP_DIR=/path/to/lychee
+# We (LycheeOrg) do not recommend the use of APP_DIR.
+# APP_DIR=
 
 # enable or disable debug bar. By default it is disabled.
+# Do note that this disable CSP!!
 DEBUGBAR_ENABLED=false
 
-LOG_CHANNEL=stack
+# enable or disable the v6 layout.
+VUEJS_ENABLED=true
+
+# enable or disable log viewer. By default it is enabled.
+LOG_VIEWER_ENABLED=true
+
+# enable or disable clockwork. By default it is disabled (and not provided on non-dev build).
+CLOCKWORK_ENABLE=false
+
+# enable s3 bucket (required in addition to needing AWS_ACCESS_KEY_ID)
+# S3_ENABLED=true
+
+# If you spread old links of to your albums in your Lychee instance starting with
+# https://lychee.text/#albumID/PhotoId
+# Set this value to true to enable redirection.
+LEGACY_V4_REDIRECT=false
 
 ##############################################################################
 # IMPORTANT: To migrate from Lychee v3 you *MUST* use the same MySQL/MariaDB #
@@ -28,24 +53,59 @@ DB_PORT=
 DB_USERNAME=
 DB_PASSWORD=
 DB_LOG_SQL=false
+DB_LOG_SQL_EXPLAIN=false #only for MySQL
+
+# List foreign keys in diagnostic page
+DB_LIST_FOREIGN_KEYS=false
+
+# Application timezone. If not specified, the server's default timezone is used.
+# Requires a named timezone identifier.
+# See https://www.php.net/manual/en/timezones.php for the list of supported timezones.
+# Don't use a timezone offset (like +01:00) or a timezone abbreviation (like CEST)
+# TIMEZONE=Europe/Paris
 
-TIMEZONE=UTC
+# Visibility of directories and (media) files in LYCHEE_UPLOADS
+# Possible values are:
+#
+#  - private: world group has neither read nor write access
+#  - public: world group has read access but no write access (the default)
+#  - world: world group has read and write access
+#
+# The default should suffice for most installations.
+# For improved security, change this setting to "private".
+# Some rare setups may require directories and files to be world writeable.
+# In this case, use "world" here.
+# USE WITH PRECAUTIONS: world writeable files and folders may be a SECURITY RISK.
+# LYCHEE_IMAGE_VISIBILITY=public
 
 # folders in which the files will be stored
-# LYCHEE_DIST="/var/www/html/Lychee-Laravel/public/dist/"
 # LYCHEE_UPLOADS="/var/www/html/Lychee-Laravel/public/uploads/"
-
+# LYCHEE_DIST="/var/www/html/Lychee-Laravel/public/dist/"
+# LYCHEE_SYM="/var/www/html/Lychee-Laravel/public/sym/"
 # url to access those files
-# LYCHEE_DIST_URL="dist/"
 # LYCHEE_UPLOADS_URL="uploads/"
+# LYCHEE_DIST_URL="dist/"
+# LYCHEE_SYM_URL="sym/"
+
+# Support for token based authentication used by API requests. Enabled by default.
+# ENABLE_TOKEN_AUTH=true
 
-BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
+# `sync` if jobs needs to be executed live (default) or `database` if they can be defered.
+QUEUE_CONNECTION=sync
 
 SECURITY_HEADER_HSTS_ENABLE=false
+SECURITY_HEADER_CSP_CONNECT_SRC=
+SECURITY_HEADER_SCRIPT_SRC_ALLOW=
+SECURITY_HEADER_CSP_CHILD_SRC=
+SECURITY_HEADER_CSP_FONT_SRC=
+SECURITY_HEADER_CSP_FORM_ACTION=
+SECURITY_HEADER_CSP_FRAME_SRC=
+SECURITY_HEADER_CSP_IMG_SRC=
+SECURITY_HEADER_CSP_MEDIA_SRC=
+SESSION_SECURE_COOKIE=false
 
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
@@ -60,10 +120,87 @@ MAIL_ENCRYPTION=
 MAIL_FROM_NAME=
 MAIL_FROM_ADDRESS=
 
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
+# The trusted proxies if Lychee is behind a reverse proxy
+# Accepted values:
+#  - `null`: no proxy
+#  - `*`: any proxy
+#  - <ip address>[,<ip address>]: a comma-seperated list of IP addresses
+TRUSTED_PROXIES=null
+
+# Comma-separated list of class names of diagnostics checks that should be skipped.
+#SKIP_DIAGNOSTICS_CHECKS=
+
+VITE_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+VITE_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+# Oauth token data
+# XXX_REDIRECT_URI should be left as default unless you know exactly what you do.
+
+# AMAZON_SIGNIN_CLIENT_ID=
+# AMAZON_SIGNIN_SECRET=
+# AMAZON_SIGNIN_REDIRECT_URI=/auth/amazon/redirect
+
+# https://developer.okta.com/blog/2019/06/04/what-the-heck-is-sign-in-with-apple
+# Note: the client secret used for "Sign In with Apple" is a JWT token that can have a maximum lifetime of 6 months.
+# The article above explains how to generate the client secret on demand and you'll need to update this every 6 months.
+# To generate the client secret for each request, see Generating A Client Secret For Sign In With Apple On Each Request.
+# https://bannister.me/blog/generating-a-client-secret-for-sign-in-with-apple-on-each-request
+# APPLE_CLIENT_ID=
+# APPLE_CLIENT_SECRET=
+# APPLE_REDIRECT_URI=/auth/apple/redirect
+
+# FACEBOOK_CLIENT_ID=
+# FACEBOOK_CLIENT_SECRET=
+# FACEBOOK_REDIRECT_URI=/auth/facebook/redirect
+
+# GITHUB_CLIENT_ID=
+# GITHUB_CLIENT_SECRET=
+# GITHUB_REDIRECT_URI=/auth/github/redirect
+
+# GOOGLE_CLIENT_ID=
+# GOOGLE_CLIENT_SECRET=
+# GOOGLE_REDIRECT_URI=/auth/google/redirect
+
+# MASTODON_DOMAIN=https://mastodon.social
+# MASTODON_ID=
+# MASTODON_SECRET=
+# MASTODON_REDIRECT_URI=/auth/mastodon/redirect
+
+# MICROSOFT_CLIENT_ID=
+# MICROSOFT_CLIENT_SECRET=
+# MICROSOFT_REDIRECT_URI=/auth/microsoft/redirect
+
+# NEXTCLOUD_CLIENT_ID=
+# NEXTCLOUD_CLIENT_SECRET=
+# NEXTCLOUD_REDIRECT_URI=/auth/nextcloud/redirect
+# NEXTCLOUD_BASE_URI=
+
+# KEYCLOAK_CLIENT_ID=
+# KEYCLOAK_CLIENT_SECRET=
+# KEYCLOAK_REDIRECT_URI=/auth/keycloak/redirect
+# KEYCLOAK_BASE_URL=
+# KEYCLOAK_REALM=
+
+# AUTHENTIK_BASE_URL=
+# AUTHENTIK_CLIENT_ID=
+# AUTHENTIK_CLIENT_SECRET=
+# AUTHENTIK_REDIRECT_URI=/auth/authentik/redirect
+
+# AWS support data
+
+# AWS_ACCESS_KEY_ID=
+# AWS_SECRET_ACCESS_KEY=
+# AWS_DEFAULT_REGION=
+# AWS_BUCKET=
+# AWS_URL=
+# AWS_ENDPOINT=
+# AWS_IMAGE_VISIBILITY=
+# AWS_USE_PATH_STYLE_ENDPOINT=
 
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+###################################################################
+# Vite local development without running a server.                #
+# set VITE_LOCAL_DEV to true                                       #
+# set VITE_HTTP_PROXY_TARGET to the rediction for the API calls.  #
+###################################################################
+# VITE_LOCAL_DEV=true
+# VITE_HTTP_PROXY_TARGET=http://localhost:8000

.gitattributes

@@ -1,4 +1,4 @@
-* text=auto
+* text=auto eol=lf
 *.css linguist-vendored
 *.scss linguist-vendored
 *.js linguist-vendored

.github/DISCUSSION_TEMPLATE/bugs.yml

@@ -0,0 +1,68 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Create a bug report to help us improve, do not ignore the [REQUIRED] sections.
+        We understand this can be frustrating, take your time and relax. We are usually
+        pretty quick to answer. :)  
+        Valid bug report will be converted into proper issues to track their advancement.
+  - type: input
+    id: lychee-version
+    attributes:
+      label: Lychee version
+      description: Which version of Lychee are you using? Please provide the full version, e.g. v3.2.6.
+      placeholder: v5.1.2
+    validations:
+      required: true
+
+  - type: dropdown
+    id: php-version
+    attributes:
+      label: Which PHP version are you using?
+      options:
+        - PHP 8.4
+        - PHP 8.3
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Detailed description of the problem
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Steps to reproduce the issue
+      description: | 
+        Which steps do we need to take to reproduce the problem you are having?
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+
+  - type: textarea
+    attributes:
+      label: Diagnostics [REQUIRED]
+      description: | 
+        Paste here is the content of your diagnostics.  
+        *(Settings => Diagnostics or https://example.com/Diagnostics or `php artisan lychee:diagnostics`)*
+      placeholder: |
+        ```
+        Paste result here
+        ```
+
+  - type: textarea
+    attributes:
+      label: Browser & System [REQUIRED]
+
+  - type: checkboxes
+    attributes:
+      label: Please confirm (incomplete submissions will not be addressed)
+      options:
+        - label: I have provided easy and step-by-step instructions to reproduce the bug.
+          required: true
+        - label: I understand my bug report will be removed if I haven't met the criteria above.
+          required: true

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -0,0 +1,14 @@
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Suggest an idea for this project. :)  
+
+        Valid ideas will be converted into proper issues to track their advancement.
+
+  - type: textarea
+    attributes:
+      label: Enhancement
+      description: Explain in a few words which functionality or improvements you would like to see in Lychee.
+    validations:
+      required: true

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: LycheeOrg # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+# patreon: # Replace with a single Patreon username
+open_collective: LycheeOrg
+# ko_fi: # Replace with a single Ko-fi username
+# tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+# community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+# liberapay: # Replace with a single Liberapay username
+# issuehunt: # Replace with a single IssueHunt username
+# otechie: # Replace with a single Otechie username
+# lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+# custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']