' . + 'URL: url_query
' . + 'response', array('url_query' => $twitter->url_query, 'response' => print_r($response, TRUE)), + WATCHDOG_NOTICE); + } + else { + $results = $response['results']; + } + + // Save the data for later. + cache_set($cid, $results, $cache_table, CACHE_TEMPORARY); + } + + // Create a variable to hold the tweets. + $tweets = array(); + + // Theme each of the returned tweets. + foreach ($results as $tweet) { + $tweets[] = theme('twitter_block_tweet', array('tweet' => $tweet, 'api' => $twitter->getApi())); + } + + $content = theme_item_list($tweets); + + drupal_add_css(drupal_get_path('module', 'twitter_block') . '/twitter_block.css'); + + $block = array(); + $block['subject'] = t($config['default_title']); + $block['content'] = $content; + + return $block; + break; } - return $blocks; -} - -/** - * Implements hook_block_configure(). - */ -function twitter_block_block_configure($delta) { - $config = twitter_block_get_config($delta); - $form = array(); - - $form['twitter_block_' . $delta] = array( - '#type' => 'fieldset', - '#title' => t('Twitter Block Configuration'), - '#collapsible' => TRUE, - '#collapsed' => FALSE, - '#element_validate' => array('twitter_block_form_validate'), - ); - - $form['twitter_block_' . $delta]['search_string'] = array( - '#type' => 'textfield', - '#title' => 'The string or username to search.', - '#size' => 32, - '#default_value' => $config['search_string'], - ); - - $form['twitter_block_' . $delta]['search_type'] = array( - '#type' => 'select', - '#title' => t('Choose the type of Tweets to return.'), - '#options' => array( - 'searchHashtag' => t('Tweets mentioning #hashtag or search string'), - 'getTweetsFrom' => t('Tweets sent from the Twitter user'), - 'getReplies' => t('Replies to the Twitter user'), - 'getMentions' => t('Tweets mentioning the Twitter user'), - ), - '#default_value' => $config['search_type'], - ); - $form['twitter_block_' . $delta]['lang'] = array( - '#type' => 'textfield', - '#title' => 'Language', - '#description' => t('If you would like to limit the search by a language, ' . - 'you can set it here. This should be the specific string expected by ' . - 'twitter for your language. See the twitter advanced search page ' . - 'for more information. (Hint: English is "en"). Leave blank if you don\'t ' . - 'want to filter by language at all.', array( - '@language' => 'http://twitter.com/#!/search-advanced')), - '#size' => 12, - '#default_value' => $config['lang'], - ); - $form['twitter_block_' . $delta]['results_per_page'] = array( - '#type' => 'textfield', - '#title' => 'Number of tweets to return', - '#description' => t('Please enter the number of tweets to return per page up to a maximum of 100.'), - '#size' => 12, - '#default_value' => $config['results_per_page'], - ); - - return $form; } /** @@ -164,98 +176,20 @@ function twitter_block_form_validate($element, &$form_state) { } /** - * Implements hook_block_save(). - */ -function twitter_block_block_save($delta = '', $edit = array()) { - db_update('twitter_block') - ->fields(array( - 'search_type' => $edit['search_type'], - 'search_string' => $edit['search_string'], - 'results_per_page' => $edit['results_per_page'], - 'lang' => $edit['lang'], - )) - ->condition('delta', $delta) - ->execute(); -} - -/** - * Implements hook_block_view(). - */ -function twitter_block_block_view($delta) { - // Load the configuration. - $config = twitter_block_get_config($delta); - - // Define the configuration. - $block = array(); - $block['subject'] = t($config['default_title']); - $block['content'] = twitter_block_load_tweets($config); - - return $block; -} - -/** - * Grab data from Twitter, store it for later. - * @param $config An array suitable for passing to the TwitterBlockSearch object. - * @return Themed output. - */ -function twitter_block_load_tweets($config) { - module_load_include('php', 'twitter_block', 'twitter_block.class'); - - // We use the MD5 of the block config as cache cid. - $cid = 'twitter_block_feed_' . md5(serialize($config)); - $cache_bin = 'cache'; - - // Build the object. - $twitter = new TwitterBlockSearch($config); - - // We cache response even if it's empty so an empty response cannot cause a - // performance problem by making us contact Twitter in every request - if ($cache = cache_get($cid, $cache_bin)) { - $results = $cache->data; - } - else { - $response = $twitter->getJSON(); - $results = array(); - if (empty($response) || !is_array($response) || !isset($response['status']) || $response['status'] !== TRUE) { - watchdog('Twitter Block', 'Recieved an unexpected reply from Twitter. ' . - 'Perhaps just a fail whale?
' . - 'URL: url_query
' . - 'response', array('url_query' => $twitter->url_query, 'response' => print_r($response, TRUE)), - WATCHDOG_NOTICE); - } - else { - $results = $response['results']; - } - - // Save the data for later. - cache_set($cid, $results, $cache_bin, CACHE_TEMPORARY); - } - - return theme('twitter_block', array('twitter_result' => $results, 'api' => $twitter->getApi())); -} - -/** - * Implements hook_theme(). + * Implementation of hook_theme(). */ function twitter_block_theme($existing, $type , $theme, $path) { - $debug = array($existing, $type, $theme, $path); - dd($debug, "Debug"); - return array(); - /* - 'twitter_block' => array( - 'variables' => array('twitter_result' => NULL, 'api' => NULL), - ), - 'twitter_block_tweet' =>array( - 'variables' => array('tweet' => NULL, 'api' => NULL), + return array( + 'twitter_block_tweet' => array( + 'arguments' => array('tweet' => NULL, 'api' => NULL), 'path' => drupal_get_path('module', 'twitter_block'), - 'template' => 'twitter-block-tweet' + 'template' => 'twitter-block-tweet', ), ); - */ } /** - * Implements hook_preprocess(). + * Implementation of hook_preprocess(). */ function twitter_block_preprocess_twitter_block_tweet(&$variables) { $variables['text'] = twitter_block_linkify($variables['tweet']->text); @@ -265,24 +199,6 @@ function twitter_block_preprocess_twitter_block_tweet(&$variables) { } /** - * Returns themed HTML for a Twitter block. - */ -function theme_twitter_block($variables) { - $twitter_result = $variables['twitter_result']; - foreach($twitter_result as $tweet) { - $tweets[] = theme('twitter_block_tweet', array('tweet' => $tweet, 'api' => $variables['api'])); - } - - // Don't show an empty block. - if (count($twitter_result) > 0) { - $html = '
';
- $html .= theme('item_list', array('items' => $tweets));
- $html .= '
';
- return $html;
- }
-}
-
-/**
* Convert nested URLs, account names and hash tags into links.
*/
function twitter_block_linkify($status_text) {