? activity-initiald6port.patch Index: activity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.info,v retrieving revision 1.1.2.1.2.2 diff -u -p -r1.1.2.1.2.2 activity.info --- activity.info 29 Dec 2007 16:25:04 -0000 1.1.2.1.2.2 +++ activity.info 15 Aug 2008 10:15:47 -0000 @@ -2,4 +2,5 @@ name = Activity description = Allow users to see their friends' activity on the site. package = Activity -dependencies = token +dependencies[] = token +core = 6.x Index: activity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.install,v retrieving revision 1.1.2.1.2.6 diff -u -p -r1.1.2.1.2.6 activity.install --- activity.install 14 Apr 2008 16:59:20 -0000 1.1.2.1.2.6 +++ activity.install 15 Aug 2008 10:15:47 -0000 @@ -10,101 +10,47 @@ * 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; - } + 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; - } -} +* Implementation of hook_schema(). +*/ +function activity_schema() { + $schema['activity'] = array( + 'fields' => array( + 'aid' => array('type' => 'int', 'not null' => TRUE), + 'module' => array('type' => 'varchar', 'length' => 50, 'not null' => TRUE, 'default' => ''), + 'type' => array('type' => 'varchar', 'length' => 25, 'not null' => TRUE, 'default' => ''), + 'operation' => array('type' => 'varchar', 'length' => 25, 'not null' => TRUE, 'default' => ''), + 'created' => array('type' => 'int', 'not null' => TRUE), + 'data' => array('type' => 'text', 'not null' => TRUE), + ), + 'indexes' => array( + 'module' => array('module'), + 'created' => array('created') + ), + 'primary key' => array('aid'), + ); + $schema['activity_targets'] = array( + 'fields' => array( + 'aid' => array('type' => 'int', 'not null' => TRUE), + 'target_uid' => array('type' => 'int', 'not null' => TRUE), + 'target_role' => array('type' => 'varchar', 'length' => 50, 'not null' => TRUE, 'default' => ''), + ), + 'indexes' => array( + 'target_uid_target_role' => array('target_uid', 'target_role'), + 'target_role' => array('target_role') + ), + 'primary key' => array('aid', 'target_uid'), + ); -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; + return $schema; } /** - * Increase the variable name column length to the Drupal 6 default of 128 - * characters. + * Implementation of hook_uninstall(). */ -function activity_update_2() { - $ret = array(); - $ret[] = update_sql("ALTER TABLE {variable} CHANGE `name` `name` varchar(128) NOT NULL DEFAULT ''"); - return $ret; +function activity_uninstall() { + drupal_uninstall_schema('activity'); } - Index: activity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/activity.module,v retrieving revision 1.1.2.2.2.30 diff -u -p -r1.1.2.2.2.30 activity.module --- activity.module 29 Apr 2008 15:59:29 -0000 1.1.2.2.2.30 +++ activity.module 15 Aug 2008 10:15:48 -0000 @@ -19,72 +19,61 @@ function activity_perm() { /** * Implementation of hook_menu(). */ -function activity_menu($may_cache) { +function activity_menu() { $items = array(); global $user; - if ($may_cache) { - $items[] = array( - 'path' => 'activity', - 'title' => t('Activity'), - 'callback' => 'activity_page', - 'access' => user_access('view public activity'), - 'weight' => 1, - ); - $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'), + $items['activity'] = array( + 'title' => 'Activity', + 'page callback' => 'activity_page', + 'access arguments' => array('view public activity'), + 'weight' => 1, + ); + $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' => $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', + 'description' => 'Customize what will display on your users activity page.', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('activity_admin_settings'), + 'access arguments' => array('administer activity'), + ); + if ($user->uid) { + $items['activity/'. $user->uid .'/feed'] = array( + 'title' => 'My activity', 'callback' => 'activity_feed', - 'callback arguments' => array(ACTIVITY_ALL), + 'callback arguments' => array($user->uid), 'type' => MENU_CALLBACK, - 'access' => user_access('view public activity'), ); - $items[] = array( - 'path' => 'activity/all/json', - 'title' => t('All activity JSON'), + $items['activity/'. $user->uid .'/json'] = array( 'callback' => 'activity_json', - 'callback arguments' => array(ACTIVITY_ALL, 1), + 'callback arguments' => array($user->uid, 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 ($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; } @@ -129,8 +118,8 @@ function activity_admin_settings() { $form[$module] = array( '#type' => 'fieldset', '#title' => t('Tokens for @name', array('@name' => t($module))), - '#collapsible' => true, - '#collapsed' => true, + '#collapsible' => TRUE, + '#collapsed' => TRUE, '#description' => t('Available tokens') . theme('item_list', $tokens), ); @@ -140,8 +129,8 @@ function activity_admin_settings() { $form[$module][$role_name] = array( '#type' => 'fieldset', '#title' => t('Messages visible to the "%role_name" role.', array('%role_name' => $role['#name'])), - '#collapsible' => true, - '#collapsed' => false, + '#collapsible' => TRUE, + '#collapsed' => FALSE, '#description' => $role['#description'] ? $role['#description'] : '', ); } @@ -153,7 +142,7 @@ function activity_admin_settings() { $token_field = "{$module}_{$type_name}_{$op_name}_{$role_name}"; $form[$module][$role_name][$token_field] = array( '#type' => 'textfield', - '#title' => $type. ': '. $op, + '#title' => $type .': '. $op, '#default_value' => variable_get($token_field, $role['#default'] ? $role['#default'] : ''), ); } @@ -203,7 +192,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)); @@ -265,7 +254,7 @@ function activity_get_activity($uids = A $nums[] = "%d"; $params[] = $uid; } - $wheres[] = 'activity_targets.target_uid IN ('. implode(',', $nums). ')'; + $wheres[] = 'activity_targets.target_uid IN ('. implode(',', $nums) .')'; } // Build sql limiting query to on filtered fields @@ -291,7 +280,7 @@ 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'"; @@ -407,7 +396,7 @@ function activity_block($op = 'list', $d '#type' => 'select', '#title' => t('Number of items'), '#default_value' => variable_get('activity_block_'. $delta, 5), - '#options' =>drupal_map_assoc(range(1, 50)), + '#options' => drupal_map_assoc(range(1, 50)), ); return $form; } @@ -467,9 +456,9 @@ function activity_page($page = 'all') { if ($page == 'mine') { $activities = activity_get_activity($user->uid, NULL, 20); $table = activity_table($activities); - $feed_url = url('activity/'. $user->uid. '/feed'); + $feed_url = url('activity/'. $user->uid .'/feed'); drupal_add_feed($feed_url); - $feed = theme('feed_icon', $feed_url); + $feed = theme('feed_icon', $feed_url, 'My activity'); return theme('activity_page', $activities, $table); } else if ($page == 'all') { @@ -477,7 +466,7 @@ function activity_page($page = 'all') { $table = activity_table($activities); $feed_url = url('activity/all/feed'); drupal_add_feed($feed_url); - $feed = theme('feed_icon', $feed_url); + $feed = theme('feed_icon', $feed_url, 'All activity'); return theme('activity_page', $activities, $table); } } @@ -520,24 +509,24 @@ function activity_table($activities) { * 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, 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)) { $user = db_fetch_object(db_query('SELECT uid, name FROM {users} WHERE uid = %d', $arg)); if ($user) { $activities = activity_get_activity($arg, NULL, 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)); } } if (count($activities) > 0) { foreach ($activities as $activity) { - $function = $activity['module']. '_format_rss_item'; + $function = $activity['module'] .'_format_rss_item'; if (function_exists($function)) { // each module gets a chance to build its own feed item. // They should use the $activity to prepare variables and @@ -546,7 +535,7 @@ 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 .'

'); } } } @@ -555,7 +544,7 @@ function activity_feed($arg) { '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. @@ -575,12 +564,12 @@ 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])) { @@ -588,7 +577,7 @@ function activity_json($arg) { 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))); } } @@ -596,7 +585,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 .''; } } @@ -674,11 +663,41 @@ function activity_format_offset($timesta */ function activity_simpletest() { $module_name = 'activity'; - $dir = drupal_get_path('module', $module_name). '/tests'; + $dir = drupal_get_path('module', $module_name) .'/tests'; $tests = file_scan_directory($dir, '\.test$'); return array_keys($tests); } +/** +* Implementation of hook_theme(). +*/ +function activity_theme() { + return array( + 'activity' => array( + 'arguments' => array( + 'message' => NULL, + 'item' => NULL, + ), + ), + 'activity_page' => array( + 'arguments' => array( + 'activities' => NULL, + 'table' => NULL, + ), + ), + 'activity_block' => array( + 'arguments' => array( + 'activities' => NULL, + 'more_link' => '', + ), + ), + 'activity_more_link' => array( + 'arguments' => array( + 'path' => NULL, + ), + ), + ); +} /** * theme function for displaying the users activity page @@ -704,5 +723,5 @@ function theme_activity_more_link($path) function theme_activity($message, $item) { // $item is the unprocessed activity item so that themers can do more with it. - return ''. $message. ''; + return ''. $message .''; } Index: contrib/activityhistory/activityhistory.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/activityhistory/activityhistory.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 activityhistory.info --- contrib/activityhistory/activityhistory.info 21 Jan 2008 13:31:04 -0000 1.1.2.1 +++ contrib/activityhistory/activityhistory.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,6 @@ ; $Id: activityhistory.info,v 1.1.2.1 2008/01/21 13:31:04 robertDouglass Exp $ name = Activity history description = Tracks whether a user has been shown a particular activity message -dependencies = activity +dependencies[] = activity package = Activity +core = 6.x \ No newline at end of file Index: contrib/activityhistory/activityhistory.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/activityhistory/activityhistory.install,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 activityhistory.install --- contrib/activityhistory/activityhistory.install 14 Apr 2008 16:28:29 -0000 1.1.2.2 +++ contrib/activityhistory/activityhistory.install 15 Aug 2008 10:15:48 -0000 @@ -2,35 +2,36 @@ // $Id: activityhistory.install,v 1.1.2.2 2008/04/14 16:28:29 jaydub Exp $ /** + * @file + * Install file for activityhistory module. + */ + +/** * Implementation of hook_install(). */ 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; - } + drupal_install_schema('activityhistory'); +} + +/** +* Implementation of hook_schema(). +*/ +function activityhistory_schema() { + $schema['activity_history'] = array( + 'fields' => array( + 'uid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), + 'aid' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), + 'timestamp' => array('type' => 'int', 'not null' => TRUE, 'default' => 0), + ), + 'primary key' => array('uid', 'aid'), + ); + + return $schema; } /** * Implementation of hook_uninstall(). */ function activityhistory_uninstall() { - if (db_table_exists('activity_history')) { - db_query("DROP TABLE {activity_history}"); - } + drupal_uninstall_schema('activityhistory'); } Index: contrib/activityhistory/activityhistory.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/activityhistory/activityhistory.module,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 activityhistory.module --- contrib/activityhistory/activityhistory.module 19 Mar 2008 17:47:46 -0000 1.1.2.3 +++ contrib/activityhistory/activityhistory.module 15 Aug 2008 10:15:48 -0000 @@ -1,6 +1,11 @@ '. $message. ''; + return $item['activity_history_new'] .' '. $message .''; } } Index: contrib/buddylistactivity/buddylistactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/buddylistactivity/buddylistactivity.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 buddylistactivity.info --- contrib/buddylistactivity/buddylistactivity.info 23 Dec 2007 18:57:26 -0000 1.1.2.1 +++ contrib/buddylistactivity/buddylistactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,7 @@ ; $Id: buddylistactivity.info,v 1.1.2.1 2007/12/23 18:57:26 robertDouglass Exp $ name = Buddylist activity description = Enable activity notifications for buddylist. -dependencies = activity buddylist +dependencies[] = activity +dependencies[] = buddylist package = Activity +core = 6.x \ No newline at end of file Index: contrib/buddylistactivity/buddylistactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/buddylistactivity/buddylistactivity.install,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 buddylistactivity.install --- contrib/buddylistactivity/buddylistactivity.install 29 Apr 2008 16:56:30 -0000 1.1.2.3 +++ contrib/buddylistactivity/buddylistactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: buddylistactivity.install,v 1.1.2.3 2008/04/29 16:56:30 jaydub Exp $ /** + * @file + * Install file for buddylistactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function buddylistactivity_uninstall() { Index: contrib/buddylistactivity/buddylistactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/buddylistactivity/buddylistactivity.module,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 buddylistactivity.module --- contrib/buddylistactivity/buddylistactivity.module 19 Mar 2008 17:47:46 -0000 1.1.2.6 +++ contrib/buddylistactivity/buddylistactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: buddylistactivity.module,v 1.1.2.6 2008/03/19 17:47:46 sirkitree Exp $ /** + * @file + * Records activity from Buddylist module + */ + +/** * Activity definition file * * This defines what hooks activity module should use @@ -95,7 +100,7 @@ function buddylistactivity_block($op = ' '#type' => 'select', '#title' => t('Number of items'), '#default_value' => variable_get('activity_block_'. $delta, 5), - '#options' =>drupal_map_assoc(range(1, 50)), + '#options' => drupal_map_assoc(range(1, 50)), ); return $form; } @@ -123,20 +128,17 @@ function buddylistactivity_block($op = ' } } -function buddylistactivity_menu($may_cache) { +function buddylistactivity_menu() { $items = array(); global $user; - if ($may_cache) { - $items[] = array( - 'path' => 'activity/buddies', - 'title' => t('My buddies\' activity'), - 'callback' => 'buddylistactivity_page', - 'access' => $user->uid, - 'type' => MENU_LOCAL_TASK, - 'access' => user_access('view own activity'), - ); - } + $items['activity/buddies'] = array( + 'title' => 'My buddies\' activity', + 'page callback' => 'buddylistactivity_page', + 'access' => $user->uid, + 'type' => MENU_LOCAL_TASK, + 'access arguments' => array('view own activity'), + ); return $items; } Index: contrib/commentactivity/commentactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/commentactivity/commentactivity.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 commentactivity.info --- contrib/commentactivity/commentactivity.info 20 Jan 2008 11:46:48 -0000 1.1.2.1 +++ contrib/commentactivity/commentactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,7 @@ ; $Id: commentactivity.info,v 1.1.2.1 2008/01/20 11:46:48 robertDouglass Exp $ name = Comment activity description = Enable activity notifications for comments. -dependencies = activity comment +dependencies[] = activity +dependencies[] = comment package = Activity +core = 6.x \ No newline at end of file Index: contrib/commentactivity/commentactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/commentactivity/commentactivity.install,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 commentactivity.install --- contrib/commentactivity/commentactivity.install 29 Apr 2008 16:56:30 -0000 1.1.2.2 +++ contrib/commentactivity/commentactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: commentactivity.install,v 1.1.2.2 2008/04/29 16:56:30 jaydub Exp $ /** + * @file + * Install file for commentactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function commentactivity_uninstall() { Index: contrib/commentactivity/commentactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/commentactivity/commentactivity.module,v retrieving revision 1.1.2.6 diff -u -p -r1.1.2.6 commentactivity.module --- contrib/commentactivity/commentactivity.module 29 Apr 2008 16:20:27 -0000 1.1.2.6 +++ contrib/commentactivity/commentactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: commentactivity.module,v 1.1.2.6 2008/04/29 16:20:27 jaydub Exp $ /** + * @file + * Records activity from Comment module + */ + +/** * Activity definition file * * This defines what hooks activity module should use @@ -111,7 +116,7 @@ function commentactivity_comment($a1, $o $user = user_load(array('uid' => $a1['uid'])); $data = array( 'author-uid' => $user->uid, - 'subject' => l($a1['subject'], 'node/'. $node->nid, array(), NULL, 'comment-'. $a1['cid']), + 'subject' => l($a1['subject'], 'node/'. $node->nid, array('fragment' => 'comment-'. $a1['cid'])), 'parent-node' => l($node->title, 'node/'. $node->nid), 'parent-node-author' => theme('username', $node_author), 'parent-node-type' => $node->type, Index: contrib/nodeactivity/nodeactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/nodeactivity/nodeactivity.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 nodeactivity.info --- contrib/nodeactivity/nodeactivity.info 23 Dec 2007 18:57:44 -0000 1.1.2.1 +++ contrib/nodeactivity/nodeactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,6 @@ ; $Id: nodeactivity.info,v 1.1.2.1 2007/12/23 18:57:44 robertDouglass Exp $ name = Node activity description = Enable activity notifications for content creation. -dependencies = activity +dependencies[] = activity package = Activity +core = 6.x \ No newline at end of file Index: contrib/nodeactivity/nodeactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/nodeactivity/nodeactivity.install,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 nodeactivity.install --- contrib/nodeactivity/nodeactivity.install 29 Apr 2008 16:56:30 -0000 1.1.2.3 +++ contrib/nodeactivity/nodeactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: nodeactivity.install,v 1.1.2.3 2008/04/29 16:56:30 jaydub Exp $ /** + * @file + * Install file for nodeactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function nodeactivity_uninstall() { Index: contrib/nodeactivity/nodeactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/nodeactivity/nodeactivity.module,v retrieving revision 1.1.2.11 diff -u -p -r1.1.2.11 nodeactivity.module --- contrib/nodeactivity/nodeactivity.module 19 Mar 2008 18:02:53 -0000 1.1.2.11 +++ contrib/nodeactivity/nodeactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: nodeactivity.module,v 1.1.2.11 2008/03/19 18:02:53 sirkitree Exp $ /** + * @file + * Records activity from Node module + */ + +/** * Activity definition file * * This defines what hooks activity module should use Index: contrib/user_relationshipsactivity/user_relationshipsactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.info,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 user_relationshipsactivity.info --- contrib/user_relationshipsactivity/user_relationshipsactivity.info 23 Dec 2007 18:58:02 -0000 1.1.2.1 +++ contrib/user_relationshipsactivity/user_relationshipsactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,7 @@ ; $Id: user_relationshipsactivity.info,v 1.1.2.1 2007/12/23 18:58:02 robertDouglass Exp $ name = User relationships activity description = Enable activity notifications for user relationships. -dependencies = activity user_relationships +dependencies[] = activity +dependencies[] = user_relationships package = Activity +core = 6.x \ No newline at end of file Index: contrib/user_relationshipsactivity/user_relationshipsactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.install,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 user_relationshipsactivity.install --- contrib/user_relationshipsactivity/user_relationshipsactivity.install 29 Apr 2008 16:56:31 -0000 1.1.2.3 +++ contrib/user_relationshipsactivity/user_relationshipsactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: user_relationshipsactivity.install,v 1.1.2.3 2008/04/29 16:56:31 jaydub Exp $ /** + * @file + * Install file for user_relationshipsactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function user_relationshipsactivity_uninstall() { Index: contrib/user_relationshipsactivity/user_relationshipsactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/user_relationshipsactivity/user_relationshipsactivity.module,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 user_relationshipsactivity.module --- contrib/user_relationshipsactivity/user_relationshipsactivity.module 19 Mar 2008 17:47:47 -0000 1.1.2.8 +++ contrib/user_relationshipsactivity/user_relationshipsactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: user_relationshipsactivity.module,v 1.1.2.8 2008/03/19 17:47:47 sirkitree Exp $ /** + * @file + * Records activity from User Relationships module + */ + +/** * Activity definition file * The User Relationships API: Index: contrib/views_bookmarkactivity/views_bookmarkactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/views_bookmarkactivity/views_bookmarkactivity.info,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 views_bookmarkactivity.info --- contrib/views_bookmarkactivity/views_bookmarkactivity.info 19 Feb 2008 14:20:51 -0000 1.1.2.3 +++ contrib/views_bookmarkactivity/views_bookmarkactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,7 @@ ; $Id: views_bookmarkactivity.info,v 1.1.2.3 2008/02/19 14:20:51 sirkitree Exp $ name = Views bookmark activity description = Enable activity notifications for views bookmarks. -dependencies = activity views_bookmark +dependencies[] = activity +dependencies[] = views_bookmark package = Activity +core = 6.x \ No newline at end of file Index: contrib/views_bookmarkactivity/views_bookmarkactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/views_bookmarkactivity/views_bookmarkactivity.install,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 views_bookmarkactivity.install --- contrib/views_bookmarkactivity/views_bookmarkactivity.install 29 Apr 2008 16:56:31 -0000 1.1.2.5 +++ contrib/views_bookmarkactivity/views_bookmarkactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: views_bookmarkactivity.install,v 1.1.2.5 2008/04/29 16:56:31 jaydub Exp $ /** + * @file + * Install file for views_bookmarkactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function views_bookmarkactivity_uninstall() { Index: contrib/views_bookmarkactivity/views_bookmarkactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/views_bookmarkactivity/views_bookmarkactivity.module,v retrieving revision 1.1.2.8 diff -u -p -r1.1.2.8 views_bookmarkactivity.module --- contrib/views_bookmarkactivity/views_bookmarkactivity.module 15 Apr 2008 16:18:51 -0000 1.1.2.8 +++ contrib/views_bookmarkactivity/views_bookmarkactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: views_bookmarkactivity.module,v 1.1.2.8 2008/04/15 16:18:51 jaydub Exp $ /** + * @file + * Records activity from Views Bookmark module + */ + +/** * Activity definition file * * This defines what hooks activity module should use Index: contrib/votingapiactivity/votingapiactivity.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/votingapiactivity/votingapiactivity.info,v retrieving revision 1.1.2.3 diff -u -p -r1.1.2.3 votingapiactivity.info --- contrib/votingapiactivity/votingapiactivity.info 20 Feb 2008 18:25:29 -0000 1.1.2.3 +++ contrib/votingapiactivity/votingapiactivity.info 15 Aug 2008 10:15:48 -0000 @@ -1,5 +1,7 @@ ; $Id: votingapiactivity.info,v 1.1.2.3 2008/02/20 18:25:29 sirkitree Exp $ name = Voting activity description = Enable activity notifications for voting. -dependencies = activity votingapi +dependencies[] = activity +dependencies[] = votingapi package = Activity +core = 6.x \ No newline at end of file Index: contrib/votingapiactivity/votingapiactivity.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/votingapiactivity/votingapiactivity.install,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 votingapiactivity.install --- contrib/votingapiactivity/votingapiactivity.install 29 Apr 2008 16:56:31 -0000 1.1.2.5 +++ contrib/votingapiactivity/votingapiactivity.install 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: votingapiactivity.install,v 1.1.2.5 2008/04/29 16:56:31 jaydub Exp $ /** + * @file + * Install file for votingapiactivity module. + */ + +/** * Implementation of hook_uninstall(). */ function votingapiactivity_uninstall() { Index: contrib/votingapiactivity/votingapiactivity.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/activity/contrib/votingapiactivity/votingapiactivity.module,v retrieving revision 1.1.2.5 diff -u -p -r1.1.2.5 votingapiactivity.module --- contrib/votingapiactivity/votingapiactivity.module 19 Mar 2008 17:47:48 -0000 1.1.2.5 +++ contrib/votingapiactivity/votingapiactivity.module 15 Aug 2008 10:15:48 -0000 @@ -2,6 +2,11 @@ // $Id: votingapiactivity.module,v 1.1.2.5 2008/03/19 17:47:48 sirkitree Exp $ /** + * @file + * Records activity from Voting API module + */ + +/** * Activity definition file * * This defines what hooks activity module should use