Merge pull request #1352 from HalianElf/v2-develop

More Monitorr stuff

api/functions/homepage-connect-functions.php

@@ -2528,7 +2528,7 @@ function getMonitorr()
 				// This section grabs the names of all services by regex
 				$services = [];
 				$servicesMatch = [];
-				$servicePattern = '/<div id="servicetitle"><div>(.*)<\/div><\/div><div class="btnonline">Online<\/div><\/a><\/div><\/div>|<div id="servicetitleoffline".*><div>(.*)<\/div><\/div><div class="btnoffline".*>Offline<\/div><\/div><\/div>/';
+				$servicePattern = '/<div id="servicetitle"><div>(.*)<\/div><\/div><div class="btnonline">Online<\/div><\/a><\/div><\/div>|<div id="servicetitleoffline".*><div>(.*)<\/div><\/div><div class="btnoffline".*>Offline<\/div><\/div><\/div>|<div id="servicetitlenolink".*><div>(.*)<\/div><\/div><div class="btnonline".*>Online<\/div><\/div><\/div>/';
 				preg_match_all($servicePattern, $html, $servicesMatch);
 				unset($servicesMatch[0]);
 				$servicesMatch = array_values($servicesMatch);
@@ -2543,7 +2543,7 @@ function getMonitorr()
 				// This section then grabs the status and image of that service with regex
 				$statuses = [];
 				foreach($services as $service) {
-					$statusPattern = '/' . $service . '<\/div><\/div><div class="btnonline">(Online)<\/div><\/a><\/div><\/div>|' . $service . '<\/div><\/div><div class="btnoffline".*>(Offline)<\/div><\/div><\/div>/';
+					$statusPattern = '/' . $service . '<\/div><\/div><div class="btnonline">(Online)<\/div>|' . $service . '<\/div><\/div><div class="btnoffline".*>(Offline)<\/div><\/div><\/div>/';
 					$status = [];
 					preg_match($statusPattern, $html, $status);
 					$statuses[$service] = $status;
@@ -2561,7 +2561,7 @@ function getMonitorr()
 
 					$imageMatch = [];
 
-					$imgPattern = '/assets\/img\/\.\.(.*)" class="serviceimg" alt=.*><\/div><\/div><div id="servicetitle"><div>'.$service.'|assets\/img\/\.\.(.*)" class="serviceimg imgoffline" alt=.*><\/div><\/div><div id="servicetitleoffline".*><div>'.$service.'/';
+					$imgPattern = '/assets\/img\/\.\.(.*)" class="serviceimg" alt=.*><\/div><\/div><div id="servicetitle"><div>'.$service.'|assets\/img\/\.\.(.*)" class="serviceimg imgoffline" alt=.*><\/div><\/div><div id="servicetitleoffline".*><div>'.$service.'|assets\/img\/\.\.(.*)" class="serviceimg" alt=.*><\/div><\/div><div id="servicetitlenolink".*><div>'.$service.'/';
 
 					preg_match($imgPattern, $html, $imageMatch);
 					unset($imageMatch[0]);
@@ -2586,6 +2586,20 @@ function getMonitorr()
 					} else {
 						$statuses[$service]['image'] = $cacheDirectory . 'no-list.png';
 					}
+
+					$linkMatch = [];
+
+					$linkPattern = '/<a class="servicetile" href="(.*)" target="_blank" style="display: block"><div id="serviceimg"><div><img id="'.strtolower($service).'-service-img/';
+
+					preg_match($linkPattern, $html, $linkMatch);
+
+					$linkMatch = array_values($linkMatch);
+					unset($linkMatch[0]);
+					foreach($linkMatch as $link) {
+						if($link!== '') {
+							$statuses[$service]['link'] = $link;
+						}
+					}
 				}
 
 				ksort($statuses);

js/custom.js

@@ -1940,9 +1940,6 @@ $(document).on("keyup", "#authBackendHostPrefix-input, #authBackendHostSuffix-in
 });
 
 // homepage healthchecks
-$(document).on('click', ".good-health-checks", function(){
-    homepageHealthChecks();
-});
 $(document).on('click', ".showMoreHealth", function(){
    var id = $(this).attr('data-id');
     $('.showMoreHealthDiv-'+id).toggleClass('d-none');

js/functions.js

@@ -5708,7 +5708,7 @@ function buildHealthChecks(array){
 	<div id="allHealthChecks">
 		<div class="el-element-overlay row">
 		    <div class="col-md-12">
-		        <h4 class="pull-left homepage-element-title"><span lang="en">Health Checks</span> : </h4><h4 class="pull-left">&nbsp;<span class="label label-info m-l-20 checkbox-circle good-health-checks mouse">`+checks+`</span></h4>
+		        <h4 class="pull-left homepage-element-title"><span lang="en">Health Checks</span> : </h4><h4 class="pull-left">&nbsp;<span class="label label-info m-l-20 checkbox-circle good-health-checks mouse" onclick="homepageHealthChecks()">`+checks+`</span></h4>
 		        <hr class="hidden-xs">
 		    </div>
 			<div class="clearfix"></div>
@@ -6783,8 +6783,10 @@ function buildMonitorrItem(array){
                             <div class="left-health bg-`+statusColor+`"></div>
                             <div class="ml-1 w-100">
                                 <i class="`+imageText+` font-20 pull-right mt-3 mb-2"></i>
-                                <h3 class="d-flex no-block align-items-center mt-2 mb-2"><img class="lazyload loginTitle" src="`+data.image+`">&nbsp;`+name+`</h3>
-                                <div class="clearfix"></div>
+                                `; if (typeof data.link !== 'undefined') { card +=`<a href="`+data.link+`" target="_blank">`; }
+                                card += `<h3 class="d-flex no-block align-items-center mt-2 mb-2"><img class="lazyload loginTitle" src="`+data.image+`">&nbsp;`+name+`</h3>
+                                `; if (typeof data.link !== 'undefined') { card +=`</a>`; }
+                                card += `<div class="clearfix"></div>
                             </div>
                         </div>
                     </div>
@@ -6795,14 +6797,16 @@ function buildMonitorrItem(array){
             <div class="col-lg-2 col-md-3 col-sm-4 col-xs-6">
                 <div class="card bg-inverse text-white mb-3 monitorr-card">
                     <div class="card-body bg-org-alt text-center">
-                        <div class="d-block">
+                        `; if (typeof data.link !== 'undefined') { card +=`<a href="`+data.link+`" target="_blank">`; }
+                        card += `<div class="d-block">
                             <h3 class="mt-0 mb-3">`+name+`</h3>
                             <img class="monitorrImage" src="`+data.image+`" alt="service icon">
                         </div>
                         <div class="d-inline-block mt-4 py-2 px-4 badge indicator bg-`+statusColor+`">
                             <p class="mb-0">`; if(data.status) { card += 'ONLINE' } else { card += 'OFFLINE' } card+=`</p>
                         </div>
-                    </div>
+                        `; if (typeof data.link !== 'undefined') { card +=`</a>`; }
+                        card += `</div>
                 </div>
             </div>
             `;
@@ -6816,13 +6820,14 @@ function buildMonitorrItem(array){
 }
 function buildMonitorr(array){
     if(array === false){ return ''; }
+    var services = (typeof array.services !== 'undefined') ? Object.keys(array.services).length : false;
     var html = `
     <div id="allMonitorr">
 		<div class="el-element-overlay row">`
     if(array['options']['titleToggle']) {
         html += `
             <div class="col-md-12">
-                <h4 class="pull-left homepage-element-title"><span class="mouse" onclick="homepageMonitorr()">`+array['options']['title']+`</span> : </h4><h4 class="pull-left">&nbsp;</h4>
+                <h4 class="pull-left homepage-element-title"><span lang="en">`+array['options']['title']+`</span> : </h4><h4 class="pull-left">&nbsp;<span class="label label-info m-l-20 checkbox-circle good-monitorr-services mouse" onclick="homepageMonitorr()">`+services+`</span></h4></h4>
                 <hr class="hidden-xs ml-2">
             </div>
             <div class="clearfix"></div>