starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

web: make a global Fluksonians block allowing BLOCK_CACHE_GLOBAL

This commit is contained in:
Bart Van Der Meerssche 2010-03-06 10:43:03 +00:00
parent b35a723820
commit 862466ad2c
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
web/drupal/modules/logger/logger.module
View File

@ -367,26 +367,28 @@ function _logger_add($uid) {
WHERE requester_id = %d AND rtid = %d WHERE requester_id = %d AND rtid = %d
GROUP BY rtid", $user->uid, $rtid)); GROUP BY rtid", $user->uid, $rtid));
// max subscriptions = 4 // don't allow users to add themselves
if ($result['COUNT(rid)'] < 4) { if ($uid != $user->uid) {
user_relationships_request_relationship($user->uid, $uid, $rtid, TRUE); // max subscriptions = 4
} if ($result['COUNT(rid)'] < 4) {
else {
//check whether the requested relationship doesn't already exist
if (!db_result(db_query("SELECT rid
FROM {user_relationships}
WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $user->uid, $uid, $rtid))) {
// if not, delete the most recently added relationship and replace it with the newly selected one
db_query("DELETE
FROM {user_relationships}
WHERE rid = %d", $result['MAX(rid)']);
user_relationships_request_relationship($user->uid, $uid, $rtid, TRUE); user_relationships_request_relationship($user->uid, $uid, $rtid, TRUE);
} }
} else {
//check whether the requested relationship doesn't already exist
if (!db_result(db_query("SELECT rid
FROM {user_relationships}
WHERE requester_id = %d AND requestee_id = %d AND rtid = %d", $user->uid, $uid, $rtid))) {
_logger_cache_clear('subscriptions'); // if not, delete the most recently added relationship and replace it with the newly selected one
db_query("DELETE
FROM {user_relationships}
WHERE rid = %d", $result['MAX(rid)']);
user_relationships_request_relationship($user->uid, $uid, $rtid, TRUE);
}
}
_logger_cache_clear('subscriptions');
}
$destination = drupal_get_destination(); $destination = drupal_get_destination();
drupal_goto($destination); drupal_goto($destination);
} }
@ -502,7 +504,7 @@ function logger_block($op = 'list', $delta = 0, $edit = array()) {
$blocks['fluksonians']['region'] = 'right'; $blocks['fluksonians']['region'] = 'right';
$blocks['fluksonians']['weight'] = 1; $blocks['fluksonians']['weight'] = 1;
$blocks['fluksonians']['pages'] = '<front>\nlogger/\nlogger/*'; $blocks['fluksonians']['pages'] = '<front>\nlogger/\nlogger/*';
$blocks['fluksonians']['cache'] = BLOCK_CACHE_PER_USER; $blocks['fluksonians']['cache'] = BLOCK_CACHE_GLOBAL;
$blocks['unit']['info'] = t('Unit'); $blocks['unit']['info'] = t('Unit');
$blocks['unit']['status'] = TRUE; $blocks['unit']['status'] = TRUE;
@ -547,7 +549,7 @@ function logger_block($op = 'list', $delta = 0, $edit = array()) {
FROM ({users} u FROM ({users} u
INNER JOIN {users_roles} ur ON u.uid = ur.uid) INNER JOIN {users_roles} ur ON u.uid = ur.uid)
INNER JOIN {role} r ON ur.rid = r.rid INNER JOIN {role} r ON ur.rid = r.rid
WHERE r.name = '%s' AND NOT u.uid = %d WHERE r.name = '%s'
ORDER BY u.name", 'fluksonian', $user->uid); ORDER BY u.name", 'fluksonian', $user->uid);
$items = array(); $items = array();
while ($fluksonian = db_fetch_object($result)) { while ($fluksonian = db_fetch_object($result)) {