Only in /Users/davexoxide/Desktop/activity: CVS
Only in activity: LICENSE.txt
diff -urp /Users/davexoxide/Desktop/activity/activity.info activity/activity.info
--- /Users/davexoxide/Desktop/activity/activity.info 2007-12-29 08:25:04.000000000 -0800
+++ activity/activity.info 2008-11-25 14:55:46.000000000 -0800
@@ -1,5 +1,10 @@
; $Id: activity.info,v 1.1.2.1.2.2 2007/12/29 16:25:04 robertDouglass Exp $
name = Activity
+core = 6.x
description = Allow users to see their friends' activity on the site.
package = Activity
-dependencies = token
+dependencies[] = token
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/activity.install activity/activity.install
--- /Users/davexoxide/Desktop/activity/activity.install 2008-09-28 02:04:27.000000000 -0700
+++ activity/activity.install 2008-11-25 17:26:39.000000000 -0800
@@ -2,6 +2,89 @@
// $Id: activity.install,v 1.1.2.1.2.7.2.1 2008/09/28 09:04:27 jaydub Exp $
/**
+ * Implementation of hook_schema().
+ */
+function activity_schema() {
+ $schema['activity'] = array(
+ 'description' => t('Required fields for any activity'),
+ 'fields' => array(
+ 'aid' => array(
+ 'description' => t('Unique activity ID'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'module' => array(
+ 'description' => t('The module that is extending activity'),
+ 'type' => 'varchar',
+ 'length' => 50,
+ 'not null' => TRUE,
+ 'default' => '',
+ ),
+ 'type' => array(
+ 'description' => t('short name for the type of activity'),
+ 'type' => 'varchar',
+ 'length' => 25,
+ 'not null' => TRUE,
+ 'default' => '',
+ ),
+ 'operation' => array(
+ 'description' => t('the operation that occurred to trigger activity'),
+ 'type' => 'varchar',
+ 'length' => 25,
+ 'not null' => TRUE,
+ 'default' => '',
+ ),
+ 'created' => array(
+ 'description' => t('timestamp'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'data' => array(
+ 'description' => t('the message that will be printed in activity feed'),
+ 'type' => 'text',
+ 'size' => 'big',
+ 'not null' => TRUE,
+ ),
+ ),
+ 'indexes' => array(
+ 'module' => array('module'),
+ 'created' => array('created'),
+ ),
+ 'primary key' => array('aid'),
+ );
+
+ $schema['activity_targets'] = array(
+ 'description' => t('TODO'),
+ 'fields' => array(
+ 'aid' => array(
+ 'description' => t('The activity id'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'target_uid' => array(
+ 'description' => t('user of the activity'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ ),
+ 'target_role' => array(
+ 'description' => t('role of the target'),
+ 'type' => 'varchar',
+ 'length' => 50,
+ 'not null' => TRUE,
+ 'default' => '',
+ ),
+ ),
+ 'indexes' => array(
+ 'target_uid_role' => array('target_uid', 'target_role'),
+ 'target_role' => array('target_role'),
+ ),
+ 'primary key' => array('aid', 'target_uid'),
+ );
+
+ return $schema;
+}
+
+/**
* @file
* Install file for activity module.
*/
@@ -10,127 +93,21 @@
* Implementation of hook_install().
*/
function activity_install() {
- switch ($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- db_query("
- CREATE TABLE {activity} (
- aid int(11) NOT NULL,
- module varchar(50) NOT NULL default '',
- type varchar(25) NOT NULL default '',
- operation varchar(25) NOT NULL default '',
- created int(11) NOT NULL,
- data longtext NOT NULL,
- PRIMARY KEY (aid),
- KEY (module),
- KEY (created)
- ) /*!40100 DEFAULT CHARACTER SET UTF8 */
- ");
- db_query(
- "CREATE TABLE {activity_targets} (
- aid int(11) NOT NULL,
- target_uid int(11) NOT NULL,
- target_role varchar(50) NOT NULL default '',
- PRIMARY KEY (aid, target_uid),
- KEY (target_uid, target_role),
- KEY (target_role)
- ) /*!40100 DEFAULT CHARACTER SET UTF8 */
- ");
- db_query("ALTER TABLE {variable} CHANGE `name` `name` varchar(128) NOT NULL DEFAULT ''");
- break;
- case 'pgsql':
- db_query("
- CREATE TABLE {activity} (
- aid int NOT NULL,
- module varchar(50) NOT NULL default '',
- type varchar(25) NOT NULL default '',
- operation varchar(25) NOT NULL default '',
- created int NOT NULL,
- data text NOT NULL,
- PRIMARY KEY (aid)
- )");
-
- db_query("CREATE INDEX {activity}_module_idx ON {activity} (module)");
- db_query("CREATE INDEX {activity}_created_idx ON {activity} (created)");
- db_query("CREATE SEQUENCE {activity}_seq");
-
- db_query(
- "CREATE TABLE {activity_targets} (
- aid int NOT NULL,
- target_uid int NOT NULL,
- target_role varchar(50) NOT NULL default '',
- PRIMARY KEY (aid, target_uid)
- )");
- db_query("CREATE INDEX {activity_targets}_target_uid_target_role_idx ON {activity_targets} (target_uid, target_role)");
- db_query("CREATE INDEX {activity_targets}_target_role_idx ON {activity_targets} (target_role)");
- db_query("ALTER TABLE {variable} ALTER COLUMN name TYPE varchar(128)");
- break;
- }
+ // Create tables.
+ drupal_install_schema('activity');
}
/**
* Implementation of hook_uninstall().
*/
function activity_uninstall() {
- if (db_table_exists('activity')) {
- db_query("DROP TABLE {activity}");
- }
- if (db_table_exists('activity_targets')) {
- db_query("DROP TABLE {activity_targets}");
- }
- switch ($GLOBALS['db_type']) {
- case 'pgsql':
- db_query("DROP SEQUENCE {activity}_seq");
- break;
- }
+ // Remove tables.
+ drupal_uninstall_schema('activity');
+
variable_del('activity_page_pager');
variable_del('activity_purge');
variable_del('activity_time_limit');
variable_del('activity_user_optout');
variable_del('activity_user_profile_records');
db_query("DELETE FROM {variable} WHERE name LIKE 'activity_block_%'");
-}
-
-function activity_update_1() {
- $ret = array();
- switch($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- $ret[] = update_sql('ALTER TABLE {activity} ADD PRIMARY KEY (aid)');
- $ret[] = update_sql('ALTER TABLE {activity} ADD KEY (uid)');
- $ret[] = update_sql('ALTER TABLE {activity} ADD KEY (module)');
- break;
- }
- return $ret;
-}
-
-/**
- * Increase the variable name column length to the Drupal 6 default of 128
- * characters.
- */
-function activity_update_2() {
- $ret = array();
- $ret[] = update_sql("ALTER TABLE {variable} CHANGE `name` `name` varchar(128) NOT NULL DEFAULT ''");
- return $ret;
-}
-
-function activity_update_3() {
- $ret = array();
- $ret[] = update_sql("ALTER TABLE {activity} ADD COLUMN scope int(11) AFTER timestamp");
- return $ret;
-}
-
-/**
- * This column was added in update 3 but was short
- * lived and no longer needed. Remove if it exists.
- */
-function activity_update_4() {
- $ret = array();
- switch($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- $ret[] = update_sql("ALTER TABLE {activity} DROP COLUMN scope");
- break;
- }
- return $ret;
-}
+}
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/activity.module activity/activity.module
--- /Users/davexoxide/Desktop/activity/activity.module 2008-10-31 03:46:01.000000000 -0700
+++ activity/activity.module 2008-11-25 17:16:40.000000000 -0800
@@ -1,7 +1,6 @@
'activity',
- 'title' => t('Activity'),
- 'callback' => 'activity_page',
- 'access' => user_access('view public activity'),
- 'weight' => 1,
- );
- $items[] = array(
- 'path' => 'activity/delete',
- 'title' => t('Delete activity'),
- 'callback' => 'activity_delete',
- 'access' => user_access('administer activity'),
- 'type' => MENU_CALLBACK,
- );
- $items[] = array(
- 'path' => 'activity/all',
- 'title' => t('All activity'),
- 'type' => MENU_DEFAULT_LOCAL_TASK,
- 'access' => user_access('view public activity'),
- );
- $items[] = array(
- 'path' => 'activity/mine',
- 'title' => t('My activity'),
- 'access' => $user->uid,
- 'type' => MENU_LOCAL_TASK,
- 'access' => user_access('view own activity'),
- );
- $items[] = array(
- 'path' => 'activity/all/feed',
- 'title' => t('All activity RSS'),
- 'callback' => 'activity_feed',
- 'callback arguments' => array(ACTIVITY_ALL),
+ $items['activity'] = array(
+ 'title' => 'Activity',
+ 'page callback' => 'activity_page',
+ 'access arguments' => array('view public activity'),
+ 'weight' => 1,
+ );
+ $items['activity/delete'] = array(
+ 'title' => 'Delete activity',
+ 'page callback' => 'activity_delete',
+ 'access arguments' => array('administer activity'),
+ 'type' => MENU_CALLBACK,
+ );
+ $items['activity/all'] = array(
+ 'title' => 'All activity',
+ 'type' => MENU_DEFAULT_LOCAL_TASK,
+ 'access arguments' => array('view public activity'),
+ );
+ $items['activity/mine'] = array(
+ 'title' => 'My activity',
+ 'access arguments' => $user->uid,
+ 'type' => MENU_LOCAL_TASK,
+ 'access arguments' => array('view own activity'),
+ );
+ $items['activity/all/feed'] = array(
+ 'title' => 'All activity RSS',
+ 'page callback' => 'activity_feed',
+ 'page arguments' => array(ACTIVITY_ALL),
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view public activity'),
+ );
+ $items['activity/all/json'] = array(
+ 'title' => 'All activity JSON',
+ 'page callback' => 'activity_json',
+ 'page arguments' => array(ACTIVITY_ALL, 1),
+ 'type' => MENU_CALLBACK,
+ 'access arguments' => array('view public activity'),
+ );
+ $items['admin/settings/activity'] = array(
+ 'title' => 'Activity Settings',
+ 'description' => 'Customize what will display on your users activity page.',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('activity_admin_settings'),
+ );
+
+ if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'activity') {
+ if ($activity_info = activity_get_info()) {
+ $module_nice_name = drupal_ucfirst(str_replace('_', ' ', substr($module, 0, -8)));
+ $items['admin/settings/activity/%module_settings'] = array(
+ 'title' => $module_nice_name .' '. 'Module Activity Settings',
+ 'description' => 'Customize what will display on your activity pages for the @module module', array('@module' => $module_nice_name),
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('activity_module_settings', 3),
+ 'type' => MENU_CALLBACK,
+ );
+ }
+ }
+
+ if ($user->uid) {
+ $items['activity/%user_id/feed'] = array(
+ 'title' => 'My activity',
+ 'page callback' => 'activity_feed',
+ 'page arguments' => array(1),
'type' => MENU_CALLBACK,
- 'access' => user_access('view public activity'),
);
- $items[] = array(
- 'path' => 'activity/all/json',
- 'title' => t('All activity JSON'),
- 'callback' => 'activity_json',
- 'callback arguments' => array(ACTIVITY_ALL, 1),
+ $items['activity/%user_id/json'] = array(
+ 'page callback' => 'activity_json',
+ 'page arguments' => array(1),
'type' => MENU_CALLBACK,
- 'access' => user_access('view public activity'),
- );
- $items[] = array(
- 'path' => 'admin/settings/activity',
- 'title' => t('Activity Settings'),
- 'description' => t('Customize what will display on your users activity page.'),
- 'callback' => 'drupal_get_form',
- 'callback arguments' => array('activity_admin_settings'),
);
}
- else {
- if (arg(0) == 'admin' && arg(1) == 'settings' && arg(2) == 'activity') {
- if ($activity_info = activity_get_info()) {
- foreach ($activity_info as $module => $info) {
- $module_nice_name = drupal_ucfirst(str_replace('_', ' ', substr($module, 0, -8)));
- $items[] = array(
- 'path' => 'admin/settings/activity/'. $module,
- 'title' => $module_nice_name .' '. t('Module Activity Settings'),
- 'description' => t('Customize what will display on your activity pages for the @module module', array('@module' => $module_nice_name)),
- 'callback' => 'drupal_get_form',
- 'callback arguments' => array('activity_module_settings', arg(3)),
- 'type' => MENU_CALLBACK,
- );
- }
- }
- }
- if ($user->uid) {
- $items[] = array(
- 'path' => 'activity/'. $user->uid .'/feed',
- 'title' => t('My activity'),
- 'callback' => 'activity_feed',
- 'callback arguments' => array($user->uid),
- 'type' => MENU_CALLBACK,
- );
- $items[] = array(
- 'path' => 'activity/'. $user->uid .'/json',
- 'callback' => 'activity_json',
- 'callback arguments' => array($user->uid, 1),
- 'type' => MENU_CALLBACK,
- );
- }
- }
return $items;
}
@@ -174,7 +159,7 @@ function activity_admin_settings() {
if (!empty($info)) {
$form['module_settings'][$module] = array(
'#type' => 'markup',
- '#value' => ''. l($module_nice_name .' activity settings page', 'admin/settings/activity/'. $module, array('title' => 'Configure '. $module_nice_name)) .'
',
+ '#value' => ''. l($module_nice_name .' activity settings page', 'admin/settings/activity/'. $module, array('attributes' => array('title' => 'Configure '. $module_nice_name))) .'
',
);
}
}
@@ -366,7 +351,7 @@ function activity_insert($module, $type,
return FALSE;
}
- $aid = db_next_id('activity');
+ $aid = db_last_insert_id('activity', 'aid');
db_query("INSERT INTO {activity} (aid, module, type, operation, created, data)
VALUES (%d, '%s', '%s', '%s', %d, '%s')",
$aid, $module, $type, $operation, time(), serialize($data));
@@ -464,10 +449,10 @@ function activity_get_activity($uids = A
$strings[] = "'%s'";
$params[] = $value;
}
- $wheres[] = $column . ($criteria == 'exclude' ? ' NOT IN ' : ' IN ') .'('. implode(',', $strings). ')';
+ $wheres[] = $column . ($criteria == 'exclude' ? ' NOT IN ' : ' IN ') . '(' . implode(',', $strings) . ')';
}
else {
- $wheres[] = $column . ($criteria == 'exclude' ? ' != ' : ' = ') ."'%s'";
+ $wheres[] = $column . ($criteria == 'exclude' ? ' != ' : ' = ') . "'%s'";
// $values is a string with the single value.
$params[] = $values;
}
@@ -505,11 +490,11 @@ function activity_get_activity($uids = A
$activity = array();
while ($row = db_fetch_array($result)) {
$row['data'] = unserialize($row['data']);
- $row['data']['created'] = $row['created'];
+ $row['data']['created'] = $row['created'];
$row['data']['activity_id'] = $row['aid'];
- $row['data']['module'] = $row['module'];
- $row['data']['type'] = $row['type'];
- $row['data']['operation'] = ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
+ $row['data']['module'] = $row['module'];
+ $row['data']['type'] = $row['type'];
+ $row['data']['operation'] = ($row['data']['operation'] ? $row['data']['operation'] : $row['operation']);
// Invoke activityapi
activity_invoke_activityapi($row, 'load');
@@ -543,7 +528,7 @@ function activity_invoke_activityapi(&$a
if (isset($result) && is_array($result)) {
$return = array_merge($return, $result);
}
- else if (isset($result)) {
+ elseif (isset($result)) {
$return[] = $result;
}
}
@@ -655,7 +640,7 @@ function activity_page($page = 'all') {
$feed = theme('feed_icon', $feed_url);
return theme('activity_page', $activities, $table);
}
- else if ($page == 'all') {
+ elseif ($page == 'all') {
$activities = activity_get_activity(ACTIVITY_ALL, NULL, variable_get('activity_page_pager', 20));
$table = theme('activity_table', $activities);
$feed_url = url('activity/all/feed');
@@ -669,18 +654,18 @@ function activity_page($page = 'all') {
* menu callback to return a feed of a signed in user's activity page
*/
function activity_feed($arg) {
- global $locale;
+ global $language;
if ($arg == ACTIVITY_ALL) {
$activities = activity_get_activity(ACTIVITY_ALL, NULL, variable_get('activity_page_pager', 20));
- $url = url('activity/all', NULL, NULL, TRUE);
+ $url = url('activity/all', array('absolute' => TRUE));
$feed_title = t('All activity');
}
- else if (is_numeric($arg)) {
+ elseif (is_numeric($arg)) {
$user = db_fetch_object(db_query('SELECT uid, name FROM {users} WHERE uid = %d', $arg));
if ($user) {
$activities = activity_get_activity($arg, NULL, variable_get('activity_page_pager', 20));
- $url = url('activity/'. $user->uid, NULL, NULL, TRUE);
+ $url = url('activity/'. $user->uid, array('absolute' => TRUE));
$feed_title = t('Activity for @username', array('@username' => $user->name));
}
}
@@ -696,16 +681,16 @@ function activity_feed($arg) {
}
else {
$message = activity_token_replace($activity);
- $items .= format_rss_item(strip_tags($message), url('activity/'. $user->uid, NULL, NULL, TRUE), format_date($activity['created']). ''. $message. '
');
+ $items .= format_rss_item(strip_tags($message), url('activity/' . $user->uid, array('absolute' => TRUE)), format_date($activity['created']) . '' . $message . '
');
}
}
}
$channel = array(
'version' => '2.0',
- 'title' => variable_get('site_name', 'Drupal') .' - '. $feed_title,
+ 'title' => variable_get('site_name', 'Drupal') . ' -' . $feed_title,
'link' => $url,
'description' => variable_get('site_mission', ''),
- 'language' => $locale,
+ 'language' => $language,
);
// TODO: Figure out what the right namespace should be.
@@ -725,20 +710,20 @@ function activity_feed($arg) {
* $arg[1] = number of activities to retreive
*/
function activity_json($arg) {
- global $locale;
+ global $language;
$args = func_get_args();
if ($args[0] == ACTIVITY_ALL) {
// get the latest activity posted
$activities = activity_get_activity(ACTIVITY_ALL, NULL, $args[1]);
- $url = url('activity/all', NULL, NULL, TRUE);
+ $url = url('activity/all', array('absolute' => TRUE));
$feed_title = t('All activity');
}
- else if (is_numeric($args[0])) {
+ elseif (is_numeric($args[0])) {
$user = db_fetch_object(db_query('SELECT uid, name FROM {users} WHERE uid = %d', $args[0]));
if ($user) {
// get the latest activity posted pertaining to this user
$activities = activity_get_activity($arg[0], NULL, $args[1]);
- $url = url('activity/'. $user->uid, NULL, NULL, TRUE);
+ $url = url('activity/'. $user->uid, array('absolute' => TRUE));
$feed_title = t('Activity for @username', array('@username' => theme('username', $user)));
}
}
@@ -746,7 +731,7 @@ function activity_json($arg) {
foreach ($activities as $activity) {
$message = activity_token_replace($activity);
$items .= '- '. format_date($activity['created'], 'small') .'';
- $items .= ''. url('activity/'. $user->uid, NULL, NULL, TRUE) .'';
+ $items .= ''. url('activity/'. $user->uid, array('absolute' => TRUE)) .'';
$items .= ''. $message .'
';
}
}
@@ -762,10 +747,10 @@ function activity_token_list($type = 'al
if ($type == 'activity') {
$tokens = array('activity' => array());
$tokens['activity'] = array(
- 'time-small' => t('Date and time in small format: @example', array('@example' => format_date(time(), 'small'))),
+ 'time-small' => t('Date and time in small format: @example', array('@example' => format_date(time(), 'small'))),
'time-medium' => t('Date and time in medium format: @example', array('@example' => format_date(time(), 'medium'))),
- 'time-large' => t('Date and time in large format: @example', array('@example' => format_date(time(), 'large'))),
- 'time-ago' => t('How long ago did this happen? Example: %time-ago', array('%time-ago' => format_interval(time() - 60 * 60 * 36))),
+ 'time-large' => t('Date and time in large format: @example', array('@example' => format_date(time(), 'large'))),
+ 'time-ago' => t('How long ago did this happen? Example: %time-ago', array('%time-ago' => format_interval(time() - 60 * 60 * 36))),
);
return $tokens;
}
@@ -777,10 +762,10 @@ function activity_token_list($type = 'al
function activity_token_values($type, $data = NULL, $options = array()) {
if ($type == 'activity' && !empty($data)) {
$tokens = array(
- 'time-small' => format_date($data['created'], 'small'),
+ 'time-small' => format_date($data['created'], 'small'),
'time-medium' => format_date($data['created'], 'medium'),
- 'time-large' => format_date($data['created'], 'large'),
- 'time-ago' => format_interval(time() - $data['created']),
+ 'time-large' => format_date($data['created'], 'large'),
+ 'time-ago' => format_interval(time() - $data['created']),
);
return $tokens;
}
@@ -811,7 +796,7 @@ function activity_install_activity_defau
// We're including the activity contrib module file manually as Drupal
// will not have access to the functions defined in the contrib module
// at install time.
- require_once(drupal_get_path('module', 'activity') ."/contrib/{$module}/{$module}.module");
+ module_load_include('module"', 'activity', '"/contrib/{$module}/{$module}');
$info = call_user_func($module .'_activity_info');
if ($info) {
variable_set($module .'_token_types', array_keys($info['types']));
@@ -860,7 +845,7 @@ function activity_format_offset($timesta
$offset = (strftime("%V") + strftime("%Y") * 52) - (strftime("%V", $timestamp) + strftime("%Y", $timestamp) * 52);
$end = $offset != 0 ? format_plural($offset, t("a week ago"), t("@count weeks ago", array("@count" => $offset))) : t("Today");
}
- else if ($offset > 0) {
+ elseif ($offset > 0) {
$end = format_plural($offset, t('Yesterday'), t('@count days ago', array('@count' => $offset)));
}
else {
@@ -903,7 +888,11 @@ function theme_activity_table($activitie
$rows[] = array(
theme('activity_timestamp', $activity['created']),
theme('activity', $activity_message, $activity),
- user_access('administer activity') ? l('X', 'activity/delete/'. $activity['aid'], array('title' => t('Delete this activity record'), 'class' => 'activity-delete-record'), drupal_get_destination()) : NULL,
+ user_access('administer activity') ? /* TODO
+ Please manually fix the parameters on the l() or url() function on the next line.
+ Typically, this was not changed because of a function call inside an array call like
+ array('title' => t('View user profile.')).*/
+l('X', 'activity/delete/'. $activity['aid'], array('title' => t('Delete this activity record'), 'class' => 'activity-delete-record'), drupal_get_destination()) : NULL,
);
}
}
@@ -943,7 +932,11 @@ function theme_activity_username($accoun
* theme function to set customized 'more' link in blocks
*/
function theme_activity_more_link($path) {
- return ''. l(t('more'), $path, array('title' => t('See all of your activity.'))) .'
';
+ return ''. /* TODO
+ Please manually fix the parameters on the l() or url() function on the next line.
+ Typically, this was not changed because of a function call inside an array call like
+ array('title' => t('View user profile.')).*/
+l(t('more'), $path, array('title' => t('See all of your activity.'))) .'
';
}
/**
@@ -967,3 +960,69 @@ function theme_activity_timestamp($times
function theme_activity_node_type($node_type) {
return strtolower(node_get_types('name', $node_type));
}
+
+/**
+ * Register theme functions
+ */
+function activity_theme() {
+ return array(
+ 'activity_page' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'activities' => NULL,
+ 'table' => NULL,
+ ),
+ ),
+ 'activity_table' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'activities' => NULL,
+ ),
+ ),
+ 'activity_block' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'activities' => NULL,
+ 'more_link' => '',
+ ),
+ ),
+ 'activity_user_profile_activity' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'activities' => NULL,
+ ),
+ ),
+ 'activity_username' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'account' => NULL,
+ 'self' => FALSE,
+ ),
+ ),
+ 'activity_more_link' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'path' => NULL,
+ ),
+ ),
+ 'activity' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'message' => NULL,
+ 'item' => NULL,
+ ),
+ ),
+ 'activity_timestamp' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'timestamp' => NULL,
+ ),
+ ),
+ 'activity_node_type' => array(
+ 'file' => 'activity.module',
+ 'arguments' => array(
+ 'node_type' => NULL,
+ ),
+ ),
+ );
+}
Only in /Users/davexoxide/Desktop/activity/contrib: CVS
Only in /Users/davexoxide/Desktop/activity/contrib/activityhistory: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/activityhistory/activityhistory.info activity/contrib/activityhistory/activityhistory.info
--- /Users/davexoxide/Desktop/activity/contrib/activityhistory/activityhistory.info 2008-01-21 05:31:04.000000000 -0800
+++ activity/contrib/activityhistory/activityhistory.info 2008-11-25 14:58:00.000000000 -0800
@@ -1,5 +1,10 @@
; $Id: activityhistory.info,v 1.1.2.1 2008/01/21 13:31:04 robertDouglass Exp $
name = Activity history
+core = 6.x
description = Tracks whether a user has been shown a particular activity message
-dependencies = activity
+dependencies[] = activity
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/activityhistory/activityhistory.install activity/contrib/activityhistory/activityhistory.install
--- /Users/davexoxide/Desktop/activity/contrib/activityhistory/activityhistory.install 2008-09-28 02:04:27.000000000 -0700
+++ activity/contrib/activityhistory/activityhistory.install 2008-11-25 16:11:10.000000000 -0800
@@ -1,31 +1,45 @@
t('TODO'),
+ 'fields' => array(
+ 'uid' => array(
+ 'description' => t('TODO'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'aid' => array(
+ 'description' => t('TODO'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ 'timestamp' => array(
+ 'description' => t('TODO'),
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ),
+ ),
+ 'primary key' => array('uid', 'aid'),
+ );
+
+ return $schema;
+}
+
function activityhistory_install() {
- switch ($GLOBALS['db_type']) {
- case 'mysql':
- case 'mysqli':
- db_query("CREATE TABLE {activity_history} (
- uid int NOT NULL default '0',
- aid int NOT NULL default '0',
- timestamp int NOT NULL default '0',
- PRIMARY KEY (uid,aid)
- ) /*!40100 DEFAULT CHARACTER SET UTF8 */ ");
- break;
- case 'pgsql':
- db_query("CREATE TABLE {activity_history} (
- uid int NOT NULL default '0',
- aid int NOT NULL default '0',
- timestamp int NOT NULL default '0',
- PRIMARY KEY (uid,aid)
- )");
- break;
- }
+ // Create tables.
+ drupal_install_schema('activityhistory');
}
function activityhistory_uninstall() {
- if (db_table_exists('activity_history')) {
- db_query("DROP TABLE {activity_history}");
- }
+ // Remove tables.
+ drupal_uninstall_schema('activityhistory');
}
Only in /Users/davexoxide/Desktop/activity/contrib/buddylist2activity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/buddylist2activity/buddylist2activity.info activity/contrib/buddylist2activity/buddylist2activity.info
--- /Users/davexoxide/Desktop/activity/contrib/buddylist2activity/buddylist2activity.info 2008-09-28 02:08:16.000000000 -0700
+++ activity/contrib/buddylist2activity/buddylist2activity.info 2008-11-25 14:58:15.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: buddylist2activity.info,v 1.1.2.1 2008/09/28 09:08:16 jaydub Exp $
name = Buddylist2 activity
+core = 6.x
description = Enable activity notifications for buddylist2.
-dependencies = activity buddy_api
+dependencies[] = activity
+dependencies[] = buddy_api
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/buddylist2activity/buddylist2activity.install activity/contrib/buddylist2activity/buddylist2activity.install
--- /Users/davexoxide/Desktop/activity/contrib/buddylist2activity/buddylist2activity.install 2008-10-20 05:06:26.000000000 -0700
+++ activity/contrib/buddylist2activity/buddylist2activity.install 2008-11-25 16:06:01.000000000 -0800
@@ -1,5 +1,5 @@
'activity/buddies',
- 'title' => t('My buddies\' activity'),
- 'callback' => 'buddylist2activity_page',
- 'type' => MENU_LOCAL_TASK,
- 'access' => user_access('view own activity'),
- );
- }
+
+ $items['activity/buddies'] = array(
+ 'title' => 'My buddies\' activity',
+ 'page callback' => 'buddylist2activity_page',
+ 'type' => MENU_LOCAL_TASK,
+ 'access arguments' => array('view own activity'),
+ );
return $items;
}
Only in /Users/davexoxide/Desktop/activity/contrib/buddylistactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.info activity/contrib/buddylistactivity/buddylistactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.info 2007-12-23 10:57:26.000000000 -0800
+++ activity/contrib/buddylistactivity/buddylistactivity.info 2008-11-25 15:01:16.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: buddylistactivity.info,v 1.1.2.1 2007/12/23 18:57:26 robertDouglass Exp $
name = Buddylist activity
+core = 6.x
description = Enable activity notifications for buddylist.
-dependencies = activity buddylist
+dependencies[] = activity
+dependencies[] = buddylist
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.install activity/contrib/buddylistactivity/buddylistactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.install 2008-10-20 05:06:26.000000000 -0700
+++ activity/contrib/buddylistactivity/buddylistactivity.install 2008-11-25 14:52:57.000000000 -0800
@@ -13,6 +13,9 @@ function buddylistactivity_install() {
* Implementation of hook_uninstall().
*/
function buddylistactivity_uninstall() {
+ // Remove tables.
+ drupal_uninstall_schema('buddylistactivity');
+
// Remove any activity entries from the buddylistactivity module
if (module_exists('activityhistory')) {
db_query("DELETE FROM {activity_history} WHERE aid IN (SELECT aid FROM {activity} WHERE module = '%s')", 'buddylistactivity');
diff -urp /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.module activity/contrib/buddylistactivity/buddylistactivity.module
--- /Users/davexoxide/Desktop/activity/contrib/buddylistactivity/buddylistactivity.module 2008-10-23 10:53:08.000000000 -0700
+++ activity/contrib/buddylistactivity/buddylistactivity.module 2008-11-25 15:40:22.000000000 -0800
@@ -185,18 +185,15 @@ function buddylistactivity_block($op = '
/**
* Implementation of hook_menu().
*/
-function buddylistactivity_menu($may_cache) {
+function buddylistactivity_menu() {
$items = array();
-
- if ($may_cache) {
- $items[] = array(
- 'path' => 'activity/buddies',
- 'title' => t('My buddies\' activity'),
- 'callback' => 'buddylistactivity_page',
- 'type' => MENU_LOCAL_TASK,
- 'access' => user_access('view own activity'),
- );
- }
+
+ $items['activity/buddies'] = array(
+ 'title' => 'My buddies\' activity',
+ 'page callback' => 'buddylistactivity_page',
+ 'type' => MENU_LOCAL_TASK,
+ 'access arguments' => array('view own activity'),
+ );
return $items;
}
Only in /Users/davexoxide/Desktop/activity/contrib/commentactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.info activity/contrib/commentactivity/commentactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.info 2008-01-20 03:46:48.000000000 -0800
+++ activity/contrib/commentactivity/commentactivity.info 2008-11-25 15:01:20.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: commentactivity.info,v 1.1.2.1 2008/01/20 11:46:48 robertDouglass Exp $
name = Comment activity
+core = 6.x
description = Enable activity notifications for comments.
-dependencies = activity comment
+dependencies[] = activity
+dependencies[] = comment
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.install activity/contrib/commentactivity/commentactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.install 2008-10-20 05:06:26.000000000 -0700
+++ activity/contrib/commentactivity/commentactivity.install 2008-11-25 14:52:57.000000000 -0800
@@ -13,6 +13,9 @@ function commentactivity_install() {
* Implementation of hook_uninstall().
*/
function commentactivity_uninstall() {
+ // Remove tables.
+ drupal_uninstall_schema('commentactivity');
+
// Remove any activity entries from the commentactivity module
if (module_exists('activityhistory')) {
db_query("DELETE FROM {activity_history} WHERE aid IN (SELECT aid FROM {activity} WHERE module = '%s')", 'commentactivity');
diff -urp /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.module activity/contrib/commentactivity/commentactivity.module
--- /Users/davexoxide/Desktop/activity/contrib/commentactivity/commentactivity.module 2008-11-03 20:58:13.000000000 -0800
+++ activity/contrib/commentactivity/commentactivity.module 2008-11-25 15:33:21.000000000 -0800
@@ -59,26 +59,26 @@ function commentactivity_activityapi(&$a
function commentactivity_token_list($type = 'all') {
if ($type == 'commentactivity') {
$tokens['commentactivity'] = array(
- 'author-uid' => t('User Id of the person who authored the comment'),
- 'author' => t('Person who authored the comment (used for "author" role)'),
- 'author-all' => t('Person who authored the comment (used for "all" role)'),
- 'author-name' => t('The username of the person who authored the comment'),
- 'comment-cid' => t('The Id of the comment'),
- 'comment-subject' => t('The subject of the comment'),
- 'comment-subject-link' => t('Link to the comment'),
- 'parent-node-id' => t('The Id of the parent node'),
- 'parent-node-title' => t('Title of the parent node'),
- 'parent-node-link' => t('Link to the parent node'),
- 'parent-node-author-uid' => t('User Id of the person who authored the parent node'),
- 'parent-node-author' => t('Person who authored the parent node'),
- 'parent-node-author-name' => t('The username of the person who authored the parent node'),
- 'parent-node-type' => t('The node type of the parent node'),
- 'parent-comment-author-uid' => t('User Id of the person who authored the parent comment'),
- 'parent-comment-author' => t('Person who authored the parent comment'),
- 'parent-comment-author-name' => t('The username of the person who authored the parent comment'),
- 'parent-comment-cid' => t('The Id of the parent comment'),
- 'parent-comment-subject' => t('The subject of the parent comment'),
- 'parent-comment-subject-link' => t('Link to the parent comment'),
+ 'author-uid' => t('User Id of the person who authored the comment'),
+ 'author' => t('Person who authored the comment (used for "author" role)'),
+ 'author-all' => t('Person who authored the comment (used for "all" role)'),
+ 'author-name' => t('The username of the person who authored the comment'),
+ 'comment-cid' => t('The Id of the comment'),
+ 'comment-subject' => t('The subject of the comment'),
+ 'comment-subject-link' => t('Link to the comment'),
+ 'parent-node-id' => t('The Id of the parent node'),
+ 'parent-node-title' => t('Title of the parent node'),
+ 'parent-node-link' => t('Link to the parent node'),
+ 'parent-node-author-uid' => t('User Id of the person who authored the parent node'),
+ 'parent-node-author' => t('Person who authored the parent node'),
+ 'parent-node-author-name' => t('The username of the person who authored the parent node'),
+ 'parent-node-type' => t('The node type of the parent node'),
+ 'parent-comment-author-uid' => t('User Id of the person who authored the parent comment'),
+ 'parent-comment-author' => t('Person who authored the parent comment'),
+ 'parent-comment-author-name' => t('The username of the person who authored the parent comment'),
+ 'parent-comment-cid' => t('The Id of the parent comment'),
+ 'parent-comment-subject' => t('The subject of the parent comment'),
+ 'parent-comment-subject-link' => t('Link to the parent comment'),
);
return $tokens;
}
@@ -105,9 +105,9 @@ function commentactivity_token_values($t
}
$data['author'] = theme('activity_username', $author, TRUE);
- $data['author-all'] = theme('activity_username', $author);
+ $data['author-all'] = theme('activity_username', $author);
$data['author-name'] = $author->name;
- $data['comment-subject-link'] = l($data['comment-subject'], 'node/'. $data['parent-node-id'], array(), NULL, 'comment-'. $data['comment-cid']);
+ $data['comment-subject-link'] = l($data['comment-subject'], 'node/'. $data['parent-node-id'], array('fragment' => 'comment-'. $data['comment-cid']));
$data['parent-node-type'] = theme('activity_node_type', $data['parent-node-type']);
$data['parent-node-link'] = l($data['parent-node-title'], 'node/'. $data['parent-node-id']);
$data['parent-node-author'] = theme('activity_username', $parent_node_author, TRUE);
@@ -115,7 +115,7 @@ function commentactivity_token_values($t
if ($parent_comment_author) {
$data['parent-comment-author'] = theme('activity_username', $parent_comment_author, TRUE);
$data['parent-comment-author-name'] = $parent_comment_author->name;
- $data['parent-comment-subject-link'] = l($data['parent-comment-subject'], 'node/'. $data['parent-node-id'], array(), NULL, 'comment-'. $data['parent-comment-cid']);
+ $data['parent-comment-subject-link'] = l($data['parent-comment-subject'], 'node/'. $data['parent-node-id'], array('fragment' => 'comment-'. $data['parent-comment-cid']));
}
return $data;
}
@@ -141,8 +141,8 @@ function commentactivity_comment($commen
// Check if both type and operation are
// enabled for activity. If not then stop here
- if (!in_array('comment', variable_get('commentactivity_token_types', array('comment')), TRUE) ||
- !in_array($op, variable_get('commentactivity_op_types', array($op)), TRUE)) {
+ if (!in_array('comment', variable_get('commentactivity_token_types', array('comment_' . $node->type)), TRUE) ||
+ !in_array($op, variable_get('commentactivity_op_types_' . $node->type, array($op)), TRUE)) {
return FALSE;
}
@@ -166,13 +166,13 @@ function commentactivity_comment($commen
}
$data = array(
- 'author-uid' => $user->uid,
- 'comment-cid' => $comment['cid'],
- 'comment-subject' => $comment['subject'],
- 'parent-node-id' => $node->nid,
- 'parent-node-title' => $node->title,
+ 'author-uid' => $user->uid,
+ 'comment-cid' => $comment['cid'],
+ 'comment-subject' => $comment['subject'],
+ 'parent-node-id' => $node->nid,
+ 'parent-node-title' => $node->title,
'parent-node-author-uid' => $node->uid,
- 'parent-node-type' => $node->type,
+ 'parent-node-type' => $node->type,
);
$target_users_roles = array();
Only in /Users/davexoxide/Desktop/activity/contrib/favorite_nodesactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.info activity/contrib/favorite_nodesactivity/favorite_nodesactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.info 2008-09-29 10:08:20.000000000 -0700
+++ activity/contrib/favorite_nodesactivity/favorite_nodesactivity.info 2008-11-25 14:58:57.000000000 -0800
@@ -1,5 +1,12 @@
; $Id:
name = Favorite Nodes activity
+core = 6.x
description = Enable activity notifications for Favorite Nodes.
-dependencies = activity favorite_nodes
+dependencies[] = activity
+dependencies[] = favorite_nodes
+dependencies[] =
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.install activity/contrib/favorite_nodesactivity/favorite_nodesactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/favorite_nodesactivity/favorite_nodesactivity.install 2008-10-20 05:06:27.000000000 -0700
+++ activity/contrib/favorite_nodesactivity/favorite_nodesactivity.install 2008-11-25 16:05:57.000000000 -0800
@@ -1,5 +1,5 @@
t('The verb of the operation that took place, eg. "create", "update", "delete"'),
- 'author-uid' => t('User Id of the person who authored the node'),
- 'author' => t('Person who authored the node (used for "author" role)'),
- 'author-all' => t('Person who authored the node (used for "all" role)'),
+ 'operation' => t('The verb of the operation that took place, eg. "create", "update", "delete"'),
+ 'author-uid' => t('User Id of the person who authored the node'),
+ 'author' => t('Person who authored the node (used for "author" role)'),
+ 'author-all' => t('Person who authored the node (used for "all" role)'),
'author-name' => t('The username of the person who authored the node'),
- 'node-id' => t('Id of the post'),
- 'node-title' => t('Title of the post'),
- 'node-link' => t('Link to the post'),
- 'node-type' => t('The node type of the post'),
+ 'node-id' => t('Id of the post'),
+ 'node-title' => t('Title of the post'),
+ 'node-link' => t('Link to the post'),
+ 'node-type' => t('The node type of the post'),
);
return $tokens;
}
@@ -104,11 +104,11 @@ function nodeactivity_nodeapi(&$node, $o
}
$data = array(
- 'author-uid' => $node->uid,
- 'operation' => $operation,
- 'node-id' => $node->nid,
- 'node-title' => $node->title,
- 'node-type' => $node->type,
+ 'author-uid' => $node->uid,
+ 'operation' => $operation,
+ 'node-id' => $node->nid,
+ 'node-title' => $node->title,
+ 'node-type' => $node->type,
);
// This determines who sees messages based on this data.
Only in /Users/davexoxide/Desktop/activity/contrib/ogactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/ogactivity/ogactivity.info activity/contrib/ogactivity/ogactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/ogactivity/ogactivity.info 2008-10-31 02:22:02.000000000 -0700
+++ activity/contrib/ogactivity/ogactivity.info 2008-11-25 15:01:40.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: ogactivity.info,v 1.1.2.1 2008/10/31 09:22:02 jaydub Exp $
name = OG activity
+core = 6.x
description = Enable activity notifications for organic groups.
-dependencies = activity og
+dependencies[] = activity
+dependencies[] = og
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/ogactivity/ogactivity.install activity/contrib/ogactivity/ogactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/ogactivity/ogactivity.install 2008-10-31 02:22:02.000000000 -0700
+++ activity/contrib/ogactivity/ogactivity.install 2008-11-25 16:05:26.000000000 -0800
@@ -1,5 +1,5 @@
t('The verb of the operation that took place.'),
- 'author-uid' => t('User Id of the person who joined or left the group'),
- 'author' => t('Person who joined or left the group (used for "author" role)'),
- 'author-all' => t('Person who joined or left the group (used for "all" role)'),
+ 'author-uid' => t('User Id of the person who joined or left the group'),
+ 'author' => t('Person who joined or left the group (used for "author" role)'),
+ 'author-all' => t('Person who joined or left the group (used for "all" role)'),
'author-name' => t('The username of the person who joined or left the group'),
- 'node-id' => t('Id of the node of the group that was joined or left'),
- 'node-title' => t('Title of the group that was joined or left'),
- 'node-link' => t('Link to the group that was joined or left'),
- 'node-type' => t('The node type of the group that was joined or left'),
+ 'node-id' => t('Id of the node of the group that was joined or left'),
+ 'node-title' => t('Title of the group that was joined or left'),
+ 'node-link' => t('Link to the group that was joined or left'),
+ 'node-type' => t('The node type of the group that was joined or left'),
);
return $tokens;
}
@@ -114,11 +114,11 @@ function ogactivity_og($op, $gid, $uid,
}
$data = array(
- 'author-uid' => $uid,
- 'operation' => $op,
- 'node-id' => $node->nid,
- 'node-title' => $node->title,
- 'node-type' => $node->type,
+ 'author-uid' => $uid,
+ 'operation' => $op,
+ 'node-id' => $node->nid,
+ 'node-title' => $node->title,
+ 'node-type' => $node->type,
);
$target_users_roles = array(
@@ -134,18 +134,15 @@ function ogactivity_og($op, $gid, $uid,
/**
* Implementation of hook_menu().
*/
-function ogactivity_menu($may_cache) {
+function ogactivity_menu() {
$items = array();
- if ($may_cache) {
- $items[] = array(
- 'path' => 'activity/og',
- 'title' => t('My groups activity'),
- 'callback' => 'ogactivity_page',
- 'type' => MENU_LOCAL_TASK,
- 'access' => user_access('view own activity'),
- );
- }
+ $items['activity/og'] = array(
+ 'title' => 'My groups activity',
+ 'page callback' => 'ogactivity_page',
+ 'type' => MENU_LOCAL_TASK,
+ 'access arguments' => array('view own activity'),
+ );
return $items;
}
Only in /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.info activity/contrib/user_relationshipsactivity/user_relationshipsactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.info 2007-12-23 10:58:02.000000000 -0800
+++ activity/contrib/user_relationshipsactivity/user_relationshipsactivity.info 2008-11-25 14:59:48.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: user_relationshipsactivity.info,v 1.1.2.1 2007/12/23 18:58:02 robertDouglass Exp $
name = User relationships activity
+core = 6.x
description = Enable activity notifications for user relationships.
-dependencies = activity user_relationships
+dependencies[] = activity
+dependencies[] = user_relationships
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.install activity/contrib/user_relationshipsactivity/user_relationshipsactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.install 2008-10-20 05:06:27.000000000 -0700
+++ activity/contrib/user_relationshipsactivity/user_relationshipsactivity.install 2008-11-25 14:52:57.000000000 -0800
@@ -13,6 +13,9 @@ function user_relationshipsactivity_inst
* Implementation of hook_uninstall().
*/
function user_relationshipsactivity_uninstall() {
+ // Remove tables.
+ drupal_uninstall_schema('user_relationshipsactivity');
+
// Remove any activity entries from the user_relationshipsactivity module
if (module_exists('activityhistory')) {
db_query("DELETE FROM {activity_history} WHERE aid IN (SELECT aid FROM {activity} WHERE module = '%s')", 'user_relationshipsactivity');
diff -urp /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module
--- /Users/davexoxide/Desktop/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module 2008-11-05 02:35:14.000000000 -0800
+++ activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module 2008-11-25 15:44:48.000000000 -0800
@@ -86,17 +86,17 @@ function user_relationshipsactivity_acti
function user_relationshipsactivity_token_list($type = 'all') {
if ($type == 'user_relationshipsactivity') {
$tokens['user_relationshipsactivity'] = array(
- 'requester-id' => t('User id of the person who issued the request'),
- 'requester' => t('Person who issued the request'),
- 'requester-name' => t('The username of the person who issued the request'),
- 'requestee-id' => t('User id of the person to whom the request was issued'),
- 'requestee' => t('Person who received the request'),
- 'requestee-name' => t('The username of the person to whom the request was issued'),
- 'relationship' => t('The name of the relationship'),
+ 'requester-id' => t('User id of the person who issued the request'),
+ 'requester' => t('Person who issued the request'),
+ 'requester-name' => t('The username of the person who issued the request'),
+ 'requestee-id' => t('User id of the person to whom the request was issued'),
+ 'requestee' => t('Person who received the request'),
+ 'requestee-name' => t('The username of the person to whom the request was issued'),
+ 'relationship' => t('The name of the relationship'),
'relationship-plural' => t('The plural name of the relationship'),
- 'x-is-blah-of-y' => t('Eg: Sam is a fan of Susan'),
- 'x-is-not-blah-of-y' => t('Eg: Sam is no longer a fan of Susan'),
- 'x-and-y-are-blahs' => t('Eg: Sam and Susan are friends'),
+ 'x-is-blah-of-y' => t('Eg: Sam is a fan of Susan'),
+ 'x-is-not-blah-of-y' => t('Eg: Sam is no longer a fan of Susan'),
+ 'x-and-y-are-blahs' => t('Eg: Sam and Susan are friends'),
'the-other-person-name' => t('In any relationship, the name of the person who is not "you". Should only be used in messages visible to the individual user.'),
'the-other-person-link' => t('In any relationship, a link to the person who is not "you". Should only be used in messages visible to the individual user.'),
);
@@ -117,13 +117,13 @@ function user_relationshipsactivity_toke
$requestee = $authors[$data['requestee-uid']];
$tokens = array(
- 'requester' => theme('activity_username', $requester),
- 'requester-name' => $requester->name,
- 'requestee' => theme('activity_username', $requestee),
- 'requestee-name' => $requestee->name,
- 'x-is-blah-of-y' => t('!sam is a @fan of !susan', array('!sam' => theme('activity_username', $requester), '@fan' => $data['relationship'], '!susan' => theme('activity_username', $requestee))),
- 'x-is-not-blah-of-y' => t('!sam is no longer a @fan of !susan', array('!sam' => theme('activity_username', $requester), '@fan' => $data['relationship'], '!susan' => theme('activity_username', $requestee))),
- 'x-and-y-are-blahs' => t('!sam and !susan are @friends', array('!sam' => theme('activity_username', $requester), '!susan' => theme('activity_username', $requestee), '@friends' => $data['relationship-plural'])),
+ 'requester' => theme('activity_username', $requester),
+ 'requester-name' => $requester->name,
+ 'requestee' => theme('activity_username', $requestee),
+ 'requestee-name' => $requestee->name,
+ 'x-is-blah-of-y' => t('!sam is a @fan of !susan', array('!sam' => theme('activity_username', $requester), '@fan' => $data['relationship'], '!susan' => theme('activity_username', $requestee))),
+ 'x-is-not-blah-of-y' => t('!sam is no longer a @fan of !susan', array('!sam' => theme('activity_username', $requester), '@fan' => $data['relationship'], '!susan' => theme('activity_username', $requestee))),
+ 'x-and-y-are-blahs' => t('!sam and !susan are @friends', array('!sam' => theme('activity_username', $requester), '!susan' => theme('activity_username', $requestee), '@friends' => $data['relationship-plural'])),
);
return $tokens + $data;
}
@@ -213,18 +213,37 @@ function user_relationshipsactivity_user
/**
* Implementation of hook_menu().
*/
-function user_relationshipsactivity_menu($may_cache) {
+function user_relationshipsactivity_menu() {
$items = array();
+/* TODO
+ Non menu code that was placed in hook_menu under the '!$may_cache' block
+ so that it could be run during initialization, should now be moved to hook_init.
+ Previously we called hook_init twice, once early in the bootstrap process, second
+ just after the bootstrap has finished. The first instance is now called boot
+ instead of init.
+
+ In Drupal 6, there are now two hooks that can be used by modules to execute code
+ at the beginning of a page request. hook_boot() replaces hook_boot() in Drupal 5
+ and runs on each page request, even for cached pages. hook_boot() now only runs
+ for non-cached pages and thus can be used for code that was previously placed in
+ hook_menu() with $may_cache = FALSE:
+
+ Dynamic menu items under a '!$may_cache' block can often be simplified
+ to remove references to arg(n) and use of '%' to check
+ conditions. See http://drupal.org/node/103114.
+
+ The title and description arguments should not have strings wrapped in t(),
+ because translation of these happen in a later stage in the menu system.
+*/
if ($may_cache) {
foreach (user_relationships_types_load() as $type) {
- $items[] = array(
- 'path' => 'activity/'. preg_replace('/ /', '_', drupal_strtolower($type->plural_name)),
- 'title' => t('My !relationship\' activity', array('!relationship' => $type->plural_name)),
- 'callback' => 'user_relationshipsactivity_page',
- 'callback arguments' => array($type->rtid),
+ $items['activity/'. preg_replace('/ /', '_', drupal_strtolower($type->plural_name))] = array(
+ 'title' => 'My !relationship\' activity', array('!relationship' => $type->plural_name),
+ 'page callback' => 'user_relationshipsactivity_page',
+ 'page arguments' => array($type->rtid),
'type' => MENU_LOCAL_TASK,
- 'access' => user_access('view own activity'),
+ 'access arguments' => array('view own activity'),
);
}
}
Only in /Users/davexoxide/Desktop/activity/contrib/useractivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/useractivity/useractivity.info activity/contrib/useractivity/useractivity.info
--- /Users/davexoxide/Desktop/activity/contrib/useractivity/useractivity.info 2008-11-05 02:45:38.000000000 -0800
+++ activity/contrib/useractivity/useractivity.info 2008-11-25 15:01:51.000000000 -0800
@@ -1,5 +1,10 @@
; $Id:
name = User activity
+core = 6.x
description = Enable activity notifications for user actions.
-dependencies = activity
-package = Activity
\ No newline at end of file
+dependencies[] = activity
+package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/useractivity/useractivity.install activity/contrib/useractivity/useractivity.install
--- /Users/davexoxide/Desktop/activity/contrib/useractivity/useractivity.install 2008-11-05 02:45:38.000000000 -0800
+++ activity/contrib/useractivity/useractivity.install 2008-11-25 16:05:15.000000000 -0800
@@ -1,5 +1,5 @@
t('The verb of the operation that took place, eg. "mark", "unmark"'),
- 'author-uid' => t('The User Id of who bookmarked the node'),
- 'author' => t('Person who bookmarked the node (use for "author" role)'),
- 'author-all' => t('Person who bookmared the node (use for "all" role)'),
+ 'operation' => t('The verb of the operation that took place, eg. "mark", "unmark"'),
+ 'author-uid' => t('The User Id of who bookmarked the node'),
+ 'author' => t('Person who bookmarked the node (use for "author" role)'),
+ 'author-all' => t('Person who bookmared the node (use for "all" role)'),
'author-name' => t('The username of who bookmarked the node'),
- 'node-type' => t('The node type of the node that was bookmarked'),
- 'node-id' => t('Id of the node that was bookmarked'),
- 'node-title' => t('Title of the node that was bookmarked'),
- 'node-link' => t('Link to the node that was bookmarked'),
+ 'node-type' => t('The node type of the node that was bookmarked'),
+ 'node-id' => t('Id of the node that was bookmarked'),
+ 'node-title' => t('Title of the node that was bookmarked'),
+ 'node-link' => t('Link to the node that was bookmarked'),
);
return $tokens;
}
@@ -108,11 +108,11 @@ function views_bookmarkactivity_views_bo
}
$data = array(
- 'author-uid' => $vb_uid,
- 'operation' => $vb_name,
- 'node-id' => $node->nid,
- 'node-title' => $node->title,
- 'node-type' => $node->type,
+ 'author-uid' => $vb_uid,
+ 'operation' => $vb_name,
+ 'node-id' => $node->nid,
+ 'node-title' => $node->title,
+ 'node-type' => $node->type,
);
$target_users_roles = array(
Only in /Users/davexoxide/Desktop/activity/contrib/votingapiactivity: CVS
diff -urp /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.info activity/contrib/votingapiactivity/votingapiactivity.info
--- /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.info 2008-02-20 10:25:29.000000000 -0800
+++ activity/contrib/votingapiactivity/votingapiactivity.info 2008-11-25 15:00:21.000000000 -0800
@@ -1,5 +1,11 @@
; $Id: votingapiactivity.info,v 1.1.2.3 2008/02/20 18:25:29 sirkitree Exp $
name = Voting activity
+core = 6.x
description = Enable activity notifications for voting.
-dependencies = activity votingapi
+dependencies[] = activity
+dependencies[] = votingapi
package = Activity
+
+; Information added by drupal.org packaging script on 2008-11-05
+project = "activity"
+datestamp = "1225886423"
\ No newline at end of file
diff -urp /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.install activity/contrib/votingapiactivity/votingapiactivity.install
--- /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.install 2008-10-20 05:06:27.000000000 -0700
+++ activity/contrib/votingapiactivity/votingapiactivity.install 2008-11-25 14:52:57.000000000 -0800
@@ -13,6 +13,9 @@ function votingapiactivity_install() {
* Implementation of hook_uninstall().
*/
function votingapiactivity_uninstall() {
+ // Remove tables.
+ drupal_uninstall_schema('votingapiactivity');
+
// Remove any activity entries from the votingapiactivity module
if (module_exists('activityhistory')) {
db_query("DELETE FROM {activity_history} WHERE aid IN (SELECT aid FROM {activity} WHERE module = '%s')", 'votingapiactivity');
diff -urp /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.module activity/contrib/votingapiactivity/votingapiactivity.module
--- /Users/davexoxide/Desktop/activity/contrib/votingapiactivity/votingapiactivity.module 2008-10-31 02:20:16.000000000 -0700
+++ activity/contrib/votingapiactivity/votingapiactivity.module 2008-11-25 15:46:41.000000000 -0800
@@ -47,17 +47,17 @@ function votingapiactivity_activityapi(&
function votingapiactivity_token_list($type = 'all') {
if ($type == 'votingapiactivity') {
$tokens['votingapiactivity'] = array(
- 'author-uid' => t('User Id of the person who voted'),
- 'author' => t('Person who voted (use for "author" role)'),
- 'author-all' => t('Person who voted (use for "all" role)'),
- 'author-name' => t('The username of who voted on the content'),
- 'author-vote' => t('Value of the author\'s vote'),
- 'content-type' => t('Content type that was voted on such as "story" or "image" or "comment"'),
- 'content-id' => t('Id of the content that was voted upon'),
- 'content-nid' => t('Id of the node that was voted upon'),
- 'content-cid' => t('Id of the comment that was voted upon'),
- 'content-title' => t('Title of the content that was voted upon'),
- 'content-link' => t('Link to the content that was voted upon'),
+ 'author-uid' => t('User Id of the person who voted'),
+ 'author' => t('Person who voted (use for "author" role)'),
+ 'author-all' => t('Person who voted (use for "all" role)'),
+ 'author-name' => t('The username of who voted on the content'),
+ 'author-vote' => t('Value of the author\'s vote'),
+ 'content-type' => t('Content type that was voted on such as "story" or "image" or "comment"'),
+ 'content-id' => t('Id of the content that was voted upon'),
+ 'content-nid' => t('Id of the node that was voted upon'),
+ 'content-cid' => t('Id of the comment that was voted upon'),
+ 'content-title' => t('Title of the content that was voted upon'),
+ 'content-link' => t('Link to the content that was voted upon'),
'content-vote-avg' => t('Average of all votes for this content'),
'content-vote-count' => t('Count of all votes for this content'),
);
@@ -78,7 +78,7 @@ function votingapiactivity_token_values(
$data['author-name'] = $author->name;
if ($data['content-type'] == t('comment')) {
- $data['content-link'] = l($data['content-title'], 'node/'. $data['content-nid'], array(), NULL, 'comment-'. $data['content-cid']);
+ $data['content-link'] = l($data['content-title'], 'node/'. $data['content-nid'], array('fragment' => 'comment-'. $data['content-cid']));
}
else {
$data['content-type'] = theme('activity_node_type', $data['content-type']);
@@ -125,7 +125,7 @@ function votingapiactivity_votingapi_ins
if ($args[0]->content_type == 'node') {
$content = node_load($args[0]->content_id);
}
- else if ($args[0]->content_type == 'comment') {
+ elseif ($args[0]->content_type == 'comment') {
$content = _comment_load($args[0]->content_id);
$content->type = t('comment');
$content->title = $content->subject;
@@ -135,10 +135,10 @@ function votingapiactivity_votingapi_ins
}
$data = array(
- 'author-uid' => $user->uid,
- 'content-nid' => $content->nid,
- 'content-id' => $args[0]->content_id,
- 'content-type' => $content->type,
+ 'author-uid' => $user->uid,
+ 'content-nid' => $content->nid,
+ 'content-id' => $args[0]->content_id,
+ 'content-type' => $content->type,
'content-title' => $content->title,
);
Only in /Users/davexoxide/Desktop/activity/tests: CVS