Merge branch 'master' of github.com:UniSharp/laravel-filemanager

UniSharp · Apr 21, 2017 · e7d4968 · e7d4968
2 parents 89049f9 + f1fad46
commit e7d4968
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/config/lfm.php b/src/config/lfm.php
@@ -150,4 +150,16 @@
         'ppt'  => 'fa-file-powerpoint-o',
         'pptx' => 'fa-file-powerpoint-o',
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | php.ini override
+    |--------------------------------------------------------------------------
+    */
+    // These values override your php.ini settings before uploading files
+    // Set these to false to ingnore and apply your php.ini settings
+    'php_ini_overrides' => [
+        'memory_limit'        => '256M'
+    ]
+
 ];
diff --git a/src/controllers/LfmController.php b/src/controllers/LfmController.php
@@ -14,6 +14,8 @@ class LfmController extends Controller
 
     public function __construct()
     {
+        $this->applyIniOverrides();
+
         if (!$this->isProcessingImages() && !$this->isProcessingFiles()) {
             throw new \Exception('unexpected type parameter');
         }

diff --git a/src/traits/LfmHelpers.php b/src/traits/LfmHelpers.php
@@ -235,6 +235,13 @@ public function enabledShareFolder()
     {
         return config('lfm.allow_share_folder') === true;
     }
+
+    public function applyIniOverrides()
+    {
+        foreach (config('lfm.php_ini_overrides') as $key => $value) {
+            if ($value && $value != 'false') ini_set($key, $value);
+        }
+    }
 
 
     /****************************