Merge pull request #2574 from MPOS/issue-2565-uptimerobot

Issue #2565 uptimerobot

Author: TheSerapher

Diff for: include/classes/monitoring.class.php

@@ -12,7 +12,7 @@ class Monitoring extends Base {
   public function storeUptimeRobotStatus() {
     if ($api_keys = $this->setting->getValue('monitoring_uptimerobot_api_keys')) {
       $aJSONData = array();
-      $url = 'http://api.uptimerobot.com';
+      $url = 'https://api.uptimerobot.com';
       $aMonitors = explode(',', $api_keys);
       foreach ($aMonitors as $aData) {
         $temp = explode('|', $aData);

Diff for: include/pages/statistics/uptime.inc.php

@@ -15,7 +15,7 @@
     ));
     $content = 'default.tpl';
   } else {
-    $_SESSION['POPUP'][] = array('CONTENT' => 'UptimeRobot API Key not configured.', 'TYPE' => 'alert alert-warning');
+    $_SESSION['POPUP'][] = array('CONTENT' => 'UptimeRobot API Key not configured or no data available.', 'TYPE' => 'alert alert-warning');
     $content = '';
   }
 } else {