From 6af727587fb6637b1c499e746c1374e13a9b0e8c Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 12 Jul 2017 16:10:18 +0200 Subject: [PATCH 1/7] [UPDATE] Removed old donation addresses --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 360be683..30d8e199 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,6 @@ 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` Website Footer ============== From 312dd4b71e23b2dac004f3f3348827702032ca52 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 12 Jul 2017 16:10:54 +0200 Subject: [PATCH 2/7] [UPDATE] Out of release commit, removed donation addresses --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 9f7a83d7..30d8e199 100644 --- a/README.md +++ b/README.md @@ -13,12 +13,6 @@ 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` -* Cryptsy Trade Key: `6ff7292142463b7b80cbbbdfc52334ba89727b11` Website Footer ============== From 1fcf97d35b1cfaac5aa4b7fa656b5881f9042fd6 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 17 Jul 2017 15:49:25 +0200 Subject: [PATCH 3/7] [UPDATE] Re-confirmed BTC address --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30d8e199..3ee442d6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Donations Donations to this project are going directly to [TheSerapher](https://github.com/TheSerapher), the original author of this project: +* BTC address: `1HuYK6WPU8o3yWCrAaADDZPRpL5QiXitfv` * LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8` Website Footer From 2549e40c07ed2aa722ca7249198cd7e0ec83b0eb Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 17 Jul 2017 15:49:43 +0200 Subject: [PATCH 4/7] [UPDATE] Re-confirmed BTC address --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30d8e199..3ee442d6 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ Donations Donations to this project are going directly to [TheSerapher](https://github.com/TheSerapher), the original author of this project: +* BTC address: `1HuYK6WPU8o3yWCrAaADDZPRpL5QiXitfv` * LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8` Website Footer From 586ca796011ba42890e15bf6f73fe63d18afad6e Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 18 Jul 2017 09:15:22 +0200 Subject: [PATCH 5/7] [FIX #2565] New Uptime Robot HTTPS URL --- include/classes/monitoring.class.php | 2 +- include/pages/statistics/uptime.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/classes/monitoring.class.php b/include/classes/monitoring.class.php index f6f4e14d..87ce9d6f 100644 --- 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 index 7eea6e14..4342a6b1 100644 --- a/include/pages/statistics/uptime.inc.php +++ b/include/pages/statistics/uptime.inc.php @@ -15,7 +15,7 @@ if (!$smarty->isCached('master.tpl', $smarty_cache_key)) { )); $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 { From 6e65a48914298e39625e18a6e12dcf63b1c28ab9 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 18 Jul 2017 15:19:29 +0200 Subject: [PATCH 6/7] [FIX] Default to bootstrap theme if none added to DB --- include/smarty_globals.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/smarty_globals.inc.php b/include/smarty_globals.inc.php index fcfdbb69..6b6930b7 100644 --- a/include/smarty_globals.inc.php +++ b/include/smarty_globals.inc.php @@ -225,7 +225,7 @@ if ($setting->getValue('website_theme') == "mpos") $_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 From 86ad3027fbf21512dc26a19a819af51628b3f305 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Tue, 18 Jul 2017 15:22:19 +0200 Subject: [PATCH 7/7] [VERSION] 1.0.7 --- include/version.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/version.inc.php b/include/version.inc.php index ad0f43a1..46e0253e 100644 --- a/include/version.inc.php +++ b/include/version.inc.php @@ -1,7 +1,7 @@