Merge pull request #2075 from MPOS/development

UPDATE : Development to Master - RC1

Author: TheSerapher

cronjobs/payouts.php

@@ -46,10 +46,10 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
+$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+$dBlocksUnconfirmedBalance = 0;
+if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
 if ($config['getbalancewithunconfirmed']) {
-  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-  $dBlocksUnconfirmedBalance = 0;
-  if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
   $dWalletBalance -= $dBlocksUnconfirmedBalance;
 }
 // Fetch Newmint
@@ -133,10 +133,10 @@
 
 // Fetch unconfirmed amount from blocks table
 empty($config['network_confirmations']) ? $confirmations = 120 : $confirmations = $config['network_confirmations'];
+$aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
+$dBlocksUnconfirmedBalance = 0;
+if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
 if ($config['getbalancewithunconfirmed']) {
-  $aBlocksUnconfirmed = $block->getAllUnconfirmed($confirmations);
-  $dBlocksUnconfirmedBalance = 0;
-  if (!empty($aBlocksUnconfirmed))foreach ($aBlocksUnconfirmed as $aData) $dBlocksUnconfirmedBalance += $aData['amount'];
   $dWalletBalance -= $dBlocksUnconfirmedBalance;
 }
 // Fetch Newmint

public/include/classes/coins/coin_base.class.php

@@ -47,13 +47,22 @@ public function calcEstaimtedShares($dDifficulty) {
    * Calculate our networks expected time per block
    **/
   public function calcNetworkExpectedTimePerBlock($dDifficulty, $dNetworkHashrate) {
-    return pow(2, 32) * $dDifficulty / $dNetworkHashrate;
+    if ($dNetworkHashrate > 0) {
+      return pow(2, 32) * $dDifficulty / $dNetworkHashrate;
+    } else {
+      return 0;
+    }
   }
   /**
    * Calculate next expected difficulty based on current difficulty
    **/
   public function calcExpectedNextDifficulty($dDifficulty, $dNetworkHashrate) {
-    return round($dDifficulty * $this->config['cointarget'] / $this->calcNetworkExpectedTimePerBlock($dDifficulty, $dNetworkHashrate), 8);
+    $iExpectedTimePerBlock = $this->calcNetworkExpectedTimePerBlock($dDifficulty, $dNetworkHashrate);
+    if (!empty($iExpectedTimePerBlock) && $iExpectedTimePerBlock > 0) {
+      return round($dDifficulty * $this->config['cointarget'] / $iExpectedTimePerBlock, 8);
+    } else {
+      return 0;
+    }
   }
 }
 

public/include/classes/mail.class.php

@@ -34,7 +34,7 @@ public function contactform($senderName, $senderEmail, $senderSubject, $senderMe
     $aData['senderEmail'] = $senderEmail;
     $aData['senderSubject'] = $senderSubject;
     $aData['senderMessage'] = $senderMessage;
-    $aData['email'] = $this->setting->getValue('website_email');
+    $aData['email'] = $this->setting->getValue('website_email', 'test@example.com');
     $aData['subject'] = 'Contact Form';
       if ($this->sendMail('contactform/body', $aData)) {
         return true;
@@ -52,7 +52,7 @@ public function contactform($senderName, $senderEmail, $senderSubject, $senderMe
    *     subject : Mail Subject
    *     email   : Destination address
    **/
-  public function sendMail($template, $aData) {
+  public function sendMail($template, $aData, $throttle=false) {
     // Prepare SMTP transport and mailer
     $transport_type = $this->config['swiftmailer']['type'];
     if ($transport_type == 'sendmail') {
@@ -65,6 +65,14 @@ public function sendMail($template, $aData) {
       }
     }
     $mailer = Swift_Mailer::newInstance($transport);
+
+    // Throttle mails to x per minute, used for newsletter for example
+    if ($this->config['swiftmailer']['type'] == 'smtp' && $throttle) {
+      $mailer->registerPlugin(new Swift_Plugins_ThrottlerPlugin(
+        $this->config['switfmailer']['smtp']['throttle'], Swift_Plugins_ThrottlerPlugin::MESSAGES_PER_MINUTE
+      ));
+    }
+
     // Prepare the smarty templates used
     $this->smarty->clearCache(BASEPATH . 'templates/mail/' . $template . '.tpl');
     $this->smarty->clearCache(BASEPATH . 'templates/mail/subject.tpl');
@@ -73,14 +81,20 @@ public function sendMail($template, $aData) {
     $this->smarty->assign('DATA', $aData);
 
     // Create new message for Swiftmailer
+    $senderEmail = $this->setting->getValue('website_email', 'test@example.com');
+    $senderName = $this->setting->getValue('website_name', 'test@example.com');
     $message = Swift_Message::newInstance()
       ->setSubject($this->smarty->fetch(BASEPATH . 'templates/mail/subject.tpl'))
-      ->setFrom(array( $this->setting->getValue('website_email') => $this->setting->getValue('website_name')))
+      ->setFrom(array( $senderEmail => $senderName))
       ->setTo($aData['email'])
-      ->setSender($this->setting->getValue('website_email'))
-      ->setReturnPath($this->setting->getValue('website_email'))
+      ->setSender($senderEmail)
+      ->setReturnPath($senderEmail)
       ->setBody($this->smarty->fetch(BASEPATH . 'templates/mail/' . $template . '.tpl'), 'text/html');
-    if (strlen(@$aData['senderName']) > 0 && @strlen($aData['senderEmail']) > 0 )
+    if (isset($aData['senderName']) &&
+        isset($aData['senderEmail']) &&
+        strlen($aData['senderName']) > 0 &&
+        strlen($aData['senderEmail']) > 0 &&
+        filter_var($aData['senderEmail'], FILTER_VALIDATE_EMAIL))
       $message->setReplyTo(array($aData['senderEmail'] => $aData['senderName']));
 
     // Send message out with configured transport

public/include/classes/notification.class.php

@@ -72,13 +72,26 @@ public function getNotifications($account_id,$limit=50) {
    * @return array Notification settings
    **/
   public function getNotificationSettings($account_id) {
+    // Some defaults, we cover them here so we can avoid adding default settings on user creation
+    $aDefaults = array( 'newsletter' => 1 );
     $this->debug->append("STA " . __METHOD__, 4);
     $stmt = $this->mysqli->prepare("SELECT * FROM $this->tableSettings WHERE account_id = ?");
     if ($stmt && $stmt->bind_param('i', $account_id) && $stmt->execute() && $result = $stmt->get_result()) {
       if ($result->num_rows > 0) {
+        $aFound = array();
         while ($row = $result->fetch_assoc()) {
+          if (array_key_exists($row['type'], $aDefaults)) $aFound[] = $row['type'];
           $aData[$row['type']] = $row['active'];
         }
+        // Check found types against our defaults, set if required
+        foreach ($aDefaults as $type => $value) {
+          if (!in_array($type, $aFound)) {
+            $aData[$type] = $value;
+          }
+        }
+        return $aData;
+      } else {
+        foreach ($aDefaults as $type => $value) $aData[$type] = $value;
         return $aData;
       }
     }

public/include/classes/transaction.class.php

@@ -150,8 +150,8 @@ public function getTransactionTypebyTime($account_id=NULL) {
         IFNULL(SUM(IF(t.type = 'TXFee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearTXFee,
         IFNULL(SUM(IF(t.type = 'Fee' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearFee,
         IFNULL(SUM(IF(t.type = 'Donation' AND timestamp >= DATE_SUB(now(), INTERVAL 31536000 SECOND), t.amount, 0)), 0) AS 1YearDonation
-      FROM transactions AS t
-      LEFT OUTER JOIN blocks AS b ON b.id = t.block_id
+      FROM $this->table AS t
+      LEFT OUTER JOIN " . $this->block->getTableName() . " AS b ON b.id = t.block_id
       WHERE
         t.account_id = ? AND (b.confirmations > 0 OR b.id IS NULL)");
     if ($this->checkStmt($stmt) && $stmt->bind_param("i", $account_id) && $stmt->execute() && $result = $stmt->get_result())

public/include/classes/user.class.php

@@ -192,6 +192,11 @@ public function checkLogin($username, $password) {
       return false;
     }
     if ($this->checkUserPassword($username, $password)) {
+      // delete notification cookies
+      setcookie("motd-box", "", time()-3600);
+      setcookie("lastlogin-box", "", time()-3600);
+      setcookie("backend-box", "", time()-3600);
+      // rest of login process
       $uid = $this->getUserId($username);
       $lastLoginTime = $this->getLastLogin($uid);
       $this->updateLoginTimestamp($uid);

public/include/config/admin_settings.inc.php

@@ -272,6 +272,20 @@
   'name' => 'acl_chat_page', 'value' => $setting->getValue('acl_chat_page'),
   'tooltip' => 'Make the chat page private (users only) or public.'
 );
+$aSettings['acl'][] = array(
+  'display' => 'MOOT Forum Page', 'type' => 'select',
+  'options' => array( 0 => 'Private', 1 => 'Public', 2 => 'Disabled' ),
+  'default' => 2,
+  'name' => 'acl_moot_forum', 'value' => $setting->getValue('acl_moot_forum'),
+  'tooltip' => 'Make the forum page private (users only) or public.'
+);
+$aSettings['acl'][] = array(
+  'display' => 'QRCode', 'type' => 'select',
+  'options' => array( 0 => 'Enabled', 1 => 'Disabled' ),
+  'default' => 0,
+  'name' => 'acl_qrcode', 'value' => $setting->getValue('acl_qrcode'),
+  'tooltip' => 'Hide or Show the QRCode Page.'
+);
 $aSettings['system'][] = array(
   'display' => 'E-mail address for system error notifications', 'type' => 'text',
   'size' => 25,
@@ -370,6 +384,13 @@
   'name' => 'system_irc_chat', 'value' => $setting->getValue('system_irc_chat'),
   'tooltip' => 'Your IRC support channel name.'
 );
+$aSettings['system'][] = array(
+  'display' => 'Moot Forum Channel', 'type' => 'text',
+  'size' => 25,
+  'default' => 'lazypoolop',
+  'name' => 'system_moot_forum', 'value' => $setting->getValue('system_moot_forum'),
+  'tooltip' => 'Your MOOT support forum name.'
+);
 $aSettings['recaptcha'][] = array(
   'display' => 'Enable re-Captcha', 'type' => 'select',
   'options' => array( 0 => 'No', 1 => 'Yes' ),
@@ -447,6 +468,13 @@
   'name' => 'notifications_disable_idle_worker', 'value' => $setting->getValue('notifications_disable_idle_worker'),
   'tooltip' => 'Enable/Disable IDLE worker notifications globally. Will remove the user option too.'
 );
+$aSettings['notifications'][] = array(
+  'display' => 'Disable Pool Newsletter', 'type' => 'select',
+  'options' => array( 0 => 'No', 1 => 'Yes'),
+  'default' => 0,
+  'name' => 'notifications_disable_pool_newsletter', 'value' => $setting->getValue('notifications_disable_pool_newsletter'),
+  'tooltip' => 'Enable/Disable pool newsletter globally. Will remove the user option too.'
+);
 $aSettings['pools'][] = array(
   'display' => 'Enable Pool Navigation', 'type' => 'select',
   'options' => array( 0 => 'No', 1 => 'Yes' ),

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

@@ -70,6 +70,7 @@
 $config['switfmailer']['smtp']['encryption'] = 'tls';
 $config['switfmailer']['smtp']['username'] = '';
 $config['switfmailer']['smtp']['password'] = '';
+$config['switfmailer']['smtp']['throttle'] = 100;
 
 /**
  * Getting Started Config

public/include/pages/about/moot.inc.php

@@ -0,0 +1,20 @@
+<?php
+$defflip = (!cfip()) ? exit(header('HTTP/1.1 401 Unauthorized')) : 1;
+
+// ACL check
+switch($setting->getValue('acl_moot_forum', 2)) {
+case '0':
+  if ($user->isAuthenticated()) {
+    $smarty->assign('CHATROOM', $setting->getValue('system_moot_forum', 'lazypoolop'));
+    $smarty->assign("CONTENT", "default.tpl");
+  }
+  break;
+case '1':
+  $smarty->assign('CHATROOM', $setting->getValue('system_moot_forum', 'lazypoolop'));
+  $smarty->assign("CONTENT", "default.tpl");
+  break;
+case '2':
+  $_SESSION['POPUP'][] = array('CONTENT' => 'Page currently disabled. Please try again later.', 'TYPE' => 'alert alert-danger');
+  $smarty->assign("CONTENT", "disabled.tpl");
+  break;
+}

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

@@ -12,52 +12,54 @@
 
 if ($user->isAuthenticated()) {
   if ($config['twofactor']['enabled']) {
-    $popupmsg = 'E-mail confirmations are required for ';
-    $popuptypes = array();
-    if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") {
-      $popuptypes[] = 'editing your details';
-      $ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5);
-      $ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']);
-    }
-    if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") {
-      $popuptypes[] = 'changing your password';
-      $cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6);
-      $cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']);
-    }
-    if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") {
-      $popuptypes[] = 'withdrawals';
-      $wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7);
-      $wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']);
-    }
+    if ($config['twofactor']['options']['details'] OR $config['twofactor']['options']['changepw'] OR $config['twofactor']['options']['withdraw']) {
+      $popupmsg = 'E-mail confirmations are required for ';
+      $popuptypes = array();
+      if ($config['twofactor']['options']['details'] && $oldtoken_ea !== "") {
+        $popuptypes[] = 'editing your details';
+        $ea_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_ea, 5);
+        $ea_sent = $user->token->doesTokenExist('account_edit', $_SESSION['USERDATA']['id']);
+      }
+      if ($config['twofactor']['options']['changepw'] && $oldtoken_cp !== "") {
+        $popuptypes[] = 'changing your password';
+        $cp_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_cp, 6);
+        $cp_sent = $user->token->doesTokenExist('change_pw', $_SESSION['USERDATA']['id']);
+      }
+      if ($config['twofactor']['options']['withdraw'] && $oldtoken_wf !== "") {
+        $popuptypes[] = 'withdrawals';
+        $wf_editable = $user->token->isTokenValid($_SESSION['USERDATA']['id'], $oldtoken_wf, 7);
+        $wf_sent = $user->token->doesTokenExist('withdraw_funds', $_SESSION['USERDATA']['id']);
+      }
 
-    // get the status of a token if set
-    $message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to ';
-    $message_tokensent_valid = 'You can currently ';
-    $messages_tokensent_status = array(
-      'ea' => 'edit your account details',
-      'wf' => 'withdraw funds',
-      'cp' => 'change your password'
-    );
-    // build the message we're going to show them for their token(s)
-    $eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : "";
-    $eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : "";
-    $wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : "";
-    $wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : "";
-    $cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : "";
-    $cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : "";
-    $ptc = 0;
-    $ptcn = count($popuptypes);
-    foreach ($popuptypes as $pt) {
-      if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; }
-      if ($ptc !== ($ptcn-1)) {
-        $popupmsg.= $popuptypes[$ptc].', ';
-      } else {
-        $popupmsg.= 'and '.$popuptypes[$ptc];
+      // get the status of a token if set
+      $message_tokensent_invalid = 'A token was sent to your e-mail that will allow you to ';
+      $message_tokensent_valid = 'You can currently ';
+      $messages_tokensent_status = array(
+        'ea' => 'edit your account details',
+        'wf' => 'withdraw funds',
+        'cp' => 'change your password'
+      );
+      // build the message we're going to show them for their token(s)
+      $eaprep_sent = ($ea_sent) ? $message_tokensent_valid.$messages_tokensent_status['ea'] : "";
+      $eaprep_edit = ($ea_editable) ? $message_tokensent_invalid.$messages_tokensent_status['ea'] : "";
+      $wfprep_sent = ($wf_sent) ? $message_tokensent_valid.$messages_tokensent_status['wf'] : "";
+      $wfprep_edit = ($wf_editable) ? $message_tokensent_invalid.$messages_tokensent_status['wf'] : "";
+      $cpprep_sent = ($cp_sent) ? $message_tokensent_valid.$messages_tokensent_status['cp'] : "";
+      $cpprep_edit = ($cp_editable) ? $message_tokensent_invalid.$messages_tokensent_status['cp'] : "";
+      $ptc = 0;
+      $ptcn = count($popuptypes);
+      foreach ($popuptypes as $pt) {
+        if ($ptcn == 1) { $popupmsg.= $popuptypes[$ptc]; continue; }
+        if ($ptc !== ($ptcn-1)) {
+          $popupmsg.= $popuptypes[$ptc].', ';
+        } else {
+          $popupmsg.= 'and '.$popuptypes[$ptc];
+        }
+        $ptc++;
       }
-      $ptc++;
+      // display global notice about tokens being in use and for which bits they're active
+      $_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning');
     }
-    // display global notice about tokens being in use and for which bits they're active
-    $_SESSION['POPUP'][] = array('CONTENT' => $popupmsg, 'TYPE' => 'alert alert-warning');
   }
 
   if (isset($_POST['do']) && $_POST['do'] == 'genPin') {
@@ -174,12 +176,12 @@
   }
 
   // display token info per each - only when sent and editable or just sent, not by default
-  (!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'success'):"";
-  (!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'success'):"";
-  (!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'success'):"";
-  (!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'success'):"";
-  (!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'success'):"";
-  (!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'success'):"";
+  (!empty($eaprep_sent) && !empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $eaprep_sent, 'TYPE' => 'alert alert-success'):"";
+  (!empty($eaprep_sent) && empty($eaprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['ea'], 'TYPE' => 'alert alert-success'):"";
+  (!empty($wfprep_sent) && !empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $wfprep_sent, 'TYPE' => 'alert alert-success'):"";
+  (!empty($wfprep_sent) && empty($wfprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['wf'], 'TYPE' => 'alert alert-success'):"";
+  (!empty($cpprep_sent) && !empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $cpprep_sent, 'TYPE' => 'alert alert-success'):"";
+  (!empty($cpprep_sent) && empty($cpprep_edit)) ? $_SESSION['POPUP'][] = array('CONTENT' => $message_tokensent_invalid.$messages_tokensent_status['cp'], 'TYPE' => 'alert alert-success'):"";
   // two-factor stuff
   $smarty->assign("CHANGEPASSUNLOCKED", $cp_editable);
   $smarty->assign("WITHDRAWUNLOCKED", $wf_editable);