Merge pull request #2431 from owlhooter/master

Add Anonymous check for blockfinder email
MPOS · May 29, 2015 · ecf2c1c · ecf2c1c
2 parents 9336608 + d1d392a
commit ecf2c1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cronjobs/findblock.php b/cronjobs/findblock.php
@@ -157,8 +157,12 @@
         // Notify users
         $aAccounts = $notification->getNotificationAccountIdByType('new_block');
         if (is_array($aAccounts)) {
-
-          $finder = $user->getUserName($iAccountId);
+          if ($user->getUserNameAnon($iAccountId) == 1) {
+                $finder = "Anonymous";
+          } else {
+               $finder = $user->getUserName($iAccountId);
+          }
+
           foreach ($aAccounts as $aData) {
             $aMailData['height'] = $aBlock['height'];
             $aMailData['subject'] = 'New Block';

diff --git a/include/classes/user.class.php b/include/classes/user.class.php
@@ -31,6 +31,9 @@ private function getHash($string, $version=0, $pepper='') {
   public function getUserName($id) {
     return $this->getSingle($id, 'username', 'id');
   }
+  public function getUserNameAnon($id) {
+    return $this->getSingle($id, 'is_anonymous', 'id');
+  }
   public function getUserNameByEmail($email) {
     return $this->getSingle($email, 'username', 'email', 's');
   }