? userpoints_nc_d7.patch Index: userpoints_nc.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_nc/userpoints_nc.info,v retrieving revision 1.1 diff -u -p -r1.1 userpoints_nc.info --- userpoints_nc.info 9 Jan 2009 07:46:35 -0000 1.1 +++ userpoints_nc.info 2 Aug 2010 07:55:35 -0000 @@ -3,4 +3,5 @@ name = Userpoints Nodes and Comments description = Grants userpoints for posting nodes or comments or moderating comments package = Userpoints dependencies[] = userpoints -core = 6.x +files[]=userpoints_nc.module +core = 7.x Index: userpoints_nc.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_nc/userpoints_nc.module,v retrieving revision 1.3.2.2 diff -u -p -r1.3.2.2 userpoints_nc.module --- userpoints_nc.module 2 Mar 2010 22:27:46 -0000 1.3.2.2 +++ userpoints_nc.module 2 Aug 2010 07:55:35 -0000 @@ -7,9 +7,10 @@ define('USERPOINTS_POST', 'userpoints_post_'); define('USERPOINTS_POST_COMMENT', 'userpoints_post_comment'); define('USERPOINTS_MODERATE_COMMENT', 'userpoints_moderate_comment'); -//define a variable to trigger the use of the v2bug please read drupal.org/node/183520 -define('USERPOINTS_USE_V2BUG', 'userpoints_use_v2bug'); +/** + * Implements hook_help(). + */ function userpoints_nc_help($path, $arg) { switch ($path) { case 'admin/settings/userpoints_nc': @@ -17,6 +18,9 @@ function userpoints_nc_help($path, $arg) } } +/** + * Implements hook_userpoints(). + */ function userpoints_nc_userpoints($op, $params = array()) { switch ($op) { case 'setting': @@ -42,7 +46,7 @@ function userpoints_nc_userpoints($op, $ $category_options[$term->tid] = str_repeat('--', $term->depth) . $term->name; } } - foreach (node_get_types() as $type => $name) { + foreach (node_type_get_types() as $type => $name) { $form[$group][USERPOINTS_POST . $type] = array( '#type' => 'textfield', '#title' => t('!Points for posting a !node-name', array_merge(userpoints_translation(), array('!node-name' => $name->name))), @@ -81,6 +85,8 @@ function userpoints_nc_userpoints($op, $ '#default_value' => variable_get(USERPOINTS_POST_COMMENT . '_category', 0), ); + // @todo: There is no moderate op in Drupal 5, 6 *and* 7. + // Replace with something that actually works :) $form[$group][USERPOINTS_MODERATE_COMMENT] = array( '#type' => 'textfield', '#title' => t('!Points for moderating a comment', userpoints_translation()), @@ -96,258 +102,171 @@ function userpoints_nc_userpoints($op, $ '#default_value' => variable_get(USERPOINTS_MODERATE_COMMENT . '_category', 0), ); - $group = 'v2compatibility'; - $form[$group] = array( - '#type' => 'fieldset', - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#title' => t('userpoints_basic events version 2.14 Compatibility', userpoints_translation()), - '#description' => t('If you have used userpoints_basic prior to version 2.14 you may need to enable this fix.
- If you have not used userpoints_basic prior to v3 you do NOT need to (nor should) enable this fix.
- This fix only affects the behavior of how !points are handled when ownership of a node/comment - changes. In version 2 data on the original owner was not kept and a static variable was used to - store this information. Unfortunately people have experienced unusual side effects such as - !points moving from one owner to a completely random user. All !points accrued with version 3 will - not exhibit this behavior thus this fix is unnecessary. - Only check this box under the following conditions
- 1) You have existing !points granted by a userpoints version prior to version 3
- 2) If ownership changes on a node/comment you want points to follow ownership
- All !points accrued by version 3 will move ownership automatically this setting only affects !points accrued with v2 -
- 3) You have read Article 183520 on drupal.org and - understand that there could be unusual issues with ownership moves', userpoints_translation()), - ); - $form[$group][USERPOINTS_USE_V2BUG] = array( - '#type' => 'checkbox', - '#title' => t('I agree to the above description and want to use the V2 bug fix'), - '#default_value' => variable_get(USERPOINTS_USE_V2BUG, false), - ); - return $form; break; } } - -function userpoints_nodeapi(&$node, $op, $teaser, $page) { - //static up_orig_uid please read drupal.org/node/183520 - static $up_orig_uid; + +/** + * Implements hook_node_insert(). + */ +function userpoints_nc_node_insert($node) { + $tid = variable_get(USERPOINTS_POST . $node->type . '_category', 0); $points = variable_get(USERPOINTS_POST . $node->type, 0); + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $node->uid, + 'operation' => 'insert', + 'entity_id' => $node->nid, + 'entity_type' => 'node' + ); + userpoints_userpointsapi($params); +} + +/** + * Implements hook_node_delete(). + */ +function userpoints_nc_node_delete($node) { + if (variable_get(USERPOINTS_POST . '_undo_points_on_delete', true)) { + $tid = variable_get(USERPOINTS_POST . $node->type . '_category', 0); + $points = variable_get(USERPOINTS_POST . $node->type, 0); + $points = -$points; + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $node->uid, + 'operation' => 'operation', + 'entity_id' => $node->nid, + 'entity_type' => 'node', + ); + userpoints_userpointsapi($params); + } +} + +/** + * Implements hook_node_update(). + */ +function userpoints_nc_node_update($node) { $tid = variable_get(USERPOINTS_POST . $node->type . '_category', 0); - switch ($op) { - case 'insert': - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $node->uid, - 'operation' => 'insert', - 'entity_id' => $node->nid, - 'entity_type' => 'node' - ); - userpoints_userpointsapi($params); - break; - case 'delete': - if (variable_get(USERPOINTS_POST . '_undo_points_on_delete', true)) { - $points = -$points; - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $node->uid, - 'operation' => 'operation', - 'entity_id' => $node->nid, - 'entity_type' => 'node', - ); - userpoints_userpointsapi($params); - } - break; - case 'prepare': - $up_orig_uid = $node->uid; - break; - case 'update': - //Find the last points granted on this node inserts and ownership gains - $sql = "SELECT points, uid - FROM {userpoints_txn} - WHERE entity_id = %d AND entity_type = '%s' - AND (operation = '%s' OR operation ='%s') - ORDER BY time_stamp DESC - LIMIT 1 - "; - $last_owner = db_fetch_object(db_query($sql, $node->nid, 'node', 'insert', 'Ownership gain')); - - //Check the UID of the original to this user, if different add/substract points - if ($node->uid != $last_owner->uid && is_numeric($last_owner->uid) ) { - //Check to see if this user has already lost the points for - // Add to the new node owner - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $node->uid, - 'operation' => 'Ownership gain', - 'entity_id' => $node->nid, - 'entity_type' => 'node' - ); - userpoints_userpointsapi($params); - // subtract from the original node owner - $params = array( - 'points' => -$points, - 'tid' => $tid, - 'uid' => $up_orig_uid, - 'operation' => 'Ownership loss', - 'entity_id' => $node->nid, - 'entity_type' => 'node' - ); - userpoints_userpointsapi($params); - } - else { - //We failed to pull a matching operation via the DB - //If the user wants to use the V2BUG we'll use it.. - //please read drupal.org/node/183520 - if (variable_get(USERPOINTS_USE_V2BUG, false)) { - if ($node->uid != $up_orig_uid) { - // Add to the new node owner - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $node->uid, - 'operation' => 'Ownership gain', - 'entity_id' => $node->nid, - 'entity_type' => 'node' - ); - userpoints_userpointsapi($params); - // subtract from the original node owner - $params = array( - 'points' => -$points, - 'tid' => $tid, - 'uid' => $up_orig_uid, - 'operation' => 'Ownership loss', - 'entity_id' => $node->nid, - 'entity_type' => 'node' - ); - userpoints_userpointsapi($params); - } - } - } - break; + $points = variable_get(USERPOINTS_POST . $node->type, 0); + + // Find the last points granted on this node inserts and ownership gains. + $sql = "SELECT points, uid + FROM {userpoints_txn} + WHERE entity_id = :id AND entity_type = :type + AND (operation = :op1 OR operation = :op2) + ORDER BY time_stamp DESC + LIMIT 1 + "; + $last_owner = db_query($sql, array(':id' => $node->nid, ':type' => 'node', ':op1' => 'insert', ':op2' => 'Ownership gain'))->fetchObject(); + + // Check the UID of the original to this user, if different add/substract points. + if ($node->uid != $last_owner->uid && is_numeric($last_owner->uid) ) { + // Check to see if this user has already lost the points for. + // Add to the new node owner. + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $node->uid, + 'operation' => 'Ownership gain', + 'entity_id' => $node->nid, + 'entity_type' => 'node' + ); + userpoints_userpointsapi($params); + // Subtract from the original node owner. + $params = array( + 'points' => -$points, + 'tid' => $tid, + 'uid' => $up_orig_uid, + 'operation' => 'Ownership loss', + 'entity_id' => $node->nid, + 'entity_type' => 'node' + ); + userpoints_userpointsapi($params); } } -function userpoints_comment($comment, $op) { +/** + * Implements hook_comment_insert(). + */ +function userpoints_nc_comment_insert($comment) { global $user; - //static up_orig_uid, please read this thread http://drupal.org/node/183520 - static $up_orig_com_uid; $points = variable_get(USERPOINTS_POST_COMMENT, 0); $tid = variable_get(USERPOINTS_POST_COMMENT . '_category', 0); - switch ($op) { - case 'insert': - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $user->uid, - 'operation' => 'insert', - 'entity_id' => $comment['cid'], - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); - break; - case 'delete': - $points = -$points; - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $comment->uid, - 'operation' => 'delete', - 'entity_id' => $comment->cid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); - break; - case 'moderate': - $points = variable_get(USERPOINTS_MODERATE_COMMENT, 0); - $tid = variable_get(USERPOINTS_MODERATE_COMMENT . '_category', 0); - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $comment->uid, - 'operation' => 'moderate', - 'entity_id' => $comment->cid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); - break; - case 'form': - $up_orig_com_uid = $comment['uid']['#value']; - break; - case 'update': - //Find the last points granted on this node inserts and ownership gains - $sql = "SELECT points, uid - FROM {userpoints_txn} - WHERE entity_id = %d AND entity_type = '%s' - AND (operation = '%s' OR operation ='%s') - ORDER BY time_stamp DESC - LIMIT 1 - "; - $cid = $comment['cid']; - $new_uid = $comment['uid']; - $last_owner = db_fetch_object(db_query($sql, $cid, 'comment', 'insert', 'Ownership gain')); - - //Check the UID of the original to this user, if different add/substract points - if ($new_uid != $last_owner->uid && is_numeric($last_owner->uid) ) { - //The owner has changed so we're removing from the - //the original owner and giving to the new owner - //Give to the original owner - $points = $last_owner->points; - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $new_uid, - 'operation' => 'Ownership gain', - 'entity_id' => $cid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $user->uid, + 'operation' => 'insert', + 'entity_id' => $comment->cid, + 'entity_type' => 'comment' + ); + userpoints_userpointsapi($params); +} - //Take away from the original owner - $params = array( - 'points' => -$points, - 'tid' => $tid, - 'uid' => $last_owner->uid, - 'operation' => 'Ownership loss', - 'entity_id' => $cid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); +/** + * Implements hook_comment_delete(). + */ +function userpoints_nc_comment_delete($comment) { + $points = variable_get(USERPOINTS_POST_COMMENT, 0); + $tid = variable_get(USERPOINTS_POST_COMMENT . '_category', 0); - } - else { - //We failed to pull a matching operation via the DB - //If the user wants to use the V2BUG we'll use it.. - //please read drupal.org/node/183520 - if (variable_get(USERPOINTS_USE_V2BUG, false)) { - if ($orig_uid != $comment['uid']) { - $params = array( - 'points' => $points, - 'tid' => $tid, - 'uid' => $new_uid, - 'operation' => 'Ownership gain', - 'entity_id' => $cid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); - - //Take away from the original owner - $params = array( - 'points' => -$points, - 'tid' => $tid, - 'uid' => $comment['uid'], - 'operation' => 'Ownership loss', - 'entity_id' => $new_uid, - 'entity_type' => 'comment' - ); - userpoints_userpointsapi($params); - } - } - } - break; + $points = -$points; + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $comment->uid, + 'operation' => 'delete', + 'entity_id' => $comment->cid, + 'entity_type' => 'comment' + ); + userpoints_userpointsapi($params); +} + +/** + * Implements hook_comment_update(). + */ +function userpoints_nc_comment_update($comment) { + // Find the last points granted on this node inserts and ownership gains. + $sql = "SELECT points, uid + FROM {userpoints_txn} + WHERE entity_id = :id AND entity_type = :type + AND (operation = :op1 OR operation = :op2) + ORDER BY time_stamp DESC + LIMIT 1 + "; + $cid = $comment->cid; + $new_uid = $comment->uid; + $last_owner = db_query($sql, array(':id' => $node->nid, ':type' => 'comment', ':op1' => 'insert', ':op2' => 'Ownership gain'))->fetchObject(); + + // Check the UID of the original to this user, if different add/substract points. + if ($new_uid != $last_owner->uid && is_numeric($last_owner->uid) ) { + // The owner has changed so we're removing from the + // the original owner and giving to the new owner + // Give to the original owner + $points = $last_owner->points; + $params = array( + 'points' => $points, + 'tid' => $tid, + 'uid' => $new_uid, + 'operation' => 'Ownership gain', + 'entity_id' => $cid, + 'entity_type' => 'comment' + ); + userpoints_userpointsapi($params); + + // Take away from the original owner. + $params = array( + 'points' => -$points, + 'tid' => $tid, + 'uid' => $last_owner->uid, + 'operation' => 'Ownership loss', + 'entity_id' => $cid, + 'entity_type' => 'comment' + ); + userpoints_userpointsapi($params); } }