? .svn
? 404470-twitter-oauth.patch
? 683870_tweet_types.patch
? 899506.patch
? CHANGELOG.txt
? twitter.api.php
? twitter_actions/.svn
? twitter_actions/twitter_actions_2.diff
Index: twitter.lib.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/twitter/twitter.lib.php,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 twitter.lib.php
--- twitter.lib.php	14 Feb 2010 04:11:45 -0000	1.1.2.5
+++ twitter.lib.php	9 Sep 2010 21:44:20 -0000
@@ -278,7 +278,7 @@ class TwitterOAuth extends Twitter {
   protected $token;
   
   public function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
-    $this->signature_method = new OAuthSignatureMethod_HMAC_SHA1();
+    $this->signature_method = new OAuthSignatureMethod_HMAC('SHA1');
     $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
     if (!empty($oauth_token) && !empty($oauth_token_secret)) {
       $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
Index: twitter.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/twitter/twitter.module,v
retrieving revision 1.10.2.5
diff -u -p -r1.10.2.5 twitter.module
--- twitter.module	25 Jan 2010 05:09:05 -0000	1.10.2.5
+++ twitter.module	9 Sep 2010 21:44:20 -0000
@@ -237,7 +237,7 @@ function twitter_twitter_accounts($accou
 }
 
 function _twitter_use_oauth() {
-  if (!module_exists('oauth')) {
+  if (!module_exists('oauth_common')) {
     return FALSE;
   }
   
Index: twitter.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/twitter/twitter.pages.inc,v
retrieving revision 1.4.2.9
diff -u -p -r1.4.2.9 twitter.pages.inc
--- twitter.pages.inc	16 Feb 2010 00:51:17 -0000	1.4.2.9
+++ twitter.pages.inc	9 Sep 2010 21:44:20 -0000
@@ -11,7 +11,7 @@ function twitter_admin_form() {
     '#type' => 'fieldset',
     '#title' => t('OAuth Settings'),
     '#description' => t(''),
-    '#access' => module_exists('oauth'),
+    '#access' => module_exists('oauth_common'),
     '#description' => t('To enable OAuth based access for twitter, you must <a href="@url">register your application</a> with twitter and add the provided keys here.', array('@url' => 'https://twitter.com/apps/new')),
   );
 
Index: twitter_actions/twitter_actions.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/twitter/twitter_actions/twitter_actions.module,v
retrieving revision 1.2
diff -u -p -r1.2 twitter_actions.module
--- twitter_actions/twitter_actions.module	27 May 2009 19:00:08 -0000	1.2
+++ twitter_actions/twitter_actions.module	9 Sep 2010 21:44:20 -0000
@@ -36,8 +36,8 @@ function twitter_actions_action_info() {
 function twitter_actions_set_status_action_form($context = array()) {
   // Set default values for form.
   $context += array(
+    'account_id' => -1,
     'screen_name' => '',
-    'password' => '',
     'message' => '',
   );
 
@@ -49,13 +49,6 @@ function twitter_actions_set_status_acti
     '#required'      => TRUE,
   );
 
-  $form['password'] = array(
-    '#title'         => t('Twitter password'),
-    '#type'          => 'password',
-    '#size'          => 25,
-    '#required'      => TRUE,
-  );
-
   $form['message'] = array(
     '#type' => 'textarea',
     '#title' => t('Message'),
@@ -69,27 +62,22 @@ function twitter_actions_set_status_acti
 }
 
 function twitter_actions_set_status_action_validate($form, $form_state) {
-  module_load_include('inc', 'twitter');
-  $verify = FALSE;
-
-  $pass = $form_state['values']['password'];
-  $name = $form_state['values']['screen_name'];
-
-  module_load_include('inc', 'twitter');
-
-  $valid = twitter_authenticate($name, $pass);
-  if (!$valid) {
-    form_set_error('password', t('Twitter authentication failed. Please check your account name and try again.'));
+  if (!_twitter_use_oauth()) {
+    form_set_error('screen_name', t('Oath has not yet been setup.'));
+  }
+  if (!db_result(db_query("SELECT twitter_uid FROM {twitter_account} WHERE screen_name = '%s'", $form_state['values']['screen_name']))) {
+    form_set_error('screen_name', t('Twitter authentication failed. Please check your account name and try again.'));
   }
 }
 
 function twitter_actions_set_status_action_submit($form, $form_state) {
   $form_values = $form_state['values'];
+  $twitter_uid = db_result(db_query("SELECT twitter_uid FROM {twitter_account} WHERE screen_name = '%s'", $form_values['screen_name']));
   // Process the HTML form to store configuration. The keyed array that
   // we return will be serialized to the database.
   $params = array(
+    'twitter_uid' => $twitter_uid,
     'screen_name' => $form_values['screen_name'],
-    'password'   => $form_values['password'],
     'message'   => $form_values['message'],
   );
   return $params;
@@ -173,5 +161,6 @@ function twitter_actions_set_status_acti
   $message = strtr($context['message'], $variables);
 
   module_load_include('inc', 'twitter');
-  twitter_set_status($context['screen_name'], $context['password'], $message);
+  $twitter_account = twitter_account_load($context['twitter_uid']);
+  twitter_set_status($twitter_account, $message);
 }