Updating random stuff

ARCANESOFT · Apr 3, 2017 · e154eab · e154eab
1 parent 051e1f7
commit e154eab
Show file tree

Hide file tree

Showing 20 changed files with 188 additions and 168 deletions.
diff --git a/resources/views/admin/system/information/_includes/php-extensions.blade.php b/resources/views/admin/system/information/_includes/php-extensions.blade.php
@@ -1,10 +1 @@
-<div class="box">
-    <div class="box-header with-border">
-        <h2 class="box-title">PHP Extensions</h2>
-    </div>
-    <div class="box-body">
-        @foreach(get_loaded_extensions() as $extension)
-            <span class="label label-default">{{ $extension }}</span>
-        @endforeach
-    </div>
-</div>
+
diff --git a/resources/views/admin/system/information/_includes/php-info.blade.php b/resources/views/admin/system/information/_includes/php-info.blade.php
@@ -0,0 +1,38 @@
+<div class="box">
+    <div class="box-header">
+        <h2 class="box-title">PHP</h2>
+    </div>
+    <div class="box-body no-padding">
+        <table class="table table-condensed table-hover no-margin">
+            <tr>
+                <th>Version</th>
+                <td class="text-right">
+                    <span class="label label-primary">{{ $phpInfo['version'] }}</span>
+                </td>
+            </tr>
+            @foreach($phpInfo['requirements'] as $requirement => $enabled)
+                <tr>
+                    <th>{{ ucfirst($requirement) }} Ext</th>
+                    <td class="text-right">
+                        @if ($enabled)
+                            <span class="label label-success"><i class="fa fa-fw fa-check"></i></span>
+                        @else
+                            <span class="label label-danger"><i class="fa fa-fw fa-times"></i></span>
+                        @endif
+                    </td>
+                </tr>
+            @endforeach
+        </table>
+    </div>
+</div>
+
+<div class="box">
+    <div class="box-header with-border">
+        <h2 class="box-title">PHP Loaded Extensions</h2>
+    </div>
+    <div class="box-body">
+        @foreach($phpInfo['extensions'] as $extension)
+            <span class="label label-default">{{ $extension }}</span>
+        @endforeach
+    </div>
+</div>
diff --git a/resources/views/admin/system/information/_includes/server-requirements.blade.php b/resources/views/admin/system/information/_includes/server-requirements.blade.php
@@ -1,31 +1,3 @@
-<div class="box">
-    <div class="box-header">
-        <h2 class="box-title">PHP</h2>
-    </div>
-    <div class="box-body no-padding">
-        <table class="table table-condensed table-hover no-margin">
-            <tr>
-                <th>Version</th>
-                <td class="text-right">
-                    <span class="label label-primary">{{ $requirements['php']['version'] }}</span>
-                </td>
-            </tr>
-            @foreach($requirements['php']['requirements'] as $requirement => $enabled)
-            <tr>
-                <th>{{ ucfirst($requirement) }} Ext</th>
-                <td class="text-right">
-                    @if ($enabled)
-                        <span class="label label-success"><i class="fa fa-fw fa-check"></i></span>
-                    @else
-                        <span class="label label-danger"><i class="fa fa-fw fa-times"></i></span>
-                    @endif
-                </td>
-            </tr>
-            @endforeach
-        </table>
-    </div>
-</div>
-
 <div class="box">
     <div class="box-header">
         <h2 class="box-title">WebServer</h2>

diff --git a/resources/views/admin/system/information/index.blade.php b/resources/views/admin/system/information/index.blade.php
@@ -9,13 +9,15 @@
         </div>
         <div class="col-md-4">
             @include(Arcanesoft\Foundation\ViewComposers\System\ServerRequirementsComposer::VIEW)
+            @include(Arcanesoft\Foundation\ViewComposers\System\FoldersPermissionsComposer::VIEW)
         </div>
         <div class="col-md-4">
-            @include(Arcanesoft\Foundation\ViewComposers\System\FoldersPermissionsComposer::VIEW)
+            @include(Arcanesoft\Foundation\ViewComposers\System\PhpInfoComposer::VIEW)
+            @include('foundation::admin.system.information._includes.php-extensions')
         </div>
     </div>
 
-    @include('foundation::admin.system.information._includes.php-extensions')
+
 @endsection
 
 @section('modals')

diff --git a/src/Contracts/Foundation.php b/src/Contracts/Foundation.php
@@ -8,6 +8,10 @@
  */
 interface Foundation
 {
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
+     */
     /**
      * Get the package version.
      *

diff --git a/src/Http/Controllers/Admin/Controller.php b/src/Http/Controllers/Admin/Controller.php
@@ -1,6 +1,7 @@
 <?php namespace Arcanesoft\Foundation\Http\Controllers\Admin;
 
 use Arcanesoft\Core\Http\Controllers\AdminController;
+use Arcanesoft\Core\Traits\Notifyable;
 
 /**
  * Class     Controller
@@ -10,6 +11,12 @@
  */
 abstract class Controller extends AdminController
 {
+    /* -----------------------------------------------------------------
+     |  Traits
+     | -----------------------------------------------------------------
+     */
+    use Notifyable;
+
     /* -----------------------------------------------------------------
      |  Properties
      | -----------------------------------------------------------------

diff --git a/src/Http/Controllers/Admin/DashboardController.php b/src/Http/Controllers/Admin/DashboardController.php
@@ -8,9 +8,9 @@
  */
 class DashboardController extends Controller
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Show the foundation dashboard.

diff --git a/src/Http/Controllers/Admin/SettingsController.php b/src/Http/Controllers/Admin/SettingsController.php
@@ -1,7 +1,5 @@
 <?php namespace Arcanesoft\Foundation\Http\Controllers\Admin;
 
-use Arcanesoft\Core\Traits\Notifyable;
-
 /**
  * Class     SettingsController
  *
@@ -10,15 +8,9 @@
  */
 class SettingsController extends Controller
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Traits
-     | ------------------------------------------------------------------------------------------------
-     */
-    use Notifyable;
-
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * SettingsController constructor.
@@ -31,9 +23,9 @@ public function __construct()
         $this->addBreadcrumbRoute('Settings', 'admin::foundation.settings.index');
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     public function index()
     {

diff --git a/src/Http/Controllers/Admin/System/BackupsController.php b/src/Http/Controllers/Admin/System/BackupsController.php
@@ -1,6 +1,5 @@
 <?php namespace Arcanesoft\Foundation\Http\Controllers\Admin\System;
 
-use Arcanesoft\Core\Traits\Notifyable;
 use Arcanesoft\Foundation\Services\Backups;
 
 /**
@@ -11,15 +10,9 @@
  */
 class BackupsController extends Controller
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Traits
-     | ------------------------------------------------------------------------------------------------
-     */
-    use Notifyable;
-
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * BackupsController constructor.
@@ -32,9 +25,9 @@ public function __construct()
         $this->addBreadcrumbRoute('Backups', 'admin::foundation.system.backups.index');
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     public function index()
     {
@@ -68,18 +61,15 @@ public function backup()
         self::onlyAjax();
 
         if (Backups::runBackups()) {
-            $ajax = ['status' => 'success'];
+            $this->notifySuccess('The Backups was created successfully !', 'Backups created !');
 
-            $this->notifySuccess('', 'Backups created !');
-        }
-        else {
-            $ajax = [
-                'status'  => 'error',
-                'message' => 'There is an error while running the backups.'
-            ];
+            return response()->json(['status' => 'success']);
         }
 
-        return response()->json($ajax);
+        return response()->json([
+            'status'  => 'error',
+            'message' => 'There is an error while running the backups.'
+        ]);
     }
 
     public function clear()
@@ -88,17 +78,14 @@ public function clear()
         self::onlyAjax();
 
         if (Backups::clearBackups()) {
-            $ajax = ['status' => 'success'];
-
             $this->notifySuccess('The Backups was cleared successfully !', 'Backups cleared !');
-        }
-        else {
-            $ajax = [
-                'status'  => 'error',
-                'message' => 'There is an error while clearing the backups.'
-            ];
+
+            return response()->json(['status' => 'success']);
         }
 
-        return response()->json($ajax);
+        return response()->json([
+            'status'  => 'error',
+            'message' => 'There is an error while clearing the backups.'
+        ]);
     }
 }
diff --git a/src/Http/Controllers/Admin/System/Controller.php b/src/Http/Controllers/Admin/System/Controller.php
@@ -10,9 +10,9 @@
  */
 abstract class Controller extends BaseController
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Constructor
+     | -----------------------------------------------------------------
      */
     /**
      * Controller constructor.

diff --git a/src/Http/Controllers/Admin/System/InformationController.php b/src/Http/Controllers/Admin/System/InformationController.php
@@ -8,9 +8,9 @@
  */
 class InformationController extends Controller
 {
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * InformationController constructor.
@@ -23,9 +23,9 @@ public function __construct()
         $this->addBreadcrumbRoute('Information', 'admin::foundation.system.information.index');
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Main Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Main Methods
+     | -----------------------------------------------------------------
      */
     public function index()
     {

diff --git a/src/Http/Controllers/Admin/System/LogViewerController.php b/src/Http/Controllers/Admin/System/LogViewerController.php
@@ -3,7 +3,6 @@
 use Arcanedev\LogViewer\Contracts\LogViewer as LogViewerContract;
 use Arcanedev\LogViewer\Entities\Log;
 use Arcanedev\LogViewer\Exceptions\LogNotFoundException;
-use Arcanesoft\Core\Traits\Notifyable;
 use Arcanesoft\Foundation\Policies\LogViewerPolicy;
 use Illuminate\Http\Request;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -17,15 +16,9 @@
  */
 class LogViewerController extends Controller
 {
-    /* ------------------------------------------------------------------------------------------------
-     |  Traits
-     | ------------------------------------------------------------------------------------------------
-     */
-    use Notifyable;
-
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Properties
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * The LogViewer instance.
@@ -41,9 +34,9 @@ class LogViewerController extends Controller
      */
     protected $perPage = 30;
 
-    /* ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
      |  Constructor
-     | ------------------------------------------------------------------------------------------------
+     | -----------------------------------------------------------------
      */
     /**
      * LogViewerController constructor.
@@ -149,9 +142,8 @@ public function showByLevel($date, $level)
 
         $log = $this->getLogOrFail($date);
 
-        if ($level == 'all') {
+        if ($level == 'all')
             return redirect()->route('admin::foundation.system.log-viewer.logs.show', [$date]);
-        }
 
         $levels  = $this->logViewer->levelsNames();
         $entries = $this->logViewer->entries($date, $level)->paginate($this->perPage);
@@ -193,23 +185,22 @@ public function delete(Request $request)
         $this->authorize(LogViewerPolicy::PERMISSION_DELETE);
 
         $date = $request->get('date');
-        $ajax = ['status' => 'error'];
 
         if ($this->logViewer->delete($date)) {
-            $ajax = ['status' => 'success'];
-
             $this->notifySuccess(
                 "The log [$date] was deleted successfully !",
                 "Log [$date] deleted !"
             );
+
+            return response()->json(['status' => 'success']);
         }
 
-        return response()->json($ajax);
+        return response()->json(['status' => 'error']);
     }
 
-    /* ------------------------------------------------------------------------------------------------
-     |  Other Functions
-     | ------------------------------------------------------------------------------------------------
+    /* -----------------------------------------------------------------
+     |  Other Methods
+     | -----------------------------------------------------------------
      */
     /**
      * Get a log or fail.