? event-to-operation.patch ? userpoints_role/userpoints_role.module.highest Index: referral_points/referral_points.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/referral_points/Attic/referral_points.module,v retrieving revision 1.1.2.2.2.2 diff -u -F^F -r1.1.2.2.2.2 referral_points.module --- referral_points/referral_points.module 2 Jun 2008 16:44:38 -0000 1.1.2.2.2.2 +++ referral_points/referral_points.module 2 Jun 2008 19:42:33 -0000 @@ -5,9 +5,9 @@ define('REFERRAL_POINTS', 'referral_points'); define('REFERRAL_POINTS_MULTIPLIER', 'referral_points_multiplier'); -define('REFERRAL_POINTS_EVENT', 'referral_points'); +define('REFERRAL_POINTS_OPERATION', 'referral_points'); -function referral_points_userpoints($op, $points = 0, $uid = 0, $event = null, $description = null) { +function referral_points_userpoints($op, $points = 0, $uid = 0, $operation = null, $description = null) { switch($op) { case 'setting': $form[REFERRAL_POINTS] = array( @@ -30,7 +30,7 @@ case 'points after': // We ignore the hook firing from us multiplying - if ($event != REFERRAL_POINTS_EVENT) { + if ($operation != REFERRAL_POINTS_OPERATION) { // We do nothing if the user referral module is not installed if (module_exists('referral')) { $referral_multiplier = variable_get(REFERRAL_POINTS_MULTIPLIER, 10); @@ -42,11 +42,11 @@ if ($referral_uid) { // multiply points award to member by the referral multiplier to determine points for referral $ref_points = (int)($points * $referral_multiplier / 100); - // call user points again but set event to say points have been awarded - this avoids infinite loop + // call user points again but set operation to say points have been awarded - this avoids infinite loop $params = array( 'points' => $ref_points, 'uid' => $referral_uid, - 'event' => REFERRAL_POINTS_EVENT, + 'operation' => REFERRAL_POINTS_OPERATION, 'description' => 'Shared points' ); userpoints_userpointsapi($params); Index: user2userpoints/user2userpoints.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/user2userpoints/Attic/user2userpoints.module,v retrieving revision 1.1.2.1.2.2 diff -u -F^F -r1.1.2.1.2.2 user2userpoints.module --- user2userpoints/user2userpoints.module 14 Oct 2007 20:09:47 -0000 1.1.2.1.2.2 +++ user2userpoints/user2userpoints.module 2 Jun 2008 19:42:33 -0000 @@ -99,13 +99,13 @@ $params = array( 'uid' => $to->uid, 'points' => $points, - 'event' => 'From: ' . $user->name, + 'operation' => 'From: ' . $user->name, ); userpoints_userpointsapi($params); $params = array( 'uid' => $user->uid, 'points' => -$points, - 'event' => 'To: ' . $to->name, + 'operation' => 'To: ' . $to->name, ); userpoints_userpointsapi($params); Index: userpoints_autoapprove/userpoints_autoapprove.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_autoapprove/Attic/userpoints_autoapprove.module,v retrieving revision 1.1.4.1 diff -u -F^F -r1.1.4.1 userpoints_autoapprove.module --- userpoints_autoapprove/userpoints_autoapprove.module 14 Oct 2007 15:18:22 -0000 1.1.4.1 +++ userpoints_autoapprove/userpoints_autoapprove.module 2 Jun 2008 19:42:33 -0000 @@ -13,7 +13,7 @@ return $output; } -function userpoints_autoapprove_userpoints($op, $points = 0, $uid = 0, $event = '') { +function userpoints_autoapprove_userpoints($op, $points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $form['autoapprove'] = array( @@ -37,7 +37,7 @@ function userpoints_autoapprove_cron() { if (variable_get(USERPOINTS_AUTOAPPROVE_PERIOD, 0) > 0) { - $result = db_query("SELECT txn_id, uid, points, event, description + $result = db_query("SELECT txn_id, uid, points, operation, description FROM {userpoints_txn} WHERE time_stamp < %d AND status = 1", (time() - (variable_get(USERPOINTS_AUTOAPPROVE_PERIOD, 0) * 60 * 60)) Index: userpoints_cap/userpoints_cap.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_cap/Attic/userpoints_cap.module,v retrieving revision 1.1.4.1 diff -u -F^F -r1.1.4.1 userpoints_cap.module --- userpoints_cap/userpoints_cap.module 14 Oct 2007 16:07:50 -0000 1.1.4.1 +++ userpoints_cap/userpoints_cap.module 2 Jun 2008 19:42:33 -0000 @@ -11,7 +11,7 @@ define('USERPOINTS_CAP_MAXIMUM', 'userpoints_cap_maximum'); define('USERPOINTS_CAP_MAXIMUM_DEFAULT', 1000000); -function userpoints_cap_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_cap_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'userpoints_cap'; Index: userpoints_ecommerce/userpoints_ecommerce.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_ecommerce/Attic/userpoints_ecommerce.module,v retrieving revision 1.1.2.4.2.1 diff -u -F^F -r1.1.2.4.2.1 userpoints_ecommerce.module --- userpoints_ecommerce/userpoints_ecommerce.module 14 Oct 2007 16:45:06 -0000 1.1.2.4.2.1 +++ userpoints_ecommerce/userpoints_ecommerce.module 2 Jun 2008 19:42:33 -0000 @@ -19,7 +19,7 @@ return $output; } -function userpoints_ecommerce_userpoints($op, $points = 0, $uid = 0, $event = '') { +function userpoints_ecommerce_userpoints($op, $points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': if (module_exists('cart') && module_exists('payment')) { @@ -107,7 +107,7 @@ $params = array( 'points' => $points, 'uid' => $uid, - 'event' => 'ec_earn' + 'operation' => 'ec_earn' ); userpoints_userpointsapi($params); } @@ -163,7 +163,7 @@ $params = array( 'points' => -$points, 'uid' => $uid, - 'event' => 'ec_spend', + 'operation' => 'ec_spend', ); userpoints_userpointsapi($params); Index: userpoints_email/userpoints_email.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_email/Attic/userpoints_email.module,v retrieving revision 1.1.2.1.2.1 diff -u -F^F -r1.1.2.1.2.1 userpoints_email.module --- userpoints_email/userpoints_email.module 14 Oct 2007 19:15:42 -0000 1.1.2.1.2.1 +++ userpoints_email/userpoints_email.module 2 Jun 2008 19:42:33 -0000 @@ -19,7 +19,7 @@ return $output; } -function userpoints_email_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_email_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'email'; Index: userpoints_expire/userpoints_expire.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_expire/Attic/userpoints_expire.module,v retrieving revision 1.1.4.2 diff -u -F^F -r1.1.4.2 userpoints_expire.module --- userpoints_expire/userpoints_expire.module 2 Jun 2008 16:38:47 -0000 1.1.4.2 +++ userpoints_expire/userpoints_expire.module 2 Jun 2008 19:42:33 -0000 @@ -16,7 +16,7 @@ return $output; } -function userpoints_expire_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_expire_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': @@ -70,7 +70,7 @@ $params = array( 'points' => $points, 'uid' => $data->uid, - 'event' => 'expiry', + 'operation' => 'expiry', ); userpoints_userpointsapi($params); } Index: userpoints_invite/userpoints_invite.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_invite/Attic/userpoints_invite.module,v retrieving revision 1.1.2.4.2.2 diff -u -F^F -r1.1.2.4.2.2 userpoints_invite.module --- userpoints_invite/userpoints_invite.module 22 May 2008 20:56:56 -0000 1.1.2.4.2.2 +++ userpoints_invite/userpoints_invite.module 2 Jun 2008 19:42:33 -0000 @@ -18,7 +18,7 @@ return $output; } -function userpoints_invite_userpoints($op, $points = 0, $uid = 0, $event = '') { +function userpoints_invite_userpoints($op, $points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'invite'; Index: userpoints_no_negative/userpoints_no_negative.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_no_negative/userpoints_no_negative.module,v retrieving revision 1.1.2.1 diff -u -F^F -r1.1.2.1 userpoints_no_negative.module --- userpoints_no_negative/userpoints_no_negative.module 2 Jun 2008 16:36:36 -0000 1.1.2.1 +++ userpoints_no_negative/userpoints_no_negative.module 2 Jun 2008 19:42:33 -0000 @@ -9,7 +9,7 @@ /** * Implementation of hook_userpoints */ -function userpoints_no_negative_userpoints($op, $points = 0, $uid = 0, $event = '') { +function userpoints_no_negative_userpoints($op, $points = 0, $uid = 0, $operation = '') { if ($op == 'points before') { if ($points < 0) { $current_points = userpoints_get_current_points($uid); Index: userpoints_reserve/userpoints_reserve.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_reserve/Attic/userpoints_reserve.module,v retrieving revision 1.1.2.1.2.1 diff -u -F^F -r1.1.2.1.2.1 userpoints_reserve.module --- userpoints_reserve/userpoints_reserve.module 2 Jun 2008 16:50:03 -0000 1.1.2.1.2.1 +++ userpoints_reserve/userpoints_reserve.module 2 Jun 2008 19:42:34 -0000 @@ -14,7 +14,7 @@ /** * Implementation of hook_userpoints(). */ -function userpoints_reserve_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_reserve_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': // ideally this would be placed in system_settings_form_submit(), Index: userpoints_retroactive/userpoints_retroactive.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_retroactive/Attic/userpoints_retroactive.module,v retrieving revision 1.1.2.6.2.2 diff -u -F^F -r1.1.2.6.2.2 userpoints_retroactive.module --- userpoints_retroactive/userpoints_retroactive.module 2 Jun 2008 16:52:12 -0000 1.1.2.6.2.2 +++ userpoints_retroactive/userpoints_retroactive.module 2 Jun 2008 19:42:34 -0000 @@ -65,7 +65,7 @@ 'uid' => $node->uid, 'points' => ($node->val * $weight), 'moderate' => false, - 'event' => 'Retroactive node', + 'operation' => 'Retroactive node', ); userpoints_userpointsapi($params); } @@ -79,7 +79,7 @@ 'uid' => $comment->uid, 'points' => ($comment->val * $weight), 'moderate' => false, - 'event' => 'Retroactive comments', + 'operation' => 'Retroactive comments', ); userpoints_userpointsapi($params); } Index: userpoints_role/userpoints_role.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_role/Attic/userpoints_role.module,v retrieving revision 1.1.2.1.2.5 diff -u -F^F -r1.1.2.1.2.5 userpoints_role.module --- userpoints_role/userpoints_role.module 5 May 2008 14:57:44 -0000 1.1.2.1.2.5 +++ userpoints_role/userpoints_role.module 2 Jun 2008 19:42:34 -0000 @@ -20,7 +20,7 @@ /** * Role promotion/demotion based on points gained/lost */ -function userpoints_role_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_role_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'role'; Index: userpoints_role_exempt/userpoints_role_exempt.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_role_exempt/Attic/userpoints_role_exempt.module,v retrieving revision 1.1 diff -u -F^F -r1.1 userpoints_role_exempt.module --- userpoints_role_exempt/userpoints_role_exempt.module 24 Jun 2007 00:35:05 -0000 1.1 +++ userpoints_role_exempt/userpoints_role_exempt.module 2 Jun 2008 19:42:34 -0000 @@ -15,7 +15,7 @@ return $output; } -function userpoints_role_exempt_userpoints($op, $points = 0, $uid = 0, $event = '') { +function userpoints_role_exempt_userpoints($op, $points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'role_exempt'; Index: userpoints_singlenotify/userpoints_singlenotify.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/userpoints_contrib/userpoints_singlenotify/Attic/userpoints_singlenotify.module,v retrieving revision 1.1 diff -u -F^F -r1.1 userpoints_singlenotify.module --- userpoints_singlenotify/userpoints_singlenotify.module 28 Aug 2007 10:21:35 -0000 1.1 +++ userpoints_singlenotify/userpoints_singlenotify.module 2 Jun 2008 19:42:34 -0000 @@ -5,7 +5,7 @@ $default_text = "!username,\n\nCongratulations! \n"; $default_text .= "You have !points_new new points. \n"; $default_text .= "Date : !points_date \n"; -$default_text .= "Event : !points_event \n"; +$default_text .= "Operation : !points_operation \n"; $default_text .= "Description : !points_description \n"; define('USERPOINTS_SINGLENOTIFY_TEXT_DEFAULT', $default_text); @@ -19,7 +19,7 @@ return $output; } -function userpoints_singlenotify_userpoints($op, $new_points = 0, $uid = 0, $event = '') { +function userpoints_singlenotify_userpoints($op, $new_points = 0, $uid = 0, $operation = '') { switch($op) { case 'setting': $group = 'singlenotify'; @@ -43,7 +43,7 @@ '#type' => 'textarea', '#title' => t('Text of email to sent.'), '#default_value' => variable_get('userpoints_singlenotify_text', USERPOINTS_SINGLENOTIFY_TEXT_DEFAULT), - '#description' => t('Body of the email to send. !username, !points, !points_new, !points_date, !points_event, !points_description are replaced with values.'), + '#description' => t('Body of the email to send. !username, !points, !points_new, !points_date, !points_operation, !points_description are replaced with values.'), '#width' => 70, '#lines' => 5, ); @@ -54,13 +54,13 @@ case 'points after': if ($new_points > 0) { $current_points = userpoints_get_current_points($uid); - _userpoints_singlenotify_process($uid, $current_points, $new_points, $event); + _userpoints_singlenotify_process($uid, $current_points, $new_points, $operation); } break; } } -function _userpoints_singlenotify_process($uid = 0, $current_points = 0, $new_points = 0, $event = '') { +function _userpoints_singlenotify_process($uid = 0, $current_points = 0, $new_points = 0, $operation = '') { $user = user_load(array('uid' => $uid)); $subject = variable_get('userpoints_singlenotify_subject', USERPOINTS_SINGLENOTIFY_SUBJECT_DEFAULT); @@ -71,7 +71,7 @@ $userpoints_txn = db_fetch_array($result); $date_points = format_date($userpoints_txn['time_stamp'], 'custom', 'm/d/y'); - $event_points = $userpoints_txn['event']; + $op_points = $userpoints_txn['operation']; $description_points = $userpoints_txn['description']; drupal_mail('userpoints_singlenotify', @@ -80,7 +80,7 @@ '!points' => $current_points, '!points_new' => $new_points, '!points_date' => $date_points, - '!points_event' => $event_points, + '!points_operation' => $op_points, '!points_description' => $description_points, ) ),