Merge https://github.com/MPOS/php-mpos into development

apojii · Sep 13, 2017 · 7dd8c69 · 7dd8c69
2 parents 6875749 + e2a3536
commit 7dd8c69
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -12,12 +12,8 @@ Donations
 
 Donations to this project are going directly to [TheSerapher](https://github.com/TheSerapher), the original author of this project:
 
-* LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8`
 * BTC address: `1HuYK6WPU8o3yWCrAaADDZPRpL5QiXitfv`
-* DOGE address: `DANk8bnc3vHEf7Jthaxq1Xgn1BSiArNdjG`
-* 42Coin address: `4VxA6Ht59Mj6ikhA4gDXLiHuAaDCJEvYTZ`
-* FST address: `fiRqMgZyhjTN1GSEB3ZxV35JXsE5bjEaQ2`
-* FRK address: `FDcgGZjX2B29qevSuiuQVwXhkNhtQT4cEW`
+* LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8`
 
 Website Footer
 ==============

diff --git a/include/classes/monitoring.class.php b/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 --git a/include/pages/statistics/uptime.inc.php b/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 {

diff --git a/include/smarty_globals.inc.php b/include/smarty_globals.inc.php
@@ -225,7 +225,7 @@
   $_SESSION['POPUP'][] = array('CONTENT' => 'You are using an old Theme that will not be maintained in the future.', 'TYPE' => 'alert alert-warning');
 
 // Check we can load the theme at all
-if ( !in_array($setting->getValue('website_theme'), $template->getThemes()))
+if ( !in_array($setting->getValue('website_theme', 'bootstrap'), $template->getThemes()))
   die('Unable to find your selected theme `' . $setting->getValue('website_theme') . '` in the list of available themes. Please reset your `website_theme` setting in your database.');
 
 // So we can display additional info

diff --git a/include/version.inc.php b/include/version.inc.php
@@ -1,7 +1,7 @@
 <?php
 $defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
 
-define('MPOS_VERSION', '1.0.6');
+define('MPOS_VERSION', '1.0.7');
 define('DB_VERSION', '1.0.2');
 define('CONFIG_VERSION', '1.0.1');
 define('HASH_VERSION', 1);