From a2bf8a3d44424b64e483d065cf522e2b29d920d9 Mon Sep 17 00:00:00 2001 From: Bryce Date: Wed, 25 Jun 2014 15:11:59 -0700 Subject: [PATCH] https profile image update --- tweet.tpl.php | 2 +- twitter.install | 26 +++++++++++++++++++++++++- twitter.lib.php | 2 ++ twitter.pages.inc | 2 +- twitter.views.inc | 2 +- twitter.views_default.inc | 24 ++++++++++++------------ 6 files changed, 42 insertions(+), 16 deletions(-) diff --git a/tweet.tpl.php b/tweet.tpl.php index e411b54..6a349b0 100644 --- a/tweet.tpl.php +++ b/tweet.tpl.php @@ -9,7 +9,7 @@
profile_image_url; ?>"> + "profile_image_url_https; ?>">
diff --git a/twitter.install b/twitter.install index d83d6b4..eca4c4b 100644 --- a/twitter.install +++ b/twitter.install @@ -203,6 +203,11 @@ function twitter_schema() { 'type' => 'varchar', 'length' => 255, ), + 'profile_image_url_https' => array( + 'description' => "The url of the {twitter_account}'s profile image", + 'type' => 'varchar', + 'length' => 255, + ), 'protected' => array( 'description' => "Boolean flag indicating whether the {twitter_account}'s posts are publicly accessible.", 'type' => 'int', @@ -478,4 +483,23 @@ function twitter_update_7503() { 'twitter_id', $spec, $index_spec); -} \ No newline at end of file +} + + +/** + * Adds https version of profile_image and background_image to twitter_account table + */ +function twitter_update_7504() { + $data = array( + 'description' => "The url of the {twitter account}'s profile image", + 'type' => 'varchar', + 'length' => 255, + ); + db_add_field('twitter_account', 'profile_image_url_https', $data); + $data = array( + 'description' => "The url of the {twitter_account}'s background image.", + 'type' => 'varchar', + 'length' => 255, + ); + db_add_field('twitter_account', 'profile_background_image_url_https', $data); +} diff --git a/twitter.lib.php b/twitter.lib.php index b1639e6..bfc9405 100644 --- a/twitter.lib.php +++ b/twitter.lib.php @@ -1371,12 +1371,14 @@ class TwitterUser { $this->favourites_count = $values['favourites_count']; $this->protected = $values['protected']; $this->profile_image_url = $values['profile_image_url']; + $this->profile_image_url_https = $values['profile_image_url_https']; $this->profile_background_color = $values['profile_background_color']; $this->profile_text_color = $values['profile_text_color']; $this->profile_link_color = $values['profile_link_color']; $this->profile_sidebar_fill_color = $values['profile_sidebar_fill_color']; $this->profile_sidebar_border_color = $values['profile_sidebar_border_color']; $this->profile_background_image_url = $values['profile_background_image_url']; + $this->profile_background_image_url_https = $values['profile_background_image_url_https']; $this->profile_background_tile = $values['profile_background_tile']; $this->verified = $values['verified']; $this->created_at = $values['created_at']; diff --git a/twitter.pages.inc b/twitter.pages.inc index 2a68c04..793eb8f 100644 --- a/twitter.pages.inc +++ b/twitter.pages.inc @@ -181,7 +181,7 @@ function _twitter_account_list_row($account) { ); $form['image'] = array( - '#markup' => theme('image', array('path' => $account->profile_image_url)), + '#markup' => theme('image', array('path' => $account->profile_image_url_https)), ); $form['visible_name'] = array( diff --git a/twitter.views.inc b/twitter.views.inc index 0ee3c5e..7b00069 100644 --- a/twitter.views.inc +++ b/twitter.views.inc @@ -278,7 +278,7 @@ function twitter_views_data() { ); // Twitter account profile image - $data['twitter_account']['profile_image_url'] = array( + $data['twitter_account']['profile_image_url_https'] = array( 'title' => t('Profile image'), 'help' => t('The image used by the Twitter account.'), 'field' => array( diff --git a/twitter.views_default.inc b/twitter.views_default.inc index cce56ab..590cae9 100644 --- a/twitter.views_default.inc +++ b/twitter.views_default.inc @@ -26,13 +26,13 @@ function twitter_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['grouping'] = ''; $handler->display->display_options['style_options']['columns'] = array( - 'profile_image_url' => 'profile_image_url', + 'profile_image_url_https' => 'profile_image_url_https', 'text' => 'text', 'created_time' => 'text', ); $handler->display->display_options['style_options']['default'] = '-1'; $handler->display->display_options['style_options']['info'] = array( - 'profile_image_url' => array( + 'profile_image_url_https' => array( 'sortable' => 0, 'separator' => '', ), @@ -46,10 +46,10 @@ function twitter_views_default_views() { ), ); /* Field: Twitter: Profile image */ - $handler->display->display_options['fields']['profile_image_url']['id'] = 'profile_image_url'; - $handler->display->display_options['fields']['profile_image_url']['table'] = 'twitter_account'; - $handler->display->display_options['fields']['profile_image_url']['field'] = 'profile_image_url'; - $handler->display->display_options['fields']['profile_image_url']['label'] = ''; + $handler->display->display_options['fields']['profile_image_url_https']['id'] = 'profile_image_url_https'; + $handler->display->display_options['fields']['profile_image_url_https']['table'] = 'twitter_account'; + $handler->display->display_options['fields']['profile_image_url_https']['field'] = 'profile_image_url_https'; + $handler->display->display_options['fields']['profile_image_url_https']['label'] = ''; /* Field: Twitter: Message text */ $handler->display->display_options['fields']['text']['id'] = 'text'; $handler->display->display_options['fields']['text']['table'] = 'twitter'; @@ -94,7 +94,7 @@ function twitter_views_default_views() { $handler->display->display_options['style_plugin'] = 'table'; $handler->display->display_options['style_options']['columns'] = array( 'twitter_id' => 'twitter_id', - 'profile_image_url' => 'profile_image_url', + 'profile_image_url_https' => 'profile_image_url_https', 'name' => 'name', 'screen_name' => 'screen_name', 'follow' => 'follow', @@ -111,7 +111,7 @@ function twitter_views_default_views() { 'separator' => '', 'empty_column' => 0, ), - 'profile_image_url' => array( + 'profile_image_url_https' => array( 'sortable' => 0, 'default_sort_order' => 'asc', 'align' => '', @@ -169,10 +169,10 @@ function twitter_views_default_views() { $handler->display->display_options['fields']['twitter_id']['exclude'] = TRUE; $handler->display->display_options['fields']['twitter_id']['element_label_colon'] = FALSE; /* Field: Twitter: Profile image */ - $handler->display->display_options['fields']['profile_image_url']['id'] = 'profile_image_url'; - $handler->display->display_options['fields']['profile_image_url']['table'] = 'twitter_account'; - $handler->display->display_options['fields']['profile_image_url']['field'] = 'profile_image_url'; - $handler->display->display_options['fields']['profile_image_url']['label'] = ''; + $handler->display->display_options['fields']['profile_image_url_https']['id'] = 'profile_image_url_https'; + $handler->display->display_options['fields']['profile_image_url_https']['table'] = 'twitter_account'; + $handler->display->display_options['fields']['profile_image_url_https']['field'] = 'profile_image_url_https'; + $handler->display->display_options['fields']['profile_image_url_https']['label'] = ''; /* Field: Twitter: Full name */ $handler->display->display_options['fields']['name']['id'] = 'name'; $handler->display->display_options['fields']['name']['table'] = 'twitter_account'; -- 1.9.1