Merge pull request #2517 from MPOS/development

UPDATE : Development to Master

Author: TheSerapher

.gitignore

@@ -37,4 +37,7 @@
 
 /vendor/
 
-tests/_output/*
+tests/_output/*
+
+# NetBeans Project Directory
+/nbproject/*

.travis.yml

@@ -18,7 +18,7 @@ branches:
 
 install:
   - wget http://selenium-release.storage.googleapis.com/2.42/selenium-server-standalone-2.42.2.jar
-  - composer global require "fxp/composer-asset-plugin:1.0.0-beta2"
+  - composer global require "fxp/composer-asset-plugin:~1.1.1"
   - composer install
 
 
@@ -38,4 +38,4 @@ script:
 
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
-  - php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml
+  - php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml

cronjobs/shared.inc.php

@@ -69,6 +69,12 @@ function cfip() { return (@defined('SECURITY')) ? 1 : 0; }
 // Load the start time for later runtime calculations for monitoring
 $cron_start[$cron_name] = microtime(true);
 
+// Skip all crons if admin enabled pool maintenance
+if ($setting->getValue('maintenance')) {
+  $log->logInfo('Cronjobs disabled due to pool maintenance');
+  $monitoring->endCronjob($cron_name, 'E0083', 2, true, false);
+}
+
 // Check if our cron is activated
 if ($monitoring->isDisabled($cron_name)) {
   $log->logFatal('Cronjob is currently disabled due to errors, use -f option to force running cron.');

include/autoloader.inc.php

@@ -78,5 +78,8 @@
 require_once(CLASS_DIR . '/roundstats.class.php');
 require_once(CLASS_DIR . '/news.class.php');
 require_once(CLASS_DIR . '/api.class.php');
+require_once(CLASS_DIR . '/usersettings.class.php');
+require_once(CLASS_DIR . '/ipushnotification.interface.php');
+require_once(CLASS_DIR . '/pushnotification.class.php');
 require_once(INCLUDE_DIR . '/lib/Michelf/Markdown.php');
 require_once(INCLUDE_DIR . '/lib/scrypt.php');

include/classes/base.class.php

@@ -16,6 +16,8 @@ class Base {
   public function getTableName() {
     return $this->table;
   }
+  
+  protected $debug;
   public function setDebug($debug) {
     $this->debug = $debug;
   }
@@ -25,9 +27,13 @@ public function setCoin($coin) {
   public function setCoinAddress($coin_address) {
     $this->coin_address = $coin_address;
   }
+  
+  public $log;
   public function setLog($log) {
     $this->log = $log;
   }
+  
+  protected $mysqli;
   public function setMysql($mysqli) {
     $this->mysqli = $mysqli;
   }
@@ -40,6 +46,10 @@ public function setSalt($salt) {
   public function setSalty($salt) {
     $this->salty = $salt;
   }
+  /**
+   * @var Smarty
+   */
+  var $smarty;
   public function setSmarty($smarty) {
     $this->smarty = $smarty;
   }
@@ -52,6 +62,8 @@ public function setSessionManager($session) {
   public function setConfig($config) {
     $this->config = $config;
   }
+  
+  protected $aErrorCodes;
   public function setErrorCodes(&$aErrorCodes) {
     $this->aErrorCodes =& $aErrorCodes;
   }

include/classes/coins/coin_neoscrypt.class.php

@@ -0,0 +1,11 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+
+/**
+ * We extend our CoinBase class
+ * No need to change anything, base class supports
+ * scrypt and sha256d
+ **/
+class Coin extends CoinBase {
+  protected $target_bits = 16;
+}

include/classes/coins/coin_x13.class.php

@@ -0,0 +1,11 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+/**
+ * We extend our CoinBase class
+ * No need to change anything, base class supports
+ * scrypt and sha256d
+ **/
+class Coin extends CoinBase {
+  protected $target_bits = 24;
+  protected $share_difficulty_precision = 4;
+}

include/classes/coins/coin_x15.class.php

@@ -0,0 +1,11 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+/**
+ * We extend our CoinBase class
+ * No need to change anything, base class supports
+ * scrypt and sha256d
+ **/
+class Coin extends CoinBase {
+  protected $target_bits = 24;
+  protected $share_difficulty_precision = 4;
+}

include/classes/ipushnotification.interface.php

@@ -0,0 +1,6 @@
+<?php
+	interface IPushNotification {
+		public static function getName();
+		public static function getParameters();
+		public function notify($message, $severity, $event);
+	}

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);
@@ -131,7 +131,7 @@ public function endCronjob($cron_name, $msgCode, $exitCode=0, $fatal=false, $mai
         $this->setErrorMessage('Failed to send mail notification');
     }
     if ($fatal) {
-      if ($exitCode != 0) $this->setStatus($cron_name . "_disabled", "yesno", 1);
+      if ($exitCode == 1) $this->setStatus($cron_name . "_disabled", "yesno", 1);
       exit($exitCode);
     }
   }