revamp dependencies page

api/classes/organizr.class.php

@@ -811,6 +811,7 @@ class Organizr
 		$status['version'] = $this->version;
 		$status['os'] = $this->getOS();
 		$status['php'] = phpversion();
+		$status['php_user'] = get_current_user();
 		$status['userConfigPath'] = $this->userConfigPath;
 		return $status;
 	}
@@ -6051,7 +6052,7 @@ class Organizr
 		if (!$error) {
 			$pre = explode('/api/v2/socks/', $requestObject->getUri()->getPath());
 			$endpoint = explode('/', $pre[1]);
-			$new = urldecode(preg_replace('/'.$endpoint[0].'/', '', $pre[1], 1));
+			$new = urldecode(preg_replace('/' . $endpoint[0] . '/', '', $pre[1], 1));
 			$getParams = ($_GET) ? '?' . http_build_query($_GET) : '';
 			$url = $this->qualifyURL($this->config[$url]) . $new . $getParams;
 			$url = $this->cleanPath($url);

api/functions/sso-functions.php

@@ -247,4 +247,4 @@ trait SSOFunctions
 			return false;
 		}
 	}
-}
+}

api/pages/dependencies.php

@@ -9,73 +9,118 @@ function get_page_dependencies($Organizr)
 <script>
 </script>
 <div class="container-fluid">
-    <div class="row bg-title">
-        <div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
-            <h4 class="page-title" lang="en">Organizr Dependency Check</h4>
-        </div>
-        <!-- /.col-lg-12 -->
-    </div>
-    <!--.row-->
-    <div class="row">
-        <div class="col-lg-8">
-            <div class="panel panel-danger">
-                <div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">Dependencies Missing</span>
-                    <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
-                </div>
-                <div class="panel-wrapper collapse in" aria-expanded="true">
-                    <div class="panel-body">
-                        <ul class="common-list" id="depenency-info"></ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-		<div class="col-lg-4">
-            <div class="panel panel-info">
-                <div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">PHP Version Check</span>
-                    <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
-                </div>
-                <div class="panel-wrapper collapse in" aria-expanded="true">
-                    <table class="table table-hover">
-                        <tbody>
-                            <tr>
-                                <td id="php-version-check" lang="en">Loading...</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-		<div class="col-lg-4">
-            <div class="panel panel-info">
-                <div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">Web Folder</span>
-                    <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
-                </div>
-                <div class="panel-wrapper collapse in" aria-expanded="true">
-                    <table class="table table-hover">
-                        <tbody>
-                            <tr>
-                                <td>' . dirname(__DIR__, 2) . '</td>
-                            </tr>
-                            <tr>
-                                <td id="web-folder" lang="en">Loading...</td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </div>
-        <div class="col-lg-4">
-            <div class="panel panel-info">
-                <div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">Browser Information</span>
-                    <div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a> <a href="#" data-perform="panel-dismiss"><i class="ti-close"></i></a> </div>
-                </div>
-                <div class="panel-wrapper collapse in" id="browser-info" aria-expanded="true"></div>
-            </div>
-        </div>
+	<div class="row bg-title">
+		<div class="col-lg-3 col-md-4 col-sm-4 col-xs-12">
+			<h4 class="page-title" lang="en">Organizr Dependency Check</h4>
+		</div>
+		<!-- /.col-lg-12 -->
+	</div>
+	<!--.row-->
+	<div class="row">
+		<div class="col-sm-12">
+			<div class="white-box">
+				<div class="row row-in">
+					<div class="col-lg-4 col-sm-6 row-in-br">
+						<ul class="col-in">
+							<li>
+								<span class="circle circle-md bg-warning dependency-dependencies-check"><i class="fa fa-spin fa-spinner"></i></span>
+							</li>
+							<li class="col-last">
+								<h3 class="counter text-right m-t-15" lang="en">Dependencies</h3>
+							</li>
+							
+						</ul>
+					</div>
+					<div class="col-lg-4 col-sm-6 row-in-br  b-r-none">
+						<ul class="col-in">
+							<li>
+								<span class="circle circle-md bg-warning dependency-phpversion-check"><i class="fa fa-spin fa-spinner"></i></span>
+							</li>
+							<li class="col-last">
+								<h3 class="counter text-right m-t-15" lang="en">PHP Version</h3>
+							</li>
+							
+						</ul>
+					</div>
+					
+					<div class="col-lg-4 col-sm-6  b-0">
+						<ul class="col-in">
+							<li>
+								<span class="circle circle-md bg-warning dependency-permissions-check"><i class="fa fa-spin fa-spinner"></i></span>
+							</li>
+							<li class="col-last">
+								<h3 class="counter text-right m-t-15" lang="en">Permissions</h3>
+							</li>
+							
+						</ul>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="row">
+		<div class="col-lg-4 col-sm-6">
+			<div class="panel panel-danger dependency-dependencies-check-listing-header">
+				<div class="panel-heading dependency-dependencies-check-listing"> <i class="ti-alert fa-fw"></i> <span lang="en">Dependencies Missing</span>
+					<div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a></div>
+				</div>
+				<div class="panel-wrapper collapse in" aria-expanded="true">
+					<div class="panel-body">
+						<ul class="common-list" id="depenency-info"></ul>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="col-lg-4 col-sm-6">
+			<div class="panel panel-info">
+				<div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">PHP Version Check</span>
+					<div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a></div>
+				</div>
+				<div class="panel-wrapper collapse in" aria-expanded="true">
+					<table class="table table-hover">
+						<tbody>
+							<tr>
+								<td id="php-version-check" lang="en">Loading...</td>
+							</tr>
+							<tr>
+								<td id="php-version-check-user" lang="en">Loading...</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="col-lg-4 col-sm-6">
+			<div class="panel panel-info">
+				<div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">Web Folder</span>
+					<div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-minus"></i></a></div>
+				</div>
+				<div class="panel-wrapper collapse in" aria-expanded="true">
+					<table class="table table-hover">
+						<tbody>
+							<tr>
+								<td>' . dirname(__DIR__, 2) . '</td>
+							</tr>
+							<tr>
+								<td id="web-folder" lang="en">Loading...</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</div>
+		<div class="col-lg-12">
+			<div class="panel panel-info">
+				<div class="panel-heading"> <i class="ti-alert fa-fw"></i> <span lang="en">Browser Information</span>
+					<div class="pull-right"><a href="#" data-perform="panel-collapse"><i class="ti-plus"></i></a></div>
+				</div>
+				<div class="panel-wrapper collapse" id="browser-info" aria-expanded="false"></div>
+			</div>
+		</div>
 
-    </div>
-    <!--./row-->
+	</div>
+	<!--./row-->
 </div>
 <!-- /.container-fluid -->
 ';
-}
+}

js/functions.js

@@ -4208,25 +4208,54 @@ function buildDependencyCheck(orgdata){
 	$("#preloader").fadeOut();
 }
 function buildDependencyInfo(arrayItems){
-	var listing = '';
+	let listing = '';
 	$.each(arrayItems.data.status.dependenciesActive, function(i,v) {
 			listing += '<li class="depenency-item" data-name="'+v+'"><a href="javascript:void(0)"><i class="fa fa-check text-success"></i> '+v+'</a></li>';
 		});
 	$.each(arrayItems.data.status.dependenciesInactive, function(i,v) {
 		listing += '<li class="depenency-item" data-name="'+v+'"><a href="javascript:void(0)"><i class="fa fa-close text-danger"><div class="notify"><span class="heartbit depend-heartbit"></span></div></i> '+v+'</a></li>';
 	});
+
+	let className = (arrayItems.data.status.dependenciesInactive.length !== 0) ? 'bg-danger text-warning' : 'bg-primary';
+	let icon = (arrayItems.data.status.dependenciesInactive.length !== 0) ? 'fa fa-exclamation-triangle' : 'fa fa-check-circle';//dependency-dependencies-check-listing-header
+	let header = (arrayItems.data.status.dependenciesInactive.length !== 0) ? 'panel-danger' : 'panel-info';
+	let listingIcon = (arrayItems.data.status.dependenciesInactive.length !== 0) ? 'ti-alert' : 'ti-check-box';
+	let listingText = (arrayItems.data.status.dependenciesInactive.length !== 0) ? 'Dependencies Missing' : 'Dependencies OK';
+
+	$('.dependency-dependencies-check-listing-header').removeClass('panel-danger').addClass(header);
+	$('.dependency-dependencies-check-listing i').first().removeClass('ti-alert').addClass(listingIcon);
+	$('.dependency-dependencies-check-listing span').text(listingText);
+	$('.dependency-dependencies-check').removeClass('bg-warning').addClass(className);
+	$('.dependency-dependencies-check i').removeClass('fa fa-spin fa-spinner').addClass(icon);
 	return listing;
 }
 function buildWebFolder(arrayItems){
-	var writable = (arrayItems.data.status.writable == 'yes') ? 'Writable - All Good' : 'Not Writable - Please fix permissions';
-	var className = (writable == 'Writable - All Good') ? 'bg-primary' : 'bg-danger text-warning';
+	let writable = 'Not Writable - Please fix permissions';
+	let className = 'bg-danger text-warning';
+	let icon = 'fa fa-exclamation-triangle';
+	if(arrayItems.data.status.writable == 'yes'){
+		writable = 'Writable - All Good';
+		className = 'bg-primary';
+		icon = 'fa fa-check-circle';
+	}
+	$('.dependency-permissions-check').removeClass('bg-warning').addClass(className);
+	$('.dependency-permissions-check i').removeClass('fa fa-spin fa-spinner').addClass(icon);
 	$('#web-folder').addClass(className);
 	return writable;
 }
 function buildPHPCheck(arrayItems){
-	var phpTest = (arrayItems.data.status.minVersion == 'yes') ? 'PHP Version Approved' : 'Upgrade PHP Version to 7.0';
-	var className = (arrayItems.data.status.minVersion == 'yes') ? 'bg-primary' : 'bg-danger text-warning';
+	let phpTest = 'Upgrade PHP Version to 7.2+';
+	let className = 'bg-danger text-warning';
+	let icon = 'fa fa-exclamation-triangle';
+	if(arrayItems.data.status.minVersion == 'yes'){
+		phpTest = 'PHP Version Approved';
+		className = 'bg-primary';
+		icon = 'fa fa-check-circle';
+	}
+	$('.dependency-phpversion-check').removeClass('bg-warning').addClass(className);
+	$('.dependency-phpversion-check i').removeClass('fa fa-spin fa-spinner').addClass(icon);
 	$('#php-version-check').addClass(className);
+	$('#php-version-check-user').html('<span lang="en">Webserver User</span>: ' + arrayItems.data.status.php_user)
 	return phpTest;
 }
 function buildBrowserInfo(){