Skip to content

Commit c919a22

Browse files
committed
Merge pull request #28 from Nikita240/controllerfix
Fix controllers extending controller in unknown namespace.
2 parents 2de7cc7 + 7ac3555 commit c919a22

File tree

10 files changed

+27
-17
lines changed

10 files changed

+27
-17
lines changed

src/controllers/Controller.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php namespace Unisharp\Laravelfilemanager\controllers;
2+
3+
use Illuminate\Foundation\Bus\DispatchesJobs;
4+
use Illuminate\Routing\Controller as BaseController;
5+
use Illuminate\Foundation\Validation\ValidatesRequests;
6+
7+
abstract class Controller extends BaseController
8+
{
9+
use DispatchesJobs, ValidatesRequests;
10+
}

src/controllers/CropController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\View;

src/controllers/DeleteController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -49,5 +49,5 @@ public function getDelete()
4949

5050
return 'OK';
5151
}
52-
52+
5353
}

src/controllers/DownloadController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\Response;

src/controllers/FolderController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;

src/controllers/ItemsController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -36,7 +36,7 @@ public function getItems()
3636
return View::make($view)
3737
->with(compact('files', 'file_info', 'directories', 'thumb_url'));
3838
}
39-
39+
4040

4141
private function getFileInfos($files, $type = 'Images')
4242
{
@@ -46,7 +46,7 @@ private function getFileInfos($files, $type = 'Images')
4646
$file_name = parent::getFileName($file);
4747
$file_created = filemtime($file);
4848
$file_size = number_format((File::size($file) / 1024), 2, ".", "");
49-
49+
5050
if ($file_size > 1024) {
5151
$file_size = number_format(($file_size / 1024), 2, ".", "") . " Mb";
5252
} else {

src/controllers/LfmController.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -19,17 +19,17 @@ class LfmController extends Controller {
1919
*/
2020
public $file_location;
2121
public $dir_location;
22-
22+
2323

2424
/**
2525
* Constructor
2626
*/
2727
public function __construct()
2828
{
2929
$this->setPathAndType();
30-
30+
3131
$this->checkMyFolderExists();
32-
32+
3333
$this->checkSharedFolderExists();
3434
}
3535

@@ -60,7 +60,7 @@ public function show()
6060
private function setPathAndType()
6161
{
6262
// dd('type:'.Input::get('type'));
63-
63+
6464
if (Input::has('type') && Input::get('type') === 'Files') {
6565
Session::put('lfm_type', 'Files');
6666
Session::put('lfm.file_location', Config::get('lfm.files_dir'));

src/controllers/RenameController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -42,7 +42,7 @@ public function getRename()
4242
File::move($old_file, $new_file);
4343
return 'OK';
4444
}
45-
45+
4646
File::move($old_file, $new_file);
4747

4848
if (Session::get('lfm_type') == 'Images') {

src/controllers/ResizeController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\View;

src/controllers/UploadController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;

0 commit comments

Comments
 (0)