2
2
3
3
namespace ctf0 \MediaManager \Controllers ;
4
4
5
- use App \Http \Controllers \Controller ;
6
- use Carbon \Carbon ;
7
5
use Exception ;
6
+ use Carbon \Carbon ;
8
7
use Illuminate \Http \Request ;
9
- use Storage ;
8
+ use App \ Http \ Controllers \ Controller ;
10
9
11
10
class MediaController extends Controller
12
11
{
13
- private $ fileSystem ;
14
- private $ storageDisk ;
15
- private $ ignoreFiles ;
16
- private $ fileChars ;
17
- private $ folderChars ;
18
- private $ sanitizedText ;
19
- private $ unallowed_mimes ;
20
- private $ fw ;
12
+ protected $ fileSystem ;
13
+ protected $ storageDisk ;
14
+ protected $ ignoreFiles ;
15
+ protected $ fileChars ;
16
+ protected $ folderChars ;
17
+ protected $ sanitizedText ;
18
+ protected $ unallowed_mimes ;
19
+ protected $ LMF ;
20
+ protected $ fw ;
21
21
22
22
public function __construct ()
23
23
{
24
24
$ this ->fileSystem = config ('mediaManager.storage_disk ' );
25
- $ this ->storageDisk = Storage:: disk ($ this ->fileSystem );
25
+ $ this ->storageDisk = app ( ' filesystem ' )-> disk ($ this ->fileSystem );
26
26
$ this ->ignoreFiles = config ('mediaManager.ignore_files ' );
27
27
$ this ->fileChars = config ('mediaManager.allowed_fileNames_chars ' );
28
28
$ this ->folderChars = config ('mediaManager.allowed_folderNames_chars ' );
29
29
$ this ->sanitizedText = config ('mediaManager.sanitized_text ' );
30
30
$ this ->unallowed_mimes = config ('mediaManager.unallowed_mimes ' );
31
+ $ this ->LMF = config ('mediaManager.last_modified_format ' );
31
32
$ this ->fw = config ('mediaManager.framework ' );
32
33
}
33
34
@@ -71,8 +72,8 @@ public function upload(Request $request)
71
72
72
73
// check name
73
74
// because dropzone automatically sanitize the file name
74
- if ($ file_name == '. ' . $ one ->getClientOriginalExtension ()) {
75
- $ file_name = $ this ->sanitizedText . $ file_name ;
75
+ if ($ file_name == '. ' . $ one ->getClientOriginalExtension ()) {
76
+ $ file_name = $ this ->sanitizedText . $ file_name ;
76
77
}
77
78
78
79
$ path = $ one ->storeAs ($ upload_path , $ this ->cleanName ($ file_name ), $ this ->fileSystem );
@@ -86,7 +87,7 @@ public function upload(Request $request)
86
87
$ result [] = [
87
88
'path ' => '' ,
88
89
'success ' => false ,
89
- 'message ' => "\"$ file_name \" " . $ e ->getMessage (),
90
+ 'message ' => "\"$ file_name \" " . $ e ->getMessage (),
90
91
];
91
92
}
92
93
}
@@ -229,7 +230,7 @@ public function move_file(Request $request)
229
230
$ destination = "{$ request ->destination }/ $ file_name " ;
230
231
$ file_name = "$ folderLocation/ $ file_name " ;
231
232
$ destination = strpos ($ destination , '../ ' ) == true
232
- ? '/ ' . dirname ($ folderLocation ). '/ ' . str_replace ('../ ' , '' , $ destination )
233
+ ? '/ ' . dirname ($ folderLocation ) . '/ ' . str_replace ('../ ' , '' , $ destination )
233
234
: "$ folderLocation/ $ destination " ;
234
235
235
236
try {
@@ -249,7 +250,7 @@ public function move_file(Request $request)
249
250
} catch (Exception $ e ) {
250
251
$ result [] = [
251
252
'success ' => false ,
252
- 'message ' => "\"$ file_name \" " . $ e ->getMessage (),
253
+ 'message ' => "\"$ file_name \" " . $ e ->getMessage (),
253
254
];
254
255
}
255
256
}
@@ -312,7 +313,7 @@ public function getFiles($dir)
312
313
'path ' => $ this ->storageDisk ->url ($ folder ),
313
314
'size ' => '' ,
314
315
'items ' => count ($ this ->storageDisk ->allFiles ($ folder )) + count ($ this ->storageDisk ->allDirectories ($ folder )),
315
- 'last_modified ' => Carbon::createFromTimestamp ($ this ->storageDisk ->lastModified ($ folder ))->toDateString (),
316
+ 'last_modified ' => Carbon::createFromTimestamp ($ this ->storageDisk ->lastModified ($ folder ))->{ $ this -> LMF } (),
316
317
];
317
318
}
318
319
}
@@ -324,7 +325,7 @@ public function getFiles($dir)
324
325
'type ' => $ this ->storageDisk ->mimeType ($ file ),
325
326
'path ' => $ this ->storageDisk ->url ($ file ),
326
327
'size ' => $ this ->storageDisk ->size ($ file ),
327
- 'last_modified ' => Carbon::createFromTimestamp ($ this ->storageDisk ->lastModified ($ file ))->toDateString (),
328
+ 'last_modified ' => Carbon::createFromTimestamp ($ this ->storageDisk ->lastModified ($ file ))->{ $ this -> LMF } (),
328
329
];
329
330
}
330
331
}
@@ -343,12 +344,12 @@ public function getFiles($dir)
343
344
protected function cleanName ($ text , $ folder = null )
344
345
{
345
346
$ pattern = [
346
- '/(script.*?\/script)|[^( ' . $ this ->fileChars . ')a-zA-Z0-9]+/ius ' ,
347
+ '/(script.*?\/script)|[^( ' . $ this ->fileChars . ')a-zA-Z0-9]+/ius ' ,
347
348
];
348
349
349
350
if ($ folder ) {
350
351
$ pattern = [
351
- '/(script.*?\/script)|[^( ' . $ this ->folderChars . ')a-zA-Z0-9]+/ius ' ,
352
+ '/(script.*?\/script)|[^( ' . $ this ->folderChars . ')a-zA-Z0-9]+/ius ' ,
352
353
];
353
354
}
354
355
0 commit comments