use parent:: to call functions from LfmHelper

streamtw · streamtw · commit 33d6d91b85cf · 2017-04-17T11:05:32.000+08:00
diff --git a/src/controllers/DeleteController.php b/src/controllers/DeleteController.php
@@ -25,31 +25,31 @@ public function getDelete()
         event(new ImageIsDeleting($file_to_delete));
 
         if (is_null($name_to_delete)) {
-            return $this->error('folder-name');
+            return parent::error('folder-name');
         }
 
         if (!File::exists($file_to_delete)) {
-            return $this->error('folder-not-found', ['folder' => $file_to_delete]);
+            return parent::error('folder-not-found', ['folder' => $file_to_delete]);
         }
 
         if (File::isDirectory($file_to_delete)) {
             if (!parent::directoryIsEmpty($file_to_delete)) {
-                return $this->error('delete-folder');
+                return parent::error('delete-folder');
             }
 
             File::deleteDirectory($file_to_delete);
 
-            return $this->success_response;
+            return parent::$success_response;
         }
 
-        if ($this->fileIsImage($file_to_delete)) {
+        if (parent::fileIsImage($file_to_delete)) {
             File::delete($thumb_to_delete);
         }
 
         File::delete($file_to_delete);
 
         event(new ImageWasDeleted($file_to_delete));
 
-        return $this->success_response;
+        return parent::$success_response;
     }
 }
diff --git a/src/controllers/FolderController.php b/src/controllers/FolderController.php
@@ -49,18 +49,18 @@ public function getFolders()
      */
     public function getAddfolder()
     {
-        $folder_name = $this->translateFromUtf8(trim(request('name')));
+        $folder_name = parent::translateFromUtf8(trim(request('name')));
 
         $path = parent::getCurrentPath($folder_name);
 
         if (empty($folder_name)) {
-            return $this->error('folder-name');
+            return parent::error('folder-name');
         } elseif (File::exists($path)) {
-            return $this->error('folder-exist');
+            return parent::error('folder-exist');
         } elseif (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $folder_name)) {
-            return $this->error('folder-alnum');
+            return parent::error('folder-alnum');
         } else {
-            $this->createFolderByPath($path);
+            parent::createFolderByPath($path);
             return $this->success_response;
         }
     }
diff --git a/src/controllers/ItemsController.php b/src/controllers/ItemsController.php
@@ -15,19 +15,19 @@ class ItemsController extends LfmController
      */
     public function getItems()
     {
-        $path = $this->getCurrentPath();
+        $path = parent::getCurrentPath();
         $sort_type = request('sort_type');
 
-        $files = $this->sortFilesAndDirectories($this->getFilesWithInfo($path), $sort_type);
-        $directories = $this->sortFilesAndDirectories($this->getDirectories($path), $sort_type);
+        $files = parent::sortFilesAndDirectories(parent::getFilesWithInfo($path), $sort_type);
+        $directories = parent::sortFilesAndDirectories(parent::getDirectories($path), $sort_type);
 
         return [
             'html' => (string)view($this->getView())->with([
                 'files'       => $files,
                 'directories' => $directories,
                 'items'       => array_merge($directories, $files)
             ]),
-            'working_dir' => $this->getInternalPath($path)
+            'working_dir' => parent::getInternalPath($path)
         ];
     }
 
@@ -40,7 +40,7 @@ private function getView()
         if ($show_list === "1") {
             $view_type = 'list';
         } elseif (is_null($show_list)) {
-            $type_key = $this->currentLfmType();
+            $type_key = parent::currentLfmType();
             $startup_view = config('lfm.' . $type_key . 's_startup_view');
 
             if (in_array($startup_view, ['list', 'grid'])) {
diff --git a/src/controllers/RedirectController.php b/src/controllers/RedirectController.php
@@ -36,7 +36,7 @@ public function getFile(Request $request, $base_path, $file_name)
 
     private function responseImageOrFile($file_name)
     {
-        $file_path = $this->getCurrentPath($file_name);
+        $file_path = parent::getCurrentPath($file_name);
 
         if (!File::exists($file_path)) {
             abort(404);
diff --git a/src/controllers/RenameController.php b/src/controllers/RenameController.php
@@ -17,16 +17,16 @@ class RenameController extends LfmController
      */
     public function getRename()
     {
-        $old_name = $this->translateFromUtf8(request('file'));
-        $new_name = $this->translateFromUtf8(trim(request('new_name')));
+        $old_name = parent::translateFromUtf8(request('file'));
+        $new_name = parent::translateFromUtf8(trim(request('new_name')));
 
         $old_file = parent::getCurrentPath($old_name);
 
         if (empty($new_name)) {
             if (File::isDirectory($old_file)) {
-                return $this->error('folder-name');
+                return parent::error('folder-name');
             } else {
-                return $this->error('file-name');
+                return parent::error('file-name');
             }
         }
 
@@ -44,25 +44,25 @@ public function getRename()
         }
 
         if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {
-            return $this->error('folder-alnum');
+            return parent::error('folder-alnum');
         } elseif (File::exists($new_file)) {
-            return $this->error('rename');
+            return parent::error('rename');
         }
 
         if (File::isDirectory($old_file)) {
             File::move($old_file, $new_file);
             event(new FolderWasRenamed($old_file, $new_file));
-            return $this->success_response;
+            return parent::$success_response;
         }
 
-        if ($this->fileIsImage($old_file)) {
+        if (parent::fileIsImage($old_file)) {
             File::move(parent::getThumbPath($old_name), parent::getThumbPath($new_name));
         }
 
         File::move($old_file, $new_file);
 
         event(new ImageWasRenamed($old_file, $new_file));
 
-        return $this->success_response;
+        return parent::$success_response;
     }
 }
diff --git a/src/controllers/ResizeController.php b/src/controllers/ResizeController.php
@@ -66,7 +66,7 @@ public function performResize()
             event(new ImageIsResizing($image_path));
             Image::make($image_path)->resize($width, $height)->save();
             event(new ImageWasResized($image_path));
-            return $this->success_response;
+            return parent::$success_response;
         } catch (Exception $e) {
             return "width : " . $width . " height: " . $height;
             return $e;
diff --git a/src/controllers/UploadController.php b/src/controllers/UploadController.php
@@ -34,7 +34,7 @@ public function upload()
         }
 
         if (is_array($files)) {
-            $response = count($error_bag) > 0 ? $error_bag : $this->success_response;
+            $response = count($error_bag) > 0 ? $error_bag : parent::$success_response;
         } else { // upload via ckeditor 'Upload' tab
             $response = $this->useFile($new_filename);
         }
@@ -54,7 +54,7 @@ private function proceedSingleUpload($file)
 
         event(new ImageIsUploading($new_file_path));
         try {
-            if ($this->fileIsImage($file) && $this->isImageToThumb($file)) {
+            if (parent::fileIsImage($file) && parent::isImageToThumb($file)) {
                 Image::make($file->getRealPath())
                     ->orientate() //Apply orientation from exif data
                     ->save($new_file_path, 90);
@@ -65,7 +65,7 @@ private function proceedSingleUpload($file)
                 File::move($file->path(), $new_file_path);
             }
         } catch (\Exception $e) {
-            return $this->error('invalid');
+            return parent::error('invalid');
         }
         event(new ImageWasUploaded(realpath($new_file_path)));
 
@@ -78,40 +78,40 @@ private function uploadValidator($file)
         $force_invalid = false;
 
         if (empty($file)) {
-            return $this->error('file-empty');
+            return parent::error('file-empty');
         } elseif (!$file instanceof UploadedFile) {
-            return $this->error('instance');
+            return parent::error('instance');
         } elseif ($file->getError() == UPLOAD_ERR_INI_SIZE) {
             $max_size = ini_get('upload_max_filesize');
-            return $this->error('file-size', ['max' => $max_size]);
+            return parent::error('file-size', ['max' => $max_size]);
         } elseif ($file->getError() != UPLOAD_ERR_OK) {
             return 'File failed to upload. Error code: ' . $file->getError();
         }
 
         $new_filename = $this->getNewName($file);
 
         if (File::exists(parent::getCurrentPath($new_filename))) {
-            return $this->error('file-exist');
+            return parent::error('file-exist');
         }
 
         $mimetype = $file->getMimeType();
 
         // size to kb unit is needed
         $file_size = $file->getSize() / 1000;
-        $type_key = $this->currentLfmType();
+        $type_key = parent::currentLfmType();
 
         if (config('lfm.should_validate_mime')) {
             $mine_config = 'lfm.valid_' . $type_key . '_mimetypes';
             $valid_mimetypes = config($mine_config, []);
             if (false === in_array($mimetype, $valid_mimetypes)) {
-                return $this->error('mime') . $mimetype;
+                return parent::error('mime') . $mimetype;
             }
         }
 
         if (config('lfm.should_validate_size')) {
             $max_size = config('lfm.max_' . $type_key . '_size', 0);
             if ($file_size > $max_size) {
-                return $this->error('size') . $mimetype;
+                return parent::error('size') . $mimetype;
             }
         }
 
@@ -120,7 +120,7 @@ private function uploadValidator($file)
 
     private function getNewName($file)
     {
-        $new_filename = $this->translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
+        $new_filename = parent::translateFromUtf8(trim(pathinfo($file->getClientOriginalName(), PATHINFO_FILENAME)));
 
         if (config('lfm.rename_file') === true) {
             $new_filename = uniqid();
@@ -134,7 +134,7 @@ private function getNewName($file)
     private function makeThumb($new_filename)
     {
         // create thumb folder
-        $this->createFolderByPath(parent::getThumbPath());
+        parent::createFolderByPath(parent::getThumbPath());
 
         // create thumb image
         Image::make(parent::getCurrentPath($new_filename))

Original file line number	Diff line number	Diff line change
`@@ -25,31 +25,31 @@ public function getDelete()`
`25`	`25`	`event(new ImageIsDeleting($file_to_delete));`
`26`	`26`
`27`	`27`	`if (is_null($name_to_delete)) {`
`28`		`- return $this->error('folder-name');`
	`28`	`+ return parent::error('folder-name');`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if (!File::exists($file_to_delete)) {`
`32`		`- return $this->error('folder-not-found', ['folder' => $file_to_delete]);`
	`32`	`+ return parent::error('folder-not-found', ['folder' => $file_to_delete]);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`if (File::isDirectory($file_to_delete)) {`
`36`	`36`	`if (!parent::directoryIsEmpty($file_to_delete)) {`
`37`		`- return $this->error('delete-folder');`
	`37`	`+ return parent::error('delete-folder');`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`File::deleteDirectory($file_to_delete);`
`41`	`41`
`42`		`- return $this->success_response;`
	`42`	`+ return parent::$success_response;`
`43`	`43`	`}`
`44`	`44`
`45`		`- if ($this->fileIsImage($file_to_delete)) {`
	`45`	`+ if (parent::fileIsImage($file_to_delete)) {`
`46`	`46`	`File::delete($thumb_to_delete);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`File::delete($file_to_delete);`
`50`	`50`
`51`	`51`	`event(new ImageWasDeleted($file_to_delete));`
`52`	`52`
`53`		`- return $this->success_response;`
	`53`	`+ return parent::$success_response;`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getFile(Request $request, $base_path, $file_name)`
`36`	`36`
`37`	`37`	`private function responseImageOrFile($file_name)`
`38`	`38`	`{`
`39`		`- $file_path = $this->getCurrentPath($file_name);`
	`39`	`+ $file_path = parent::getCurrentPath($file_name);`
`40`	`40`
`41`	`41`	`if (!File::exists($file_path)) {`
`42`	`42`	`abort(404);`
Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,16 @@ class RenameController extends LfmController`
`17`	`17`	`*/`
`18`	`18`	`public function getRename()`
`19`	`19`	`{`
`20`		`- $old_name = $this->translateFromUtf8(request('file'));`
`21`		`- $new_name = $this->translateFromUtf8(trim(request('new_name')));`
	`20`	`+ $old_name = parent::translateFromUtf8(request('file'));`
	`21`	`+ $new_name = parent::translateFromUtf8(trim(request('new_name')));`
`22`	`22`
`23`	`23`	`$old_file = parent::getCurrentPath($old_name);`
`24`	`24`
`25`	`25`	`if (empty($new_name)) {`
`26`	`26`	`if (File::isDirectory($old_file)) {`
`27`		`- return $this->error('folder-name');`
	`27`	`+ return parent::error('folder-name');`
`28`	`28`	`} else {`
`29`		`- return $this->error('file-name');`
	`29`	`+ return parent::error('file-name');`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -44,25 +44,25 @@ public function getRename()`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`if (config('lfm.alphanumeric_directory') && preg_match('/[^\w-]/i', $new_name)) {`
`47`		`- return $this->error('folder-alnum');`
	`47`	`+ return parent::error('folder-alnum');`
`48`	`48`	`} elseif (File::exists($new_file)) {`
`49`		`- return $this->error('rename');`
	`49`	`+ return parent::error('rename');`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`if (File::isDirectory($old_file)) {`
`53`	`53`	`File::move($old_file, $new_file);`
`54`	`54`	`event(new FolderWasRenamed($old_file, $new_file));`
`55`		`- return $this->success_response;`
	`55`	`+ return parent::$success_response;`
`56`	`56`	`}`
`57`	`57`
`58`		`- if ($this->fileIsImage($old_file)) {`
	`58`	`+ if (parent::fileIsImage($old_file)) {`
`59`	`59`	`File::move(parent::getThumbPath($old_name), parent::getThumbPath($new_name));`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`File::move($old_file, $new_file);`
`63`	`63`
`64`	`64`	`event(new ImageWasRenamed($old_file, $new_file));`
`65`	`65`
`66`		`- return $this->success_response;`
	`66`	`+ return parent::$success_response;`
`67`	`67`	`}`
`68`	`68`	`}`