Commit c62d1821 authored by dmorley's avatar dmorley

just some package updates and some less update.php complaining

parent 182f62fe
Pipeline #2898 passed with stage
in 46 seconds
......@@ -242,16 +242,16 @@
},
{
"name": "jaybizzle/crawler-detect",
"version": "v1.2.86",
"version": "v1.2.89",
"source": {
"type": "git",
"url": "https://github.com/JayBizzle/Crawler-Detect.git",
"reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee"
"reference": "374d699ce4944107015eee0798eab072e3c47df9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/1835311c4f458b2f59bbfec05ebfc64ac382b6ee",
"reference": "1835311c4f458b2f59bbfec05ebfc64ac382b6ee",
"url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/374d699ce4944107015eee0798eab072e3c47df9",
"reference": "374d699ce4944107015eee0798eab072e3c47df9",
"shasum": ""
},
"require": {
......@@ -287,7 +287,7 @@
"crawlerdetect",
"php crawler detect"
],
"time": "2019-10-15T20:54:57+00:00"
"time": "2019-11-16T13:47:52+00:00"
},
{
"name": "kylekatarnls/update-helper",
......@@ -788,16 +788,16 @@
},
{
"name": "symfony/translation",
"version": "v4.3.5",
"version": "v4.3.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "fe6193b066c457c144333c06aaa869a2d42a167f"
"reference": "bbce239b35b0cd47bd75848b23e969f17dd970e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/fe6193b066c457c144333c06aaa869a2d42a167f",
"reference": "fe6193b066c457c144333c06aaa869a2d42a167f",
"url": "https://api.github.com/repos/symfony/translation/zipball/bbce239b35b0cd47bd75848b23e969f17dd970e7",
"reference": "bbce239b35b0cd47bd75848b23e969f17dd970e7",
"shasum": ""
},
"require": {
......@@ -860,7 +860,7 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2019-09-27T14:37:39+00:00"
"time": "2019-11-06T23:21:49+00:00"
},
{
"name": "symfony/translation-contracts",
......@@ -923,16 +923,16 @@
"packages-dev": [
{
"name": "squizlabs/php_codesniffer",
"version": "3.5.1",
"version": "3.5.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "82cd0f854ceca17731d6d019c7098e3755c45060"
"reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/82cd0f854ceca17731d6d019c7098e3755c45060",
"reference": "82cd0f854ceca17731d6d019c7098e3755c45060",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
"reference": "65b12cdeaaa6cd276d4c3033a95b9b88b12701e7",
"shasum": ""
},
"require": {
......@@ -970,7 +970,7 @@
"phpcs",
"standards"
],
"time": "2019-10-16T21:14:26+00:00"
"time": "2019-10-28T04:36:32+00:00"
}
],
"aliases": [],
......
......@@ -99,8 +99,12 @@ if ('save' === $_action) {
?>
<script>
window.onload = function() {
$("#weight").ionRangeSlider();
$("#podmin_notify_level").ionRangeSlider();
$("#weight").ionRangeSlider({
skin: "big"
});
$("#podmin_notify_level").ionRangeSlider({
skin: "big"
});
}
</script>
Authorized to edit <b><?php echo $_domain; ?></b> for <?php echo (new Carbon($pod['tokenexpire']))->diffForHumans(null, true); ?><br>
......
......@@ -160,8 +160,12 @@ foreach ($pods as $pod) {
$service_xmpp = ($jsonssl->metadata->xmppChat ?? false) === true;
if (json_last_error() === 0) {
(!$jsonssl->software->version) || $score += 1;
if (is_array($jsonssl->services->outbound)) {
$services = json_encode($jsonssl->services->outbound);
if (isset($jsonssl->services)) {
if (is_array($jsonssl->services->outbound)) {
$services = json_encode($jsonssl->services->outbound);
}
} else {
$services = "{}";
}
if (is_array($jsonssl->protocols)) {
$protocols = json_encode($jsonssl->protocols);
......
......@@ -33,7 +33,6 @@ $fullview = false;
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.min.css">
<link rel="stylesheet" href="css/poduptime.css"/>
<link rel="stylesheet" href="node_modules/ion-rangeslider/css/ion.rangeSlider.css"/>
<link rel="stylesheet" href="node_modules/ion-rangeslider/css/ion.rangeSlider.skinHTML5.css"/>
<link rel="stylesheet" href="node_modules/featherlight/release/featherlight.min.css"/>
<link rel="stylesheet" href="node_modules/tablesorter/dist/css/theme.bootstrap_4.min.css"/>
<link rel="stylesheet" href="node_modules/@fortawesome/fontawesome-free/css/all.min.css"/>
......
......@@ -17,7 +17,9 @@ require_once __DIR__ . '/boot.php';
<head>
<script>
$(document).ready(function () {
$("#rating").ionRangeSlider();
$("#rating").ionRangeSlider({
skin: "big"
});
$('#addrating').click(function () {
$('.ratings').hide('fast');
$('#commentform').show('slow');
......
......@@ -6,9 +6,24 @@
declare(strict_types=1);
use Poduptime\PodStatus;
use RedBeanPHP\R;
require_once __DIR__ . '/boot.php';
// CloudFlare country code pull.
$country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? '';
try {
$pods = R::getAll("
SELECT count(domain)
FROM pods
WHERE status < ?
", [PodStatus::RECHECK]);
} catch (\RedBeanPHP\RedException $e) {
die('Error in SQL query: ' . $e->getMessage());
}
?>
<style>
......@@ -58,7 +73,7 @@ $country_code = $_SERVER['HTTP_CF_IPCOUNTRY'] ?? '';
<div class="table-responsive">
<div class="loadingtable">
<div class="loadingmessage">Loading Table</div>
<div class="loadingmessage">Loading <?php echo $pods[0]['count']; ?> lines of data to the table, this takes under 30 seconds</div>
<div class="signal"></div>
</div>
<table class="table table-bordered table-sm tablesorter table-hover tfont">
......
......@@ -147,7 +147,7 @@ foreach ($pods as $pod) {
foreach ($services as $service) {
// Make sure we have this service in the list.
if (!isset($services_list[$service])) {
debugToConsole($service);
//debugToConsole($service);
continue;
}
......
......@@ -13,9 +13,9 @@ bootstrap@^4.1.3:
integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
chart.js@^2.7.2:
version "2.8.0"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.8.0.tgz#b703b10d0f4ec5079eaefdcd6ca32dc8f826e0e9"
integrity sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==
version "2.9.3"
resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.9.3.tgz#ae3884114dafd381bc600f5b35a189138aac1ef7"
integrity sha512-+2jlOobSk52c1VU6fzkh3UwqHMdSlgH1xFv9FKMqHiNCpXsGPQa/+81AFa+i3jZ253Mq9aAycPwDjnn1XbRNNw==
dependencies:
chartjs-color "^2.1.0"
moment "^2.10.2"
......@@ -28,17 +28,24 @@ chartjs-color-string@^0.6.0:
color-name "^1.0.0"
chartjs-color@^2.1.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
version "2.4.1"
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.4.1.tgz#6118bba202fe1ea79dd7f7c0f9da93467296c3b0"
integrity sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==
dependencies:
chartjs-color-string "^0.6.0"
color-convert "^0.5.3"
color-convert "^1.9.3"
color-convert@^1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
dependencies:
color-name "1.1.3"
color-convert@^0.5.3:
version "0.5.3"
resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-0.5.3.tgz#bdb6c69ce660fadffe0b0007cc447e1b9f7282bd"
integrity sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=
color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
color-name@^1.0.0:
version "1.1.4"
......@@ -72,9 +79,9 @@ leaflet.markercluster@^1.3.0:
integrity sha512-ZSEpE/EFApR0bJ1w/dUGwTSUvWlpalKqIzkaYdYB7jaftQA/Y2Jav+eT4CMtEYFj+ZK4mswP13Q2acnPBnhGOw==
leaflet@^1.3.3:
version "1.5.1"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.5.1.tgz#9afb9d963d66c870066b1342e7a06f92840f46bf"
integrity sha512-ekM9KAeG99tYisNBg0IzEywAlp0hYI5XRipsqRXyRTeuU8jcuntilpp+eFf5gaE0xubc9RuSNIVtByEKwqFV0w==
version "1.6.0"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.6.0.tgz#aecbb044b949ec29469eeb31c77a88e2f448f308"
integrity sha512-CPkhyqWUKZKFJ6K8umN5/D2wrJ2+/8UIpXppY7QDnUZW5bZL5+SEI2J7GBpwh4LIupOKqbNSQXgqmrEJopHVNQ==
moment@^2.10.2:
version "2.24.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment