diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
index 4ee9f644..42e347a0 100755
--- a/cronjobs/findblock.php
+++ b/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']) ) {
diff --git a/public/include/admin_checks.php b/public/include/admin_checks.php
index b10e9dfa..98ecbbb2 100644
--- a/public/include/admin_checks.php
+++ b/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);
diff --git a/public/include/bootstrap.php b/public/include/bootstrap.php
index fc300de6..c63ad5fa 100644
--- a/public/include/bootstrap.php
+++ b/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']);
diff --git a/public/include/classes/api.class.php b/public/include/classes/api.class.php
index 8e245a22..913a1f03 100644
--- a/public/include/classes/api.class.php
+++ b/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');
}
diff --git a/public/include/classes/block.class.php b/public/include/classes/block.class.php
index 76ccf43d..cf0ea7ee 100644
--- a/public/include/classes/block.class.php
+++ b/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
diff --git a/public/include/classes/monitoring.class.php b/public/include/classes/monitoring.class.php
index 46324086..d5b99a7b 100644
--- a/public/include/classes/monitoring.class.php
+++ b/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') {
diff --git a/public/include/classes/notification.class.php b/public/include/classes/notification.class.php
old mode 100755
new mode 100644
diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index 978d530d..81fefd45 100644
--- a/public/include/classes/user.class.php
+++ b/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';
diff --git a/public/include/config/global.inc.dist.php b/public/include/config/global.inc.dist.php
index 06e67c82..2da7464e 100644
--- a/public/include/config/global.inc.dist.php
+++ b/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
diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php
index cde09a77..a09b2abd 100644
--- a/public/include/pages/account/edit.inc.php
+++ b/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'])) {
diff --git a/public/include/pages/account/notifications.inc.php b/public/include/pages/account/notifications.inc.php
old mode 100755
new mode 100644
diff --git a/public/include/smarty_globals.inc.php b/public/include/smarty_globals.inc.php
index 61d350f4..8b7bd71e 100644
--- a/public/include/smarty_globals.inc.php
+++ b/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']
diff --git a/public/site_assets/global/images/flags/ad.png b/public/site_assets/global/images/flags/ad.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ae.png b/public/site_assets/global/images/flags/ae.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/af.png b/public/site_assets/global/images/flags/af.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ag.png b/public/site_assets/global/images/flags/ag.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ai.png b/public/site_assets/global/images/flags/ai.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/al.png b/public/site_assets/global/images/flags/al.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/am.png b/public/site_assets/global/images/flags/am.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/an.png b/public/site_assets/global/images/flags/an.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ar.png b/public/site_assets/global/images/flags/ar.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/as.png b/public/site_assets/global/images/flags/as.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/at.png b/public/site_assets/global/images/flags/at.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/au.png b/public/site_assets/global/images/flags/au.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/aw.png b/public/site_assets/global/images/flags/aw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ax.png b/public/site_assets/global/images/flags/ax.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/az.png b/public/site_assets/global/images/flags/az.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ba.png b/public/site_assets/global/images/flags/ba.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bb.png b/public/site_assets/global/images/flags/bb.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bd.png b/public/site_assets/global/images/flags/bd.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/be.png b/public/site_assets/global/images/flags/be.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bf.png b/public/site_assets/global/images/flags/bf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bg.png b/public/site_assets/global/images/flags/bg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bh.png b/public/site_assets/global/images/flags/bh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bi.png b/public/site_assets/global/images/flags/bi.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bj.png b/public/site_assets/global/images/flags/bj.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bm.png b/public/site_assets/global/images/flags/bm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bn.png b/public/site_assets/global/images/flags/bn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bo.png b/public/site_assets/global/images/flags/bo.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/br.png b/public/site_assets/global/images/flags/br.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bs.png b/public/site_assets/global/images/flags/bs.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bt.png b/public/site_assets/global/images/flags/bt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bv.png b/public/site_assets/global/images/flags/bv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bw.png b/public/site_assets/global/images/flags/bw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/by.png b/public/site_assets/global/images/flags/by.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/bz.png b/public/site_assets/global/images/flags/bz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ca.png b/public/site_assets/global/images/flags/ca.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cc.png b/public/site_assets/global/images/flags/cc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cf.png b/public/site_assets/global/images/flags/cf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cg.png b/public/site_assets/global/images/flags/cg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ch.png b/public/site_assets/global/images/flags/ch.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ci.png b/public/site_assets/global/images/flags/ci.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ck.png b/public/site_assets/global/images/flags/ck.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cl.png b/public/site_assets/global/images/flags/cl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cm.png b/public/site_assets/global/images/flags/cm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cn.png b/public/site_assets/global/images/flags/cn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/co.png b/public/site_assets/global/images/flags/co.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cr.png b/public/site_assets/global/images/flags/cr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cs.png b/public/site_assets/global/images/flags/cs.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cu.png b/public/site_assets/global/images/flags/cu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cv.png b/public/site_assets/global/images/flags/cv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cx.png b/public/site_assets/global/images/flags/cx.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cy.png b/public/site_assets/global/images/flags/cy.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/cz.png b/public/site_assets/global/images/flags/cz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/de.png b/public/site_assets/global/images/flags/de.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/dj.png b/public/site_assets/global/images/flags/dj.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/dk.png b/public/site_assets/global/images/flags/dk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/dm.png b/public/site_assets/global/images/flags/dm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/do.png b/public/site_assets/global/images/flags/do.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/dz.png b/public/site_assets/global/images/flags/dz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ec.png b/public/site_assets/global/images/flags/ec.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ee.png b/public/site_assets/global/images/flags/ee.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/eg.png b/public/site_assets/global/images/flags/eg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/eh.png b/public/site_assets/global/images/flags/eh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/england.png b/public/site_assets/global/images/flags/england.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/er.png b/public/site_assets/global/images/flags/er.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/es.png b/public/site_assets/global/images/flags/es.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/et.png b/public/site_assets/global/images/flags/et.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fam.png b/public/site_assets/global/images/flags/fam.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fi.png b/public/site_assets/global/images/flags/fi.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fj.png b/public/site_assets/global/images/flags/fj.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fk.png b/public/site_assets/global/images/flags/fk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fm.png b/public/site_assets/global/images/flags/fm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fo.png b/public/site_assets/global/images/flags/fo.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/fr.png b/public/site_assets/global/images/flags/fr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ga.png b/public/site_assets/global/images/flags/ga.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gd.png b/public/site_assets/global/images/flags/gd.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ge.png b/public/site_assets/global/images/flags/ge.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gf.png b/public/site_assets/global/images/flags/gf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gh.png b/public/site_assets/global/images/flags/gh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gi.png b/public/site_assets/global/images/flags/gi.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gl.png b/public/site_assets/global/images/flags/gl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gm.png b/public/site_assets/global/images/flags/gm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gn.png b/public/site_assets/global/images/flags/gn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gp.png b/public/site_assets/global/images/flags/gp.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gq.png b/public/site_assets/global/images/flags/gq.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gr.png b/public/site_assets/global/images/flags/gr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gs.png b/public/site_assets/global/images/flags/gs.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gt.png b/public/site_assets/global/images/flags/gt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gu.png b/public/site_assets/global/images/flags/gu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gw.png b/public/site_assets/global/images/flags/gw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/gy.png b/public/site_assets/global/images/flags/gy.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/hk.png b/public/site_assets/global/images/flags/hk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/hm.png b/public/site_assets/global/images/flags/hm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/hn.png b/public/site_assets/global/images/flags/hn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/hr.png b/public/site_assets/global/images/flags/hr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ht.png b/public/site_assets/global/images/flags/ht.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/hu.png b/public/site_assets/global/images/flags/hu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/id.png b/public/site_assets/global/images/flags/id.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ie.png b/public/site_assets/global/images/flags/ie.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/il.png b/public/site_assets/global/images/flags/il.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/in.png b/public/site_assets/global/images/flags/in.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/io.png b/public/site_assets/global/images/flags/io.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/iq.png b/public/site_assets/global/images/flags/iq.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ir.png b/public/site_assets/global/images/flags/ir.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/is.png b/public/site_assets/global/images/flags/is.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/it.png b/public/site_assets/global/images/flags/it.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/jm.png b/public/site_assets/global/images/flags/jm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/jo.png b/public/site_assets/global/images/flags/jo.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/jp.png b/public/site_assets/global/images/flags/jp.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ke.png b/public/site_assets/global/images/flags/ke.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kg.png b/public/site_assets/global/images/flags/kg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kh.png b/public/site_assets/global/images/flags/kh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ki.png b/public/site_assets/global/images/flags/ki.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/km.png b/public/site_assets/global/images/flags/km.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kn.png b/public/site_assets/global/images/flags/kn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kp.png b/public/site_assets/global/images/flags/kp.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kr.png b/public/site_assets/global/images/flags/kr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kw.png b/public/site_assets/global/images/flags/kw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ky.png b/public/site_assets/global/images/flags/ky.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/kz.png b/public/site_assets/global/images/flags/kz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/la.png b/public/site_assets/global/images/flags/la.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lb.png b/public/site_assets/global/images/flags/lb.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/li.png b/public/site_assets/global/images/flags/li.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lk.png b/public/site_assets/global/images/flags/lk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lr.png b/public/site_assets/global/images/flags/lr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ls.png b/public/site_assets/global/images/flags/ls.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lt.png b/public/site_assets/global/images/flags/lt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lu.png b/public/site_assets/global/images/flags/lu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/lv.png b/public/site_assets/global/images/flags/lv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ly.png b/public/site_assets/global/images/flags/ly.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ma.png b/public/site_assets/global/images/flags/ma.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mc.png b/public/site_assets/global/images/flags/mc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/md.png b/public/site_assets/global/images/flags/md.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mg.png b/public/site_assets/global/images/flags/mg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mh.png b/public/site_assets/global/images/flags/mh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mk.png b/public/site_assets/global/images/flags/mk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ml.png b/public/site_assets/global/images/flags/ml.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mm.png b/public/site_assets/global/images/flags/mm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mn.png b/public/site_assets/global/images/flags/mn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mo.png b/public/site_assets/global/images/flags/mo.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mp.png b/public/site_assets/global/images/flags/mp.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mq.png b/public/site_assets/global/images/flags/mq.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mr.png b/public/site_assets/global/images/flags/mr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ms.png b/public/site_assets/global/images/flags/ms.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mt.png b/public/site_assets/global/images/flags/mt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mu.png b/public/site_assets/global/images/flags/mu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mv.png b/public/site_assets/global/images/flags/mv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mw.png b/public/site_assets/global/images/flags/mw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mx.png b/public/site_assets/global/images/flags/mx.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/my.png b/public/site_assets/global/images/flags/my.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/mz.png b/public/site_assets/global/images/flags/mz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/na.png b/public/site_assets/global/images/flags/na.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nc.png b/public/site_assets/global/images/flags/nc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ne.png b/public/site_assets/global/images/flags/ne.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nf.png b/public/site_assets/global/images/flags/nf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ng.png b/public/site_assets/global/images/flags/ng.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ni.png b/public/site_assets/global/images/flags/ni.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nl.png b/public/site_assets/global/images/flags/nl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/no.png b/public/site_assets/global/images/flags/no.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/np.png b/public/site_assets/global/images/flags/np.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nr.png b/public/site_assets/global/images/flags/nr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nu.png b/public/site_assets/global/images/flags/nu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/nz.png b/public/site_assets/global/images/flags/nz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/om.png b/public/site_assets/global/images/flags/om.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pa.png b/public/site_assets/global/images/flags/pa.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pe.png b/public/site_assets/global/images/flags/pe.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pf.png b/public/site_assets/global/images/flags/pf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pg.png b/public/site_assets/global/images/flags/pg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ph.png b/public/site_assets/global/images/flags/ph.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pk.png b/public/site_assets/global/images/flags/pk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pl.png b/public/site_assets/global/images/flags/pl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pm.png b/public/site_assets/global/images/flags/pm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pn.png b/public/site_assets/global/images/flags/pn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pr.png b/public/site_assets/global/images/flags/pr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ps.png b/public/site_assets/global/images/flags/ps.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pt.png b/public/site_assets/global/images/flags/pt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/pw.png b/public/site_assets/global/images/flags/pw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/py.png b/public/site_assets/global/images/flags/py.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/qa.png b/public/site_assets/global/images/flags/qa.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/re.png b/public/site_assets/global/images/flags/re.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ro.png b/public/site_assets/global/images/flags/ro.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ru.png b/public/site_assets/global/images/flags/ru.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/rw.png b/public/site_assets/global/images/flags/rw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sa.png b/public/site_assets/global/images/flags/sa.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sb.png b/public/site_assets/global/images/flags/sb.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sc.png b/public/site_assets/global/images/flags/sc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/scotland.png b/public/site_assets/global/images/flags/scotland.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sd.png b/public/site_assets/global/images/flags/sd.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/se.png b/public/site_assets/global/images/flags/se.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sg.png b/public/site_assets/global/images/flags/sg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sh.png b/public/site_assets/global/images/flags/sh.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/si.png b/public/site_assets/global/images/flags/si.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sj.png b/public/site_assets/global/images/flags/sj.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sk.png b/public/site_assets/global/images/flags/sk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sl.png b/public/site_assets/global/images/flags/sl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sm.png b/public/site_assets/global/images/flags/sm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sn.png b/public/site_assets/global/images/flags/sn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/so.png b/public/site_assets/global/images/flags/so.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sr.png b/public/site_assets/global/images/flags/sr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/st.png b/public/site_assets/global/images/flags/st.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sv.png b/public/site_assets/global/images/flags/sv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sy.png b/public/site_assets/global/images/flags/sy.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/sz.png b/public/site_assets/global/images/flags/sz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tc.png b/public/site_assets/global/images/flags/tc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/td.png b/public/site_assets/global/images/flags/td.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tf.png b/public/site_assets/global/images/flags/tf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tg.png b/public/site_assets/global/images/flags/tg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/th.png b/public/site_assets/global/images/flags/th.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tj.png b/public/site_assets/global/images/flags/tj.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tk.png b/public/site_assets/global/images/flags/tk.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tl.png b/public/site_assets/global/images/flags/tl.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tm.png b/public/site_assets/global/images/flags/tm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tn.png b/public/site_assets/global/images/flags/tn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/to.png b/public/site_assets/global/images/flags/to.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tr.png b/public/site_assets/global/images/flags/tr.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tt.png b/public/site_assets/global/images/flags/tt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tv.png b/public/site_assets/global/images/flags/tv.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tw.png b/public/site_assets/global/images/flags/tw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/tz.png b/public/site_assets/global/images/flags/tz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ua.png b/public/site_assets/global/images/flags/ua.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ug.png b/public/site_assets/global/images/flags/ug.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/um.png b/public/site_assets/global/images/flags/um.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/us.png b/public/site_assets/global/images/flags/us.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/uy.png b/public/site_assets/global/images/flags/uy.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/uz.png b/public/site_assets/global/images/flags/uz.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/va.png b/public/site_assets/global/images/flags/va.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/vc.png b/public/site_assets/global/images/flags/vc.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ve.png b/public/site_assets/global/images/flags/ve.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/vg.png b/public/site_assets/global/images/flags/vg.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/vi.png b/public/site_assets/global/images/flags/vi.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/vn.png b/public/site_assets/global/images/flags/vn.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/vu.png b/public/site_assets/global/images/flags/vu.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/wales.png b/public/site_assets/global/images/flags/wales.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/wf.png b/public/site_assets/global/images/flags/wf.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ws.png b/public/site_assets/global/images/flags/ws.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/ye.png b/public/site_assets/global/images/flags/ye.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/yt.png b/public/site_assets/global/images/flags/yt.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/za.png b/public/site_assets/global/images/flags/za.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/zm.png b/public/site_assets/global/images/flags/zm.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/global/images/flags/zw.png b/public/site_assets/global/images/flags/zw.png
old mode 100755
new mode 100644
diff --git a/public/site_assets/mobile/js/justgage.1.0.1.min.js b/public/site_assets/mobile/js/justgage.1.0.1.min.js
old mode 100755
new mode 100644
diff --git a/public/site_assets/mobile/js/raphael.2.1.0.min.js b/public/site_assets/mobile/js/raphael.2.1.0.min.js
old mode 100755
new mode 100644
diff --git a/public/site_assets/mpos/js/justgage.1.0.1.min.js b/public/site_assets/mpos/js/justgage.1.0.1.min.js
old mode 100755
new mode 100644
diff --git a/public/templates/mpos/account/edit/default.tpl b/public/templates/mpos/account/edit/default.tpl
index 4b7053f5..0f6e48b4 100644
--- a/public/templates/mpos/account/edit/default.tpl
+++ b/public/templates/mpos/account/edit/default.tpl
@@ -89,6 +89,9 @@
Please note: a {if $GLOBAL.config.txfee_manual > 0.00001}{$GLOBAL.config.txfee_manual}{else}{$GLOBAL.config.txfee_manual|number_format:"8"}{/if} {$GLOBAL.config.currency} transaction will apply when processing "On-Demand" manual payments 
+
+ Minimum Cashout: {$GLOBAL.config.mp_threshold} {$GLOBAL.config.currency}
+