From 3b705c28dbb77a499f0e0d0199c2e0e73cf9b9b5 Mon Sep 17 00:00:00 2001
From: Bryce <brycedanz@gmail.com>
Date: Tue, 24 Jun 2014 17:09:49 -0700
Subject: [PATCH] fixed whitespace

---
 #tweet.tpl.php#           |  43 ++++
 #twitter.install#         | 508 ++++++++++++++++++++++++++++++++++++++++++++++
 tweet.tpl.php             |   2 +-
 twitter.install           |  26 +++
 twitter.lib.php           |   6 +
 twitter.pages.inc         |   2 +-
 twitter.views.inc         |   2 +-
 twitter.views_default.inc |  20 +-
 8 files changed, 596 insertions(+), 13 deletions(-)
 create mode 100644 #tweet.tpl.php#
 create mode 100644 #twitter.install#

diff --git a/#tweet.tpl.php# b/#tweet.tpl.php#
new file mode 100644
index 0000000..ef31ba6
--- /dev/null
+++ b/#tweet.tpl.php#
@@ -0,0 +1,43 @@
+<?php
+/**
+ * @file
+ * Renders a tweet as it does look like at Twitter.com.
+ * @see twitter.css
+ */
+?>
+<div class="twitter-status clearfix">
+  <div class="avatar">
+    <a alt="<?php print $author->name; ?>" title="<?php print $author->name; ?>" href=1
+    "https://twitter.com/<?php print $author->screen_name; ?>"><img src=
+    "<?php print $author->profile_image_url; ?>"></a>
+  </div>
+
+  <div class="timestamp">
+    <?php print $status->time_ago; ?>
+  </div>
+
+  <div class="name-handle">
+    <div class="name">
+      <a href="http://twitter.com/<?php print $author->screen_name; ?>"><?php print $author->name; ?></a>
+    </div>
+
+    <div class="handle">
+      <a href="http://twitter.com/<?php print $author->screen_name; ?>">@<?php print $author->screen_name; ?></a>
+    </div>
+  </div>
+
+  <div class="text">
+    <?php print _twitter_filter_link(_twitter_filter_hashtag(_twitter_filter_username($status->text, NULL), NULL), NULL); ?>
+  </div>
+
+  <ul class="actions">
+    <li><a href=
+    "https://twitter.com/intent/tweet?in_reply_to=<?php print $status->twitter_id; ?>">Reply</a></li>
+
+    <li><a href=
+    "https://twitter.com/intent/retweet?tweet_id=<?php print $status->twitter_id; ?>">Retweet</a></li>
+
+    <li><a href=
+    "https://twitter.com/intent/favorite?tweet_id=<?php print $status->twitter_id; ?>">Favorite</a></li>
+  </ul>
+</div>
diff --git a/#twitter.install# b/#twitter.install#
new file mode 100644
index 0000000..9344d08
--- /dev/null
+++ b/#twitter.install#
@@ -0,0 +1,506 @@
+<?php
+/**
+ * @file
+ * Install, update and uninstall functions for the twitter module.
+ *
+ */
+
+/**
+ * Implements hook_requirements()
+ */
+function twitter_requirements($phase) {
+  $requirements = array();
+  $t = get_t();
+  if ($phase == 'runtime') {
+    // Verify that the Twitter Application keys are set.
+    $requirements['twitter_keys'] = array('title' => $t('Twitter Application keys'));
+    $consumer_key = variable_get('twitter_consumer_key', NULL);
+    $consumer_secret = variable_get('twitter_consumer_secret', NULL);
+    if (empty($consumer_key) || empty($consumer_secret)) {
+      $requirements['twitter_keys']['value'] = $t('Missing');
+      $requirements['twitter_keys']['description'] =
+        $t('In order to interact with Twitter, you need to create an application at ' .
+           '<a href="http://dev.twitter.com" target="_blank">http://dev.twitter.com</a> ' .
+           'and set the generated Application keys at the ' .
+           '<a href="/admin/config/services/twitter">Twitter settings page</a>');
+      $requirements['twitter_keys']['severity'] = REQUIREMENT_ERROR;
+    }
+    else {
+      $requirements['twitter_keys']['value'] = $t('Configured');
+      $requirements['twitter_keys']['severity'] = REQUIREMENT_OK;
+    }
+  }
+  return $requirements;
+}
+
+/**
+ * Implements hook_schema().
+ */
+function twitter_schema() {
+  $schema['twitter'] = array(
+    'description' => "Stores individual Twitter posts.",
+    'fields' => array(
+      'twitter_id' => array(
+        'description' => "Unique identifier for each {twitter} post.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'size' => 'big',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'screen_name' => array(
+        'description' => "Screen Name of the {twitter_account} user.",
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'created_at' => array(
+        'description' => "Date and time the {twitter} post was created.",
+        'type' => 'varchar',
+        'length' => 64,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'created_time' => array(
+        'description' => "A duplicate of {twitter}.created_at in UNIX timestamp format.",
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'text' => array(
+        'description' => "The text of the {twitter} post.",
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => FALSE,
+      ),
+      'source' => array(
+        'description' => "The application that created the {twitter} post.",
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => FALSE,
+      ),
+      'in_reply_to_status_id' => array(
+        'description' => "Unique identifier of a status this {twitter} post was replying to.",
+        'type' => 'numeric',
+        'unsigned' => TRUE,
+        'precision' => 20,
+        'scale' => 0,
+        'not null' => FALSE,
+      ),
+      'in_reply_to_user_id' => array(
+        'description' => "Unique identifier for the {twitter_account} this post was replying to.",
+        'type' => 'numeric',
+        'unsigned' => TRUE,
+        'precision' => 20,
+        'scale' => 0,
+        'not null' => FALSE,
+      ),
+      'in_reply_to_screen_name' => array(
+        'description' => "Screen name of the {twitter} user this post was replying to.",
+        'type' => 'varchar',
+        'length' => 255,
+        'not null' => FALSE,
+      ),
+      'truncated' => array(
+        'description' => "Boolean flag indicating whether the {twitter} status was cut off to fit in the 140 character limit.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'entities' => array(
+        'type' => 'blob',
+        'not null' => FALSE,
+        'size' => 'big',
+        'serialize' => TRUE,
+        'description' => 'A serialized array of {twitter} post entities.',
+      ),
+    ),
+    'indexes' => array('screen_name' => array('screen_name')),
+    'primary key' => array('twitter_id'),
+  );
+
+  $schema['twitter_account'] = array(
+    'description' => "Stores information on specific Twitter user accounts.",
+    'fields' => array(
+      'twitter_uid' => array(
+        'description' => "The unique identifier of the {twitter_account}.",
+        'type' => 'numeric',
+        'unsigned' => TRUE,
+        'precision' => 20,
+        'scale' => 0,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'host' => array(
+        'description' => 'The host for this account can be a laconi.ca instance',
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'screen_name' => array(
+        'description' => "The unique login name of the {twitter_account} user.",
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'oauth_token' => array(
+        'description' => 'The token_key for oauth-based access.',
+        'type' => 'varchar',
+        'length' => 64,
+      ),
+      'oauth_token_secret' => array(
+        'description' => 'The token_secret for oauth-based access.',
+        'type' => 'varchar',
+        'length' => 64,
+      ),
+      'name' => array(
+        'description' => "The full name of the {twitter_account} user.",
+        'type' => 'varchar',
+        'length' => 64,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'description' => array(
+        'description' => "The description/biography associated with the {twitter_account}.",
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'location' => array(
+        'description' => "The location of the {twitter_account}'s owner.",
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'followers_count' => array(
+        'description' => "The number of users following this {twitter_account}.",
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'friends_count' => array(
+        'description' => "The number of users this {twitter_account} is following.",
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'statuses_count' => array(
+        'description' => "The total number of status updates performed by a user, excluding direct messages sent.",
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'favourites_count' => array(
+        'description' => "The  number of statuses a user has marked as favorite.",
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'url' => array(
+        'description' => "The url of the {twitter_account}'s home page.",
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'profile_image_url_https' => array(
+        'description' => "The url of the {twitter_account}'s profile image.",
+	'type' => 'varchar',
+	'length' => '255',
+	),
+      'profile_image_url' => 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',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'profile_background_color' => array(
+        'description' => "hex RGB value for a user's background color",
+        'type' => 'varchar',
+        'length' => 6,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'profile_text_color' => array(
+        'description' => "hex RGB value for a user's text color",
+        'type' => 'varchar',
+        'length' => 6,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'profile_link_color' => array(
+        'description' => "hex RGB value for a user's link color",
+        'type' => 'varchar',
+        'length' => 6,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'profile_sidebar_fill_color' => array(
+        'description' => "hex RGB value for a user's sidebar color",
+        'type' => 'varchar',
+        'length' => 6,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'profile_sidebar_border_color' => array(
+        'description' => "hex RGB value for a user's border color",
+        'type' => 'varchar',
+        'length' => 6,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'profile_background_image_url' => array(
+        'description' => "The url of the {twitter_account}'s profile image.",
+	'type' => 'varchar',
+	'length' => '255',
+      ),
+      'profile_background_image_url' => array(
+        'description' => "The url of the {twitter_account}'s profile image.",
+        'type' => 'varchar',
+        'length' => 255,
+      ),
+      'profile_background_tile' => array(
+        'description' => "Boolean indicating if a user's background is tiled.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 1,
+      ),
+      'verified' => array(
+        'description' => "Indicates if a user is verified.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 1,
+      ),
+      'created_at' => array(
+        'description' => "Date and time the {twitter_account} was created.",
+        'type' => 'varchar',
+        'length' => 64,
+        'not null' => TRUE,
+        'default' => '',
+      ),
+      'created_time' => array(
+        'description' => "A duplicate of {twitter_account}.created_at in UNIX timestamp format.",
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'utc_offset' => array(
+        'description' => "A duplicate of {twitter_account}.created_at in UNIX timestamp format.",
+        'type' => 'int',
+        'not null' => TRUE,
+      ),
+      'import' => array(
+        'description' => "Boolean flag indicating whether the {twitter_user}'s posts should be pulled in by the site.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'mentions' => array(
+        'description' => "Boolean flag indicating whether the {twitter_user}'s mentions should be pulled in by the site.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'last_refresh' => array(
+        'description' => "A UNIX timestamp marking the date Twitter statuses were last fetched on.",
+        'type' => 'int',
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'is_global' => array(
+        'description' => "Boolean flag indicating if this account is available for global use.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+      'uid' => array(
+        'description' => "The uid of the user who added this Twitter account.",
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 0,
+      ),
+    ),
+    'indexes' => array('screen_name' => array('screen_name')),
+    'primary key' => array('twitter_uid'),
+  );
+
+  return $schema;
+}
+
+/**
+ * Implements hook_install().
+ */
+function twitter_install() {
+  // Set the weight to 3, making it heavier than Pathauto.
+  db_update('system')
+    ->fields(array(
+        'weight' => 3,
+      ))
+    ->condition('type', 'module')
+    ->condition('name', 'twitter')
+    ->execute();
+}
+
+/**
+ * Implements hook_uninstall().
+ */
+function twitter_uninstall() {
+  // Remove variables
+  variable_del('twitter_import');
+  variable_del('twitter_expire');
+  variable_del('twitter_consumer_key');
+  variable_del('twitter_consumer_secret');
+  variable_del('twitter_host');
+  variable_del('twitter_signin_button');
+  variable_del('twitter_signin_register');
+  variable_del('twitter_host');
+  variable_del('twitter_api');
+  variable_del('twitter_search');
+  variable_del('twitter_tinyurl');
+}
+
+/**
+ * Removes password field
+ */
+function twitter_update_7300() {
+  db_drop_field('twitter_account', 'password');
+  return t('Password field was removed from Twitter accounts.');
+}
+
+/**
+ * Removes include_retweets field
+ */
+function twitter_update_7301() {
+  if (db_field_exists('twitter_account', 'include_retweets')) {
+    db_drop_field('twitter_account', 'include_retweets');
+    return t('Include Retweets field was removed from Twitter accounts.');
+  }
+}
+
+/**
+ * Adds field mentions to twitter_account table.
+ */
+function twitter_update_7400() {
+  $data = array(
+    'description' => "Boolean flag indicating whether the {twitter_user}'s mentions should be pulled in by the site.",
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 0,
+  );
+  db_add_field('twitter_account', 'mentions', $data);
+}
+
+/**
+ * Drops field uid at twitter_account.
+ *
+ * This update has been set empty afterwards as the field is actually needed.
+ */
+function twitter_update_7401() {}
+
+/**
+ * Makes the import field not enabled by default at twitter_account table.
+ */
+function twitter_update_7402() {
+  $spec = array(
+    'description' => "Boolean flag indicating whether the {twitter_user}'s posts should be pulled in by the site.",
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => TRUE,
+    'default' => 0,
+  );
+
+  db_change_field('twitter_account', 'import', 'import', $spec);
+}
+
+/**
+ * Adds field added_by_uid to twitter_account table.
+ *
+ * This update has been set empty afterwards as the existing field twitter_account.uid is used.
+ */
+function twitter_update_7403() {}
+
+/**
+ * Renames twitter_account.added_by_uid to twitter_account.uid.
+ *
+ * This reverts update 7403.
+ */
+function twitter_update_7500() {
+  if (db_field_exists('twitter_account', 'added_by_uid')) {
+    $spec = array(
+      'description' => "The uid of the user who added this Twitter account.",
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+    );
+    db_change_field('twitter_account', 'added_by_uid', 'uid', $spec);
+  }
+}
+
+/**
+ * Updates twitter_search variable to point to http://twitter.com
+ */
+function twitter_update_7501(&$sandbox) {
+  variable_set('twitter_search', 'http://twitter.com');
+}
+
+/**
+ * Add entities field to the twitter post table.
+ */
+function twitter_update_7502(&$sandbox) {
+  if (!db_field_exists('twitter', 'entities')) {
+    db_add_field('twitter', 'entities', array(
+      'type' => 'blob',
+      'not null' => FALSE,
+      'size' => 'big',
+      'serialize' => TRUE,
+      'description' => 'A serialized array of {twitter} post entities.',
+    ));
+  }
+}
+
+
+/**
+ * Update the twitter_id column to a big int, rather than a float-type value
+ */
+function twitter_update_7503() {
+  db_drop_primary_key('twitter');
+  $spec = array(
+    'description' => "Unique identifier for each {twitter} post.",
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'size' => 'big',
+    'not null' => TRUE,
+    'default' => 0,
+  );
+  $index_spec = array(
+    'primary key' => array('twitter_id'),
+    );
+  db_change_field('twitter',
+    'twitter_id',
+    'twitter_id',
+    $spec,
+    $index_spec);
+}
+
+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/tweet.tpl.php b/tweet.tpl.php
index e411b54..6a349b0 100644
--- a/tweet.tpl.php
+++ b/tweet.tpl.php
@@ -9,7 +9,7 @@
   <div class="avatar">
     <a alt="<?php print $author->name; ?>" title="<?php print $author->name; ?>" href=
     "https://twitter.com/<?php print $author->screen_name; ?>"><img src=
-    "<?php print $author->profile_image_url; ?>"></a>
+    "<?php print $author->profile_image_url_https; ?>"></a>
   </div>
 
   <div class="timestamp">
diff --git a/twitter.install b/twitter.install
index d83d6b4..d140acd 100644
--- a/twitter.install
+++ b/twitter.install
@@ -198,6 +198,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',
+	),
       'profile_image_url' => array(
         'description' => "The url of the {twitter_account}'s profile image.",
         'type' => 'varchar',
@@ -247,6 +252,11 @@ function twitter_schema() {
       ),
       'profile_background_image_url' => array(
         'description' => "The url of the {twitter_account}'s profile image.",
+	'type' => 'varchar',
+	'length' => '255',
+      ),
+      'profile_background_image_url' => array(
+        'description' => "The url of the {twitter_account}'s profile image.",
         'type' => 'varchar',
         'length' => 255,
       ),
@@ -478,3 +488,18 @@ function twitter_update_7503() {
     'twitter_id',
     $spec,
     $index_spec);
+}
+
+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);
}
\ No newline at end of file
diff --git a/twitter.lib.php b/twitter.lib.php
index b1639e6..90bc19d 100644
--- a/twitter.lib.php
+++ b/twitter.lib.php
@@ -1330,6 +1330,8 @@ class TwitterUser {
 
   public $profile_image_url;
 
+  public $profile_image_url_https;
+
   public $profile_background_color;
 
   public $profile_text_color;
@@ -1342,6 +1344,8 @@ class TwitterUser {
 
   public $profile_background_image_url;
 
+  public $profile_background_image_url_https;
+
   public $profile_background_tile;
 
   public $verified;
@@ -1371,12 +1375,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_backround_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..059e59a 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,9 +46,9 @@ 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']['id'] = 'profile_image_url_https';
   $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']['field'] = 'profile_image_url_https';
   $handler->display->display_options['fields']['profile_image_url']['label'] = '';
   /* Field: Twitter: Message text */
   $handler->display->display_options['fields']['text']['id'] = 'text';
@@ -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,11 +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