Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 1a7a54b

Browse files
committed
add new option for last_modified time
...
1 parent cd45162 commit 1a7a54b

File tree

3 files changed

+36
-22
lines changed

3 files changed

+36
-22
lines changed

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,11 @@ return [
124124
* css farmework
125125
*/
126126
'framework' => env('MIX_MM_FRAMEWORK'),
127+
128+
/*
129+
* display file last modification time as
130+
*/
131+
'last_modified_format' => 'toDateString',
127132
];
128133
```
129134

@@ -171,4 +176,3 @@ new Vue({
171176

172177
* Add Support To Other Css Frameworks.
173178
* Add Support For Editors usage "tinymce / Ckeditor/ etc..".
174-
* Fix `sortBy:size` To Work Properly With (kb vs Mb).

src/Controllers/MediaController.php

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,33 @@
22

33
namespace ctf0\MediaManager\Controllers;
44

5-
use App\Http\Controllers\Controller;
6-
use Carbon\Carbon;
75
use Exception;
6+
use Carbon\Carbon;
87
use Illuminate\Http\Request;
9-
use Storage;
8+
use App\Http\Controllers\Controller;
109

1110
class MediaController extends Controller
1211
{
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;
2121

2222
public function __construct()
2323
{
2424
$this->fileSystem = config('mediaManager.storage_disk');
25-
$this->storageDisk = Storage::disk($this->fileSystem);
25+
$this->storageDisk = app('filesystem')->disk($this->fileSystem);
2626
$this->ignoreFiles = config('mediaManager.ignore_files');
2727
$this->fileChars = config('mediaManager.allowed_fileNames_chars');
2828
$this->folderChars = config('mediaManager.allowed_folderNames_chars');
2929
$this->sanitizedText = config('mediaManager.sanitized_text');
3030
$this->unallowed_mimes = config('mediaManager.unallowed_mimes');
31+
$this->LMF = config('mediaManager.last_modified_format');
3132
$this->fw = config('mediaManager.framework');
3233
}
3334

@@ -71,8 +72,8 @@ public function upload(Request $request)
7172

7273
// check name
7374
// 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;
7677
}
7778

7879
$path = $one->storeAs($upload_path, $this->cleanName($file_name), $this->fileSystem);
@@ -86,7 +87,7 @@ public function upload(Request $request)
8687
$result[] = [
8788
'path' => '',
8889
'success' => false,
89-
'message' => "\"$file_name\" ".$e->getMessage(),
90+
'message' => "\"$file_name\" " . $e->getMessage(),
9091
];
9192
}
9293
}
@@ -229,7 +230,7 @@ public function move_file(Request $request)
229230
$destination = "{$request->destination}/$file_name";
230231
$file_name = "$folderLocation/$file_name";
231232
$destination = strpos($destination, '../') == true
232-
? '/'.dirname($folderLocation).'/'.str_replace('../', '', $destination)
233+
? '/' . dirname($folderLocation) . '/' . str_replace('../', '', $destination)
233234
: "$folderLocation/$destination";
234235

235236
try {
@@ -249,7 +250,7 @@ public function move_file(Request $request)
249250
} catch (Exception $e) {
250251
$result[] = [
251252
'success' => false,
252-
'message' => "\"$file_name\" ".$e->getMessage(),
253+
'message' => "\"$file_name\" " . $e->getMessage(),
253254
];
254255
}
255256
}
@@ -312,7 +313,7 @@ public function getFiles($dir)
312313
'path' => $this->storageDisk->url($folder),
313314
'size' => '',
314315
'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}(),
316317
];
317318
}
318319
}
@@ -324,7 +325,7 @@ public function getFiles($dir)
324325
'type' => $this->storageDisk->mimeType($file),
325326
'path' => $this->storageDisk->url($file),
326327
'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}(),
328329
];
329330
}
330331
}
@@ -343,12 +344,12 @@ public function getFiles($dir)
343344
protected function cleanName($text, $folder = null)
344345
{
345346
$pattern = [
346-
'/(script.*?\/script)|[^('.$this->fileChars.')a-zA-Z0-9]+/ius',
347+
'/(script.*?\/script)|[^(' . $this->fileChars . ')a-zA-Z0-9]+/ius',
347348
];
348349

349350
if ($folder) {
350351
$pattern = [
351-
'/(script.*?\/script)|[^('.$this->folderChars.')a-zA-Z0-9]+/ius',
352+
'/(script.*?\/script)|[^(' . $this->folderChars . ')a-zA-Z0-9]+/ius',
352353
];
353354
}
354355

src/config/mediaManager.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
return [
44
/*
55
* ignore files pattern
6+
*
7+
* ignore any file starts with "."
68
*/
79
'ignore_files' => '/^\..*/',
810

@@ -40,4 +42,11 @@
4042
* MIX_MM_FRAMEWORK=bulma
4143
*/
4244
'framework' => env('MIX_MM_FRAMEWORK'),
45+
46+
/*
47+
* display file last modification time as
48+
*
49+
* check "/vendor/nesbot/carbon/src/Carbon/Carbon.php"
50+
*/
51+
'last_modified_format' => 'toDateString',
4352
];

0 commit comments

Comments
 (0)