From 67a6d9aff415063acd3729dd8a4ee1f23389f328 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Thu, 2 Jan 2014 11:05:07 +0100
Subject: [PATCH] [UPDATE] Coding style

---
 public/include/classes/user.class.php     |  20 ++---
 public/include/pages/account/edit.inc.php | 100 +++++++++++-----------
 2 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/public/include/classes/user.class.php b/public/include/classes/user.class.php
index a2af2f94..27459ef4 100644
--- a/public/include/classes/user.class.php
+++ b/public/include/classes/user.class.php
@@ -172,7 +172,7 @@ public function generatePin($userID, $current) {
     $username = $this->getUserName($userID);
     $email = $this->getUserEmail($username);
     $current = $this->getHash($current);
-    $newpin = intval( "0" . rand(1,9) . rand(0,9) . rand(0,9) . rand(0,9) );
+    $newpin = intval( '0' . rand(1,9) . rand(0,9) . rand(0,9) . rand(0,9) );
     $aData['username'] = $username;
     $aData['email'] = $email;
     $aData['pin'] = $newpin;
@@ -180,17 +180,15 @@ public function generatePin($userID, $current) {
     $aData['subject'] = 'PIN Reset Request';
     $stmt = $this->mysqli->prepare("UPDATE $this->table SET pin = ? WHERE ( id = ? AND pass = ? )");
 
-    if ($this->checkStmt($stmt) && $stmt->bind_param('sis', $newpin, $userID, $current) && $stmt->execute())
-    {
-        if ($stmt->errno == 0 && $stmt->affected_rows === 1) {
-            if ($this->mail->sendMail('pin/reset', $aData)) {
-            return true;
-            } else {
-            $this->setErrorMessage('Unable to send mail to your address');
-            return false;
-            }
+    if ($this->checkStmt($stmt) && $stmt->bind_param('sis', $newpin, $userID, $current) && $stmt->execute()) {
+      if ($stmt->errno == 0 && $stmt->affected_rows === 1) {
+        if ($this->mail->sendMail('pin/reset', $aData)) {
+          return true;
+        } else {
+          $this->setErrorMessage('Unable to send mail to your address');
+          return false;
         }
-        $stmt->close();
+      }
     }
     $this->setErrorMessage( 'Unable to generate PIN, current password incorrect?' );
     return false;
diff --git a/public/include/pages/account/edit.inc.php b/public/include/pages/account/edit.inc.php
index 0ca82ef9..50a2618f 100644
--- a/public/include/pages/account/edit.inc.php
+++ b/public/include/pages/account/edit.inc.php
@@ -5,58 +5,58 @@ if (!defined('SECURITY'))
   die('Hacking attempt');
 
 if ($user->isAuthenticated()) {
-if (isset($_POST['do']) && $_POST['do'] == 'genPin') {
-      if ($user->generatePin($_SESSION['USERDATA']['id'], $_POST['currentPassword'])) {
-        $_SESSION['POPUP'][] = array('CONTENT' => 'Your PIN # has been sent to your email.', 'TYPE' => 'success');
-      } else {
-        $_SESSION['POPUP'][] = array('CONTENT' => $user->getError(), 'TYPE' => 'errormsg');
-      }
-}
-else {
-  if ( @$_POST['do'] && (! $user->checkPin($_SESSION['USERDATA']['id'], @$_POST['authPin']))) {
-    $_SESSION['POPUP'][] = array('CONTENT' => 'Invalid PIN. ' . ($config['maxfailed']['pin'] - $user->getUserPinFailed($_SESSION['USERDATA']['id'])) . ' attempts remaining.', 'TYPE' => 'errormsg');
-  } else {
-    switch (@$_POST['do']) {
-    case 'cashOut':
-      if ($setting->getValue('disable_payouts') == 1 || $setting->getValue('disable_manual_payouts') == 1) {
-        $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info');
-      } else {
-        $aBalance = $transaction->getBalance($_SESSION['USERDATA']['id']);
-        $dBalance = $aBalance['confirmed'];
-        if ($dBalance > $config['txfee']) {
-          if (!$oPayout->isPayoutActive($_SESSION['USERDATA']['id'])) {
-            if ($iPayoutId = $oPayout->createPayout($_SESSION['USERDATA']['id'])) {
-              $_SESSION['POPUP'][] = array('CONTENT' => 'Created new manual payout request with ID #' . $iPayoutId);
-            } else {
-              $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to create manual payout request.', 'TYPE' => 'errormsg');
-            }
-          } else {
-            $_SESSION['POPUP'][] = array('CONTENT' => 'You already have one active manual payout request.', 'TYPE' => 'errormsg');
-          }
-        } else {
-          $_SESSION['POPUP'][] = array('CONTENT' => 'Insufficient funds, you need more than ' . $config['txfee'] . ' ' . $config['currency'] . ' to cover transaction fees', 'TYPE' => 'errormsg');
-        }
-      }
-      break;
-
-    case 'updateAccount':
-      if ($user->updateAccount($_SESSION['USERDATA']['id'], $_POST['paymentAddress'], $_POST['payoutThreshold'], $_POST['donatePercent'], $_POST['email'], $_POST['is_anonymous'])) {
-        $_SESSION['POPUP'][] = array('CONTENT' => 'Account details updated', 'TYPE' => 'success');
-      } else {
-        $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to update your account: ' . $user->getError(), 'TYPE' => 'errormsg');
-      }
-      break;
-
-    case 'updatePassword':
-      if ($user->updatePassword($_SESSION['USERDATA']['id'], $_POST['currentPassword'], $_POST['newPassword'], $_POST['newPassword2'])) {
-        $_SESSION['POPUP'][] = array('CONTENT' => 'Password updated', 'TYPE' => 'success');
-      } else {
-        $_SESSION['POPUP'][] = array('CONTENT' => $user->getError(), 'TYPE' => 'errormsg');
-      }
-      break;
+  if (isset($_POST['do']) && $_POST['do'] == 'genPin') {
+    if ($user->generatePin($_SESSION['USERDATA']['id'], $_POST['currentPassword'])) {
+      $_SESSION['POPUP'][] = array('CONTENT' => 'Your PIN # has been sent to your email.', 'TYPE' => 'success');
+    } else {
+      $_SESSION['POPUP'][] = array('CONTENT' => $user->getError(), 'TYPE' => 'errormsg');
+    }
+  }
+  else {
+    if ( @$_POST['do'] && (! $user->checkPin($_SESSION['USERDATA']['id'], @$_POST['authPin']))) {
+      $_SESSION['POPUP'][] = array('CONTENT' => 'Invalid PIN. ' . ($config['maxfailed']['pin'] - $user->getUserPinFailed($_SESSION['USERDATA']['id'])) . ' attempts remaining.', 'TYPE' => 'errormsg');
+    } else {
+      switch (@$_POST['do']) {
+      case 'cashOut':
+        if ($setting->getValue('disable_payouts') == 1 || $setting->getValue('disable_manual_payouts') == 1) {
+          $_SESSION['POPUP'][] = array('CONTENT' => 'Manual payouts are disabled.', 'TYPE' => 'info');
+        } else {
+          $aBalance = $transaction->getBalance($_SESSION['USERDATA']['id']);
+          $dBalance = $aBalance['confirmed'];
+          if ($dBalance > $config['txfee']) {
+            if (!$oPayout->isPayoutActive($_SESSION['USERDATA']['id'])) {
+              if ($iPayoutId = $oPayout->createPayout($_SESSION['USERDATA']['id'])) {
+                $_SESSION['POPUP'][] = array('CONTENT' => 'Created new manual payout request with ID #' . $iPayoutId);
+              } else {
+                $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to create manual payout request.', 'TYPE' => 'errormsg');
+              }
+            } else {
+              $_SESSION['POPUP'][] = array('CONTENT' => 'You already have one active manual payout request.', 'TYPE' => 'errormsg');
+            }
+          } else {
+            $_SESSION['POPUP'][] = array('CONTENT' => 'Insufficient funds, you need more than ' . $config['txfee'] . ' ' . $config['currency'] . ' to cover transaction fees', 'TYPE' => 'errormsg');
+          }
+        }
+        break;
+
+      case 'updateAccount':
+        if ($user->updateAccount($_SESSION['USERDATA']['id'], $_POST['paymentAddress'], $_POST['payoutThreshold'], $_POST['donatePercent'], $_POST['email'], $_POST['is_anonymous'])) {
+          $_SESSION['POPUP'][] = array('CONTENT' => 'Account details updated', 'TYPE' => 'success');
+        } else {
+          $_SESSION['POPUP'][] = array('CONTENT' => 'Failed to update your account: ' . $user->getError(), 'TYPE' => 'errormsg');
+        }
+        break;
+
+      case 'updatePassword':
+        if ($user->updatePassword($_SESSION['USERDATA']['id'], $_POST['currentPassword'], $_POST['newPassword'], $_POST['newPassword2'])) {
+          $_SESSION['POPUP'][] = array('CONTENT' => 'Password updated', 'TYPE' => 'success');
+        } else {
+          $_SESSION['POPUP'][] = array('CONTENT' => $user->getError(), 'TYPE' => 'errormsg');
+        }
+        break;
+      }
     }
   }
-}
 }
 // Tempalte specifics
 $smarty->assign("CONTENT", "default.tpl");