diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 862ea632b0..40a9eaab90 100755 --- a/app/Http/Controllers/UsersController.php +++ b/app/Http/Controllers/UsersController.php @@ -40,6 +40,8 @@ use Illuminate\Http\Request; * * @version v1.0 */ + + class UsersController extends Controller { @@ -1132,6 +1134,8 @@ class UsersController extends Controller */ public function postLDAP() { + ini_set('max_execution_time', 600); //600 seconds = 10 minutes + ini_set('memory_limit', '500M'); $location_id = e(Input::get('location_id')); diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 97851f66dc..5034722a1a 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -260,8 +260,18 @@