'. t('The view assigned to the "User profiles" context does not affect the view shown on conversation pages.') .'
'; - $output .= theme('table', $header, $rows, array('id' => 'facebook-status-admin-contexts-table')); - $output .= drupal_render($form); + $output = '' . t('The view assigned to the "User profiles" context does not affect the view shown on conversation pages.') . '
'; + $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'facebook-status-admin-contexts-table'))); + $output .= drupal_render_children($form); return $output; } @@ -318,7 +323,7 @@ function facebook_status_admin_context_s if ($type == 'user') { $form['notice'] = array( - '#value' => ''. t('The view assigned to the "User profiles" context does not affect the view shown on conversation pages.') .'
', + '#value' => '' . t('The view assigned to the "User profiles" context does not affect the view shown on conversation pages.') . '
', ); } @@ -332,17 +337,17 @@ function facebook_status_admin_context_s $form['view'] = array( '#type' => 'select', '#title' => t('View'), - '#description' => t('Show this view for !type streams.', array('@type' => $context['title'])) .' '. t('The "default" display will be used.'), + '#description' => t('Show this view for !type streams.', array('@type' => $context['title'])) . ' ' . t('The "default" display will be used.'), '#default_value' => isset($context['view']) ? $context['view'] : '', '#options' => $options, ); if ($type == 'user') { $form['view']['#title'] = t('View for "my stream"'); - $form['view']['#description'] = t('Show this view for user streams when a user is looking at their own stream.') .' '. t('The "default" display will be used.'); + $form['view']['#description'] = t('Show this view for user streams when a user is looking at their own stream.') . ' ' . t('The "default" display will be used.'); $form['other_view'] = array( '#type' => 'select', '#title' => t("View for others users' streams"), - '#description' => t("Show this view for user streams when a user is looking at another user's stream.") .' '. t('The "default" display will be used.'), + '#description' => t("Show this view for user streams when a user is looking at another user's stream.") . ' ' . t('The "default" display will be used.'), '#default_value' => variable_get('facebook_status_user_other_view', 'facebook_status_stream'), '#options' => $options, ); @@ -353,18 +358,18 @@ function facebook_status_admin_context_s '#rows' => 2, '#default_value' => isset($context['selectors']) ? $context['selectors'] : '', '#title' => t('Refreshable DOM selectors'), - '#description' => ''. - t('Enter CSS selectors that specify sections of the page that should be automatically refreshed via AJAX when a status of that type is submitted.') .' '. - t('For example, to automatically update all <div> elements with class "myclass", enter "div.myclass" in the box (without the quotes).') .' '. - t('Do not include selectors that include the status update form.') .' '. + '#description' => '
' . + t('Enter CSS selectors that specify sections of the page that should be automatically refreshed via AJAX when a status of that type is submitted.') . ' ' . + t('For example, to automatically update all <div> elements with class "myclass", enter "div.myclass" in the box (without the quotes).') . ' ' . + t('Do not include selectors that include the status update form.') . ' ' . t('Enter each selector on a separate line.') . '
', ); // adapted from block_admin_configure() $form['page_vis_settings'] = array( - '#type' => 'fieldset', - '#title' => t('Advanced: change where this context applies'), + '#type' => 'fieldset', + '#title' => t('Advanced: change where this context applies'), '#collapsible' => TRUE, '#collapsed' => TRUE, ); @@ -382,25 +387,29 @@ function facebook_status_admin_context_s } else { $form['page_vis_settings']['warning'] = array( - '#value' => ''. t('Changing these values could break your site. Only change these settings if you know what you are doing.') .'
-'. t('Specifically, most contexts make assumptions about what pages they are enabled on in order to identify the correct recipient of status messages.') .' '. - t('Enabling a context on an unsupported page will cause that context to fail.') .' '. - t('Additionally, the User context should apply on all pages as a fallback. If no context applies on a given page, errors will occur.') .'
', + '#value' => '' . t('Changing these values could break your site. Only change these settings if you know what you are doing.') . '
+' . t('Specifically, most contexts make assumptions about what pages they are enabled on in order to identify the correct recipient of status messages.') . ' ' . + t('Enabling a context on an unsupported page will cause that context to fail.') . ' ' . + t('Additionally, the User context should apply on all pages as a fallback. If no context applies on a given page, errors will occur.') . '
', + ); + $options = array( + -1 => t('Use module default settings.'), + 0 => t('Show on every page except the listed pages.'), + 1 => t('Show on only the listed pages.'), ); - $options = array(-1 => t('Use module default settings.'), 0 => t('Show on every page except the listed pages.'), 1 => t('Show on only the listed pages.')); $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => 'TRUE (PHP-mode, experts only).');
- $description .= ' '. t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
+ $description .= ' ' . t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => ''));
}
if (module_exists('context')) {
$options[3] = t('Use the conditions from a Context from the Context module');
- drupal_add_js(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status_admin.js');
+ drupal_add_js(drupal_get_path('module', 'facebook_status') . '/resources/facebook_status_admin.js');
}
$form['page_vis_settings']['visibility'] = array(
'#type' => 'radios',
- '#title' => t('Apply context on specific pages'),
- '#options' => $options,
+ '#title' => t('Apply context on specific pages'),
+ '#options' => $options,
'#default_value' => isset($context['visibility']) ? ($context['visibility'] == 3 && !module_exists('context') ? -1 : $context['visibility']) : -1,
);
if (module_exists('context')) {
@@ -419,9 +428,9 @@ function facebook_status_admin_context_s
);
}
$form['page_vis_settings']['pages'] = array(
- '#type' => 'textarea',
- '#title' => t('Pages'),
- '#default_value' => isset($context['pages']) ? $context['pages'] : '',
+ '#type' => 'textarea',
+ '#title' => t('Pages'),
+ '#default_value' => isset($context['pages']) ? $context['pages'] : '',
'#description' => $description,
);
}
diff -up -r includes/utility/facebook_status.ahah.inc includes/utility/facebook_status.ahah.inc
--- includes/utility/facebook_status.ahah.inc 2011-07-24 17:13:08.000000000 -0400
+++ includes/utility/facebook_status.ahah.inc 2011-07-24 17:13:24.000000000 -0400
@@ -11,11 +11,14 @@
function facebook_status_save_js() {
//Make sure we have form stuff available.
module_load_include('inc', 'facebook_status', 'includes/utility/facebook_status.form');
- $form_state = array('storage' => NULL, 'submitted' => FALSE);
+ $form_state = array(
+ 'storage' => NULL,
+ 'submitted' => FALSE,
+ );
$form_build_id = $_POST['form_build_id'];
$form = form_get_cache($form_build_id, $form_state);
$form_state['post'] = $form['#post'] = $_POST;
- $form['#programmed'] = $form['#redirect'] = FALSE;
+ $form['#programmed'] = $form_state['#redirect'] = FALSE;
$args = $form['#parameters'];
//This happens if someone goes directly to the JS processing page.
if (!is_array($args) && !$args) {
@@ -39,6 +42,7 @@ function facebook_status_save_js() {
//If the $form['fbss-submit']['#ahah']['wrapper'] div was found in a #prefix or #suffix of a form element that we re-rendered here,
//then we would have to unset() it to prevent duplicate wrappers. However, we have a somewhat unique implementation in which the wrappers
//are actually their own elements, so this is not an issue.
+ // TODO Please change this theme call to use an associative array for the $variables parameter.
$output = theme('status_messages') . drupal_render($new_form);
//Return the results.
@@ -47,9 +51,9 @@ function facebook_status_save_js() {
//This version does work for these things.
//From the AHAH Helper module, see http://drupal.org/node/331941
//And from the Filefield module.
- $javascript = drupal_add_js(NULL, NULL, 'header');
+ $javascript = drupal_add_js(NULL, array('type' => NULL));
$GLOBALS['devel_shutdown'] = FALSE; //Still not really sure what the point of this is.
- echo drupal_to_js(array(
+ echo drupal_json_encode(array(
'status' => TRUE,
'data' => $output,
'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']),
diff -up -r includes/utility/facebook_status.announce.inc includes/utility/facebook_status.announce.inc
--- includes/utility/facebook_status.announce.inc 2011-07-24 17:13:08.000000000 -0400
+++ includes/utility/facebook_status.announce.inc 2011-07-24 17:13:24.000000000 -0400
@@ -24,14 +24,14 @@ function facebook_status_announce_admin(
'#required' => TRUE,
);
/*
- // Unfortunately we have to use the default format because we don't have any
- // way to keep track of which format to use at display time.
- $formats = filter_formats();
- $f = array();
- foreach ($formats as $format) {
- $f[$format->format] = filter_xss($format->name);
- }
- $form['format'] = filter_form();
+ // Unfortunately we have to use the default format because we don't have any
+ // way to keep track of which format to use at display time.
+ $formats = filter_formats();
+ $f = array();
+ foreach ($formats as $format) {
+ $f[$format->format] = filter_xss($format->name);
+ }
+ $form['format'] = filter_form();
*/
$form['send'] = array(
'#type' => 'submit',
@@ -53,14 +53,14 @@ function facebook_status_announce_admin_
$v['format'] = NULL;
}
- $count = db_result(db_query("SELECT COUNT(*) FROM {users} WHERE status = 1"));
+ $count = db_query("SELECT COUNT(*) FROM {users} WHERE status = :status", array(':status' => 1))->fetchField();
$batch = array(
'operations' => array(
array('facebook_status_announce_generate_status', array($v['message'], $from, $count, $v['format'])),
),
'finished' => 'facebook_status_announce_batch_finished',
'title' => t('Sending message to all users'),
- 'file' => drupal_get_path('module', 'facebook_status') .'/facebook_status.announce.inc',
+ 'file' => drupal_get_path('module', 'facebook_status') . '/facebook_status.announce.inc',
);
batch_set($batch);
}
@@ -81,10 +81,10 @@ function facebook_status_announce_genera
if (!isset($context['sandbox']['progress'])) {
$context['sandbox']['progress'] = 0;
}
- $uid = db_result(db_query_range("SELECT uid FROM {users} WHERE status = 1", $context['sandbox']['progress'], 1));
+ $uid = db_query_range("SELECT uid FROM {users} WHERE status = :status", array(':status' => 1))->fetchField();
// Caching here is actually slower than not caching because we should only load each user once.
// So we use user_load() instead of _facebook_status_user_load().
- $to = user_load(array('uid' => $uid));
+ $to = user_load($uid);
facebook_status_save_status($to, 'user', $message, $from);
$context['message'] = t('Sending message to %user (@current of @total)',
array('%user' => $to->name, '@current' => $context['sandbox']['progress'], '@total' => $count));
@@ -103,7 +103,7 @@ function facebook_status_announce_batch_
drupal_set_message(format_plural(count($results),
'Sent message to 1 user: !list',
'Sent message to @count users: !list',
- array('!list' => theme('item_list', $results))
+ array('!list' => theme('item_list', array('items' => $results)))
));
}
else {
@@ -114,9 +114,9 @@ function facebook_status_announce_batch_
$error_operation = reset($operations);
drupal_set_message(t('An error occurred while processing %error_operation with arguments: @arguments',
array(
- '%error_operation' => $error_operation[0],
- '@arguments' => print_r($error_operation[1], TRUE)
- )
+ '%error_operation' => $error_operation[0],
+ '@arguments' => print_r($error_operation[1], TRUE),
+ )
));
}
}
diff -up -r includes/utility/facebook_status.contexts.inc includes/utility/facebook_status.contexts.inc
--- includes/utility/facebook_status.contexts.inc 2011-07-24 17:13:08.000000000 -0400
+++ includes/utility/facebook_status.contexts.inc 2011-07-24 17:13:24.000000000 -0400
@@ -40,7 +40,7 @@ class facebook_status_context {
* Returns an object representing the recipient given the recipient's ID.
*/
function load_recipient($id) {
- return call_user_func($this->type() .'_load', $id);
+ return call_user_func($this->type() . '_load', $id);
}
/**
@@ -72,7 +72,7 @@ class facebook_status_context {
* Returns a URL to the recipient given an object representing the recipient.
*/
function recipient_url($recipient) {
- return $this->type() .'/'. $this->recipient_id($recipient);
+ return $this->type() . '/' . $this->recipient_id($recipient);
}
/**
@@ -160,11 +160,11 @@ class facebook_status_user_context exten
return _facebook_status_user_load($id);
}
function load_random_recipient() {
- $uid = db_result(db_query_range("SELECT uid FROM {users} WHERE status = 1 ORDER BY RAND() ASC", 0, 1));
+ $uid = db_query_range("SELECT uid FROM {users} WHERE status = :status ORDER BY RAND() ASC", array(':status' => 1))->fetchField();
return $this->load_recipient($uid);
}
function recipient_link($recipient) {
- return theme('username', $recipient);
+ return theme('username', array('account' => $recipient));
}
function access_add($recipient, $sender) {
return ($sender->uid == $recipient->uid && user_access('update and view own stream', $sender)) ||
@@ -194,8 +194,8 @@ class facebook_status_node_context exten
return isset($recipient->nid) ? $recipient->nid : 0;
}
function load_random_recipient() {
- $nid = db_result(db_query_range("SELECT nid FROM {node} ORDER BY RAND() ASC", 0, 1));
- return node_load(array('nid' => $nid));
+ $nid = db_query_range("SELECT nid FROM {node} ORDER BY RAND() ASC")->fetchField();
+ return node_load($nid);
}
function access_add($recipient, $sender) {
return parent::access_add($recipient, $sender) || $sender->uid == $recipient->uid;
@@ -231,7 +231,7 @@ class facebook_status_og_context extends
return node_load($id);
}
function recipient_url($recipient) {
- return 'node/'. $recipient->nid;
+ return 'node/' . $recipient->nid;
}
function access_add($recipient, $sender) {
// Only group members can add content of any kind.
@@ -265,20 +265,20 @@ class facebook_status_term_context exten
return arg(0) == 'taxonomy' && arg(1) == 'term' && is_numeric(arg(2));
}
function find_recipient() {
- return $this->is_applicable() ? taxonomy_get_term(arg(2)) : new stdClass();
+ return $this->is_applicable() ? taxonomy_term_load(arg(2)) : new stdClass();
}
function load_recipient($id) {
- return taxonomy_get_term($id);
+ return taxonomy_term_load($id);
}
function load_random_recipient() {
- $tid = db_result(db_query_range("SELECT tid FROM {term_data} ORDER BY RAND() ASC", 0, 1));
- return taxonomy_get_term($tid);
+ $tid = db_query_range("SELECT tid FROM {taxonomy_term_data} ORDER BY RAND() ASC")->fetchField();
+ return taxonomy_term_load($tid);
}
function recipient_id($recipient) {
return isset($recipient->tid) ? $recipient->tid : 0;
}
function recipient_url($recipient) {
- return 'taxonomy/term/'. $this->recipient_id($recipient);
+ return 'taxonomy/term/' . $this->recipient_id($recipient);
}
function recipient_name($recipient) {
return isset($recipient->name) ? $recipient->name : '';
diff -up -r includes/utility/facebook_status.conversation.inc includes/utility/facebook_status.conversation.inc
--- includes/utility/facebook_status.conversation.inc 2011-07-24 17:13:08.000000000 -0400
+++ includes/utility/facebook_status.conversation.inc 2011-07-24 17:13:24.000000000 -0400
@@ -54,7 +54,7 @@ function _facebook_status_conversation()
$key = $key ? 0 : 1; //The recipient is not the current user.
$recipient = _facebook_status_user_load($args[$key]);
if (facebook_status_user_access('converse') && !empty($recipient->uid)) {
- return theme('facebook_status_form_display', $recipient, 'user');
+ return theme('facebook_status_form_display', array('recipient' => $recipient, 'type' => 'user'));
}
drupal_not_found();
}
diff -up -r includes/utility/facebook_status.edit.inc includes/utility/facebook_status.edit.inc
--- includes/utility/facebook_status.edit.inc 2011-07-24 17:13:08.000000000 -0400
+++ includes/utility/facebook_status.edit.inc 2011-07-24 17:13:24.000000000 -0400
@@ -11,9 +11,9 @@
function facebook_status_edit(&$form_state, $status) {
$context = facebook_status_determine_context($status->type);
$maxlength = variable_get('facebook_status_length', 140);
- $path = drupal_get_path('module', 'facebook_status') .'/resources';
- drupal_add_js($path .'/facebook_status.js');
- drupal_add_css($path .'/facebook_status.css');
+ $path = drupal_get_path('module', 'facebook_status') . '/resources';
+ drupal_add_js($path . '/facebook_status.js');
+ drupal_add_css($path . '/facebook_status.css');
if (module_exists('modalframe')) {
modalframe_child_js();
}
@@ -24,8 +24,8 @@ function facebook_status_edit(&$form_sta
}
$form = array('#cache' => TRUE);
$form['intro'] = array(
- '#value' => ''. t('Are you sure you want to permanently delete the status %status?', array('%status' => $status->message)) .'
'); + $form['infotext'] = array('#value' => '' . t('Are you sure you want to permanently delete the status %status?', array('%status' => $status->message)) . '
'); $form['confirm'] = array( '#type' => 'submit', '#value' => t('Confirm'), @@ -156,47 +156,47 @@ function _facebook_status_get_edit_intro $orig = nl2br(check_plain($status->message)); if ($status->type == 'user') { if ($user->uid == $status->sender && $status->sender == $status->recipient) { - $intro = ''. t('Original status: !status', array('!status' => $orig)) .' '; + $intro = '' . t('Original status: !status', array('!status' => $orig)) . ' '; } elseif ($user->uid == $status->sender) { - $intro = ''. t('Original message from you to !recipient: !status', array( - '!recipient' => theme('username', _facebook_status_user_load($status->recipient)), - '!status' => $orig - )) .''; + $intro = '' . t('Original message from you to !recipient: !status', array( + '!recipient' => theme('username', array('account' => _facebook_status_user_load($status->recipient))), + '!status' => $orig, + )) . ''; } elseif ($user->uid == $status->recipient) { - $intro = ''. t('Original message from !sender to you: !status', array( - '!sender' => theme('username', _facebook_status_user_load($status->sender)), - '!status' => $orig - )) .''; + $intro = '' . t('Original message from !sender to you: !status', array( + '!sender' => theme('username', array('account' => _facebook_status_user_load($status->sender))), + '!status' => $orig, + )) . ''; } elseif ($status->sender == $status->recipient) { - $intro = ''. t('Original status by !creator: !status', array( - '!creator' => theme('username', _facebook_status_user_load($status->sender)), - '!status' => $orig - )) .''; + $intro = '' . t('Original status by !creator: !status', array( + '!creator' => theme('username', array('account' => _facebook_status_user_load($status->sender))), + '!status' => $orig, + )) . ''; } else { - $intro = ''. t('Original message from !sender to !recipient: !status', array( - '!sender' => theme('username', _facebook_status_user_load($status->sender)), - '!recipient' => theme('username', _facebook_status_user_load($status->recipient)), - '!status' => $orig - )) .''; + $intro = '' . t('Original message from !sender to !recipient: !status', array( + '!sender' => theme('username', array('account' => _facebook_status_user_load($status->sender))), + '!recipient' => theme('username', array('account' => _facebook_status_user_load($status->recipient))), + '!status' => $orig, + )) . ''; } } else { if ($status->sender == $user->uid) { - $intro = ''. t('Original message from you to !recipient: !status', array( + $intro = '' . t('Original message from you to !recipient: !status', array( '!recipient' => $context['handler']->recipient_link($context['handler']->load_recipient($status->recipient)), - '!status' => $orig - )) .''; + '!status' => $orig, + )) . ''; } else { - $intro = ''. t('Original message from !sender to !recipient: !status', array( - '!sender' => theme('username', _facebook_status_user_load($status->sender)), + $intro = '' . t('Original message from !sender to !recipient: !status', array( + '!sender' => theme('username', array('account' => _facebook_status_user_load($status->sender))), '!recipient' => $context['handler']->recipient_link($context['handler']->load_recipient($status->recipient)), - '!status' => $orig - )) .''; + '!status' => $orig, + )) . ''; } } return $intro; diff -up -r includes/utility/facebook_status.form.inc includes/utility/facebook_status.form.inc --- includes/utility/facebook_status.form.inc 2011-07-24 17:13:08.000000000 -0400 +++ includes/utility/facebook_status.form.inc 2011-07-24 17:13:24.000000000 -0400 @@ -32,7 +32,11 @@ * - There are no relevant status messages and the current user does not * have access to use the form */ -function theme_facebook_status_form_display($context = NULL, $type = NULL, $view = NULL, $display = 'default') { +function theme_facebook_status_form_display($variables) { + $context = $variables['recipient']; + $type = $variables['type']; + $view = $variables['view']; + // TODO Number of parameters in this theme funcion does not match number of parameters found in hook_theme. global $user; // $context is NULL, so find everything. if (empty($context)) { @@ -69,8 +73,8 @@ function theme_facebook_status_form_disp if ($conversation) { $converse = ' facebook-status-conversation-form'; } - $output .= ''. t('Are you sure you want to permanently delete the status comment %comment?', - array('%comment' => $comment->comment)) .'
' + '#value' => '' . t('Are you sure you want to permanently delete the status comment %comment?', + array('%comment' => $comment->comment)) . '
', ); $form['confirm'] = array( '#type' => 'submit', diff -up -r submodules/fbss_comments/fbss_comments.views.inc submodules/fbss_comments/fbss_comments.views.inc --- submodules/fbss_comments/fbss_comments.views.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments.views.inc 2011-07-24 17:13:27.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_views_data(). + * Implements hook_views_data(). */ function fbss_comments_views_data() { // Basic table information. @@ -174,7 +174,7 @@ function fbss_comments_views_data() { } /** - * Implementation of hook_views_data_alter(). + * Implements hook_views_data_alter(). */ function fbss_comments_views_data_alter(&$data) { $data['fbss_comments']['users'] = array( @@ -208,7 +208,7 @@ function fbss_comments_views_data_alter( } /** - * Implementation of hook_views_handlers(). + * Implements hook_views_handlers(). */ function fbss_comments_views_handlers() { return array( diff -up -r submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.flag.inc submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.flag.inc --- submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.flag.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.flag.inc 2011-07-24 17:13:28.000000000 -0400 @@ -63,7 +63,7 @@ class fbss_comments_flag extends flag_fl $flag_action = parent::get_flag_action($content_id); $comment = $this->fetch_content($content_id); $flag_action->content_title = $comment->comment; - $flag_action->content_url = 'statuses/'. $comment->sid; + $flag_action->content_url = 'statuses/' . $comment->sid; return $flag_action; } function rules_get_event_arguments_definition() { diff -up -r submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.info submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.info --- submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.info 2011-07-24 17:13:30.000000000 -0400 @@ -3,4 +3,7 @@ description = "Integrates Flag with Face package = Facebook-style Statuses dependencies[] = fbss_comments dependencies[] = flag -core = 6.x \ No newline at end of file +core = 7.x +files[] = fbss_comments_flag.flag.inc +files[] = fbss_comments_flag.install +files[] = fbss_comments_flag.module diff -up -r submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.install submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.install --- submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.install 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.install 2011-07-24 17:13:28.000000000 -0400 @@ -6,11 +6,18 @@ */ /** - * Implementation of hook_install(). + * Implements hook_install(). */ function fbss_comments_flag_install() { // Lower weight so that the Flag module's classes are available to us. // We take precautions in fbss_flag.inc to make sure this isn't strictly // necessary, but it (probably) doesn't hurt. - db_query("UPDATE {system} SET weight = 2 WHERE name = 'fbss_comments_flag'"); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("UPDATE {system} SET weight = 2 WHERE name = 'fbss_comments_flag'") */ + db_update('system') + ->fields(array( + 'weight' => 2, + )) + ->condition('name', 'fbss_comments_flag') + ->execute(); } diff -up -r submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.module submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.module --- submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_flag/fbss_comments_flag.module 2011-07-24 17:13:28.000000000 -0400 @@ -6,23 +6,41 @@ */ /** - * Implementation of hook_facebook_status_delete(). + * Implements hook_facebook_status_delete(). */ function fbss_comments_flag_facebook_status_delete($status) { - db_query("DELETE FROM {flag_content} WHERE content_type = 'fbss_comment' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)", $status->sid); - db_query("DELETE FROM {flag_counts} WHERE content_type = 'fbss_comment' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)", $status->sid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_content} WHERE content_type = 'fbss_comment' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)", $status->sid) */ + db_delete('flag_content') + ->where('content_type = ' fbss_comment ' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)', ) + ->execute(); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_counts} WHERE content_type = 'fbss_comment' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)", $status->sid) */ + db_delete('flag_counts') + ->where('content_type = ' fbss_comment ' AND content_id IN (SELECT cid FROM {fbss_comments} WHERE sid = %d)', ) + ->execute(); } /** - * Implementation of hook_fbss_comments_delete(). + * Implements hook_fbss_comments_delete(). */ function fbss_comments_flag_fbss_comments_delete($cid) { - db_query("DELETE FROM {flag_content} WHERE content_type = 'fbss_comment' AND content_id = %s", $cid); - db_query("DELETE FROM {flag_counts} WHERE content_type = 'fbss_comment' AND content_id = %s", $cid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_content} WHERE content_type = 'fbss_comment' AND content_id = %s", $cid) */ + db_delete('flag_content') + ->condition('content_type', 'fbss_comment') + ->condition('content_id', $cid) + ->execute(); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_counts} WHERE content_type = 'fbss_comment' AND content_id = %s", $cid) */ + db_delete('flag_counts') + ->condition('content_type', 'fbss_comment') + ->condition('content_id', $cid) + ->execute(); } /** - * Implementation of hook_flag_definitions(). + * Implements hook_flag_definitions(). */ function fbss_comments_flag_flag_definitions() { return array( @@ -35,7 +53,7 @@ function fbss_comments_flag_flag_definit } /** - * Implementation of hook_flag_default_flags(). + * Implements hook_flag_default_flags(). */ function fbss_comments_flag_flag_default_flags() { $flags = array(); diff -up -r submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.info submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.info --- submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.info 2011-07-24 17:13:30.000000000 -0400 @@ -3,4 +3,7 @@ description = "Integrates Rules with Fac dependencies[] = fbss_comments dependencies[] = rules package = Facebook-style Statuses -core = 6.x +core = 7.x + +files[] = fbss_comments_rules.module +files[] = fbss_comments_rules.rules.inc diff -up -r submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.module submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.module --- submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.module 2011-07-24 17:13:28.000000000 -0400 @@ -8,6 +8,10 @@ /* * Implementation of hook_fbss_comments_after_save(). */ +/** + * @todo Please document this function. + * @see http://drupal.org/node/1354 + */ function fbss_comments_rules_fbss_comments_after_save($comment, $edit) { if ($edit) { rules_invoke_event('fbss_comments_edit', $comment); @@ -20,6 +24,10 @@ function fbss_comments_rules_fbss_commen /* * Implementation of hook_fbss_comments_delete(). */ +/** + * @todo Please document this function. + * @see http://drupal.org/node/1354 + */ function fbss_comments_rules_fbss_comments_delete($cid) { $comment = fbss_comments_load($cid); rules_invoke_event('fbss_comments_delete', $comment); diff -up -r submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.rules.inc submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.rules.inc --- submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.rules.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_rules/fbss_comments_rules.rules.inc 2011-07-24 17:13:28.000000000 -0400 @@ -1,7 +1,7 @@ t('User saves a new comment on a status'), 'module' => 'Facebook-style Statuses Comments', 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), ), 'fbss_comments_edit' => array( 'label' => t('User edits a comment on a status'), 'module' => 'Facebook-style Statuses Comments', 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), ), 'fbss_comments_delete' => array( 'label' => t('User deletes a comment on a status'), 'module' => 'Facebook-style Statuses Comments', 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), ), ); } /** - * Implementation of hook_rules_condition_info(). + * Implements hook_rules_condition_info(). */ function fbss_comments_rules_rules_condition_info() { return array( 'fbss_comments_rules_on_own' => array( 'label' => t('Comment was posted on own status'), 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), 'module' => 'Facebook-style Statuses Comments', ), @@ -49,14 +61,20 @@ function fbss_comments_rules_rules_condi 'fbss_comments_rules_can_edit' => array( 'label' => t('User has permission to edit a status comment'), 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), 'module' => 'Facebook-style Statuses Comments', ), 'fbss_comments_rules_can_delete' => array( 'label' => t('User has permission to delete a status comment'), 'arguments' => array( - 'comment' => array('type' => 'fbss_comment', 'label' => t('The status comment.')), + 'comment' => array( + 'type' => 'fbss_comment', + 'label' => t('The status comment.'), + ), ), 'module' => 'Facebook-style Statuses Comments', ), @@ -93,14 +111,17 @@ function fbss_comments_rules_can_delete( } /** - * Implementation of hook_rules_action_info(). + * Implements hook_rules_action_info(). */ function fbss_comments_rules_rules_action_info() { return array( 'fbss_comments_rules_load_action' => array( 'label' => t('Load a status comment'), 'new variables' => array( - 'comment_loaded' => array('type' => 'fbss_comment', 'label' => t('Loaded status comment')), + 'comment_loaded' => array( + 'type' => 'fbss_comment', + 'label' => t('Loaded status comment'), + ), ), 'help' => t('Enter the Comment ID of a status comment to load.'), 'module' => 'Facebook-style Statuses Comments', @@ -151,7 +172,10 @@ function fbss_comments_rules_load_action * Builds the form for editing a status comment. */ function fbss_comments_rules_edit_action_form($settings, &$form) { - $settings += array('cid' => '', 'message' => ''); + $settings += array( + 'cid' => '', + 'message' => '', + ); $form['settings']['cid'] = array( '#type' => 'textfield', '#title' => t('Status Comment ID'), @@ -170,7 +194,14 @@ function fbss_comments_rules_edit_action * Edits a status. */ function fbss_comments_rules_edit_action($settings) { - db_query("UPDATE {fbss_comments} SET comment = '%s' WHERE cid = %d", $settings['message'], $settings['cid']); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("UPDATE {fbss_comments} SET comment = '%s' WHERE cid = %d", $settings['message'], $settings['cid']) */ + db_update('fbss_comments') + ->fields(array( + 'comment' => $settings['message'], + )) + ->condition('cid', $settings['cid']) + ->execute(); $c = fbss_comments_load($settings['cid']); module_invoke_all('fbss_comments_after_save', $c, TRUE); if (module_exists('trigger')) { @@ -202,7 +233,11 @@ function fbss_comments_rules_delete_acti * Builds the form for adding a status. */ function fbss_comments_rules_add_action_form($settings, &$form) { - $settings += array('sid' => '', 'message' => '', 'uid' => ''); + $settings += array( + 'sid' => '', + 'message' => '', + 'uid' => '', + ); $form['settings']['sid'] = array( '#type' => 'textfield', '#title' => t('Status ID'), @@ -233,7 +268,7 @@ function fbss_comments_rules_add_action( } /** - * Implementation of hook_rules_data_type_info(). + * Implements hook_rules_data_type_info(). */ function fbss_comments_rules_rules_data_type_info() { return array( diff -up -r submodules/fbss_comments/fbss_comments_views_handler_field_cc.inc submodules/fbss_comments/fbss_comments_views_handler_field_cc.inc --- submodules/fbss_comments/fbss_comments_views_handler_field_cc.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_views_handler_field_cc.inc 2011-07-24 17:13:28.000000000 -0400 @@ -11,7 +11,7 @@ class fbss_comments_views_handler_field_cc extends views_handler_field { function render($values) { $sid = $values->{$this->field_alias}; - $count = db_result(db_query("SELECT COUNT(cid) FROM {fbss_comments} WHERE sid = %d", $sid)); + $count = db_query("SELECT COUNT(cid) FROM {fbss_comments} WHERE sid = :sid", array(':sid' => $sid))->fetchField(); return $count; } } diff -up -r submodules/fbss_comments/fbss_comments_views_handler_field_cc2.inc submodules/fbss_comments/fbss_comments_views_handler_field_cc2.inc --- submodules/fbss_comments/fbss_comments_views_handler_field_cc2.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_views_handler_field_cc2.inc 2011-07-24 17:13:28.000000000 -0400 @@ -11,7 +11,7 @@ class fbss_comments_views_handler_field_cc2 extends views_handler_field { function render($values) { $sid = $values->{$this->field_alias}; - $count = db_result(db_query("SELECT COUNT(cid) FROM {fbss_comments} WHERE sid = %d", $sid)); + $count = db_query("SELECT COUNT(cid) FROM {fbss_comments} WHERE sid = :sid", array(':sid' => $sid))->fetchField(); return format_plural($count, '1 comment', '@count comments'); } } diff -up -r submodules/fbss_comments/fbss_comments_views_handler_field_comment_box.inc submodules/fbss_comments/fbss_comments_views_handler_field_comment_box.inc --- submodules/fbss_comments/fbss_comments_views_handler_field_comment_box.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_views_handler_field_comment_box.inc 2011-07-24 17:13:28.000000000 -0400 @@ -10,6 +10,6 @@ */ class fbss_comments_views_handler_field_comment_box extends views_handler_field { function render($values) { - return theme('fbss_comments_form_display', $values->{$this->field_alias}, TRUE, TRUE); + return theme('fbss_comments_form_display', array('sid' => $values->{$this->field_alias}, 'delay_load_form' => TRUE, 'delay_load_comments' => TRUE)); } } diff -up -r submodules/fbss_comments/fbss_comments_views_handler_field_delete.inc submodules/fbss_comments/fbss_comments_views_handler_field_delete.inc --- submodules/fbss_comments/fbss_comments_views_handler_field_delete.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_views_handler_field_delete.inc 2011-07-24 17:13:28.000000000 -0400 @@ -27,8 +27,8 @@ class fbss_comments_views_handler_field_ if (module_exists('modalframe')) { modalframe_parent_js(); } - drupal_add_css(drupal_get_path('module', 'fbss_comments') .'/fbss_comments.css'); - return ''. l(t('Delete'), 'statuses/comment/'. $comment->cid .'/delete', array('query' => array('destination' => $_GET['q']))) .''; + drupal_add_css(drupal_get_path('module', 'fbss_comments') . '/fbss_comments.css'); + return '' . l(t('Delete'), 'statuses/comment/' . $comment->cid . '/delete', array('query' => array('destination' => $_GET['q']))) . ''; } } } diff -up -r submodules/fbss_comments/fbss_comments_views_handler_field_edit.inc submodules/fbss_comments/fbss_comments_views_handler_field_edit.inc --- submodules/fbss_comments/fbss_comments_views_handler_field_edit.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_comments/fbss_comments_views_handler_field_edit.inc 2011-07-24 17:13:28.000000000 -0400 @@ -27,8 +27,8 @@ class fbss_comments_views_handler_field_ if (module_exists('modalframe')) { modalframe_parent_js(); } - drupal_add_css(drupal_get_path('module', 'fbss_comments') .'/fbss_comments.css'); - return ''. l(t('Edit'), 'statuses/comment/'. $comment->cid .'/edit', array('query' => array('destination' => $_GET['q']))) .''; + drupal_add_css(drupal_get_path('module', 'fbss_comments') . '/fbss_comments.css'); + return '' . l(t('Edit'), 'statuses/comment/' . $comment->cid . '/edit', array('query' => array('destination' => $_GET['q']))) . ''; } } } diff -up -r submodules/fbss_flag/fbss_flag.info submodules/fbss_flag/fbss_flag.info --- submodules/fbss_flag/fbss_flag.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_flag/fbss_flag.info 2011-07-24 17:13:30.000000000 -0400 @@ -3,4 +3,11 @@ description = "Integrates Flag with Face package = Facebook-style Statuses dependencies[] = facebook_status dependencies[] = flag -core = 6.x \ No newline at end of file +core = 7.x +files[] = fbss_flag.flag.inc +files[] = fbss_flag.install +files[] = fbss_flag.module +files[] = views/facebook_status_views_handler_argument_flagged_user.inc +files[] = views/facebook_status_views_handler_filter_flagged_user.inc +files[] = views/fbss_flag.views.inc +files[] = views/fbss_flag.views_default.inc diff -up -r submodules/fbss_flag/fbss_flag.install submodules/fbss_flag/fbss_flag.install --- submodules/fbss_flag/fbss_flag.install 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_flag/fbss_flag.install 2011-07-24 17:13:28.000000000 -0400 @@ -6,11 +6,18 @@ */ /** - * Implementation of hook_install(). + * Implements hook_install(). */ function fbss_flag_install() { // Lower weight so that the Flag module's classes are available to us. // We take precautions in fbss_flag.inc to make sure this isn't strictly // necessary, but it (probably) doesn't hurt. - db_query("UPDATE {system} SET weight = 2 WHERE name = 'fbss_flag'"); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("UPDATE {system} SET weight = 2 WHERE name = 'fbss_flag'") */ + db_update('system') + ->fields(array( + 'weight' => 2, + )) + ->condition('name', 'fbss_flag') + ->execute(); } diff -up -r submodules/fbss_flag/fbss_flag.module submodules/fbss_flag/fbss_flag.module --- submodules/fbss_flag/fbss_flag.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_flag/fbss_flag.module 2011-07-24 17:13:28.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_link(). + * Implements hook_link(). */ function fbss_flag_link($type, $status) { if ($type != 'facebook_status') { @@ -14,7 +14,7 @@ function fbss_flag_link($type, $status) } $links = array(); foreach (flag_get_flags('facebook_status') as $flag) { - $links['flag-'. $flag->name] = array( + $links['flag-' . $flag->name] = array( 'html' => TRUE, 'title' => flag_create_link($flag->name, $status->sid), ); @@ -23,36 +23,46 @@ function fbss_flag_link($type, $status) } /** - * Implementation of hook_facebook_status_delete(). + * Implements hook_facebook_status_delete(). */ function fbss_flag_facebook_status_delete($status) { - db_query("DELETE FROM {flag_content} WHERE content_type = 'facebook_status' AND content_id = %d", $status->sid); - db_query("DELETE FROM {flag_counts} WHERE content_type = 'facebook_status' AND content_id = %d", $status->sid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_content} WHERE content_type = 'facebook_status' AND content_id = %d", $status->sid) */ + db_delete('flag_content') + ->condition('content_type', 'facebook_status') + ->condition('content_id', $status->sid) + ->execute(); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {flag_counts} WHERE content_type = 'facebook_status' AND content_id = %d", $status->sid) */ + db_delete('flag_counts') + ->condition('content_type', 'facebook_status') + ->condition('content_id', $status->sid) + ->execute(); } /** - * Implementation of hook_form_FORM_ID_alter(). + * Implements hook_form_FORM_ID_alter(). */ function fbss_flag_form_facebook_status_box_alter(&$form, $form_state) { // Make sure the necessary resources are loaded when the list of status updates is empty. // Otherwise, when the first status is posted, flagging an item will refresh the page. - $path = drupal_get_path('module', 'flag') .'/theme'; - drupal_add_css($path .'/flag.css'); - drupal_add_js($path .'/flag.js'); + $path = drupal_get_path('module', 'flag') . '/theme'; + drupal_add_css($path . '/flag.css'); + drupal_add_js($path . '/flag.js'); } /** - * Implementation of hook_views_api(). + * Implements hook_views_api(). */ function fbss_flag_views_api() { return array( 'api' => 2, - 'path' => drupal_get_path('module', 'fbss_flag') .'/views', + 'path' => drupal_get_path('module', 'fbss_flag') . '/views', ); } /** - * Implementation of hook_views_default_views_alter(). + * Implements hook_views_default_views_alter(). */ function fbss_flag_views_default_views_alter(&$views) { // Add the "like" field to default Views. @@ -120,7 +130,7 @@ function fbss_flag_views_default_views_a } /** - * Implementation of hook_flag_definitions(). + * Implements hook_flag_definitions(). */ function fbss_flag_flag_definitions() { return array( @@ -133,7 +143,7 @@ function fbss_flag_flag_definitions() { } /** - * Implementation of hook_flag_default_flags(). + * Implements hook_flag_default_flags(). */ function fbss_flag_flag_default_flags() { $flags = array(); diff -up -r submodules/fbss_flag/views/fbss_flag.views.inc submodules/fbss_flag/views/fbss_flag.views.inc --- submodules/fbss_flag/views/fbss_flag.views.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_flag/views/fbss_flag.views.inc 2011-07-24 17:13:28.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_views_data(). + * Implements hook_views_data(). */ function fbss_flag_views_data() { $data = array(); @@ -32,12 +32,12 @@ function fbss_flag_views_data() { } /** - * Implementation of hook_views_handlers(). + * Implements hook_views_handlers(). */ function fbss_flag_views_handlers() { return array( 'info' => array( - 'path' => drupal_get_path('module', 'fbss_flag') .'/views', + 'path' => drupal_get_path('module', 'fbss_flag') . '/views', ), 'handlers' => array( 'facebook_status_views_handler_filter_flagged_user' => array( diff -up -r submodules/fbss_flag/views/fbss_flag.views_default.inc submodules/fbss_flag/views/fbss_flag.views_default.inc --- submodules/fbss_flag/views/fbss_flag.views_default.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_flag/views/fbss_flag.views_default.inc 2011-07-24 17:13:28.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_views_default_views(). + * Implements hook_views_default_views(). */ function fbss_flag_views_default_views() { $views = array(); diff -up -r submodules/fbss_mollom/fbss_mollom.info submodules/fbss_mollom/fbss_mollom.info --- submodules/fbss_mollom/fbss_mollom.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_mollom/fbss_mollom.info 2011-07-24 17:13:30.000000000 -0400 @@ -3,4 +3,6 @@ description = "Integrates Mollom with Fa package = Facebook-style Statuses dependencies[] = facebook_status dependencies[] = mollom -core = 6.x +core = 7.x + +files[] = fbss_mollom.module diff -up -r submodules/fbss_mollom/fbss_mollom.module submodules/fbss_mollom/fbss_mollom.module --- submodules/fbss_mollom/fbss_mollom.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_mollom/fbss_mollom.module 2011-07-24 17:13:28.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_mollom_form_list(). + * Implements hook_mollom_form_list(). */ function fbss_mollom_mollom_form_list() { return array( @@ -34,7 +34,7 @@ function fbss_mollom_mollom_form_list() } /** - * Implementation of hook_mollom_form_info(). + * Implements hook_mollom_form_info(). */ function fbss_mollom_mollom_form_info($form_id) { if ($form_id == 'facebook_status_box') { diff -up -r submodules/fbss_notifications/fbss_notifications.info submodules/fbss_notifications/fbss_notifications.info --- submodules/fbss_notifications/fbss_notifications.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_notifications/fbss_notifications.info 2011-07-24 17:13:30.000000000 -0400 @@ -4,4 +4,8 @@ package = Facebook-style Statuses dependencies[] = facebook_status dependencies[] = notifications dependencies[] = messaging -core = 6.x +core = 7.x + +files[] = fbss_notifications.install +files[] = fbss_notifications.module +files[] = fbss_notifications.pages.inc diff -up -r submodules/fbss_notifications/fbss_notifications.install submodules/fbss_notifications/fbss_notifications.install --- submodules/fbss_notifications/fbss_notifications.install 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_notifications/fbss_notifications.install 2011-07-24 17:13:28.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function fbss_notifications_uninstall() { variable_del('fbss_notifications_type'); diff -up -r submodules/fbss_notifications/fbss_notifications.module submodules/fbss_notifications/fbss_notifications.module --- submodules/fbss_notifications/fbss_notifications.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_notifications/fbss_notifications.module 2011-07-24 17:13:28.000000000 -0400 @@ -9,7 +9,7 @@ define('FBSS_NOTIFICATIONS_PAGER', 20); /** - * Implementation of hook_menu(). + * Implements hook_menu(). */ function fbss_notifications_menu() { $items = array(); @@ -31,10 +31,10 @@ function fbss_notifications_menu() { 'file' => 'fbss_notifications.pages.inc', ); foreach (facebook_status_all_contexts() as $type => $info) { - $items['user/%user/notifications/'. $type .'-stream'] = array( + $items['user/%user/notifications/' . $type . '-stream'] = array( 'type' => MENU_LOCAL_TASK, 'access callback' => FALSE, - 'title' => $info['title'] .' statuses', + 'title' => $info['title'] . ' statuses', 'page callback' => 'fbss_notifications_page_type', 'pàge arguments' => array(1), 'weight' => 30, @@ -52,10 +52,15 @@ function fbss_notifications_menu() { } /** - * Implementation of hook_perm(). + * Implements hook_permission(). */ -function fbss_notifications_perm() { - $perms = array('subscribe to a status stream'); +function fbss_notifications_permission() { + $perms = array( + 'subscribe to a status stream' => array( + 'title' => t('subscribe to a status stream'), + 'description' => t('TODO Add a description for \'subscribe to a status stream\''), + ), + ); if (module_exists('fbss_comments')) { $perms[] = 'subscribe to comments on a status'; } @@ -63,7 +68,7 @@ function fbss_notifications_perm() { } /** - * Implementation of hook_facebook_status_delete(). + * Implements hook_facebook_status_delete(). */ function fbss_notifications_facebook_status_delete($status) { db_query(" @@ -78,7 +83,7 @@ function fbss_notifications_facebook_sta } /** - * Implementation of hook_facebook_status_save(). + * Implements hook_facebook_status_save(). */ function fbss_notifications_facebook_status_save($status, $context, $edit, $options) { global $user; @@ -94,7 +99,11 @@ function fbss_notifications_facebook_sta 'oid' => $status->sid, 'type' => $event_type, 'action' => 'update-self', - 'params' => array('sid' => $status->sid, 'recipient' => $status->recipient, 'type' => $status->type), + 'params' => array( + 'sid' => $status->sid, + 'recipient' => $status->recipient, + 'type' => $status->type, + ), ); notifications_event($event); } @@ -106,7 +115,11 @@ function fbss_notifications_facebook_sta 'oid' => $status->sid, 'type' => $event_type, 'action' => 'update-other', - 'params' => array('sid' => $status->sid, 'recipient' => $status->recipient, 'type' => $status->type), + 'params' => array( + 'sid' => $status->sid, + 'recipient' => $status->recipient, + 'type' => $status->type, + ), ); notifications_event($event); } @@ -134,7 +147,11 @@ function fbss_notifications_facebook_sta 'oid' => $status->sid, 'type' => $event_type, 'action' => 'create-self', - 'params' => array('sid' => $status->sid, 'recipient' => $status->recipient, 'type' => $status->type), + 'params' => array( + 'sid' => $status->sid, + 'recipient' => $status->recipient, + 'type' => $status->type, + ), ); notifications_event($event); } @@ -146,7 +163,11 @@ function fbss_notifications_facebook_sta 'oid' => $status->sid, 'type' => $event_type, 'action' => 'create-other', - 'params' => array('sid' => $status->sid, 'recipient' => $status->recipient, 'type' => $status->type), + 'params' => array( + 'sid' => $status->sid, + 'recipient' => $status->recipient, + 'type' => $status->type, + ), ); notifications_event($event); } @@ -156,7 +177,7 @@ function fbss_notifications_facebook_sta } /** - * Implementation of hook_fbss_comments_after_save(). + * Implements hook_fbss_comments_after_save(). */ function fbss_notifications_fbss_comments_after_save($comment, $edit) { if (!$edit) { @@ -189,14 +210,14 @@ function fbss_notifications_fbss_comment } /** - * Implementation of hook_notifications(). + * Implements hook_notifications(). */ function fbss_notifications_notifications($op, &$arg0 = NULL, $arg1 = NULL, $arg2 = NULL) { switch ($op) { case 'subscription types': // Kinds of subscriptions a user can add, e.g. "Subscribe to thread" and "Subscribe to stream" $types = array(); if (module_exists('fbss_comments')) { - $types['status'] = array( // 'status' is $subscription->type + $types['status'] = array(// 'status' is $subscription->type 'event_type' => 'status', // 'status' is $subscription->event_type 'title' => t('Status thread'), 'access' => "subscribe to a user's status updates", @@ -208,15 +229,15 @@ function fbss_notifications_notification ); } foreach (facebook_status_all_contexts() as $type => $info) { - $types[$type .'-stream'] = array( // $type-stream is $subscription->type + $types[$type . '-stream'] = array(// $type-stream is $subscription->type 'event_type' => 'stream', // 'stream' is $subscription->event_type 'title' => t('!type status stream', array('!type' => $info['title'])), 'access' => "subscribe to an entity's status stream", 'page callback' => 'fbss_notifications_page_type', - 'user page' => 'user/%user/notifications/'. $type .'-stream', + 'user page' => 'user/%user/notifications/' . $type . '-stream', 'fields' => array('recipient', 'fs_type'), 'description' => t('Subscribe to this stream of statuses.'), - 'disabled' => in_array($type .'-stream', array_values(variable_get('fbss_notifications_type', array()))), + 'disabled' => in_array($type . '-stream', array_values(variable_get('fbss_notifications_type', array()))), ); } return $types; @@ -237,15 +258,15 @@ function fbss_notifications_notification // 100 is an arbitrary length. if (drupal_strlen($message) > 100) { // "\xE2\x80\xA6" is the unicode escape sequence for the HTML entity … (an ellipsis) - $message = drupal_substr($message, 0, 99) ."\xE2\x80\xA6"; + $message = drupal_substr($message, 0, 99) . "\xE2\x80\xA6"; } $subs->names['type'] = t('Status thread: @message', array('@message' => $message)); } } break; case 'subscription fields': // Describe important properties of an object a subscription may be against. - // Used to get info about the fields used in queries, not to actually build queries. - // Also used to display options for adding an arbitrary subscription. + // Used to get info about the fields used in queries, not to actually build queries. + // Also used to display options for adding an arbitrary subscription. $fields = array(); $fields['sid'] = array( 'name' => t('Status ID'), @@ -361,7 +382,10 @@ function fbss_notifications_notification $options[] = array( 'name' => t('All status updates by @name', array('@name' => $arg1->name)), 'type' => 'user-stream', - 'fields' => array('recipient' => $arg1->uid, 'type' => 'user'), + 'fields' => array( + 'recipient' => $arg1->uid, + 'type' => 'user', + ), ); } return $options; @@ -372,15 +396,21 @@ function fbss_notifications_notification $options[] = array( 'name' => t('All status updates on %name', array('@name' => $arg1->title)), 'type' => 'node-stream', - 'fields' => array('recipient' => $arg1->nid, 'type' => 'node'), + 'fields' => array( + 'recipient' => $arg1->nid, + 'type' => 'node', + ), ); } elseif (module_exists('og') && in_array('og', array_values(variable_get('fbss_notifications_link', array('user' => 'user', 'node' => 0, 'og' => 'og'))))) { - if (db_result(db_query("SELECT nid FROM {og} WHERE nid = %d", $arg1->nid))) { + if (db_query("SELECT nid FROM {og} WHERE nid = :nid", array(':nid' => $arg1->nid))->fetchField()) { $options[] = array( 'name' => t('All status updates on %name', array('@name' => $arg1->title)), 'type' => 'node-stream', - 'fields' => array('recipient' => $arg1->nid, 'type' => 'node'), + 'fields' => array( + 'recipient' => $arg1->nid, + 'type' => 'node', + ), ); } } @@ -434,7 +464,7 @@ function fbss_notifications_notification } /** - * Implementation of hook_messaging(). + * Implements hook_messaging(). */ function fbss_notifications_messaging($op, $arg1 = NULL, $arg2 = NULL) { switch ($op) { diff -up -r submodules/fbss_notifications/fbss_notifications.pages.inc submodules/fbss_notifications/fbss_notifications.pages.inc --- submodules/fbss_notifications/fbss_notifications.pages.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_notifications/fbss_notifications.pages.inc 2011-07-24 17:13:29.000000000 -0400 @@ -23,7 +23,10 @@ function fbss_notifications_settings_for '#default_value' => variable_get('fbss_notifications_type', array()), '#description' => t('Define the available subscription types that will be enabled globally'), ); - $options = array('user' => t('User profiles'), 'node' => t('Nodes')); + $options = array( + 'user' => t('User profiles'), + 'node' => t('Nodes'), + ); if (module_exists('og')) { $options['og'] = t('Organic groups'); } @@ -76,19 +79,22 @@ function fbss_notifications_page_thread( // 100 is an arbitrary length. if (drupal_strlen($message) > 100) { // "\xE2\x80\xA6" is the unicode escape sequence for the HTML entity … (an ellipsis) - $message = drupal_substr($message, 0, 99) ."\xE2\x80\xA6"; + $message = drupal_substr($message, 0, 99) . "\xE2\x80\xA6"; } - $list[$sub->fs_sid] = '['. $content_types[$sub->fs_type]['title'] .'] '. l($message, 'statuses/'. $sub->fs_sid); + $list[$sub->fs_sid] = '[' . $content_types[$sub->fs_type]['title'] . '] ' . l($message, 'statuses/' . $sub->fs_sid); } if (empty($subscriptions)) { $output = t('You are not currently subscribed to any active threads'); } else { $output = t('You are currently subscribed to the following threads:'); - $defaults = array('type' => 'status', 'event_type' => 'status'); + $defaults = array( + 'type' => 'status', + 'event_type' => 'status', + ); $options = array('title' => t('Message')); $output .= drupal_get_form('notifications_user_form', $account, 'status', $subscriptions, $list, $defaults, $options); - $output .= theme('pager', NULL, FBSS_NOTIFICATIONS_PAGER); + $output .= theme('pager', array('tags' => NULL)); } return $output; } @@ -136,10 +142,13 @@ function fbss_notifications_page_type($a $output = t('There are no active !type subscriptions.', array('!type' => $context['title'])); } else { - $defaults = array('type' => arg(3), 'event_type' => 'status'); + $defaults = array( + 'type' => arg(3), + 'event_type' => 'status', + ); $options = array('title' => t('Subscribed to')); $output = drupal_get_form('notifications_user_form', $account, arg(3), $subscriptions, $list, $defaults, $options); - $output .= theme('pager', NULL, FBSS_NOTIFICATIONS_PAGER); + $output .= theme('pager', array('tags' => NULL)); } return $output; } @@ -199,7 +208,7 @@ function fbss_notifications_autocomplete } } } - drupal_json($matches); + drupal_json_output($matches); } /** @@ -239,12 +248,12 @@ function fbss_notifications_author_uid($ switch ($type) { case 'og': case 'node': - return db_result(db_query_range("SELECT nid FROM {node} WHERE title = '%s'", $name, 0, 1)); + return db_query_range("SELECT nid FROM {node} WHERE title = :title", array(':title' => $name))->fetchField(); case 'user': - return db_result(db_query_range("SELECT uid FROM {users} WHERE name = '%s'", $name, 0, 1)); + return db_query_range("SELECT uid FROM {users} WHERE name = :name", array(':name' => $name))->fetchField(); case 'term': if (module_exists('taxonomy')) { - return db_result(db_query_range("SELECT tid FROM {term_data} WHERE name = '%s'", $name, 0, 1)); + return db_query_range("SELECT tid FROM {taxonomy_term_data} WHERE name = :name", array(':name' => $name))->fetchField(); } } } @@ -259,7 +268,7 @@ function fbss_notifications_author_uid($ //====================== /** - * Implementation of hook_fbss_notifications_autocomplete_recipient(). + * Implements hook_fbss_notifications_autocomplete_recipient(). */ function fbss_notifications_fbss_notifications_autocomplete_recipient($string) { $orig_string = $string; @@ -274,7 +283,8 @@ function fbss_notifications_fbss_notific // Users. $matches['user'] = array(); - $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10); + // TODO Please convert this statement to the D7 database API syntax. + $result = db_query_range("SELECT name FROM {users} WHERE LOWER(name) LIKE LOWER('%s%%')", $string); while ($account = db_fetch_object($result)) { $key = $prefix . _fbss_notifications_autocomplete_key_helper($account->name); $matches['user'][$key] = check_plain($account->name); @@ -283,6 +293,7 @@ function fbss_notifications_fbss_notific // Organic groups. if (module_exists('og')) { $matches['og'] = array(); + // TODO Please convert this statement to the D7 database API syntax. $result = db_query_range(db_rewrite_sql(" SELECT n.nid, n.title FROM {og_uid} ou @@ -294,7 +305,7 @@ function fbss_notifications_fbss_notific LOWER(n.title) LIKE LOWER('%s%%') AND (og.og_private = 0 OR ou.uid = %d) AND n.status = 1 - "), $string, $user->uid, 0, 10); + "), $string, $user->uid); while ($node = db_fetch_object($result)) { $key = $prefix . _fbss_notifications_autocomplete_key_helper($node->title); $matches['og'][$key] = check_plain($node->title); @@ -303,6 +314,7 @@ function fbss_notifications_fbss_notific $matches['node'] = array(); if (module_exists('og')) { + // TODO Please convert this statement to the D7 database API syntax. $result = db_query_range(db_rewrite_sql(" SELECT n.nid, n.title FROM {node} n @@ -312,16 +324,17 @@ function fbss_notifications_fbss_notific og.nid IS NULL AND n.status = 1 AND LOWER(n.title) LIKE LOWER('%s%%') - "), $string, 0, 10); + "), $string); } else { + // TODO Please convert this statement to the D7 database API syntax. $result = db_query_range(db_rewrite_sql(" SELECT nid, title FROM {node} WHERE status = 1 AND LOWER(title) LIKE LOWER('%s%%') - "), $string, 0, 10); + "), $string); } while ($node = db_fetch_object($result)) { $key = $prefix . _fbss_notifications_autocomplete_key_helper($node->title); @@ -331,7 +344,8 @@ function fbss_notifications_fbss_notific // Taxonomy terms. if (module_exists('taxonomy') && module_exists('facebook_status_tags') && variable_get('facebook_status_tags_vid', -1) != -1) { $matches['term'] = array(); - $result = db_query_range("SELECT name FROM {facebook_status_tags} WHERE LOWER(name) LIKE LOWER('%s%%')", $string, 0, 10); + // TODO Please convert this statement to the D7 database API syntax. + $result = db_query_range("SELECT name FROM {facebook_status_tags} WHERE LOWER(name) LIKE LOWER('%s%%')", $string); while ($term = db_fetch_object($result)) { $key = $prefix . _fbss_notifications_autocomplete_key_helper($term->name); $matches['node'][$key] = check_plain($term->name); diff -up -r submodules/fbss_pathauto/fbss_pathauto.info submodules/fbss_pathauto/fbss_pathauto.info --- submodules/fbss_pathauto/fbss_pathauto.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_pathauto/fbss_pathauto.info 2011-07-24 17:13:30.000000000 -0400 @@ -3,4 +3,5 @@ description = "Integrates Pathauto with package = Facebook-style Statuses dependencies[] = facebook_status dependencies[] = pathauto -core = 6.x \ No newline at end of file +core = 7.x +files[] = fbss_pathauto.module diff -up -r submodules/fbss_pathauto/fbss_pathauto.module submodules/fbss_pathauto/fbss_pathauto.module --- submodules/fbss_pathauto/fbss_pathauto.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_pathauto/fbss_pathauto.module 2011-07-24 17:13:29.000000000 -0400 @@ -6,20 +6,24 @@ */ /** - * Implementation of hook_facebook_status_delete(). + * Implements hook_facebook_status_delete(). */ function fbss_pathauto_facebook_status_delete($status) { - db_query("DELETE FROM {url_alias} WHERE src = 'statuses/%d'", $status->sid); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("DELETE FROM {url_alias} WHERE src = 'statuses/%d'", $status->sid) */ + db_delete('url_alias') + ->condition('src', $status->sid) + ->execute(); } /** - * Implementation of hook_facebook_status_save(). + * Implements hook_facebook_status_save(). */ function fbss_pathauto_facebook_status_save($status, $context, $edit = FALSE) { $op = $edit ? 'update' : 'insert'; module_load_include('inc', 'pathauto'); $placeholders = pathauto_get_placeholders('facebook_status', $status); - $src = 'statuses/'. $status->sid; + $src = 'statuses/' . $status->sid; if ($context['type'] == 'user') { $type = ($context['recipient']->{$context['recipient_id']} == $sender->uid) ? 'self' : 'other'; } @@ -30,7 +34,7 @@ function fbss_pathauto_facebook_status_s } /** - * Implementation of hook_pathauto(). + * Implements hook_pathauto(). */ function fbss_pathauto_pathauto($op) { if ($op != 'settings') { @@ -67,7 +71,7 @@ function fbss_pathauto_pathauto($op) { } /** - * Implementation of hook_pathauto_bulkupdate(). + * Implements hook_pathauto_bulkupdate(). * Inspired by the node implementation in pathauto_node.inc. */ function fbss_pathauto_pathauto_bulkupdate() { @@ -83,7 +87,7 @@ function fbss_pathauto_pathauto_bulkupda // Check for generic pattern. if (!trim(variable_get('pathauto_fbss_pathauto_pattern', ''))) { foreach ($pattern_types as $type) { - if (!trim(variable_get('pathauto_fbss_pathauto_'. $type .'_pattern', ''))) { + if (!trim(variable_get('pathauto_fbss_pathauto_' . $type . '_pattern', ''))) { unset($pattern_types[$type]); } } @@ -95,12 +99,17 @@ function fbss_pathauto_pathauto_bulkupda LEFT JOIN {url_alias} alias ON CONCAT('statuses/', CAST(fbss.sid AS CHAR)) = alias.src WHERE alias.src IS NULL"; - $result = db_query_range($query, 0, variable_get('pathauto_max_bulk_update', 50)); + // TODO Please convert this statement to the D7 database API syntax. + $result = db_query_range("SELECT fbss.*, alias.src, alias.dst + FROM {facebook_status} fbss + LEFT JOIN {url_alias} alias + ON CONCAT('statuses/', CAST(fbss.sid AS CHAR)) = alias.src + WHERE alias.src IS NULL"); $placeholders = array(); while ($status = db_fetch_object($result)) { // pathauto.inc should already be included. $placeholders = pathauto_get_placeholders('facebook_status', $status); - $source = 'statuses/'. $status->sid; + $source = 'statuses/' . $status->sid; $type = ($status->type == 'user' ? (($status->sender == $status->recipient) ? 'self' : 'other') : $status->type); if (in_array($type, $pattern_types)) { if (pathauto_create_alias('fbss_pathauto', 'bulkupdate', $placeholders, $source, $type)) { @@ -115,7 +124,7 @@ function fbss_pathauto_pathauto_bulkupda } /** - * Implementation of hook_path_alias_types(). + * Implements hook_path_alias_types(). */ function fbss_pathauto_path_alias_types() { return array( diff -up -r submodules/fbss_privacy/fbss_privacy.info submodules/fbss_privacy/fbss_privacy.info --- submodules/fbss_privacy/fbss_privacy.info 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_privacy/fbss_privacy.info 2011-07-24 17:13:30.000000000 -0400 @@ -2,4 +2,12 @@ name = Facebook-style Statuses Private S description = "Allows statuses between two users to be designated as private." dependencies[] = facebook_status package = Facebook-style Statuses -core = 6.x +core = 7.x + +files[] = fbss_privacy.install +files[] = fbss_privacy.module +files[] = fbss_privacy.views.inc +files[] = fbss_privacy.views_default.inc +files[] = fbss_privacy_views_handler_argument.inc +files[] = fbss_privacy_views_handler_field.inc +files[] = fbss_privacy_views_handler_filter.inc diff -up -r submodules/fbss_privacy/fbss_privacy.install submodules/fbss_privacy/fbss_privacy.install --- submodules/fbss_privacy/fbss_privacy.install 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_privacy/fbss_privacy.install 2011-07-24 17:13:29.000000000 -0400 @@ -6,11 +6,11 @@ */ /** - * Implementation of hook_install(). + * Implements hook_install(). */ function fbss_privacy_install() { $ret = array(); - db_add_field($ret, 'facebook_status', 'private', array( + db_add_field('facebook_status', 'private', array( 'type' => 'int', 'size' => 'tiny', 'unsigned' => TRUE, @@ -21,9 +21,9 @@ function fbss_privacy_install() { } /** - * Implementation of hook_uninstall(). + * Implements hook_uninstall(). */ function fbss_privacy_uninstall() { $ret = array(); - db_drop_field($ret, 'facebook_status', 'private'); + db_drop_field('facebook_status', 'private'); } diff -up -r submodules/fbss_privacy/fbss_privacy.module submodules/fbss_privacy/fbss_privacy.module --- submodules/fbss_privacy/fbss_privacy.module 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_privacy/fbss_privacy.module 2011-07-24 17:13:29.000000000 -0400 @@ -17,10 +17,19 @@ //============ /** - * Implementation of hook_perm(). + * Implements hook_permission(). */ -function fbss_privacy_perm() { - return array('send private status messages', 'view all private status messages'); +function fbss_privacy_permission() { + return array( + 'send private status messages' => array( + 'title' => t('send private status messages'), + 'description' => t('TODO Add a description for \'send private status messages\''), + ), + 'view all private status messages' => array( + 'title' => t('view all private status messages'), + 'description' => t('TODO Add a description for \'view all private status messages\''), + ), + ); } //============ @@ -28,13 +37,13 @@ function fbss_privacy_perm() { //============ /** - * Implementation of hook_form_FORM_ID_alter(). + * Implements hook_form_FORM_ID_alter(). */ function fbss_privacy_form_facebook_status_box_alter(&$form, &$form_state) { if ($form['recipient']['#value'] == $GLOBALS['user']->uid || $form['type']['#value'] != 'user' || !user_access('send private status messages')) { return; } - drupal_add_css(drupal_get_path('module', 'fbss_privacy') .'/fbss_privacy.css'); + drupal_add_css(drupal_get_path('module', 'fbss_privacy') . '/fbss_privacy.css'); $form['private'] = array( '#type' => 'checkbox', '#title' => t('Private'), @@ -51,19 +60,26 @@ function fbss_privacy_form_facebook_stat */ function fbss_privacy_facebook_status_box_submit($form, $form_state) { if (!empty($form_state['values']['private']) && user_access('send private status messages')) { - db_query("UPDATE {facebook_status} SET private = %d WHERE sid = %d", $form_state['values']['private'], $form_state['facebook_status']['sid']); + // TODO Please review the conversion of this statement to the D7 database API syntax. + /* db_query("UPDATE {facebook_status} SET private = %d WHERE sid = %d", $form_state['values']['private'], $form_state['facebook_status']['sid']) */ + db_update('facebook_status') + ->fields(array( + 'private' => $form_state['values']['private'], + )) + ->condition('sid', $form_state['facebook_status']['sid']) + ->execute(); } } /** - * Implementation of hook_facebook_status_form_ahah_alter(). + * Implements hook_facebook_status_form_ahah_alter(). */ function fbss_privacy_facebook_status_form_ahah_alter(&$new_form, $old_form) { $new_form['private'] = $old_form['private']; } /** - * Implementation of hook_facebook_status_user_access_alter(). + * Implements hook_facebook_status_user_access_alter(). */ function fbss_privacy_facebook_status_user_access_alter(&$allow, $op, $args) { if ($op == 'view') { @@ -77,12 +93,12 @@ function fbss_privacy_facebook_status_us } /** - * Implementation of hook_preprocess_facebook_status_item(). + * Implements hook_preprocess_facebook_status_item(). */ function fbss_privacy_preprocess_facebook_status_item(&$vars) { $vars['private'] = (bool) $vars['status']->private; $vars['private_text'] = $vars['private'] ? t('(Private)') : t('Public'); - drupal_add_css(drupal_get_path('module', 'fbss_privacy') .'/fbss_privacy.css'); + drupal_add_css(drupal_get_path('module', 'fbss_privacy') . '/fbss_privacy.css'); } //============= @@ -90,7 +106,7 @@ function fbss_privacy_preprocess_faceboo //============= /** - * Implementation of hook_views_api(). + * Implements hook_views_api(). */ function fbss_privacy_views_api() { return array( @@ -100,7 +116,7 @@ function fbss_privacy_views_api() { } /** - * Implementation of hook_views_default_views_alter(). + * Implements hook_views_default_views_alter(). */ function fbss_privacy_views_default_views_alter(&$views) { foreach ($views as $view) { diff -up -r submodules/fbss_privacy/fbss_privacy.views.inc submodules/fbss_privacy/fbss_privacy.views.inc --- submodules/fbss_privacy/fbss_privacy.views.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_privacy/fbss_privacy.views.inc 2011-07-24 17:13:29.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_views_query_alter(). + * Implements hook_views_query_alter(). */ function fbss_privacy_views_query_alter(&$view, &$query) { global $user; @@ -14,9 +14,9 @@ function fbss_privacy_views_query_alter( foreach ($query->table_queue as $table) { if ($table['table'] == 'facebook_status' && !isset($query->where['fbss_privacy']) && !user_access('view all private status messages')) { $query->add_where('fbss_privacy', - $table['alias'] .'.private = 0 OR '. - $table['alias'] .'.sender = %d OR ('. - $table['alias'] .".type = 'user' AND ". $table['alias'] .".recipient = %d)", + $table['alias'] . '.private = 0 OR ' . + $table['alias'] . '.sender = %d OR (' . + $table['alias'] . ".type = 'user' AND " . $table['alias'] . ".recipient = %d)", $user->uid, $user->uid); break; } @@ -24,7 +24,7 @@ function fbss_privacy_views_query_alter( } /** - * Implementation of hook_views_data(). + * Implements hook_views_data(). */ function fbss_privacy_views_data() { $data = array(); @@ -52,7 +52,7 @@ function fbss_privacy_views_data() { } /** - * Implementation of hook_views_handlers(). + * Implements hook_views_handlers(). */ function fbss_privacy_views_handlers() { return array( diff -up -r submodules/fbss_privacy/fbss_privacy.views_default.inc submodules/fbss_privacy/fbss_privacy.views_default.inc --- submodules/fbss_privacy/fbss_privacy.views_default.inc 2011-07-24 17:13:08.000000000 -0400 +++ submodules/fbss_privacy/fbss_privacy.views_default.inc 2011-07-24 17:13:29.000000000 -0400 @@ -6,7 +6,7 @@ */ /** - * Implementation of hook_views_default_views(). + * Implements hook_views_default_views(). */ function fbss_privacy_views_default_views() { $views = array(); @@ -232,7 +232,7 @@ function fbss_privacy_views_default_view 'label' => '', 'alter' => array( 'text' => '