Only in ../twitter/: CHANGELOG.txt Only in ../twitter/: scheduled_tweet.patch Only in ../twitter/: twitter.api.php diff -up ../../../../../modules/twitter-dev/twitter.inc ../twitter/twitter.inc --- ../../../../../modules/twitter-dev/twitter.inc 2010-02-15 19:51:17.000000000 -0500 +++ ../twitter/twitter.inc 2011-01-16 16:07:39.000000000 -0500 @@ -79,12 +79,20 @@ function twitter_status_save($status) { /** * Post a message to twitter + * Returns true or false on success or failure */ + //TODO: needs to return false if it fails, true if not. function twitter_set_status($twitter_account, $status) { module_load_include('lib.php', 'twitter'); $twitter = twitter_connect($twitter_account); - $twitter->status_update($status); + $twitter_status_post_success = $twitter->status_update($status); + if ($twitter_status_post_success->created_at) { + return TRUE; + } + else { + return FALSE; + } } /** diff -up ../../../../../modules/twitter-dev/twitter.info ../twitter/twitter.info --- ../../../../../modules/twitter-dev/twitter.info 2010-11-12 07:23:13.000000000 -0500 +++ ../twitter/twitter.info 2010-10-20 13:01:26.000000000 -0400 @@ -4,9 +4,9 @@ description = Adds integration with the php = 5.1 core = 6.x -; Information added by drupal.org packaging script on 2010-11-12 -version = "6.x-3.x-dev" +; Information added by drupal.org packaging script on 2010-10-20 +version = "6.x-3.0-beta3" core = "6.x" project = "twitter" -datestamp = "1289564593" +datestamp = "1287594086" diff -up ../../../../../modules/twitter-dev/twitter.module ../twitter/twitter.module --- ../../../../../modules/twitter-dev/twitter.module 2010-10-21 11:12:17.000000000 -0400 +++ ../twitter/twitter.module 2010-10-20 11:48:19.000000000 -0400 @@ -1,5 +1,5 @@ t('OAuth Consumer secret'), '#default_value' => variable_get('twitter_consumer_secret', NULL), ); - + $form['import'] = array( '#type' => 'fieldset', '#title' => t('Twitter import'), @@ -103,7 +103,7 @@ function _twitter_account_list_row($acco '#type' => 'value', '#value' => $account->uid, ); - + $form['screen_name'] = array( '#type' => 'value', '#value' => $account->screen_name, @@ -129,14 +129,11 @@ function _twitter_account_list_row($acco '#value' => empty($account->protected) ? t('No') : t('Yes'), ); - if (user_access('import own tweets')){ // Here we use user_access('import own tweets') to check permission instead of user_access('import own tweets', $account->uid) is because we allow roles with sufficient permission to overwrite the user's import settings. - $form['import'] = array( - '#type' => 'checkbox', - '#default_value' => user_access('import own tweets') ? $account->import : '', - ); - } - - + $form['import'] = array( + '#type' => 'checkbox', + '#default_value' => $account->import, + ); + $form['delete'] = array( '#type' => 'checkbox', ); @@ -145,45 +142,30 @@ function _twitter_account_list_row($acco } function theme_twitter_account_list_form($form) { - - if (user_access('import own tweets')) { - $header = array('', t('Name'), t('Description'), t('Private'), t('Import'), t('Delete')); - }else { - $header = array('', t('Name'), t('Description'), t('Private'), t('Delete')); - } + $header = array('', t('Name'), t('Description'), t('Private'), t('Import'), t('Delete')); if (user_access('make twitter accounts global')) { $header[] = ''; } - + $rows = array(); foreach (element_children($form['accounts']) as $key) { $element = &$form['accounts'][$key]; - if (user_access('import own tweets')) { - $row = array( + $row = array( drupal_render($element['image']), drupal_render($element['id']) . drupal_render($element['screen_name']) . drupal_render($element['visible_name']), drupal_render($element['description']), drupal_render($element['protected']), drupal_render($element['import']), drupal_render($element['delete']), - ); - }else { - $row = array( - drupal_render($element['image']), - drupal_render($element['id']) . drupal_render($element['screen_name']) . drupal_render($element['visible_name']), - drupal_render($element['description']), - drupal_render($element['protected']), - drupal_render($element['delete']), - ); - } + ); if (user_access('make twitter accounts global')) { $label = ($element['#account']->is_global) ? t('remove global') : t('make global'); $row[] = l($label, 'user/'. $element['#account']->uid .'/edit/twitter/global/'. $element['#account']->id); } - + $rows[] = $row; } @@ -229,7 +211,7 @@ function twitter_user_make_global($form_ $text = t('Are you sure you want to allow other users to access the %screen_name account?', array('%screen_name' => $twitter_account->screen_name)); $description = t('This will allow other users to post using this account.'); } - + return confirm_form($form, $text, 'user/'. $account->uid .'/edit/twitter', $description); } @@ -264,21 +246,21 @@ function twitter_account_form($form_stat '#title' => t('Password'), '#description' => t("If your Twitter account is protected, or you wish to post to Twitter from Drupal, you must enter the Twitter account's password.") ); - + $form['import'] = array( '#type' => 'checkbox', '#title' => t('Import statuses from this account'), '#default_value' => TRUE, '#access' => FALSE, ); - + } $form['submit'] = array( '#type' => 'submit', '#value' => t('Add account'), ); - + return $form; } @@ -318,7 +300,7 @@ function twitter_account_form_submit($fo function twitter_account_oauth_validate($form, &$form_state) { module_load_include('lib.php', 'oauth'); module_load_include('lib.php', 'twitter'); - + $key = variable_get('twitter_consumer_key', ''); $secret = variable_get('twitter_consumer_secret', ''); $twitter = new TwitterOAuth($key, $secret); @@ -337,7 +319,7 @@ function twitter_oauth_callback(&$form_s '#type' => 'hidden', '#default_value' => $_GET['oauth_token'], ); - + return $form; } @@ -361,7 +343,7 @@ function twitter_oauth_callback_validate module_load_include('lib.php', 'twitter'); module_load_include('inc', 'twitter'); - $twitter = new TwitterOAuth($key, $secret, $token['oauth_token'], $token['oauth_token_secret']); + $twitter = new TwitterOAuth($key, $secret, $token['oauth_token'], $token['oauth_token_secret']); $response = $twitter->get_access_token(); $form_state['twitter_oauth']['response'] = $response; } @@ -370,8 +352,8 @@ function twitter_oauth_callback_submit(& $key = variable_get('twitter_consumer_key', ''); $secret = variable_get('twitter_consumer_secret', ''); $response = $form_state['twitter_oauth']['response']; - - $twitter = new TwitterOAuth($key, $secret, $response['oauth_token'], $response['oauth_token_secret']); + + $twitter = new TwitterOAuth($key, $secret, $response['oauth_token'], $response['oauth_token_secret']); $account = $twitter->users_show($response['screen_name']); $account->set_auth($response); twitter_account_save($account, TRUE); Common subdirectories: ../../../../../modules/twitter-dev/twitter_actions and ../twitter/twitter_actions Common subdirectories: ../../../../../modules/twitter-dev/twitter_post and ../twitter/twitter_post Common subdirectories: ../../../../../modules/twitter-dev/twitter_signin and ../twitter/twitter_signin