Here is the patch for userpoints integration. This is a complete port.

Comments

icecreamyou’s picture

Status: Needs review » Needs work

Patch looks fine except for whitespace issues. I'm using Dreditor to review the patch, it's helpful with these things.

+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -104,16 +104,22 @@ function fbss_userpoints_statuses_save($status, $context, $edit, $options) {
-  $points_today = db_query("SELECT SUM(points) FROM {userpoints_txn}
-    WHERE uid = :uid AND time_stamp > :time_stamp
-      AND (operation = :(operation OR operation = :operation)
-      AND expired = :expired AND status = :status", array(':uid' => $sender->uid, ':time_stamp' => REQUEST_TIME - 86400, ':(operation' => 'statuses add own', ':operation' => 'statuses add other', ':expired' => 0, ':status' => 0))->fetchField();
+  $points_query  =  db_select('userpoints_txn')
+                      ->condition('uid',  $sender->uid)
+                      ->condition('time_stamp',  (REQUEST_TIME - 86400),  '>')
+                      ->condition(db_or()->condition('operation',  'statuses add own')->condition('operation',  'statuses add other'))
+                      ->condition('expired',  0)
+                      ->condition('status',  0);
+                      ¶
+  $points_query->addExpression('SUM(points)',  'points');
+  $points_today  =  $points_query->execute()
+                      ->fetchField();

Too much whitespace here:

  • There should only be one space on either side of the = sign
  • Too much indenting for the ->condition and ->fetchField statements, just indent two spaces
  • The blank line has trailing whitespace -- I'd just remove that line
+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -149,10 +155,16 @@ function fbss_userpoints_statuses_delete($status, $meta = array()) {
-  $result = db_fetch_object(db_query("SELECT points FROM {userpoints_txn} WHERE operation LIKE 'statuses add%%' AND reference = :reference AND uid = :uid", array(':reference' => $status->sid, ':uid' => $sender->uid)));
+  $result  =  db_select('userpoints_txn')
+                ->fields('userpoints_txn',  array('points'))
+                ->condition('operation',  'statuses add%%',  'LIKE')
+                ->condition('reference',  $status->sid)
+                ->condition('uid',  $sender->uid)
+                ->execute()
+                ->fetchField();

Again, too much whitespace

+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -174,10 +186,20 @@ function fbss_userpoints_fbss_comments_after_save($comment, $edit) {
-  $points_today = db_query("SELECT SUM(points) FROM {userpoints_txn}
+  /*$points_today = db_query("SELECT SUM(points) FROM {userpoints_txn}
     WHERE uid = :uid AND time_stamp > :time_stamp
       AND operation = :operation
-      AND expired = :expired AND status = :status", array(':uid' => $comment->uid, ':time_stamp' => REQUEST_TIME - 86400, ':operation' => 'fbss_comments add', ':expired' => 0, ':status' => 0))->fetchField();
+      AND expired = :expired AND status = :status", array(':uid' => $comment->uid, ':time_stamp' => REQUEST_TIME - 86400, ':operation' => 'fbss_comments add', ':expired' => 0, ':status' => 0))->fetchField();*/
+  $points_query  =  db_select('userpoints_txn')
+                      ->condition('uid',  $comment->uid)
+                      ->condition('time_stamp',  (REQUEST_TIME - 86400),  '>')
+                      ->condition('operation',  'fbss_comments add')
+                      ->condition('expired',  0)
+                      ->condition('status',  0);
+                      ¶
+  $points_query->addExpression('SUM(points)',  'points');
+  $points_today  =  $points_query->execute()
+                      ->fetchField();

same comments as above

+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -200,10 +222,16 @@ function fbss_userpoints_fbss_comments_after_save($comment, $edit) {
-  $result = db_fetch_object(db_query("SELECT points FROM {userpoints_txn} WHERE operation = :operation AND reference = :reference AND uid = :uid", array(':operation' => 'fbss_comments add', ':reference' => $cid, ':uid' => $comment->uid)));
+  $result  =  db_select('userpoints_txn')
+                ->fields('userpoints_txn',  array('points'))
+                ->condition('operation',  'fbss_comments add')
+                ->condition('reference',  $cid)
+                ->condition('uid',  $comment->uid)
+                ->execute()
+                ->fetchField();

same as above

mathankumarc’s picture

Status: Needs work » Needs review
StatusFileSize
new4.64 KB

Updated the patch as per the comments in #1.

icecreamyou’s picture

Status: Needs review » Needs work
+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -104,16 +104,21 @@ function fbss_userpoints_statuses_save($status, $context, $edit, $options) {
+    ->condition('status',  0);                      ¶

trailing space

+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -173,11 +184,16 @@ function fbss_userpoints_fbss_comments_after_save($comment, $edit) {
+  $account = _statuses_user_load($comment->uid);  ¶

trailing space

+++ b/submodules/fbss_userpoints/fbss_userpoints.module
@@ -173,11 +184,16 @@ function fbss_userpoints_fbss_comments_after_save($comment, $edit) {
+    ->condition('status',  0);                      ¶

trailing space

Other than that this is RTBC

mathankumarc’s picture

Status: Needs work » Fixed

Status: Fixed » Closed (fixed)

Automatically closed -- issue fixed for 2 weeks with no activity.