Merge remote-tracking branch 'origin/master' into oasis

# Conflicts:
#	.php-cs-fixer.cache
#	app/Http/helpers.php
#	app/Services/FileManagerService.php
#	composer.lock
#	public/chunks/environment-setup.js
#	public/chunks/files~chunks/shared/file-browser.js
#	public/js/main.js
#	public/mix-manifest.json

resources/js/App.vue

@@ -60,7 +60,7 @@ export default {
             this.$router.push({name: 'InstallationDisclaimer'})
 
         if (installation === 'setup-done')
-            this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.language)
+            this.$store.dispatch('getLanguageTranslations', this.$root.$data.config.locale)
                 .then(() => {
                     this.isLoaded = true
 

resources/js/components/FilesView/MobileToolbar.vue

@@ -2,8 +2,8 @@
     <div class="mobile-toolbar">
 
         <!-- Go back-->
-        <div @click="goBack" class="go-back-button">
-            <chevron-left-icon :class="{'is-visible': browseHistory.length > 1}" size="17" class="icon-back" />
+		<div @click="goBack" class="go-back-button" :class="{'is-visible': browseHistory.length > 1}">
+            <chevron-left-icon size="17" class="icon-back" />
         </div>
 
         <!--Folder Title-->
@@ -103,23 +103,25 @@
             white-space: nowrap;
         }
 
-        .go-back-button {
-            text-align: left;
-            flex: 1;
+		.go-back-button {
+			text-align: left;
+			flex: 1;
+			opacity: 0;
+			visibility: hidden;
+			pointer-events: none;
 
-            .icon-back {
-                vertical-align: middle;
-                cursor: pointer;
-                opacity: 0;
-                visibility: hidden;
-                margin-top: -2px;
+			.icon-back {
+				vertical-align: middle;
+				cursor: pointer;
+				margin-top: -2px;
+			}
 
-                &.is-visible {
-                    opacity: 1;
-                    visibility: visible;
-                }
-            }
-        }
+			&.is-visible {
+				pointer-events: initial;
+				visibility: visible;
+				opacity: 1;
+			}
+		}
 
         .directory-name {
             line-height: 1;

resources/js/helpers.js

@@ -215,13 +215,13 @@ const Helpers = {
 
                 isNotGeneralError = true,
 
-                striped_name = item.file.name
-                    .replace(/[^A-Za-z 0-9 \.,\?""!@#\$%\^&\*\(\)-_=\+;:<>\/\\\|\}\{\[\]`~]*/g, ''),
+                striped_spaces = item.file.name.replace(/\s/g, '-'),
+                striped_to_safe_characters = striped_spaces.match(/^[A-Za-z0-9._~()'!*:@,;+?-\W]*$/g),
 
-                filename = Array(16)
+                source_name = Array(16)
                     .fill(0)
                     .map(x => Math.random().toString(36).charAt(2))
-                    .join('') + '-' + striped_name + '.part'
+                    .join('') + '-' + striped_to_safe_characters + '.part'
 
             do {
                 let isLast = chunks.length === 1,
@@ -229,7 +229,8 @@ const Helpers = {
                     attempts = 0
 
                 // Set form data
-                formData.set('file', chunk, filename);
+                formData.set('filename', item.file.name);
+                formData.set('file', chunk, source_name);
                 formData.set('folder_id', item.folder_id)
                 formData.set('is_last', isLast);
 

resources/js/i18n/index.js

@@ -4,7 +4,7 @@ import VueI18n from 'vue-i18n';
 Vue.use(VueI18n);
 
 const i18n = new VueI18n({
-    locale: config.language,
+    locale: config.locale,
     silentTranslationWarn: true,
 });
 

resources/js/views/SetupWizard/EnvironmentSetup.vue

@@ -172,6 +172,9 @@ export default {
 
             if (this.storage.driver === 'backblaze')
                 this.storage.endpoint = 'https://s3.' + val + '.backblazeb2.com'
+
+			if (this.storage.driver === 'oss')
+				this.storage.endpoint = 'https://' + val + '.aliyuncs.com'
         },
     },
     computed: {
@@ -189,12 +192,65 @@ export default {
                 case 'backblaze':
                     return this.backblazeRegions
                     break
+				case 'oss':
+					return this.ossRegions
+					break
             }
         },
     },
     data() {
         return {
             isLoading: false,
+			ossRegions: [
+				{
+					label: 'China (Hangzhou)',
+					value: 'oss-cn-hangzhou',
+				},
+				{
+					label: 'China (Shanghai)',
+					value: 'oss-cn-shanghai',
+				},
+				{
+					label: 'China (Qingdao)',
+					value: 'oss-cn-qingdao',
+				},
+				{
+					label: 'China (Beijing)',
+					value: 'oss-cn-beijing',
+				},
+				{
+					label: 'China (Zhangjiakou)',
+					value: 'oss-cn-zhangjiakou',
+				},
+				{
+					label: 'China (Hohhot)',
+					value: 'oss-cn-huhehaote',
+				},
+				{
+					label: 'China (Ulanqab)',
+					value: 'oss-cn-wulanchabu',
+				},
+				{
+					label: 'China (Shenzhen)',
+					value: 'oss-cn-shenzhen',
+				},
+				{
+					label: 'China (Heyuan)',
+					value: 'oss-cn-heyuan',
+				},
+				{
+					label: 'China (Guangzhou)',
+					value: 'oss-cn-guangzhou',
+				},
+				{
+					label: 'China (Chengdu)',
+					value: 'oss-cn-chengdu',
+				},
+				{
+					label: 'China (Hong Kong)',
+					value: 'oss-cn-hongkong',
+				},
+			],
             wasabiRegions: [
                 {
                     label: 'US East 1 (N. Virginia)',
@@ -352,6 +408,10 @@ export default {
                     label: 'Backblaze B2 Cloud Storage',
                     value: 'backblaze',
                 },
+				{
+					label: 'Alibaba Cloud OSS',
+					value: 'oss',
+				},
             ],
             encryptionList: [
                 {

resources/views/index.blade.php

@@ -40,8 +40,7 @@
         let config = {
             host: '{{ url('/') }}',
             api: '{{ url('/api') }}',
-            locale: '{{ \Illuminate\Support\Facades\App::getLocale() }}',
-            language: '{{ $settings->language ?? 'en' }}',
+            locale: '{{ app()->getLocale() }}',
 
             app_color: '{{ $settings->app_color ?? '#00BC7E' }}',
             app_logo: '{{ $settings->app_logo ?? null }}',