'.print_r($result->fetchAssoc(), true).''; die(); + while ($c = $result->fetchAssoc()) { $contexts[$c['type']]['in_db'] = TRUE; @@ -675,5 +679,2 @@ function facebook_status_all_contexts() $contexts[$c['type']]['selectors'] = $c['selectors']; - $contexts[$c['type']]['visibility'] = $c['visibility']; - $contexts[$c['type']]['pages'] = $c['pages']; - $contexts[$c['type']]['context'] = $c['context']; } @@ -696,27 +697,17 @@ function facebook_status_all_contexts() * - * @param $status + * @param $sid * The Status ID or a status object. - * @param $meta - * An array of metadata that affects what behaviors are triggered from this - * function. There are no default options, but other modules may use them. - * For example, the Facebook-style Micropublisher module makes use of a - * "has attachment" option, which denotes whether the status that is being - * deleted has attached media. - */ -function facebook_status_delete_status($status, $meta = array()) { - if (!is_object($status)) { - $status = facebook_status_load($status); + */ +function facebook_status_delete_status($sid) { + if (is_object($sid)) { + $sid = $sid->sid; } // Trigger integration. - // Don't call if there is an attachment (from the FBSMP module) because there is a separate trigger for that. - if (module_exists('trigger') && empty($options['has attachment'])) { - module_invoke_all('facebook_status', 'fbss_deleted', $status); - $type = $status->type; - if ($type == 'user') { - $type .= ($status->sender == $status->recipient ? '_self' : '_other'); - } - module_invoke_all('facebook_status', 'fbss_deleted_'. $type, $status); - } - module_invoke_all('facebook_status_delete', $status, $meta); - db_query("DELETE FROM {facebook_status} WHERE sid = %d", $status->sid); + /* i have to close this out, caus some things aren't implemented correct yet. <--- + if (module_exists('trigger')) { + module_invoke_all('facebook_status', 'fbss_deleted', $sid); + } + <--- leave !!! */ + module_invoke_all('facebook_status_delete', $sid); + db_query('DELETE FROM {facebook_status} WHERE sid = :sid', array(':sid' => $sid)); } @@ -740,3 +731,3 @@ function facebook_status_delete_status($ * 'discard duplicates' => TRUE, - * 'timed override' => FALSE, + * 'timed override' => TRUE, * 'discard blank statuses' => TRUE, @@ -750,3 +742,3 @@ function facebook_status_save_status($re $recipient_id = $context['handler']->recipient_id($recipient); - $time = time(); + $time = REQUEST_TIME; $message = trim($message); @@ -755,7 +747,8 @@ function facebook_status_save_status($re 'discard duplicates' => TRUE, - 'timed override' => FALSE, + 'timed override' => TRUE, 'discard blank statuses' => TRUE, ); - // Calls hook_facebook_status_save_options_alter(&$options, $edit). - drupal_alter('facebook_status_save_options', $options, FALSE); + + // Calls hook_facebook_status_save_options_alter(&$options). + drupal_alter('facebook_status_save_options', $options); // Pretend to have set a new status if the submitted status is exactly the same as the old one. @@ -770,2 +764,3 @@ function facebook_status_save_status($re ); + #echo '
'.print_r($status, true).''; die(); if ($message != $status->message || $type != $status->type || $recipient_id != $status->recipient || !$options['discard duplicates']) { @@ -776,19 +771,28 @@ function facebook_status_save_status($re if ($time - $status->created < FACEBOOK_STATUS_OVERRIDE_TIMER && $type = 'user' && $sender->uid == $recipient_id && $options['timed override']) { - $sql = "UPDATE {facebook_status} SET message = '%s', created = %d WHERE sid = %d ORDER BY sid DESC"; - db_query($sql, $message, $time, $status->sid); - $object->sid = $status->sid; + + /* db_query($sql, $message, $time, $status->sid) */ + db_update('facebook_status') + ->fields(array( + 'message' => $message, + 'created' => $time, + )) + ->condition('sid', $status->sender) + //->condition('ORDER BY sender DESC', '') + ->execute(); + $object->sender = $status->sender; $edit = TRUE; + return object; // ---> } else { - // Avoid saving blank statuses except on a user's own profile if this is explicitly allowed. + // Don't save blank messages unless to clear the user's own last status update. + // The only reason clearing the last status update would even be needed would be if the most recent status update was displayed by itself somewhere. if ($type != 'user' || $sender->uid != $recipient_id || !empty($message) || !$options['discard blank statuses']) { drupal_write_record('facebook_status', $object); + return $object; // killer } } - // Invokes hook_facebook_status_save($status, $context, $edit, $options). - module_invoke_all('facebook_status_save', $object, $context, $edit, $options); - // Trigger integration. - // Don't call if the status is blank because usually nothing interesting is happening. - // Also don't call if there is an attachment (from the FBSMP module) because there is a separate trigger for that. - if (module_exists('trigger') && !empty($message) && empty($options['has attachment'])) { + // Invokes hook_facebook_status_save($status, $context, $edit). + module_invoke_all('facebook_status_save', $object, $context, $edit); + // Trigger integration. Don't call if the status is blank because usually nothing interesting is happening. + if (module_exists('trigger') && !empty($message)) { $op = 'fbss_submitted_'. $type; @@ -798,7 +802,6 @@ function facebook_status_save_status($re module_invoke_all('facebook_status', $op, $object, $context); - module_invoke_all('facebook_status', 'fbss_submitted', $object, $context); } } - elseif ($message == $status->status) { - $object->sid = $status->sid; + elseif ($message == $status->message) { + $object->sender = $status->sender; } @@ -807,65 +810,2 @@ function facebook_status_save_status($re -/** - * Update a status. - * - * @param $status - * The status object to be edited. - * @param $new_message - * The new text of the status. - * @param $options - * An array of options that affects what behaviors this function uses. These - * are the defaults, used if no option is specified for the relevant keys: - * array( - * 'discard duplicates' => TRUE, - * 'timed override' => TRUE, - * 'discard blank statuses' => TRUE, - * 'update timestamp' => FALSE, - * ); - * The first three options have little meaning if the status is being edited, - * but other modules are free to add their own options that should be - * respected here. - */ -function facebook_status_edit_status($status, $new_message, $options = array()) { - $context = facebook_status_determine_context($status->type); - $new_message = trim($new_message); - // Merge in defaults. - $options += array( - 'discard duplicates' => TRUE, - 'timed override' => TRUE, - 'discard blank statuses' => TRUE, - 'update timestamp' => FALSE, - ); - // Calls hook_facebook_status_save_options_alter(&$options, $edit). - drupal_alter('facebook_status_save_options', $options, TRUE); - $time = time(); - global $user; - // Pretend to have set a new status if the submitted status is exactly the same as the old one. - if ($new_message != $status->message) { - if ($options['update timestamp']) { - $sql = "UPDATE {facebook_status} SET message = '%s', created = %d WHERE sid = %d"; - db_query($sql, $new_message, $time, $status->sid); - $status->created = $time; - } - else { - $sql = "UPDATE {facebook_status} SET message = '%s' WHERE sid = %d"; - db_query($sql, $new_message, $status->sid); - } - $status->message = $new_message; - // Invokes hook_facebook_status_save($status, $context, $edit, $options). - module_invoke_all('facebook_status_save', $status, $context, TRUE, $options); - } - // Trigger integration. - // Don't call if the status is blank because usually nothing interesting is happening. - // Also don't call if there is an attachment (from the FBSMP module) because there is a separate trigger for that. - if (module_exists('trigger') && !empty($new_message) && empty($options['has attachment'])) { - $op = 'fbss_edited_'. $status->type; - if ($status->type == 'user') { - $op .= ($status->recipient == $status->sender ? '_self' : '_other'); - } - module_invoke_all('facebook_status', $op, $status, $context); - module_invoke_all('facebook_status', 'fbss_edited', $status, $context); - } - return $status; -} - //=================== @@ -892,3 +832,3 @@ function _facebook_status_run_filter($st if (variable_get('facebook_status_filter', 'none') != 'none') { - return check_markup($status, variable_get('facebook_status_filter', 'none'), FALSE); + return check_markup($status, variable_get('facebook_status_filter', 'none'), $langcode = '', FALSE); /* TODO Set this variable LANGCODE. */ } @@ -906,5 +846,11 @@ function _facebook_status_run_filter($st function _facebook_status_get_status_fast($uid) { - $status = db_fetch_object(db_query("SELECT * FROM {facebook_status} WHERE sender = %d AND recipient = %d AND type = 'user' ORDER BY sid DESC", $uid, $uid)); + $status = db_query("SELECT * FROM {facebook_status} WHERE sender = :sender AND recipient = :recipient AND type = :type ORDER BY sid DESC", array(':sender' => $uid, ':recipient' => $uid, ':type' => 'user'))->fetchObject(); if (!$status) { - $status = (object) array('sender' => $uid, 'recipient' => $uid, 'message' => '', 'created' => 0, 'type' => 'user'); + $status = (object) array( + 'sender' => $uid, + 'recipient' => $uid, + 'message' => '', + 'created' => 0, + 'type' => 'user', + ); } @@ -924,3 +870,3 @@ function _facebook_status_user_load($uid if (!isset($accounts[$uid])) { - $accounts[$uid] = user_load(array('uid' => $uid)); + $accounts[$uid] = user_load($uid); } @@ -940,3 +886,3 @@ function _facebook_status_user_load_by_n if (!isset($accounts[$name])) { - $accounts[$name] = user_load(array('name' => $name)); + $accounts[$name] = array_shift(user_load_multiple(array(), array('name' => $name), FALSE)); } @@ -945,46 +891,2 @@ function _facebook_status_user_load_by_n -/** - * Determine whether a context applies in the current situation. - * - * @param $context - * The context array to test for application. - * @return - * TRUE if the context applies here; FALSE otherwise. - */ -function _facebook_status_context_applies($context) { - $context += array( - 'visibility' => -1, - ); - if ($context['visibility'] == -1) { - return $context['handler']->is_applicable(); - } - elseif ($context['visibility'] == 3) { - if (module_exists('context')) { - return in_array($context['context'], array_keys(context_active_contexts())); - } - return $context['handler']->is_applicable(); - } - // Match path if necessary. This behavior adapted from block_list() - elseif (!empty($context['pages'])) { - if ($context['visibility'] < 2) { - $path = drupal_get_path_alias($_GET['q']); - // Compare with the internal and path alias (if any). - $page_match = drupal_match_path($path, $context['pages']); - if ($path != $_GET['q']) { - $page_match = $page_match || drupal_match_path($_GET['q'], $context['pages']); - } - // When $context['visibility'] has a value of 0, the block is displayed - // on all pages except those listed in $context['pages']. When set to 1, - // it is displayed only on those pages listed in $context['pages']. - return !($context['visibility'] xor $page_match); - } - else { - return drupal_eval($context['pages']); - } - } - else { - return TRUE; - } -} - //========================== @@ -994,3 +896,3 @@ function _facebook_status_context_applie /** - * Implementation of hook_facebook_status_context_info(). + * Implements hook_facebook_status_context_info(). */ @@ -1004,4 +906,4 @@ function facebook_status_facebook_status 'handler' => 'facebook_status_user_context', - 'view' => module_exists('user_relationships_api') ? 'fbss_ur_stream' : 'facebook_status_stream', - 'weight' => 999, + 'view' => 'facebook_status_stream', + 'weight' => 9999, 'file' => $path .'/includes/utility/facebook_status.contexts.inc', @@ -1026,11 +928,2 @@ function facebook_status_facebook_status ), - 'term' => array( - 'title' => t('Taxonomy terms'), - 'description' => t('The stream belongs to the currently viewed taxonomy term, if applicable.'), - 'handler' => 'facebook_status_term_context', - 'dependencies' => array('taxonomy'), - 'view' => 'facebook_status_stream', - 'weight' => 1000, // heavier than the user context, therefore disabled by default - 'file' => $path .'/includes/utility/facebook_status.contexts.inc', - ), ); @@ -1043,29 +936,19 @@ function facebook_status_facebook_status /** - * Implementation of hook_hook_info(). + * Implements hook_trigger_info(). */ -function facebook_status_hook_info() { +function facebook_status_trigger_info() { $info = array( 'facebook_status' => array( - 'facebook_status' => array( - 'fbss_deleted' => array( - 'runs when' => t('A status has been deleted'), + 'facebook_status_fbss_deleted' => array( + 'label' => t('A status has been deleted'), ), - 'fbss_deleted_user_self' => array( - 'runs when' => t('A user has deleted their status'), + 'facebook_status_fbss_edited' => array( + 'label' => t('A status has been edited'), ), - 'fbss_deleted_user_other' => array( - 'runs when' => t('A user has deleted a status message to another user'), - ), - 'fbss_edited' => array( - 'runs when' => t('A status has been edited'), - ), - 'fbss_edited_user_self' => array( - 'runs when' => t('A user has edited their own status'), - ), - 'fbss_edited_user_other' => array( - 'runs when' => t('A user has edited a status message to another user'), - ), - 'fbss_submitted' => array( - 'runs when' => t('A status has been submitted'), ), + ); + /* + foreach (facebook_status_all_contexts() as $type => $details) { + if ($type == 'user') { + $info['facebook_status']['facebook_status'] += array( 'fbss_submitted_user_self' => array( @@ -1076,13 +959,5 @@ function facebook_status_hook_info() { ), - ), - ), - ); - foreach (facebook_status_all_contexts() as $type => $details) { - if ($type != 'user') { - $info['facebook_status']['facebook_status']['fbss_deleted_'. $type] = array( - 'runs when' => t('A user has deleted a status message to a stream of type %type', array('%type' => $type)), - ); - $info['facebook_status']['facebook_status']['fbss_edited_'. $type] = array( - 'runs when' => t('A user has edited a status message to a stream of type %type', array('%type' => $type)), ); + } + else { $info['facebook_status']['facebook_status']['fbss_submitted_'. $type] = array( @@ -1092,2 +967,3 @@ function facebook_status_hook_info() { } + */ return $info; @@ -1096,8 +973,10 @@ function facebook_status_hook_info() { /** - * Implementation of hook_facebook_status(). + * Implements hook_facebook_status(). * or - * Implementation of hook_trigger_name(). + * Implements hook_trigger_name(). */ -function facebook_status_facebook_status($op, $status, $context = NULL) { - if (strpos($op, 'fbss_deleted') !== 0 && strpos($op, 'fbss_submitted') !== 0 && strpos($op, 'fbss_edited') !== 0) { +/* 'facebook_status', 'fbss_deleted', $sid */ + +function facebook_status_facebook_status($op, $a1, $context = NULL) { + if (!in_array($op, array('fbss_deleted', 'fbss_edited')) && strpos($op, 'fbss_submitted') !== 0) { return; @@ -1105,2 +984,9 @@ function facebook_status_facebook_status $aids = _trigger_get_hook_aids('facebook_status', $op); + print_r($aids) . "983"; die(); + if ($op == 'fbss_deleted' || $op == 'fbss_edited') { + $status = facebook_status_load($a1); + } + elseif (strpos($op, 'fbss_submitted') === 0) { + $status = $a1; + } $context = facebook_status_determine_context($status->type); @@ -1130,3 +1016,3 @@ function facebook_status_facebook_status /** - * Implementation of hook_token_list(). + * Implements hook_token_list(). */ @@ -1145,4 +1031,4 @@ function facebook_status_token_list($typ 'recipient-id' => t('The ID of the recipient of the status message.'), - 'message-unformatted' => t('The status text, with HTML escaped but no filters or anything run over it.'), - 'message-formatted' => t('The status text completely themed.'), + 'message-unformatted' => t('The new status text, with HTML escaped but no filters or anything run over it.'), + 'message-formatted' => t('The new status text completely themed.'), 'message-raw' => t('The completely unfiltered status text. WARNING: raw user input.'), @@ -1150,3 +1036,2 @@ function facebook_status_token_list($typ 'status-id' => t('The Status ID.'), - 'status-url' => t('The URL of the status message.'), 'status-edit' => t('Edit status link.'), @@ -1164,3 +1049,3 @@ function facebook_status_token_list($typ /** - * Implementation of hook_token_values(). + * Implements hook_token_values(). */ @@ -1188,3 +1073,3 @@ function facebook_status_token_values($t $values = array( - 'sender-themed' => theme('username', $sender), + 'sender-themed' => theme('username', array('account' => $sender)), 'sender-name' => check_plain($sender->name), @@ -1201,5 +1086,4 @@ function facebook_status_token_values($t 'message-raw' => $status->message, - 'status-themed' => facebook_status_show($status), + 'status-themed' => theme('facebook_status_item', array('status' => $status)), 'status-id' => $status->sid, - 'status-url' => url('statuses/'. $status->sid, array('absolute' => TRUE)), 'status-edit' => $edit, @@ -1207,3 +1091,3 @@ function facebook_status_token_values($t 'status-comment-count' => (module_exists('fbss_comments')) ? fbss_comments_count_comments($status->sid) : 0, - 'created' => format_date($status->created, 'small'), + 'created' => format_date($status->created, 'short'), ); @@ -1218,3 +1102,3 @@ function facebook_status_token_values($t /** - * Implementation of hook_views_api(). + * Implements hook_views_api(). */ @@ -1222,3 +1106,3 @@ function facebook_status_views_api() { return array( - 'api' => 2, + 'api' => 3, 'path' => drupal_get_path('module', 'facebook_status') .'/includes/views', @@ -1233,17 +1117,3 @@ function facebook_status_display_user_pi drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css'); - return theme('user_picture', $account); -} - -/** - * Implementation of hook_views_query_alter(). - */ -function facebook_status_views_query_alter(&$view, &$query) { - if ($view->base_table == 'users') { - foreach ($query->table_queue as $alias => $info) { - if ($info['table'] == 'facebook_status') { - $query->add_groupby($info['alias'] .'.sid'); - return; - } - } - } + return theme('user_picture', array('account' => $account)); } @@ -1255,3 +1125,3 @@ function facebook_status_views_query_alt /** - * Implementation of hook_sms_incoming(). + * Implements hook_sms_incoming(). */ @@ -1274,3 +1144,3 @@ function facebook_status_sms_incoming($o /** - * Implementation of hook_views_bulk_operations_object_info(). + * Implements hook_views_bulk_operations_object_info(). */ @@ -1282,3 +1152,3 @@ function facebook_status_views_bulk_oper 'load' => 'facebook_status_load', - 'title' => 'message', + 'title' => 'status', ), @@ -1292,3 +1162,3 @@ function facebook_status_views_bulk_oper /** - * Implementation of hook_ctools_plugin_directory(). + * Implements hook_ctools_plugin_directory(). */ diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/ctools/content_types/facebook_status_stream.inc screamwork_fbss7/includes/ctools/content_types/facebook_status_stream.inc --- facebook_status_6_3/includes/ctools/content_types/facebook_status_stream.inc 2011-04-09 19:23:26.524616700 -0400 +++ screamwork_fbss7/includes/ctools/content_types/facebook_status_stream.inc 2011-05-25 20:53:28.000000000 -0400 @@ -8,3 +8,3 @@ /** - * Implementation of hook_ctools_content_types(). + * Implements hook_ctools_content_types(). */ @@ -22,6 +22,6 @@ function facebook_status_facebook_status /** - * Implementation of hook_content_type_render(). + * Implements hook_content_type_render(). */ function facebook_status_facebook_status_stream_content_type_render($subtype, $conf, $panel_args, $context) { - $account = isset($context->data) ? drupal_clone($context->data) : NULL; + $account = isset($context->data) ? clone $context->data : NULL; $block = new stdClass(); @@ -30,2 +30,3 @@ function facebook_status_facebook_status $block->title = t("Stream"); + // TODO Please change this theme call to use an associative array for the $variables parameter. $block->content = theme('facebook_status_form_display'); @@ -36,3 +37,3 @@ function facebook_status_facebook_status /** - * Implementation of hook_content_type_admin_title(). + * Implements hook_content_type_admin_title(). */ diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/facebook_status.preprocess.inc screamwork_fbss7/includes/facebook_status.preprocess.inc --- facebook_status_6_3/includes/facebook_status.preprocess.inc 2011-06-05 00:45:00.294465500 -0400 +++ screamwork_fbss7/includes/facebook_status.preprocess.inc 2011-05-25 20:53:28.000000000 -0400 @@ -13,3 +13,3 @@ function template_preprocess_facebook_st $vars['self'] = $status->type == 'user' && $status->sender == $status->recipient; - $vars['page'] = $options['page']; + $vars['page'] = isset($options['page']) ? $options['page'] : ''; $vars['type'] = $status->type; @@ -20,4 +20,7 @@ function template_preprocess_facebook_st $vars += array( - 'recipient' => '', 'recipient_name' => '', 'recipient_picture' => '', - 'meta' => '', 'links' => '', + 'recipient' => '', + 'recipient_name' => '', + 'recipient_picture' => '', + 'meta' => '', + 'links' => '', ); @@ -27,3 +30,3 @@ function template_preprocess_facebook_st if ($status->type == 'user') { - $vars['recipient_picture'] = theme('user_picture', $vars['recipient']); + $vars['recipient_picture'] = theme('user_picture', array('account' => $vars['recipient'])); } @@ -31,12 +34,12 @@ function template_preprocess_facebook_st $vars['sender_name'] = check_plain($vars['sender']->name); - $vars['sender_link'] = theme('username', $vars['sender']); - $vars['sender_picture'] = theme('user_picture', $vars['sender']); - if ($options['cacheable']) { - $vars['created'] = format_date($status->created, 'small'); + $vars['sender_link'] = theme('username', array('account' => $vars['sender'])); + $vars['sender_picture'] = theme('user_picture', array('account' => $vars['sender'])); + if (isset($options['cacheable'])) { + $vars['created'] = format_date($status->created, 'short'); } else { - $vars['created'] = theme('facebook_status_time', $status->created); + $vars['created'] = theme('facebook_status_time', array('time' => $status->created)); if ($status->type == 'user') { - if ($status->sender != $status->recipient) { - $vars['meta'] = t('to !recipient', array('!recipient' => $vars['recipient_link'])); + if ($status->sender != $status->recipient || strpos($status->message, '@') === 0 || strpos($status->message, '[@') === 0) { + $vars['meta'] = t('To @recipient', array('@recipient' => $vars['recipient_name'])); } @@ -44,6 +47,6 @@ function template_preprocess_facebook_st elseif (!empty($vars['recipient_name'])) { - $vars['meta'] = t('on !entity', array('!entity' => $vars['recipient_link'])); + $vars['meta'] = t('Posted on %entity', array('%entity' => $vars['recipient_name'])); } - if ($options['links']) { - $vars['links'] = !empty($status->links) ? theme('links', $status->links, array('class' => 'links inline')) : ''; + if (isset($options['links'])) { + $vars['links'] = !empty($status->links) ? theme('links', array('links' => $node->links, 'attributes' => array('class' => array('links inline')))) : ''; } @@ -64,11 +68,9 @@ function _facebook_status_show($status, 'cacheable' => FALSE, - 'extras' => TRUE, ); - if ($options['links']) { + if (isset($links)) { $status->links = module_invoke_all('link', 'facebook_status', $status); drupal_alter('facebook_status_link', $status->links, $status); - uasort($status->links, '_facebook_status_links_sort'); } $message = trim($status->message); - if ($options['page']) { + if (isset($options['page'])) { $title = ''; @@ -83,8 +85,7 @@ function _facebook_status_show($status, else { - $context = facebook_status_determine_context($status->type); - $recipient = $context['handler']->load_recipient($status->recipient); - $recipient_name = $context['handler']->recipient_name($recipient); + + $recipient = _facebook_status_user_load($status->recipient); //"\xC2\xBB" is the unicode escape sequence for the HTML entity » (a double right angle bracket) $title = t("@sender \xC2\xBB @recipient: @message", - array('@sender' => $sender->name, '@recipient' => $recipient_name, '@message' => $message) + array('@sender' => $sender->name, '@recipient' => $recipient->name, '@message' => $message) ); @@ -98,16 +101,3 @@ function _facebook_status_show($status, drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css'); - return theme('facebook_status_item', $status, $options); -} - -/** - * Helps sort links by weight. - */ -function _facebook_status_links_sort($a, $b) { - if (!isset($a['weight'])) { - $a['weight'] = 0; - } - if (!isset($b['weight'])) { - $b['weight'] = 0; - } - return $a['weight'] > $b['weight'] ? 1 : ($a['weight'] < $b['weight'] ? -1 : 0); + return theme('facebook_status_item', array('status' => $status, 'options' => $options)); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.access.inc screamwork_fbss7/includes/utility/facebook_status.access.inc --- facebook_status_6_3/includes/utility/facebook_status.access.inc 2011-05-24 15:36:13.021412400 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.access.inc 2011-05-25 20:53:28.000000000 -0400 @@ -24,5 +24,4 @@ function facebook_status_user_access_add($recipient = NULL, $type = 'user', $sender = NULL) { - global $user; - $recipient = (empty($recipient) ? $user : $recipient); - $sender = (empty($sender) ? $user : $sender); + $recipient = (empty($recipient) ? $GLOBALS['user'] : $recipient); + $sender = (empty($sender) ? $GLOBALS['user'] : $sender); $context = facebook_status_determine_context($type); @@ -120,5 +119,4 @@ function facebook_status_user_access_vie function facebook_status_user_access_view_stream($recipient = NULL, $type = 'user', $account = NULL) { - global $user; - $account = (empty($account) ? $user : $account); - $recipient = (empty($recipient) ? $user : $recipient); + $account = (empty($account) ? $GLOBALS['user'] : $account); + $recipient = (empty($recipient) ? $GLOBALS['user'] : $recipient); $context = facebook_status_determine_context($type); @@ -126,11 +124 @@ function facebook_status_user_access_vie } - -/** - * Checks permission to generate status updates via Devel Generate. - */ -function facebook_status_user_access_generate() { - return user_access('delete all statuses') && - user_access('post status messages to other streams') && - user_access('send messages to all users at once') && - user_access('administer Facebook-style Statuses settings'); -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.admin.inc screamwork_fbss7/includes/utility/facebook_status.admin.inc --- facebook_status_6_3/includes/utility/facebook_status.admin.inc 2011-06-10 12:18:22.638599900 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.admin.inc 2011-05-25 20:53:28.000000000 -0400 @@ -10,14 +10,5 @@ */ -function facebook_status_admin($form_state) { - $form['facebook_status_length'] = array( - '#type' => 'textfield', - '#title' => t('Maximum status length'), - '#description' => t('Must be a positive integer, or zero for no maximum length.'), - '#default_value' => variable_get('facebook_status_length', 140), - '#size' => 3, - '#maxlength' => 5, - '#required' => TRUE, - '#weight' => -40, - ); - $formats = filter_formats(); +function facebook_status_admin($form, &$form_state) { + global $user; + $formats = filter_formats($user); $options = array('none' => t('None (HTML escaped)')); @@ -38,4 +29,4 @@ function facebook_status_admin($form_sta '#description' => t('The format of the default message when users click a link to re-post a status.') .' '. - t("@name will be replaced with the poster's name and @message will be replaced with the status text."), - '#default_value' => variable_get('facebook_status_repost', 'Re: @name @message '), + t("@name will be replaced with the poster's name and @status will be replaced with the status text."), + '#default_value' => variable_get('facebook_status_repost', 'Re: @name @status '), '#weight' => -20, @@ -45,3 +36,3 @@ function facebook_status_admin($form_sta foreach ($views as $name => $view) { - if ($view->disabled == 0) { + if (!isset($view->disabled) || $view->disabled != TRUE) { $list[$name] = $name; @@ -53,3 +44,3 @@ function facebook_status_admin($form_sta '#description' => t('The default facebook_status_stream view is recommended.'), - '#default_value' => variable_get('facebook_status_share_view', $list['facebook_status_stream']), + '#default_value' => variable_get('facebook_status_share_view', $list['facebook_status_mystream']), '#options' => $list, @@ -64,6 +55,2 @@ function facebook_status_admin($form_sta function facebook_status_admin_validate($form, &$form_state) { - $size = $form_state['values']['facebook_status_length']; - if (!is_numeric($size) || $size < 0 || $size != round($size)) { - form_set_error('facebook_status_length', t('The maximum status length must be a positive integer, or zero for no maximum length.')); - } } @@ -73,3 +60,3 @@ function facebook_status_admin_validate( */ -function facebook_status_admin_advanced($form_state) { +function facebook_status_admin_advanced($form, &$form_state) { $form['facebook_status_box_rows'] = array( @@ -84,15 +71,2 @@ function facebook_status_admin_advanced( ); - $form['facebook_status_hide_length'] = array( - '#type' => 'textfield', - '#title' => t('Show "Read more" after'), - '#field_suffix' => t('characters'), - '#description' => t('If a status message is longer than this number of characters and the viewing user has JavaScript enabled, the message will be truncated to this length and a "Read more" link will be appended.') .' '. - t('When clicked, the "Read more" link will reveal the rest of the status message.') .' '. - t('Must be a positive integer less than the maximum status message length, or zero to ignore this option.'), - '#default_value' => variable_get('facebook_status_hide_length', 0), - '#size' => 3, - '#maxlength' => 5, - '#required' => TRUE, - '#weight' => -70, - ); $form['facebook_status_nl2br'] = array( @@ -106,12 +80,2 @@ function facebook_status_admin_advanced( ); - $form['facebook_status_refresh'] = array( - '#type' => 'checkbox', - '#title' => t('Show AJAX "Refresh" link after status update views'), - '#description' => t('Display a "Refresh" link under content that will be automatically refreshed when the status update form is submitted.') .' '. - t('Clicking the link will similarly update the related content via JavaScript, without refreshing the page.') .' '. - t('Obviously, the "Refresh" link will only appear when there is something that can be refreshed.') .' '. - t('If you disable AHAH refreshing below or if you have no views attached to your status update forms, this setting is useless.'), - '#default_value' => variable_get('facebook_status_refresh', 0), - '#weight' => -50, - ); $form['facebook_status_profile'] = array( @@ -142,9 +106,2 @@ function facebook_status_admin_advanced( ); - $form['facebook_status_ahah'] = array( - '#type' => 'checkbox', - '#title' => t('Use AHAH to refresh the status update form without refreshing the page'), - '#description' => t("You should leave this checked unless you know what you're doing."), - '#default_value' => variable_get('facebook_status_ahah', 1), - '#weight' => -10, - ); return system_settings_form($form); @@ -160,7 +117,2 @@ function facebook_status_admin_advanced_ } - $length = $form_state['values']['facebook_status_hide_length']; - if (!is_numeric($length) || $length < 0 || ($length >= variable_get('facebook_status_length', 140) && variable_get('facebook_status_length', 140) != 0) || $length != round($length)) { - form_set_error('facebook_status_hide_length', - t('The "Read more after" option requires that the number of characters specified is a positive integer less than the maximum status message length, or zero to ignore this option.')); - } } @@ -170,3 +122,3 @@ function facebook_status_admin_advanced_ */ -function facebook_status_admin_contexts(&$form_state) { +function facebook_status_admin_contexts($form, &$form_state) { $data = facebook_status_all_contexts(); @@ -179,3 +132,4 @@ function facebook_status_admin_contexts( foreach ($views as $name => $view) { - if (empty($view->disabled)) { + //if (empty($view->disabled)) { + if (!isset($view->disabled) || $view->disabled != TRUE) { $options[$name] = $name; @@ -185,5 +139,6 @@ function facebook_status_admin_contexts( $form['components'][$type]['title'] = array( - '#prefix' => '
'. 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); - return $output; -} - -/** - * The individual context settings form. - */ -function facebook_status_admin_context_settings($form_state, $context) { - drupal_set_title(t('Context settings: !type', array('!type' => $context['title']))); - $type = $context['handler']->type(); - $form = array(); - - 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.') .'
', + $row[] = drupal_render($element['title'], array('#attributes' => array('class' => 'title-group'))); + $row[] = drupal_render($element['view'], array('#attributes' => array('class' => 'view-group'))); + $row[] = drupal_render($element['selectors'], array('#attributes' => array('class' => 'selectors-group'))); + $row[] = drupal_render($element['weight'], array('#attributes' => array('class' => 'weight-group'))); + $row[] = drupal_render($element['type'], array('#attributes' => array('class' => 'type'))); + $row[] = drupal_render($element['already_saved'], array('#attributes' => array('class' => 'already-saved'))); + $rows[] = array( + 'data' => $row, + 'class' => array('class' => 'draggable'), ); } - - $views = views_get_all_views(); - $options = array('' => t('None')); - foreach ($views as $name => $view) { - if (empty($view->disabled)) { - $options[$name] = $name; - } - } - $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.'), - '#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['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.'), - '#default_value' => variable_get('facebook_status_user_other_view', 'facebook_status_stream'), - '#options' => $options, - ); - } - - $form['selectors'] = array( - '#type' => 'textarea', - '#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.') .' '. + $output = '
' . + t('In the "Refreshable DOM selectors" column, 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).') .' '. @@ -347,113 +222,8 @@ function facebook_status_admin_context_s 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'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - ); - $access = user_access('use PHP for context visibility'); - if ($edit['visibility'] == 2 && !$access) { - $form['page_vis_settings'] = array(); - $form['page_vis_settings']['visibility'] = array( - '#type' => 'value', - '#value' => 2, - ); - $form['page_vis_settings']['pages'] = array( - '#type' => 'value', - '#value' => $edit['pages'], - ); - } - 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.') .'
', - ); - $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' => ''));
- }
- 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');
- }
- $form['page_vis_settings']['visibility'] = array(
- '#type' => 'radios',
- '#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')) {
- $form['page_vis_settings']['context'] = array(
- '#type' => 'select',
- '#title' => t('Context'),
- '#description' => t('Choose a context provided by the Context module whose conditions should be evaluated to determine whether the stream context applies.'),
- '#default_value' => isset($context['context']) ? $context['context'] : '',
- '#options' => drupal_map_assoc(array_keys(context_enabled_contexts())),
- );
- }
- else {
- $form['page_vis_settings']['context'] = array(
- '#type' => 'value',
- '#value' => isset($context['context']) ? $context['context'] : '',
- );
- }
- $form['page_vis_settings']['pages'] = array(
- '#type' => 'textarea',
- '#title' => t('Pages'),
- '#default_value' => isset($context['pages']) ? $context['pages'] : '',
- '#description' => $description,
- );
- }
-
- $form['submit'] = array(
- '#type' => 'submit',
- '#value' => t('Save'),
- );
- $form['type'] = array(
- '#type' => 'hidden',
- '#value' => $type,
- );
- $form['already_saved'] = array(
- '#type' => 'hidden',
- '#value' => isset($context['in_db']) ? $context['in_db'] : FALSE,
- );
- $form['weight'] = array(
- '#type' => 'hidden',
- '#default_value' => isset($context['weight']) ? $context['weight'] : 0,
- );
- return $form;
-}
-
-/**
- * The submit callback for the individual stream context configuration form.
- */
-function facebook_status_admin_context_settings_submit($form, &$form_state) {
- $v = $form_state['values'];
- $record = array(
- 'type' => $v['type'],
- 'weight' => intval($v['weight']),
- 'view' => $v['view'],
- 'selectors' => $v['selectors'],
- 'visibility' => intval($v['visibility']),
- 'pages' => $v['pages'],
- 'context' => $v['context'],
- );
- if ($v['already_saved']) {
- drupal_write_record('facebook_status_contexts', $record, 'type');
- }
- else {
- drupal_write_record('facebook_status_contexts', $record);
- }
- if (isset($v['other_view'])) {
- variable_set('facebook_status_user_other_view', $v['other_view']);
- }
- drupal_set_message(t('The configuration options have been saved.'));
+ '' . + t('Also note that 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; } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.ahah.inc screamwork_fbss7/includes/utility/facebook_status.ahah.inc --- facebook_status_6_3/includes/utility/facebook_status.ahah.inc 2011-04-09 19:23:26.533617200 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.ahah.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,58 +0,0 @@ - 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; - $args = $form['#parameters']; - //This happens if someone goes directly to the JS processing page. - if (!is_array($args) && !$args) { - watchdog('facebook_status', 'Someone tried to access the JavaScript processing page for Facebook-style Statuses directly.', array(), WATCHDOG_DEBUG); - drupal_goto('user'); - return; - } - $form_id = array_shift($args); - drupal_process_form($form_id, $form, $form_state); - $form = drupal_rebuild_form($form_id, $form_state, $args, $form_build_id); - //Get HTML for the replacement form. Only these elements will be AHAH-refreshed. - $new_form['slider'] = $form['slider']; - $new_form['fbss-status'] = $form['fbss-status']; - $new_form['chars'] = $form['chars']; - $new_form['fbss-submit'] = $form['fbss-submit']; - $new_form['sdefault'] = $form['sdefault']; - //Clear the status form after it's already been submitted once to prevent confusion. - unset($new_form['status']['#default_value']); - //Calls hook_facebook_status_form_ahah_alter(&$new_form, $form). - drupal_alter('facebook_status_form_ahah', $new_form, $form); - //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. - $output = theme('status_messages') . drupal_render($new_form); - - //Return the results. - //The standard way is drupal_json(array('status' => TRUE, 'data' => $output)); - //However, this doesn't work with file uploading and re-attaching AHAH behaviors to form elements. - //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'); - $GLOBALS['devel_shutdown'] = FALSE; //Still not really sure what the point of this is. - echo drupal_to_js(array( - 'status' => TRUE, - 'data' => $output, - 'settings' => call_user_func_array('array_merge_recursive', $javascript['setting']), - )); - exit; -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.announce.inc screamwork_fbss7/includes/utility/facebook_status.announce.inc --- facebook_status_6_3/includes/utility/facebook_status.announce.inc 2011-04-09 19:23:26.534617300 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.announce.inc 2011-05-25 20:53:28.000000000 -0400 @@ -10,6 +10,6 @@ */ -function facebook_status_announce_admin(&$form_state) { +function facebook_status_announce_admin($form, &$form_state) { $form = array(); $form['info'] = array( - '#value' => t('Warning: this can be very slow on sites with lots of users.'), + '#markup' => t('Warning: this can be very slow on sites with lots of users.'), ); @@ -57,3 +59,3 @@ function facebook_status_announce_admin_ - $count = db_result(db_query("SELECT COUNT(*) FROM {users} WHERE status = 1")); + $count = db_query("SELECT COUNT(DISTINCT uid) FROM {users} WHERE status = :status", array(':status' => 1))->fetchField(); $batch = array( @@ -64,3 +66,3 @@ function facebook_status_announce_admin_ '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') . '/includes/utility/facebook_status.announce.inc', ); @@ -82,15 +85,40 @@ function facebook_status_announce_admin_ function facebook_status_announce_generate_status($message, $from, $count, $format, &$context) { + // because of userid = 1, admin doesn't send himself. + $count = $count - 1; if (!isset($context['sandbox']['progress'])) { $context['sandbox']['progress'] = 0; + $context['sandbox']['current_userid'] = 1; + $context['sandbox']['max'] = $count; } - $uid = db_result(db_query_range("SELECT uid FROM {users} WHERE status = 1", $context['sandbox']['progress'], 1)); - // 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)); + $limit = $count; + + $result = db_select('users', 'uid') + ->fields('uid') + ->condition('uid', $context['sandbox']['current_userid'], '>') + ->condition('status', 1) + ->orderBy('uid') + ->range(0, $limit) + ->execute(); + + foreach ($result as $row) { + + $to = user_load($row->uid); + //$context['message'] = check_plain($to->name); + + $context['message'] = t('Sending message to @user (@current of @total)', + array('@user' => $to->name, '@current' => $context['sandbox']['progress'], '@total' => $count)); + 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)); - $context['sandbox']['progress']++; + $context['results'][] = check_plain($to->name); - $context['finished'] = $context['sandbox']['progress'] / $count; + + $context['sandbox']['current_userid'] = $to->uid; + + if ($context['sandbox']['progress'] != $context['sandbox']['max']) { + $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max']; + } + $context['sandbox']['progress']++; + + } + } @@ -107,3 +136,3 @@ function facebook_status_announce_batch_ 'Sent message to @count users: !list', - array('!list' => theme('item_list', $results)) + array('!list' => theme('item_list', array('items' => $results))) )); @@ -119,3 +148,3 @@ function facebook_status_announce_batch_ '%error_operation' => $error_operation[0], - '@arguments' => print_r($error_operation[1], TRUE) + '@arguments' => print_r($error_operation[1], TRUE), ) diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.contexts.inc screamwork_fbss7/includes/utility/facebook_status.contexts.inc --- facebook_status_6_3/includes/utility/facebook_status.contexts.inc 2011-06-30 00:55:51.802139200 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.contexts.inc 2011-05-25 20:53:28.000000000 -0400 @@ -19,2 +19,4 @@ class facebook_status_context { * The context type. + * Used to automatically determine several values, but not required by + * subclasses if those values are overridden. */ @@ -137,20 +139,2 @@ class facebook_status_user_context exten function find_recipient() { - global $user; - // On the conversation page, the active user is actually the *other* user. - if (arg(0) == 'statuses' && arg(1) == 'conversation') { - $args = explode(',', arg(2)); - $count = count($args); - if ($count === 1) { - return is_numeric($args[0]) ? _facebook_status_user_load($args[0]) : $user; - } - elseif ($count == 2) { - if ($args[0] == $user->uid) { - return is_numeric($args[1]) ? _facebook_status_user_load($args[1]) : $user; - } - elseif ($args[1] == $user->uid) { - return is_numeric($args[0]) ? _facebook_status_user_load($args[0]) : $user; - } - } - return $user; - } return arg(0) == 'user' && is_numeric(arg(1)) ? /* menu_get_object('user') */ _facebook_status_user_load(arg(1)) : $GLOBALS['user']; @@ -162,7 +146,11 @@ class facebook_status_user_context exten function load_random_recipient() { - $uid = db_result(db_query_range("SELECT uid FROM {users} WHERE status = 1 ORDER BY RAND() ASC", 0, 1)); - return $this->load_recipient($uid); + $uids = devel_get_users(); + if (!empty($uids)) { + $uid = $uids[array_rand($uids)]; + return $this->load_recipient($id); + } + return user_load(0); } function recipient_link($recipient) { - return theme('username', $recipient); + return theme('username', array('account' => $recipient)); } @@ -196,4 +184,4 @@ class facebook_status_node_context exten 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); } @@ -236,4 +224,3 @@ class facebook_status_og_context extends function access_add($recipient, $sender) { - // Only group members can add content of any kind. - return parent::access_add($recipient, $sender) && + return parent::access_add($recipient, $sender) || og_is_group_member($recipient->nid, TRUE, $sender->uid); @@ -245,47 +232,8 @@ class facebook_status_og_context extends function access_view($status, $account) { - // Only group members can view group statuses if the group is private. - return parent::access_view($status, $account) && - (og_is_group_member($status->recipient, TRUE, $account->uid) || empty($this->load_recipient($status->recipient)->og_private)); - } - function access_stream($recipient, $account) { - // Only group members can view group statuses if the group is private. - return parent::access_stream($recipient, $account) && - (og_is_group_member($recipient->nid, TRUE, $account->uid) || empty($recipient->og_private)); - } -} - -/** - * The taxonomy term context. - */ -class facebook_status_term_context extends facebook_status_context { - function type() { - return 'term'; - } - function is_applicable() { - 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(); - } - function load_recipient($id) { - return taxonomy_get_term($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); - } - function recipient_id($recipient) { - return isset($recipient->tid) ? $recipient->tid : 0; - } - function recipient_url($recipient) { - return 'taxonomy/term/'. $this->recipient_id($recipient); - } - function recipient_name($recipient) { - return isset($recipient->name) ? $recipient->name : ''; - } - function access_view($status, $account) { - return parent::access_view($status, $account) || user_access('administer taxonomy', $account); + return parent::access_view($status, $account) || + og_is_group_member($status->recipient, TRUE, $account->uid); } function access_stream($recipient, $account) { - return parent::access_stream($recipient, $account) || user_access('administer taxonomy', $account); + return parent::access_stream($recipient, $account) || + og_is_group_member($recipient->nid, TRUE, $account->uid); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.conversation.inc screamwork_fbss7/includes/utility/facebook_status.conversation.inc --- facebook_status_6_3/includes/utility/facebook_status.conversation.inc 2011-04-09 19:23:26.535617300 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.conversation.inc 2011-05-25 20:53:28.000000000 -0400 @@ -42,4 +43,3 @@ function _facebook_status_conversation() if ($count > 2 || $count < 1 || ($count == 1 && $args[0] == $user->uid) || !is_numeric($args[0]) || ($count == 2 && !is_numeric($args[1]))) { - drupal_not_found(); - return; + return drupal_not_found(); } @@ -50,4 +50,6 @@ function _facebook_status_conversation() } - $arg = implode(',', $args); - return views_embed_view('facebook_status_conversation', 'default', $arg, $arg); + $arg = implode('/', $args); + #print_R($arg); die(); + //return views_embed_view('facebook_status_conversation', 'default', $arg, $arg); + return views_embed_view('facebook_status_conversation', 'default', $args[0], $args[1]); } @@ -56,5 +58,5 @@ function _facebook_status_conversation() 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(); + return drupal_not_found(); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/utility/facebook_status.edit.inc screamwork_fbss7/includes/utility/facebook_status.edit.inc --- facebook_status_6_3/includes/utility/facebook_status.edit.inc 2011-06-08 16:17:35.559958200 -0400 +++ screamwork_fbss7/includes/utility/facebook_status.edit.inc 2011-05-25 20:53:28.000000000 -0400 @@ -10,11 +10,7 @@ */ -function facebook_status_edit(&$form_state, $status) { +function facebook_status_edit($form, &$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'); - if (module_exists('modalframe')) { - modalframe_child_js(); - } + //$path = drupal_get_path('module', 'facebook_status') . '/resources'; + //drupal_add_js($path . '/facebook_status.js'); + //drupal_add_css($path . '/facebook_status.css'); $intro = _facebook_status_get_edit_intro($status, $context); @@ -26,4 +22,6 @@ function facebook_status_edit(&$form_sta $form['intro'] = array( - '#value' => ''. t('Are you sure you want to permanently delete the status %status?', array('%status' => $status->message)) .'
'); +function _facebook_status_delete($form, &$form_state, $status) { + $form['infotext'] = array( + '#type' => 'markup', + '#markup' => '' . t('Are you sure you want to permanently delete the status !status?', array('!status' => $status->message)) . '
' + ); $form['confirm'] = array( @@ -103,3 +110,3 @@ function _facebook_status_delete(&$form_ $form['status-sid'] = array( - '#type' => 'value', + '#type' => 'hidden', '#value' => $status->sid, @@ -114,5 +121,6 @@ function _facebook_status_delete_confirm $status = facebook_status_load($form_state['values']['status-sid']); - facebook_status_delete_status($status); + facebook_status_delete_status($status->sid); drupal_set_message(t('Status deleted.')); - if ($_GET['destination']) { + + if (isset($_GET['destination'])) { $form_state['redirect'] = $_GET['destination']; @@ -120,6 +128,3 @@ function _facebook_status_delete_confirm else { - $form_state['redirect'] = ($status->type == 'user' ? 'user' : ''.print_r($this, true).''; die(); + $xx = $this->view->args; + $arg1 = $xx[0]; + $arg2 = $xx[1]; + // views_plugin_query_default.inc - line 844 + $this->query->add_where_expression(0, "($this->table_alias.sender = $arg1 AND $this->table_alias.recipient = $arg2) OR ($this->table_alias.sender = $arg2 AND $this->table_alias.recipient = $arg1)", array()); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_argument_rels_and_me.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_argument_rels_and_me.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_argument_rels_and_me.inc 2011-06-10 10:07:05.749067600 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_argument_rels_and_me.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,21 +0,0 @@ -ensure_my_table(); - $this->query->ensure_table('users'); - $argument = $this->argument; - // Argument user is in an approved relationship - $this->query->add_where($this->options['group'], db_prefix_tables(" - (($this->table_alias.requestee_id = %d OR $this->table_alias.requester_id = %d) AND $this->table_alias.approved = 1) OR {users}.uid = %d - "), $argument, $argument, $argument); - } -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_created.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_created.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_created.inc 2011-06-02 15:32:40.129353400 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_created.inc 2011-05-25 20:53:28.000000000 -0400 @@ -25,3 +25,2 @@ class facebook_status_views_handler_fiel $custom_format = ''; - $output = ''; if (in_array($format, array('custom', 'raw time ago', 'time ago', 'raw time span', 'time span'))) { @@ -30,16 +29,14 @@ class facebook_status_views_handler_fiel if (!$value) { - $output .= theme('views_nodate'); + // TODO Please change this theme call to use an associative array for the $variables parameter. + return theme('views_nodate'); } else { - $time_diff = time() - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence) + $time_diff = REQUEST_TIME - $value; // will be positive for a datetime in the past (ago), and negative for a datetime in the future (hence) switch ($format) { case 'raw time ago': - $output .= format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2); - break; + return format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2); case 'time ago': - $output .= t('%time ago', array('%time' => format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2))); - break; + return t('%time ago', array('%time' => format_interval($time_diff, is_numeric($custom_format) ? $custom_format : 2))); case 'raw time span': - $output .= ($time_diff < 0 ? '-' : '') . format_interval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2); - break; + return ($time_diff < 0 ? '-' : '') . format_interval(abs($time_diff), is_numeric($custom_format) ? $custom_format : 2); case 'time span': @@ -47,19 +44,13 @@ class facebook_status_views_handler_fiel if ($time_diff < 0) { - $output .= t('%time hence', $args); - break; + return t('%time hence', $args); } - $output .= t('%time ago', $args); - break; + return t('%time ago', $args); case 'custom': - $output .= format_date($value, $format, $custom_format); - break; + return format_date($value, $format, $custom_format); case 'themed': - $output .= theme('facebook_status_time', $value); - break; + return theme('facebook_status_time', array('time' => $value)); default: - $output .= format_date($value, $format); - break; + return format_date($value, $format); } } - return $output .''; } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_cross.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_cross.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_cross.inc 2011-06-12 16:22:22.306629600 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_cross.inc 2011-05-25 20:53:28.000000000 -0400 @@ -22,3 +22,3 @@ class facebook_status_views_handler_fiel if ($sender_id == $recipient_id && $type == 'user') { - return theme('username', _facebook_status_user_load($sender_id)); + return theme('username', array('account' => _facebook_status_user_load($sender_id))); } @@ -28,4 +28,4 @@ class facebook_status_views_handler_fiel $args = array( - '!sender' => ''. theme('username', _facebook_status_user_load($sender_id)) .'', - '!recipient' => ''. $context['handler']->recipient_link($recipient) .'', + '!sender' => theme('username', array('account' => _facebook_status_user_load($sender_id))), + '!recipient' => $context['handler']->recipient_link($recipient), ); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc 2011-06-12 16:27:05.959853600 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_cross_pic.inc 2011-05-25 20:53:28.000000000 -0400 @@ -55,6 +55,3 @@ class facebook_status_views_handler_fiel } - return t('!picture !user', array( - '!picture' => ''. facebook_status_display_user_picture($sender) .'', - '!user' => ''. theme('username', $sender) .'' - )); + return t('!picture !user', array('!picture' => facebook_status_display_user_picture($sender), '!user' => theme('username', array('account' => $sender)))); } @@ -67,7 +64,7 @@ class facebook_status_views_handler_fiel $args = array( - '!sender' => ''. theme('username', $sender) .'', - '!recipient' => ''. theme('username', $recipient) .'', - '!sender-picture' => ''. facebook_status_display_user_picture($sender) .'', - '!recipient-picture' => ''. facebook_status_display_user_picture($recipient) .'', + '!sender' => theme('username', array('account' => $sender)), + '!recipient' => theme('username', array('account' => $recipient)), ); + $args['!sender-picture'] = facebook_status_display_user_picture($sender); + $args['!recipient-picture'] = facebook_status_display_user_picture($recipient); return t('!sender-picture !sender » !recipient-picture !recipient', $args); @@ -82,5 +79,5 @@ class facebook_status_views_handler_fiel $args = array( - '!sender' => ''. theme('username', $sender) .'', - '!recipient' => ''. $context['handler']->recipient_link($recipient) .'', - '!sender-picture' => ''. facebook_status_display_user_picture($sender) .'', + '!sender' => theme('username', array('account' => $sender)), + '!recipient' => $context['handler']->recipient_link($recipient), + '!sender-picture' => facebook_status_display_user_picture($sender), ); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_current_uid.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_current_uid.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_current_uid.inc 2011-06-06 02:06:27.050999800 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_current_uid.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,15 +0,0 @@ -uid; - } -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_delete.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_delete.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_delete.inc 2011-04-13 23:30:07.884535500 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_delete.inc 2011-05-25 20:53:28.000000000 -0400 @@ -24,5 +24,2 @@ class facebook_status_views_handler_fiel if (facebook_status_user_access('delete', $status)) { - if (module_exists('modalframe')) { - modalframe_parent_js(); - } drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css'); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_edit.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_edit.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_edit.inc 2011-04-13 23:30:16.668037900 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_edit.inc 2011-05-25 20:53:28.000000000 -0400 @@ -24,5 +24,2 @@ class facebook_status_views_handler_fiel if (facebook_status_user_access('edit', $status)) { - if (module_exists('modalframe')) { - modalframe_parent_js(); - } drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css'); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_last.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_last.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_last.inc 2011-06-06 01:58:08.681494700 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_last.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,24 +0,0 @@ -{$this->field_alias}; - $message = db_result(db_query_range("SELECT message FROM {facebook_status} WHERE type = 'user' AND message <> '' AND - ((sender = %d AND recipient = %d) OR (sender = %d AND recipient = %d)) - ORDER BY sid DESC", $user->uid, $uid, $uid, $user->uid, 0, 1)); - $message = _facebook_status_run_filter($message); - if (variable_get('facebook_status_nl2br', 0)) { - $message = nl2br($message); - } - return ''. $message .''; - } -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_recipient.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_recipient.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_recipient.inc 2011-06-12 16:21:31.046697700 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_recipient.inc 2011-05-25 20:53:28.000000000 -0400 @@ -36,5 +36,5 @@ class facebook_status_views_handler_fiel if (!empty($this->options['link_to'])) { - return ''. $context['handler']->recipient_link($recipient) .''; + return $context['handler']->recipient_link($recipient); } - return ''. check_plain($context['handler']->recipient_name($recipient)) .''; + return check_plain($context['handler']->recipient_name($recipient)); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_recipient_pic.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_recipient_pic.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_recipient_pic.inc 2011-06-12 16:27:37.272644600 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_recipient_pic.inc 2011-05-25 20:53:28.000000000 -0400 @@ -50,3 +50,3 @@ class facebook_status_views_handler_fiel } - return ''. facebook_status_display_user_picture($account) .''; + return facebook_status_display_user_picture($account); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_repost.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_repost.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_repost.inc 2011-06-17 14:27:56.764336200 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_repost.inc 2011-05-25 20:53:28.000000000 -0400 @@ -28,10 +28,4 @@ class facebook_status_views_handler_fiel } - function construct() { - parent::construct(); - $this->additional_fields['sender'] = 'sender'; - } function render($values) { - $sender_uid = $values->{$this->aliases['sender']}; - // Don't allow sharing your own status. - if (facebook_status_user_access('add') && $sender_uid != $GLOBALS['user']->uid) { + if (facebook_status_user_access('add')) { drupal_add_css(drupal_get_path('module', 'facebook_status') .'/resources/facebook_status.css'); @@ -39,3 +33,6 @@ class facebook_status_views_handler_fiel 'attributes' => array('class' => 'facebook-status-repost'), - 'query' => array('sid' => $values->{$this->field_alias}, 'destination' => $_GET['q']) + 'query' => array( + 'sid' => $values->{$this->field_alias}, + 'destination' => $_GET['q'], + ), ); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_respond.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_respond.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_field_respond.inc 2011-06-11 22:20:23.664579900 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_field_respond.inc 2011-05-25 20:53:28.000000000 -0400 @@ -39,3 +39,7 @@ class facebook_status_views_handler_fiel // Evidently url() sanitizes query strings itself, so we don't have to use check_plain() here. - $options['query'] = array('s' => $s, 'rsid' => $values->{$this->aliases['sid']}, 'destination' => $_GET['q']); + $options['query'] = array( + 's' => $s, + 'rsid' => $values->{$this->aliases['sid']}, + 'destination' => $_GET['q'], + ); return l(t('Respond'), 'statuses/share', $options); diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_autotype.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_autotype.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_autotype.inc 2011-04-09 19:23:26.551618200 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_autotype.inc 2011-05-25 20:53:28.000000000 -0400 @@ -11,2 +11,13 @@ class facebook_status_views_handler_filter_autotype extends views_handler_filter { + + function query() { + $context = facebook_status_determine_context(); + $type = $context['handler']->type(); + $recipient = $context['handler']->find_recipient(); + $recipient_id = $context['handler']->recipient_id($recipient); + $query = "$this->table.recipient = $recipient_id AND $this->table.type = '$type'"; + $this->query->add_where_expression($this->options['group'], $query, array()); + } + + /* function query() { @@ -19,2 +30,3 @@ class facebook_status_views_handler_filt } + */ } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_communicated.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_communicated.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_communicated.inc 2011-06-06 01:41:38.163840400 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_communicated.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,21 +0,0 @@ -ensure_my_table(); - $this->query->add_where(0, db_prefix_tables(" - ({users}.uid IN (SELECT sender FROM {facebook_status} WHERE type = 'user' AND recipient = %d) OR - {users}.uid IN (SELECT recipient FROM {facebook_status} WHERE type = 'user' AND sender = %d)) - AND {users}.uid <> %d - "), $user->uid, $user->uid, $user->uid); - } -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc 1969-12-31 19:00:00.000000000 -0500 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_flagged_user.inc 2011-05-25 20:53:28.000000000 -0400 @@ -0,0 +1,46 @@ +fid : NULL; + $options['facebook_status_flag_type'] = array( + 'default' => $default, + 'translatable' => FALSE, + ); + return $options; + } + function options_form(&$form, &$form_state) { + parent::options_form($form, $form_state); + $flags = flag_get_flags('user'); + $options = array(); + foreach ($flags as $flag) { + $options[$flag->fid] = $flag->get_title(); + } + $form['warning'] = array( + '#value' => t('Warning: this filter can be slow.'), + '#weight' => -100, + ); + $form['facebook_status_flag_type'] = array( + '#type' => 'radios', + '#title' => t('Flag'), + '#options' => $options, + '#default_value' => $this->options['facebook_status_flag_type'], + '#required' => TRUE, + ); + } + function query() { + $query = "({$this->table}.sender IN (SELECT content_id FROM {flag_content} WHERE fid = %d AND uid = %d) OR {$this->table}.sender = %d)"; + $query = db_prefix_tables($query); + $this->query->add_where($this->options['group'], $query, $this->options['facebook_status_flag_type'], $GLOBALS['user']->uid, $GLOBALS['user']->uid); + } +} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_latest_only.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_latest_only.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_latest_only.inc 2011-04-09 19:23:26.554618400 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_latest_only.inc 2011-05-25 20:53:28.000000000 -0400 @@ -22,3 +22,3 @@ class facebook_status_views_handler_filt $subquery = "(SELECT MAX(sid) FROM {facebook_status} WHERE sender = recipient AND type = 'user' GROUP BY recipient)"; - $this->query->add_where(0, db_prefix_tables("$this->table_alias.sid IN $subquery")); + $this->query->add_where_expression(0, db_prefix_tables("$this->table_alias.sid IN $subquery")); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_not_own.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_not_own.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_not_own.inc 2011-04-09 19:23:26.554618400 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_not_own.inc 2011-05-25 20:53:28.000000000 -0400 @@ -21,3 +21,4 @@ class facebook_status_views_handler_filt $this->ensure_my_table(); - $this->query->add_where(0, db_prefix_tables("($this->table_alias.type <> 'user' OR $this->table_alias.sender <> $this->table_alias.recipient)")); + + $this->query->add_where_expression(0, "$this->table_alias.type <> 'user' OR $this->table_alias.sender <> $this->table_alias.recipient"); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_own.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_own.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_own.inc 2011-04-09 19:23:26.555618500 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_own.inc 2011-05-25 20:53:28.000000000 -0400 @@ -14,3 +14,5 @@ class facebook_status_views_handler_filt $this->definition['label'] = t('Show only own statuses'); + if (isset($this->definition['label'])) { $this->value_value = $this->definition['label']; + } parent::construct(); @@ -21,3 +23,11 @@ class facebook_status_views_handler_filt $this->ensure_my_table(); - $this->query->add_where(0, db_prefix_tables("($this->table_alias.type = 'user' AND $this->table_alias.sender = $this->table_alias.recipient)")); + + $this->query->add_where_expression(0, "$this->table_alias.type = 'user' AND $this->table_alias.sender = $this->table_alias.recipient"); + + /* + if (isset($definition['field'])) { + $this->real_field = $definition['field']; + } + $this->query->add_where(0, $this->real_field); + */ } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_participant.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_participant.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_participant.inc 2011-04-09 19:23:26.555618500 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_participant.inc 2011-05-25 20:53:28.000000000 -0400 @@ -32,2 +32,13 @@ class facebook_status_views_handler_filt } + + /* + function query() { + $this->query->add_where( + $this->options['group'], + "$this->table.sender = %d OR ($this->table.recipient = %d AND $this->table.type = 'user')", + $this->value, + $this->value + ); + } + */ } diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_type.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_type.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_handler_filter_type.inc 2011-05-24 00:40:33.813126300 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_handler_filter_type.inc 1969-12-31 19:00:00.000000000 -0500 @@ -1,20 +0,0 @@ - $info) { - $options[$type] = $info['title']; - } - $this->value_options = $options; - } -} diff -u -p1 -r -N -b -B -w facebook_status_6_3/includes/views/handlers/facebook_status_views_plugin_row_rss.inc screamwork_fbss7/includes/views/handlers/facebook_status_views_plugin_row_rss.inc --- facebook_status_6_3/includes/views/handlers/facebook_status_views_plugin_row_rss.inc 2011-04-09 19:23:26.556618500 -0400 +++ screamwork_fbss7/includes/views/handlers/facebook_status_views_plugin_row_rss.inc 2011-05-25 20:53:28.000000000 -0400 @@ -48,3 +48,6 @@ class facebook_status_views_plugin_row_r $item->elements = array( - array('key' => 'pubDate', 'value' => gmdate('r', $status->created)), + array( + 'key' => 'pubDate', + 'value' => gmdate('r', $status->created), + ), array( @@ -57,3 +60,3 @@ class facebook_status_views_plugin_row_r 'value' => $status->sid . ' at ' . $base_url, - 'attributes' => array('isPermaLink' => 'false') + 'attributes' => array('isPermaLink' => 'false'), ), @@ -67,2 +70,3 @@ class facebook_status_views_plugin_row_r + // TODO Please change this theme call to use an associative array for the $variables parameter. return theme($this->theme_functions(), $this->view, $this->options, $item); diff -u -p1 -r -N -b -B -w facebook_status_6_3/resources/facebook_status.css screamwork_fbss7/resources/facebook_status.css --- facebook_status_6_3/resources/facebook_status.css 2011-06-14 03:40:18.848694900 -0400 +++ screamwork_fbss7/resources/facebook_status.css 2011-05-25 20:53:28.000000000 -0400 @@ -5,7 +6,3 @@ .facebook-status-chars { - float: right; -} - -#facebook-status-edit .facebook-status-chars { - float: none; + margin-right: 0.5em; } @@ -16,6 +13,2 @@ -.facebook-status-update { - margin-bottom: 1em; -} - .facebook-status-update form#facebook-status-box { @@ -27,5 +20,3 @@ .facebook-status-respond, -.facebook-status-repost, -.facebook-status-share, -.facebook-status-details .flag-wrapper { +.facebook-status-repost { font-size: 90%; @@ -43,10 +34,3 @@ input.facebook-status-submit { - float: right; margin-top: 0; - margin-left: 1em; -} - -.facebook-status-back { - float: right; - margin: 0.5em; } diff -u -p1 -r -N -b -B -w facebook_status_6_3/resources/facebook_status.js screamwork_fbss7/resources/facebook_status.js --- facebook_status_6_3/resources/facebook_status.js 2011-06-12 17:08:15.129082000 -0400 +++ screamwork_fbss7/resources/facebook_status.js 2011-05-25 20:53:28.000000000 -0400 @@ -1,4 +1,6 @@ -var fbss_allowClickRefresh = true; -var fbss_refreshIDs; -Drupal.behaviors.facebookStatus = function (context) { +(function ($) { + +var allowClickRefresh = true; +Drupal.behaviors.facebookStatus = { + attach: function (context, settings) { var initialLoad = false; @@ -15,5 +17,3 @@ Drupal.behaviors.facebookStatus = functi var fbss_hidelen = parseInt(Drupal.settings.facebook_status.hideLength); - if (fbss_refreshIDs == undefined) { - fbss_refreshIDs = Drupal.settings.facebook_status.refreshIDs; - } + var refreshIDs = Drupal.settings.facebook_status.refreshIDs; if ($.fn.autogrow && $facebook_status_field) { @@ -26,4 +26,4 @@ Drupal.behaviors.facebookStatus = functi if (Drupal.settings.facebook_status.noautoclear || Drupal.settings.facebook_status.autofocus) { - if ($facebook_status_field.val() && $facebook_status_field.val().length != 0 && fbss_maxlen != 0) { - fbss_print_remaining(fbss_maxlen - facebook_status_original_value.length, $facebook_status_field.parents('.facebook-status-update').find('.facebook-status-chars')); + if ($facebook_status_field.val() && $facebook_status_field.val().length != 0) { + fbss_print_remaining(fbss_maxlen - facebook_status_original_value.length, $facebook_status_field.parent().next()); } @@ -36,10 +36,7 @@ Drupal.behaviors.facebookStatus = functi ctxt.find('.facebook-status-text-main').one('focus', function() { - var th = $(this); - if (th.val() == facebook_status_original_value) { - th.val(''); - if (fbss_maxlen != 0) { - fbss_print_remaining(fbss_maxlen, th.parents('.facebook-status-update').find('.facebook-status-chars')); - } + if ($(this).val() == facebook_status_original_value) { + $(this).val(''); + fbss_print_remaining(fbss_maxlen, $(this).parent().next()); } - th.removeClass('facebook-status-faded'); + $(this).removeClass('facebook-status-faded'); }); @@ -47,4 +44,5 @@ Drupal.behaviors.facebookStatus = functi // Truncate long status messages. - function fbss_truncate(i, val) { - var th = $(val); + if (fbss_hidelen > 0) { + ctxt.find('.facebook-status-content').each(function() { + var th = $(this); var oldMsgText = th.html(); @@ -62,6 +60,5 @@ Drupal.behaviors.facebookStatus = functi th.find('.facebook-status-readmore-toggle').click(function(e) { - var thi = $(this); e.preventDefault(); - var pa = thi.parents('.facebook-status-content'); - thi.hide(); + var pa = $(this).parents('.facebook-status-content'); + $(this).hide(); pa.find('.facebook-status-hellip').hide(); @@ -70,15 +67,34 @@ Drupal.behaviors.facebookStatus = functi } + }); + } + // Fix bad redirect destinations. + ctxt.find('.facebook-status-edit a, .facebook-status-delete a, a.facebook-status-respond, a.facebook-status-repost').each(function() { + var loc = $(this).attr('href').split('?'), base = loc[0], query = ''; + if (loc[1]) { + var search = window.location.search; + if (search.indexOf('?q=') == 0) { + search = search.substring(3); + } + // window.location.href doesn't work for sites not in the webroot with weird server configurations. + var destination = escape(window.location.pathname.substring(Drupal.settings.basePath.length) + search); + var q = loc[1].split('&'); + for (var i = 0; i < q.length; i++) { + var item = q[i].split('='), param = item[0]; + if (i == 0) { + query += '?'; } - if (fbss_hidelen > 0) { - ctxt.find('.facebook-status-content').each(fbss_truncate); + else { + query += '&'; + } + query += param +'='; + if (param == 'destination') { + query += destination; + } + else if (item[1]) { + query += item[1]; } - // Modal Frame integration. - if (Drupal.modalFrame) { - ctxt.find('.facebook-status-edit a, .facebook-status-delete a').click(function(event) { - event.preventDefault(); - Drupal.modalFrame.open({url: $(this).attr('href'), onSubmit: fbss_refresh}); - }); } - // Don't show multiple loading symbols if a status is submitted via AHAH after an attached view changes pages via AJAX. - ctxt.find('#facebook-status-replace').unbind('ahah_success'); + $(this).attr('href', base + query); + } + }); // React when a status is submitted. @@ -88,8 +104,51 @@ Drupal.behaviors.facebookStatus = functi } - fbss_refresh(); + if (Drupal.heartbeat) { + Drupal.heartbeat.pollMessages(); + } + // Refresh elements by re-loading the current page and replacing the old version with the updated version. + var loaded = {}; + if (refreshIDs && refreshIDs != undefined) { + var loaded2 = {}; + $.each(refreshIDs, function(i, val) { + if (val && val != undefined) { + if ($.trim(val) && loaded2[val] !== true) { + loaded2[val] = true; + var element = $(val); + element.before('
'.print_r($statuses, true).''; die(); return $statuses; @@ -242,3 +266,3 @@ function facebook_status_tags_get_status function facebook_status_tags_has_tags($sid, $type = NULL) { - $sql = "SELECT COUNT(rid) FROM {facebook_status_tags} WHERE sid = %d"; + $sql = "SELECT COUNT(rid) FROM {facebook_status_tags} WHERE sid = ?"; $args = array($sid); @@ -246,3 +270,3 @@ function facebook_status_tags_has_tags($ if (is_string($type)) { - $sql .= " AND type = '%s'"; + $sql .= " AND type = ?"; $args[] = $type; @@ -250,3 +274,3 @@ function facebook_status_tags_has_tags($ elseif (is_array($type)) { - $sql .= " AND TYPE IN (". db_placeholders($type, 'text') .")"; + $sql .= " AND TYPE IN (?)"; $args = array_merge($args, $type); @@ -254,3 +278,3 @@ function facebook_status_tags_has_tags($ } - return db_result(db_query($sql, $args)); + return db_query($sql, $args)->fetchField(); } @@ -270,3 +294,3 @@ function facebook_status_tags_has_tags($ function facebook_status_tags_status_has_tag($sid, $rid, $type = 'term') { - return db_result(db_query("SELECT COUNT(*) FROM {facebook_status_tags} WHERE sid = %d AND rid = %d AND type = '%s'", $sid, $rid, $type)); + return db_query("SELECT COUNT(*) FROM {facebook_status_tags} WHERE sid = :sid AND rid = :rid AND type = :type", array(':sid' => $sid, ':rid' => $rid, ':type' => $type))->fetchField(); } @@ -286,3 +310,3 @@ function facebook_status_tags_status_has function facebook_status_tags_status_has_tag_by_name($sid, $tag, $type = 'term') { - return db_result(db_query("SELECT COUNT(*) FROM {facebook_status_tags} WHERE sid = %d AND name = '%s' AND type = '%s'", $sid, $tag, $type)); + return db_query("SELECT COUNT(*) FROM {facebook_status_tags} WHERE sid = :sid AND name = :name AND type = :type", array(':sid' => $sid, ':name' => $tag, ':type' => $type))->fetchField(); } @@ -300,7 +324,7 @@ function facebook_status_tags_status_has function facebook_status_tags_get_status_tags($sid, $type = 'term') { - $result = db_query("SELECT rid FROM {facebook_status_tags} WHERE sid = %d AND type = '%s'", $sid, $type); + $result = db_query("SELECT rid FROM {facebook_status_tags} WHERE sid = :sid AND type = :type", array(':sid' => $sid, ':type' => $type)); $rids = array(); - while ($rid = db_fetch_object($result)) { + while ($rid = $result->fetchObject()) { if ($type == 'term') { - $rids[] = taxonomy_get_term($rid->rid); + $rids[] = taxonomy_term_load($rid->rid); } @@ -360,3 +384,4 @@ function facebook_status_tags_popular_us function facebook_status_tags_popular($type = 'term', $count = 5, $time = 'all', $options = array()) { - $now = time(); + #print_r($options) . "388"; die(); + $now = REQUEST_TIME; if (is_numeric($time)) { @@ -399,14 +424,19 @@ function facebook_status_tags_popular($t if ($options['current user only']) { - $restrict .= "f.sender = %d AND "; - $args[] = $GLOBALS['user']->uid; + $restrict .= "f.sender = :userid AND "; + $args['userid'] = $GLOBALS['user']->uid; } - $args[] = $type; - $args[] = $time; + $args['type'] = $type; + $args['time'] = $time; + $result = db_query_range("SELECT COUNT(t.sid) count, t.rid FROM {facebook_status_tags} t INNER JOIN {facebook_status} f ON t.sid = f.sid - WHERE ". $restrict ."t.type = '%s' AND f.created > %d GROUP BY t.rid ORDER BY count DESC, t.sid DESC", $args, 0, $count); + WHERE " . $restrict . "t.type = :type AND f.created > :time GROUP BY t.rid ORDER BY count DESC, t.sid DESC", + 0, + variable_get('facebook_status_tags_count', 5), + $args + ); $tags = array(); - while ($tag = db_fetch_object($result)) { + while ($tag = $result->fetchObject()) { $c = $tag->count; if ($type == 'term') { - $tag = taxonomy_get_term($tag->rid); + $tag = taxonomy_term_load($tag->rid); } @@ -426,3 +456,3 @@ function facebook_status_tags_popular($t * The message to process. - * @return + * @param * The message text with @mentions and #hashtags replaced. @@ -470,3 +499,6 @@ function _facebook_status_tags_filter($s $replace = array(); - $items = array('@' => array(), '#' => array()); + $items = array( + '@' => array(), + '#' => array(), + ); foreach ($words as $word) { @@ -483,4 +515,4 @@ function _facebook_status_tags_filter($s $account = _facebook_status_user_load_by_name($match); - if ($account->uid) { - $link = $op . theme('username', $account); + if (isset($account->uid)) { + $link = $op . theme('username', array('account' => $account)); $items['@'][] = $account; @@ -496,3 +528,4 @@ function _facebook_status_tags_filter($s ); - taxonomy_save_term($term); + $term = (object) $term; + taxonomy_term_save($term); } @@ -565,3 +599,3 @@ function _facebook_status_tags_resolve($ function _facebook_status_tags_get_term($name) { - return db_fetch_object(db_query("SELECT tid, name FROM {term_data} WHERE LOWER(name) = LOWER('%s') AND vid = %d", $name, variable_get('facebook_status_tags_vid', -1))); + return db_query("SELECT tid, name FROM {taxonomy_term_data} WHERE name = :name", array(':name' => $name))->fetchObject(); } @@ -573,3 +607,3 @@ function _facebook_status_tags_get_term( /** - * Implementation of hook_preprocess_facebook_status_item(). + * Implements hook_preprocess_facebook_status_item(). */ @@ -584,8 +618,10 @@ function facebook_status_tags_preprocess /** - * Implementation of hook_facebook_status_save(). + * Implements hook_facebook_status_save(). */ -function facebook_status_tags_facebook_status_save($status, $edit = FALSE) { +function facebook_status_tags_facebook_status_save($status, $context = NULL, $edit = FALSE) { // If the status was just edited, the tags could have changed, so we flush them. if ($edit) { - db_query("DELETE FROM {facebook_status_tags} WHERE sid = %d", $status->sid); + db_delete('facebook_status_tags') + ->condition('sid', $status->sid) + ->execute(); } @@ -593,6 +629,6 @@ function facebook_status_tags_facebook_s // Users. - $old_matches = array(); + $old_matches_user = array(); foreach ($matches['@'] as $account) { - if (!in_array($account->uid, $old_matches)) { - $array = array( + if (!in_array($account->uid, $old_matches_user)) { + $user_array = array( 'sid' => $status->sid, @@ -602,14 +638,6 @@ function facebook_status_tags_facebook_s ); - drupal_write_record('facebook_status_tags', $array); - $old_matches[] = $account->uid; - if (module_exists('rules')) { - rules_invoke_event('facebook_status_tags_user_was_tagged', $status, $account); + drupal_write_record('facebook_status_tags', $user_array); + $old_matches_user[] = $account->uid; } - if (module_exists('trigger')) { - module_invoke_all('facebook_status_tags', 'fbsst_user_tagged', $status, $account); } - module_invoke_all('facebook_status_tags_user_was_tagged', $status, $account); - } - } - // Terms. @@ -620,5 +648,5 @@ function facebook_status_tags_facebook_s foreach ($matches['#'] as $term) { - $term = (object) $term; + #$term = (object) $term; if (!in_array($term->tid, $old_matches)) { - $array = array( + $term_array = array( 'sid' => $status->sid, @@ -628,3 +656,3 @@ function facebook_status_tags_facebook_s ); - drupal_write_record('facebook_status_tags', $array); + drupal_write_record('facebook_status_tags', $term_array); $old_matches[] = $term->tid; @@ -635,17 +663,8 @@ function facebook_status_tags_facebook_s /** - * Implementation of hook_facebook_status_delete(). + * Implements hook_facebook_status_delete(). */ -function facebook_status_tags_facebook_status_delete($status) { - db_query("DELETE FROM {facebook_status_tags} WHERE sid = %d", $status->sid); - - if (module_exists('activity')) { - $result = db_query("SELECT aid FROM {activity} WHERE type = 'facebook_status_tags' AND eid = %d", $status->sid); - $records = array(); - while ($record = db_fetch_object($result)) { - $records[] = $record->aid; - } - if (!empty($records)) { - activity_delete($records); - } - } +function facebook_status_tags_facebook_status_delete($sid) { + db_delete('facebook_status_tags') + ->condition('sid', $sid) + ->execute(); } @@ -657,3 +676,3 @@ function facebook_status_tags_facebook_s /** - * Implementation of hook_views_api(). + * Implements hook_views_api(). */ @@ -661,3 +680,3 @@ function facebook_status_tags_views_api( return array( - 'api' => 2, + 'api' => 3, 'path' => drupal_get_path('module', 'facebook_status_tags') .'/views', @@ -667,3 +686,3 @@ function facebook_status_tags_views_api( /** - * Implementation of hook_views_data_alter(). + * Implements hook_views_data_alter(). * @@ -676,27 +695,9 @@ function facebook_status_tags_views_data /** - * Implementation of hook_taxonomy(). - */ -function facebook_status_tags_taxonomy($op, $type, $array = NULL) { - if ($op != 'delete') { - return; - } - if ($type == 'term') { - db_query("DELETE FROM {facebook_status_tags} WHERE rid = %d AND type = 'term'", $array['tid']); - } - elseif ($type == 'vocabulary') { - if ($array['vid'] === variable_get('facebook_status_tags_vid', -1)) { - // If the vocabulary is deleted, all the tags will no longer exist, so the references are invalid. - db_query("DELETE FROM {facebook_status_tags} WHERE type = 'term'"); - variable_set('facebook_status_tags_vid', -1); - } - } -} - -/** - * Implementation of hook_user(). + * Implements hook_taxonomy_term_delete($term). */ -function facebook_status_tags_user($op, &$edit, &$account, $category = NULL) { - if ($op == 'delete') { - db_query("DELETE FROM {facebook_status_tags} WHERE rid = %d and type = 'user'", $account->uid); - } +function facebook_status_tags_taxonomy_term_delete($term) { + db_delete('facebook_status_tags') + ->condition('rid', $array['tid']) + ->condition('type', 'term') + ->execute(); } @@ -704,95 +705,11 @@ function facebook_status_tags_user($op, /** - * Implementation of hook_hook_info(). + * Implements hook_taxonomy_vocabulary_delete($vocabulary). */ -function facebook_status_tags_hook_info() { - return array( - 'facebook_status_tags' => array( - 'facebook_status_tags' => array( - 'fbsst_user_tagged' => array( - 'runs when' => t('A user has been mentioned in a status message'), - ), - ), - ), - ); -} - -/** - * Implementation of hook_facebook_status(). - * or - * Implementation of hook_trigger_name(). - */ -function facebook_status_tags_facebook_status_tags($op, $status, $account) { - if ($op != 'fbsst_user_tagged') { - return; - } - $aids = _trigger_get_hook_aids('facebook_status_tags', $op); - $context = array( - 'hook' => 'facebook_status_tags', - 'op' => $op, - 'facebook_status' => $status, - 'account' => $account, - ); - actions_do(array_keys($aids), $account, $context); -} - -//======================= -// ACTIVITY INTEGRATION. -//======================= - -/** - * Implementation of hook_activity_info(). - */ -function facebook_status_tags_activity_info() { - $info = new stdClass(); - $info->api = 2; - $info->name = 'facebook_status_tags'; - $info->object_type = 'facebook_status'; - $info->eid_field = 'sid'; - $info->objects = array('Mentioned user' => 'facebook_status'); - $info->hooks = array('facebook_status_tags' => array('fbsst_user_tagged')); - $info->realms = array('facebook_status_tags_mentioned' => 'Mentioned user'); - return $info; -} - -/** - * Implementation of hook_activity_grants(). - */ -function facebook_status_tags_activity_grants($activity) { - $realms = array(); - if ($activity->type == 'facebook_status_tags') { - $result = db_query("SELECT rid FROM {facebook_status_tags} WHERE type = 'user' AND sid = %d", $activity->eid); - while ($account = db_fetch_object($result)) { - $realms['facebook_status_tags_mentioned'][] = $account->rid; - } - } - return $realms; -} - -/** - * Implementation of hook_activity_access_grants(). - */ -function facebook_status_tags_activity_access_grants($account) { - return array( - 'facebook_status_tags_mentioned' => array($account->uid), - ); -} - -/** - * Implementation of hook_list_activity_actions(). - */ -function facebook_status_tags_list_activity_actions($hook, $op, $max_age) { - $actions = array(); - if (!empty($max_age)) { - $min_time = time() - $max_age; - } - else { - $min_time = 0; - } - - $result = db_query("SELECT f.sid as id, f.created, t.rid as actor FROM {facebook_status_tags} t INNER JOIN {facebook_status} f ON t.sid = f.sid WHERE t.type = 'user' AND created > %d", $min_time); - while ($row = db_fetch_array($result)) { - $actions[] = $row; +function facebook_status_tags_taxonomy_vocabulary_delete($vocabulary) { + if ($array['vid'] === variable_get('facebook_status_tags_vid', -1)) { + db_delete('facebook_status_tags') + ->condition('type', 'term') + ->execute(); + variable_set('facebook_status_tags_vid', -1); } - - return $actions; } @@ -800,17 +717,8 @@ function facebook_status_tags_list_activ /** - * Implementation of hook_load_activity_context(). + * Implements hook_user_cancel(). */ -function facebook_status_tags_load_activity_context($hook, $op, $id) { - $staus = facebook_status_load($id); - $activity_context = array(); - - if (!empty($status)) { - $activity_context = array( - 'hook' => 'facebook_status_tags', - 'op' => $op, - 'facebook_status' => $status, - ); - } - - return $activity_context; +function facebook_status_tags_user_cancel($edit, $account, $method) { + db_delete('facebook_status_tags') + ->condition('rid', $account->uid) + ->execute(); } diff -u -p1 -r -N -b -B -w facebook_status_6_3/submodules/facebook_status_tags/facebook_status_tags.rules.inc screamwork_fbss7/submodules/facebook_status_tags/facebook_status_tags.rules.inc --- facebook_status_6_3/submodules/facebook_status_tags/facebook_status_tags.rules.inc 2011-04-13 22:10:04.934822500 -0400 +++ screamwork_fbss7/submodules/facebook_status_tags/facebook_status_tags.rules.inc 2011-05-25 20:53:28.000000000 -0400 @@ -8,19 +8,3 @@ /** - * Implementation of hook_rules_event_info(). - */ -function facebook_status_tags_rules_event_info() { - return array( - 'facebook_status_tags_user_was_tagged' => array( - 'label' => t('User was tagged in a status'), - 'module' => 'Facebook-style Statuses', - 'arguments' => array( - 'status' => array('type' => 'facebook_status', 'label' => t('The status.')), - 'account' => array('type' => 'user', 'label' => t('The user who was tagged in the status.')), - ), - ), - ); -} - -/** - * Implementation of hook_rules_condition_info(). + * Implements hook_rules_condition_info(). */ @@ -31,3 +15,6 @@ function facebook_status_tags_rules_cond 'arguments' => array( - 'status' => array('type' => 'facebook_status', 'label' => t('The status')), + 'status' => array( + 'type' => 'facebook_status', + 'label' => t('The status'), + ), ), @@ -39,3 +26,6 @@ function facebook_status_tags_rules_cond 'arguments' => array( - 'status' => array('type' => 'facebook_status', 'label' => t('The status')), + 'status' => array( + 'type' => 'facebook_status', + 'label' => t('The status'), + ), ), @@ -81,3 +71,6 @@ function facebook_status_tags_has_specif function facebook_status_tags_has_specific_tag_condition_form($settings, &$form) { - $settings += array('type' => '', 'tag' => ''); + $settings += array( + 'type' => '', + 'tag' => '', + ); $form['settings']['type'] = array( diff -u -p1 -r -N -b -B -w facebook_status_6_3/submodules/facebook_status_tags/views/facebook_status_tags.views.inc screamwork_fbss7/submodules/facebook_status_tags/views/facebook_status_tags.views.inc --- facebook_status_6_3/submodules/facebook_status_tags/views/facebook_status_tags.views.inc 2011-06-11 21:32:37.539646900 -0400 +++ screamwork_fbss7/submodules/facebook_status_tags/views/facebook_status_tags.views.inc 2011-05-25 20:53:28.000000000 -0400 @@ -8,3 +8,3 @@ /** - * Implementation of hook_views_data(). + * Implements hook_views_data(). */ @@ -132,3 +132,3 @@ function facebook_status_tags_views_data /** - * Implementation of hook_views_handlers(). + * Implements hook_views_handlers(). */ diff -u -p1 -r -N -b -B -w facebook_status_6_3/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc screamwork_fbss7/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc --- facebook_status_6_3/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc 2011-06-12 17:11:27.995113300 -0400 +++ screamwork_fbss7/submodules/facebook_status_tags/views/facebook_status_tags.views_default.inc 2011-05-25 20:53:28.000000000 -0400 @@ -8,3 +8,3 @@ /** - * Implementation of hook_views_default_views(). + * Implements hook_views_default_views(). */ @@ -19,34 +19,5 @@ function facebook_status_tags_views_defa $view->api_version = 2; - $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */ + $view->disabled = !module_exists('taxonomy'); $handler = $view->new_display('default', 'Tag Reference', 'default'); $handler->override_option('fields', array( - 'sid' => array( - 'label' => '', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'exclude' => 1, - 'id' => 'sid', - 'table' => 'facebook_status', - 'field' => 'sid', - 'relationship' => 'none', - ), 'user_contextual_pic' => array( @@ -104,4 +75,4 @@ function facebook_status_tags_views_defa 'text' => '', - 'make_link' => 1, - 'path' => 'statuses/[sid]', + 'make_link' => 0, + 'path' => '', 'alt' => '', @@ -125,90 +96,2 @@ function facebook_status_tags_views_defa ), - 'edit' => array( - 'label' => '', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'exclude' => 1, - 'id' => 'edit', - 'table' => 'facebook_status', - 'field' => 'edit', - 'relationship' => 'none', - ), - 'delete' => array( - 'label' => '', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'exclude' => 1, - 'id' => 'delete', - 'table' => 'facebook_status', - 'field' => 'delete', - 'relationship' => 'none', - ), - 'repost' => array( - 'label' => '', - 'alter' => array( - 'alter_text' => 0, - 'text' => '', - 'make_link' => 0, - 'path' => '', - 'link_class' => '', - 'alt' => '', - 'prefix' => '', - 'suffix' => '', - 'target' => '', - 'help' => '', - 'trim' => 0, - 'max_length' => '', - 'word_boundary' => 1, - 'ellipsis' => 1, - 'html' => 0, - 'strip_tags' => 0, - ), - 'empty' => '', - 'hide_empty' => 0, - 'empty_zero' => 0, - 'repost_text' => 'Share', - 'exclude' => 1, - 'id' => 'repost', - 'table' => 'facebook_status', - 'field' => 'repost', - 'relationship' => 'none', - ), 'nothing' => array( @@ -216,5 +99,3 @@ function facebook_status_tags_views_defa 'alter' => array( - 'text' => '
' . t('Are you sure you want to permanently delete the status comment %comment?', + array('%comment' => $comment->comment)) . '
', + ); + $form['confirm'] = array( + '#type' => 'submit', + '#value' => t('Confirm'), + '#submit' => array('fbss_comments_delete_confirm'), + ); + $form['back'] = array( + '#type' => 'submit', + '#value' => t('Cancel'), + '#submit' => array('fbss_comments_delete_cancel'), + ); + $form['#cid'] = $comment->cid; + return $form; +} + +/** + * The confirmation submit handler for the delete form for status comments. + */ +function fbss_comments_delete_confirm($form, &$form_state) { + fbss_comments_delete_comment($form['#cid']); + drupal_set_message(t('Status comment deleted.')); + if (isset($_GET['destination']) && ($_GET['destination'] != 'fbss_comments/js/refresh')) { + $form_state['redirect'] = $_GET['destination']; + } + else { + $form_state['redirect'] = ''. t('Are you sure you want to permanently delete the status comment %comment?', - array('%comment' => $comment->comment)) .'
' - ); - $form['confirm'] = array( - '#type' => 'submit', - '#value' => t('Confirm'), - '#submit' => array('fbss_comments_delete_confirm'), - ); - $form['back'] = array( - '#type' => 'submit', - '#value' => t('Cancel'), - '#submit' => array('fbss_comments_delete_cancel'), - ); - $form['#cid'] = $comment->cid; - if (module_exists('modalframe')) { - modalframe_child_js(); - } - return $form; -} - -/** - * The confirmation submit handler for the delete form for status comments. - */ -function fbss_comments_delete_confirm($form, &$form_state) { - fbss_comments_delete_comment($form['#cid']); - drupal_set_message(t('Status comment deleted.')); - if ($_GET['destination'] && $_GET['destinaton'] != 'fbss_comments/js/refresh') { - $form_state['redirect'] = $_GET['destination']; - } - else { - $form_state['redirect'] = '