Merge pull request #1902 from MPOS/development

Merging Development to master

cronjobs/findblock.php

@@ -26,7 +26,7 @@ chdir(dirname(__FILE__));
 require_once('shared.inc.php');
 
 // Fetch our last block found from the DB as a starting point
-$aLastBlock = @$block->getLast();
+$aLastBlock = @$block->getLastValid();
 $strLastBlockHash = $aLastBlock['blockhash'];
 if (!$strLastBlockHash) $strLastBlockHash = '';
 
@@ -58,6 +58,15 @@ if (empty($aTransactions['transactions'])) {
       $aBlockRPCInfo = $bitcoin->getblock($aData['blockhash']);
       $config['reward_type'] == 'block' ? $aData['amount'] = $aData['amount'] : $aData['amount'] = $config['reward'];
       $aData['height'] = $aBlockRPCInfo['height'];
+      $aTxDetails = $bitcoin->gettransaction($aBlockRPCInfo['tx'][0]);
+      if (!isset($aBlockRPCInfo['confirmations'])) {
+        $aData['confirmations'] = $aBlockRPCInfo['confirmations'];
+      } else if (isset($aTxDetails['confirmations'])) {
+        $aData['confirmations'] = $aTxDetails['confirmations'];
+      } else {
+        $log->logFatal('    RPC does not return any usable block confirmation information');
+        $monitoring->endCronjob($cron_name, 'E0082', 1, true);
+      }
       $aData['difficulty'] = $aBlockRPCInfo['difficulty'];
       $log->logInfo(sprintf($strLogMask, substr($aData['blockhash'], 0, 17)."...", $aData['height'], $aData['amount'], $aData['confirmations'], $aData['difficulty'], strftime("%Y-%m-%d %H:%M:%S", $aData['time'])));
       if ( ! empty($aBlockRPCInfo['flags']) && preg_match('/proof-of-stake/', $aBlockRPCInfo['flags']) ) {

public/include/admin_checks.php

@@ -9,7 +9,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
   
   // setup some basic stuff for checking - getuid/getpwuid not available on mac/windows
   $apache_user = 'unknown';
-  if (substr_count(strtolower(PHP_OS), 'nix') > 0) {
+  if (substr_count(strtolower(PHP_OS), 'nix') > 0 || substr_count(strtolower(PHP_OS), 'linux') > 0) {
     $apache_user = (function_exists('posix_getuid')) ? posix_getuid() : 'unknown';
     $apache_user = (function_exists('posix_getpwuid')) ? posix_getpwuid($apache_user) : $apache_user;
   }
@@ -100,7 +100,7 @@ if (@$_SESSION['USERDATA']['is_admin'] && $user->isAdmin(@$_SESSION['USERDATA'][
     if ($socket !== false) {
       $address = @gethostbyname($config['gettingstarted']['stratumurl']);
       $result = @socket_connect($socket, $address, $config['gettingstarted']['stratumport']);
-      if ($result !== 1) {
+      if ($result !== true) {
         $enotice[] = "We tried to poke your Stratum server using config->gettingstarted details but it didn't respond";
       }
       $close = @socket_close($socket);

public/include/bootstrap.php

@@ -19,13 +19,13 @@ if (!include_once(BASEPATH . 'include/config/security.inc.dist.php')) die('Unabl
 if (@file_exists(BASEPATH . 'include/config/security.inc.php')) include_once(BASEPATH . 'include/config/security.inc.php');
 
 // start our session, we need it for smarty caching
-$session_start = @session_start();
 session_set_cookie_params(time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']);
+$session_start = @session_start();
 if (!$session_start) {
-    $log->log("info", "Forcing session id regeneration, session failed to start [hijack attempt?]");
-      session_destroy();
-      session_regenerate_id(true);
-        session_start();
+  $log->log("info", "Forcing session id regeneration, session failed to start [hijack attempt?]");
+  session_destroy();
+  session_regenerate_id(true);
+  session_start();
 }
 @setcookie(session_name(), session_id(), time()+$config['cookie']['duration'], $config['cookie']['path'], $config['cookie']['domain'], $config['cookie']['secure'], $config['cookie']['httponly']);
 

public/include/classes/api.class.php

@@ -15,6 +15,7 @@ class Api extends Base {
       return true;
     } else {
       if ($error == true) {
+        unset($_SESSION['POPUP']);
         header('HTTP/1.1 501 Not implemented');
         die('501 Not implemented');
       }

public/include/classes/block.class.php

@@ -15,6 +15,18 @@ class Block extends Base {
       return $result->fetch_assoc();
     return $this->sqlError();
   }
+  
+  /**
+   * Specific method to fetch the latest block found that is VALID
+   * @param none
+   * @return data array Array with database fields as keys
+   **/
+  public function getLastValid() {
+    $stmt = $this->mysqli->prepare("SELECT * FROM $this->table WHERE confirmations > -1 ORDER BY height DESC LIMIT 1");
+    if ($this->checkStmt($stmt) && $stmt->execute() && $result = $stmt->get_result())
+      return $result->fetch_assoc();
+    return $this->sqlError();
+  }
 
   /**
    * Get a specific block, by block height

public/include/classes/monitoring.class.php

@@ -16,8 +16,8 @@ class Monitoring extends Base {
       $aMonitors = explode(',', $api_keys);
       foreach ($aMonitors as $aData) {
         $temp = explode('|', $aData);
-        $aMonitor['api_key'] = $temp[0];
-        $aMonitor['monitor_id'] = $temp[1];
+        $aMonitor['api_key'] = trim($temp[0]);
+        $aMonitor['monitor_id'] = trim($temp[1]);
         $target = '/getMonitors?apiKey=' . $aMonitor['api_key'] . '&monitors=' . $aMonitor['monitor_id'] . '&format=json&noJsonCallback=1&customUptimeRatio=1-7-30&logs=1';
         $aMonitorStatus = $this->tools->getApi($url, $target);
         if (!$aMonitorStatus || @$aMonitorStatus['stat'] == 'fail') {

public/include/classes/user.class.php

@@ -347,7 +347,7 @@ class User extends Base {
    **/
   public function existsCoinAddress($address) {
     $this->debug->append("STA " . __METHOD__, 4);
-    return $this->getSingle($address, 'coin_address', 'coin_address') === $address;
+    return $this->getSingle($address, 'coin_address', 'coin_address', 's') === $address;
   }
 
   /**
@@ -624,15 +624,12 @@ class User extends Base {
     // Unset all of the session variables
     $_SESSION = array();
     // As we're killing the sesison, also kill the cookie!
-    if (ini_get("session.use_cookies")) {
-        $params = session_get_cookie_params();
-        setcookie(session_name(), '', time() - 42000, $params["path"], $params["domain"], $params["secure"], $params["httponly"]);
-    }
+    setcookie(session_name(), '', time() - 42000);
     // Destroy the session.
     session_destroy();
     // Enforce generation of a new Session ID and delete the old
     session_regenerate_id(true);
-    
+
     // Enforce a page reload and point towards login with referrer included, if supplied
     $port = ($_SERVER["SERVER_PORT"] == "80" || $_SERVER["SERVER_PORT"] == "443") ? "" : (":".$_SERVER["SERVER_PORT"]);
     $pushto = $_SERVER['SCRIPT_NAME'].'?page=login';

public/include/config/global.inc.dist.php

@@ -77,6 +77,13 @@ $config['price']['currency'] = 'USD';
 $config['ap_threshold']['min'] = 1;
 $config['ap_threshold']['max'] = 250;
 
+/**
+ * Minimum manual Payout Threshold
+ *  Minimum manual payout amount
+ *   https://github.com/MPOS/php-mpos/wiki/Config-Setup#wiki-manual-payout-threshold
+ **/
+$config['mp_threshold'] = 1;
+
 /**
  * Donation thresholds
  *  Minimum donation amount in percent

public/include/pages/account/edit.inc.php

@@ -94,13 +94,15 @@ if ($user->isAuthenticated()) {
       } else {
         switch (@$_POST['do']) {
           case 'cashOut':
+        	$aBalance = $transaction->getBalance($_SESSION['USERDATA']['id']);
+        	$dBalance = $aBalance['confirmed'];
         	if ($setting->getValue('disable_payouts') == 1 || $setting->getValue('disable_manual_payouts') == 1) {
         	  $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info');
-          } else if (!$user->getCoinAddress($_SESSION['USERDATA']['id'])) {
-            $_SESSION['POPUP'][] = array('CONTENT' => 'You have no payout address set.', 'TYPE' => 'errormsg');
+            } else if ($dBalance < $config['mp_threshold']) {
+              $_SESSION['POPUP'][] = array('CONTENT' => 'Payout must be greater or equal than ' . $config['mp_threshold'] . '.', 'TYPE' => 'info');
+            } else if (!$user->getCoinAddress($_SESSION['USERDATA']['id'])) {
+              $_SESSION['POPUP'][] = array('CONTENT' => 'You have no payout address set.', 'TYPE' => 'errormsg');
         	} else {
-        	  $aBalance = $transaction->getBalance($_SESSION['USERDATA']['id']);
-        	  $dBalance = $aBalance['confirmed'];
         	  $user->log->log("info", $_SESSION['USERDATA']['username']." requesting manual payout");
         	  if ($dBalance > $config['txfee_manual']) {
         	    if (!$oPayout->isPayoutActive($_SESSION['USERDATA']['id'])) {

public/include/smarty_globals.inc.php

@@ -88,6 +88,7 @@ $aGlobal = array(
     'txfee_manual' => $config['txfee_manual'],
     'txfee_auto' => $config['txfee_auto'],
     'payout_system' => $config['payout_system'],
+    'mp_threshold' => $config['mp_threshold'],
     'ap_threshold' => array(
       'min' => $config['ap_threshold']['min'],
       'max' => $config['ap_threshold']['max']