Using singleton instance of AddThis instead of static methods.

diff --git a/addthis.module b/addthis.module
index 0cb7169..f397e28 100644 (file)
--- a/addthis.module
+++ b/addthis.module
@@ -72,5 +72,5 @@ function addthis_permission() {
  * Implements hook_page_alter().
  */
 function addthis_page_alter(&$page) {
-  AddThis::addConfigurationOptionsJs();
+  AddThis::getInstance()->addConfigurationOptionsJs();
 }

diff --git a/classes/AddThis.php b/classes/AddThis.php
index 3736fab..5e3d5ea 100644 (file)
--- a/classes/AddThis.php
+++ b/classes/AddThis.php
@@ -53,7 +53,21 @@ class AddThis {
   const WIDGET_TYPE_SHARECOUNT = 'sharecount';
   const WIDGET_TYPE_TOOLBOX = 'toolbox';
 
-  public static function getWidgetTypes() {
+  private static $instance;
+
+  private function __construct() {
+    // Private constructor
+  }
+
+  public static function getInstance() {
+    if (!isset(self::$instance)) {
+      $class = __CLASS__;
+      self::$instance = new $class;
+    }
+    return self::$instance;
+  }
+
+  public function getWidgetTypes() {
     return array(
       self::WIDGET_TYPE_DISABLED => t('Disabled'),
       self::WIDGET_TYPE_COMPACT_BUTTON => t('Compact button'),
@@ -63,11 +77,11 @@ class AddThis {
     );
   }
 
-  public static function getBlockWidgetType() {
+  public function getBlockWidgetType() {
     return variable_get(self::BLOCK_WIDGET_TYPE_KEY, self::WIDGET_TYPE_COMPACT_BUTTON);
   }
 
-  public static function getWidgetMarkup($widgetType = '', $entity = NULL) {
+  public function getWidgetMarkup($widgetType = '', $entity = NULL) {
     $href = 'href';
     switch ($widgetType) {
       case self::WIDGET_TYPE_LARGE_BUTTON:
@@ -129,32 +143,32 @@ class AddThis {
     return $markup;
   }
 
-  public static function getProfileId() {
+  public function getProfileId() {
     return check_plain(variable_get(AddThis::PROFILE_ID_KEY));
   }
 
-  public static function getServicesCssUrl() {
+  public function getServicesCssUrl() {
     return check_url(variable_get(AddThis::SERVICES_CSS_URL_KEY, self::DEFAULT_SERVICES_CSS_URL));
   }
 
-  public static function getServicesJsonUrl() {
+  public function getServicesJsonUrl() {
     return check_url(variable_get(AddThis::SERVICES_JSON_URL_KEY, self::DEFAULT_SERVICES_JSON_URL));
   }
 
-  public static function getServiceOptions() {
+  public function getServiceOptions() {
     return self::getServices();
   }
 
-  public static function getEnabledServiceOptions() {
+  public function getEnabledServiceOptions() {
     return self::getEnabledServices();
   }
 
-  public static function addStylesheets() {
+  public function addStylesheets() {
     drupal_add_css(self::getServicesCssUrl(), 'external');
     drupal_add_css(self::getAdminCssFilePath(), 'file');
   }
 
-  public static function addConfigurationOptionsJs() {
+  public function addConfigurationOptionsJs() {
     if (self::isCustomConfigurationCodeEnabled()) {
       $javascript = self::getCustomConfigurationCode();
     } else {
@@ -167,27 +181,35 @@ class AddThis {
     drupal_add_js($javascript, 'inline');
   }
 
-  public static function areLargeIconsEnabled() {
+  public function areLargeIconsEnabled() {
     return variable_get(self::LARGE_ICONS_ENABLED_KEY, FALSE);
   }
 
-  public static function getUiHeaderColor() {
+  public function getUiHeaderColor() {
     return check_plain(variable_get(self::UI_HEADER_COLOR_KEY));
   }
 
-  public static function getUiHeaderBackgroundColor() {
+  public function getUiHeaderBackgroundColor() {
     return check_plain(variable_get(self::UI_HEADER_BACKGROUND_COLOR_KEY));
   }
 
-  public static function getCustomConfigurationCode() {
+  public function getCustomConfigurationCode() {
     return variable_get(self::CUSTOM_CONFIGURATION_CODE_KEY, self::DEFAULT_CUSTOM_CONFIGURATION_CODE);
   }
 
-  public static function isCustomConfigurationCodeEnabled() {
+  public function isCustomConfigurationCodeEnabled() {
     return variable_get(self::CUSTOM_CONFIGURATION_CODE_ENABLED_KEY, FALSE);
   }
 
-  private static function getUiHeaderColorConfigurationOptions() {
+  public function getBaseWidgetJsUrl() {
+    return check_url(variable_get(self::WIDGET_JS_URL_KEY, self::DEFAULT_WIDGET_JS_URL));
+  }
+
+  public function getBaseBookmarkUrl() {
+    return check_url(variable_get(self::BOOKMARK_URL_KEY, self::DEFAULT_BOOKMARK_URL));
+  }
+
+  private function getUiHeaderColorConfigurationOptions() {
     $configurationOptions = ',';
     $uiHeaderColor = self::getUiHeaderColor();
     $uiHeaderBackgroundColor = self::getUiHeaderBackgroundColor();
@@ -200,11 +222,11 @@ class AddThis {
     return $configurationOptions;
   }
 
-  private static function getLargeButtonsClass() {
+  private function getLargeButtonsClass() {
     return self::areLargeIconsEnabled() ? ' addthis_32x32_style ' : '';
   }
 
-  private static function getServiceNamesAsCommaSeparatedString() {
+  private function getServiceNamesAsCommaSeparatedString() {
     $enabledServiceNames = array_values(self::getEnabledServices());
     $enabledServicesAsCommaSeparatedString = '';
     foreach ($enabledServiceNames as $enabledServiceName) {
@@ -215,11 +237,11 @@ class AddThis {
     return $enabledServicesAsCommaSeparatedString;
   }
 
-  private static function getAdminCssFilePath() {
+  private function getAdminCssFilePath() {
     return drupal_get_path('module', self::MODULE_NAME) . '/' . self::ADMIN_CSS_FILE;
   }
 
-  private static function getServices() {
+  private function getServices() {
     $rows = array();
     $json = new Json();
     $services = $json->decode(self::getServicesJsonUrl());
@@ -233,51 +255,43 @@ class AddThis {
     return $rows;
   }
 
-  private static function getEnabledServices() {
+  private function getEnabledServices() {
     return variable_get(self::ENABLED_SERVICES_KEY, array());
   }
 
-  public static function getBaseBookmarkUrl() {
-    return check_url(variable_get(self::BOOKMARK_URL_KEY, self::DEFAULT_BOOKMARK_URL));
-  }
-
-  private static function getFullBookmarkUrl() {
+  private function getFullBookmarkUrl() {
     return check_url(self::getBaseBookmarkUrl() . self::getProfileIdQueryParameterPrefixedWithAmp());
   }
 
-  public static function getBaseWidgetJsUrl() {
-    return check_url(variable_get(self::WIDGET_JS_URL_KEY, self::DEFAULT_WIDGET_JS_URL));
-  }
-
-  private static function getProfileIdQueryParameter($prefix) {
+  private function getProfileIdQueryParameter($prefix) {
     $profileId = self::getProfileId();
     return $profileId != NULL ? $prefix . self::PROFILE_ID_QUERY_PARAMETER . '=' . $profileId : '';
   }
 
-  private static function getProfileIdQueryParameterPrefixedWithAmp() {
+  private function getProfileIdQueryParameterPrefixedWithAmp() {
     return self::getProfileIdQueryParameter('&');
   }
 
-  private static function getProfileIdQueryParameterPrefixedWithHash() {
+  private function getProfileIdQueryParameterPrefixedWithHash() {
     return self::getProfileIdQueryParameter('#');
   }
 
-  private static function getAddThisAttributesMarkup($entity) {
+  private function getAddThisAttributesMarkup($entity) {
     if (is_object($entity)) {
       return self::getAddThisTitleAttributeMarkup($entity) . ' ';
     }
     return '';
   }
 
-  private static function getAddThisTitleAttributeMarkup($entity) {
+  private function getAddThisTitleAttributeMarkup($entity) {
     return MarkupGenerator::generateAttribute(self::TITLE_ATTRIBUTE, drupal_get_title() . ' - ' . check_plain($entity->title));
   }
 
-  private static function getWidgetScriptElement() {
+  private function getWidgetScriptElement() {
     return '<script type="text/javascript" src="' . self::getWidgetUrl() . '"></script>';
   }
 
-  private static function getWidgetUrl() {
+  private function getWidgetUrl() {
     return check_url(self::getBaseWidgetJsUrl() . self::getProfileIdQueryParameterPrefixedWithHash());
   }
 }

diff --git a/includes/addthis.admin.inc b/includes/addthis.admin.inc
index c2c62df..671f744 100644 (file)
--- a/includes/addthis.admin.inc
+++ b/includes/addthis.admin.inc
@@ -9,11 +9,11 @@
  * Implements hook_admin_settings_form().
  */
 function addthis_admin_settings_form($form_state) {
-  AddThis::addStylesheets();
+  AddThis::getInstance()->addStylesheets();
   $form[AddThis::PROFILE_ID_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis Profile ID'),
-    '#default_value' => AddThis::getProfileId(),
+    '#default_value' => AddThis::getInstance()->getProfileId(),
     '#required' => FALSE,
     '#description' => t('Profile ID at <a href="http://addthis.com/" target="_blank">AddThis.com</a>. Required for statistics.'),
   );
@@ -26,21 +26,21 @@ function addthis_admin_settings_form($form_state) {
   $form['visual_settings_fieldset'][AddThis::LARGE_ICONS_ENABLED_KEY] = array(
     '#type' => 'checkbox',
     '#title' => t('Use large toolbox icons'),
-    '#default_value' => AddThis::areLargeIconsEnabled(),
+    '#default_value' => AddThis::getInstance()->areLargeIconsEnabled(),
     '#required' => FALSE,
     '#description' => t('Use large 32x32 pixel toolbox icons instead of smaller 16x16 pixel icons.'),
   );
   $form['visual_settings_fieldset'][AddThis::UI_HEADER_COLOR_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis user interface header text color'),
-    '#default_value' => AddThis::getUiHeaderColor(),
+    '#default_value' => AddThis::getInstance()->getUiHeaderColor(),
     '#required' => FALSE,
     '#description' => t('AddThis user interface header text color (like #ffffff).'),
   );
   $form['visual_settings_fieldset'][AddThis::UI_HEADER_BACKGROUND_COLOR_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis user interface header background color'),
-    '#default_value' => AddThis::getUiHeaderBackgroundColor(),
+    '#default_value' => AddThis::getInstance()->getUiHeaderBackgroundColor(),
     '#required' => FALSE,
     '#description' => t('AddThis user interface header background color (like #000000).'),
   );
@@ -53,28 +53,28 @@ function addthis_admin_settings_form($form_state) {
   $form['service_urls_fieldset'][AddThis::BOOKMARK_URL_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis bookmark URL'),
-    '#default_value' => AddThis::getBaseBookmarkUrl(),
+    '#default_value' => AddThis::getInstance()->getBaseBookmarkUrl(),
     '#required' => TRUE,
     '#description' => t('AddThis bookmark URL.'),
   );
   $form['service_urls_fieldset'][AddThis::SERVICES_CSS_URL_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis services stylesheet URL'),
-    '#default_value' => AddThis::getServicesCssUrl(),
+    '#default_value' => AddThis::getInstance()->getServicesCssUrl(),
     '#required' => TRUE,
     '#description' => t('AddThis services stylesheet URL.'),
   );
   $form['service_urls_fieldset'][AddThis::SERVICES_JSON_URL_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis services json URL'),
-    '#default_value' => AddThis::getServicesJsonUrl(),
+    '#default_value' => AddThis::getInstance()->getServicesJsonUrl(),
     '#required' => TRUE,
     '#description' => t('AddThis services json URL.'),
   );
   $form['service_urls_fieldset'][AddThis::WIDGET_JS_URL_KEY] = array(
     '#type' => 'textfield',
     '#title' => t('AddThis javascript widget URL'),
-    '#default_value' => AddThis::getBaseWidgetJsUrl(),
+    '#default_value' => AddThis::getInstance()->getBaseWidgetJsUrl(),
     '#required' => TRUE,
     '#description' => t('AddThis javascript widget URL.'),
   );
@@ -87,8 +87,8 @@ function addthis_admin_settings_form($form_state) {
   $form['enabled_services_fieldset'][AddThis::ENABLED_SERVICES_KEY] = array(
     '#type' => 'checkboxes',
     '#title' => t('Enabled services'),
-    '#options' => AddThis::getServiceOptions(),
-    '#default_value' => AddThis::getEnabledServiceOptions(),
+    '#options' => AddThis::getInstance()->getServiceOptions(),
+    '#default_value' => AddThis::getInstance()->getEnabledServiceOptions(),
     '#required' => FALSE,
     '#description' => t('Check enabled services.'),
   );
@@ -102,14 +102,14 @@ function addthis_admin_settings_form($form_state) {
   $form['advanced_settings_fieldset'][AddThis::CUSTOM_CONFIGURATION_CODE_ENABLED_KEY] = array(
     '#type' => 'checkbox',
     '#title' => t('Use custom AddThis configuration code'),
-    '#default_value' => AddThis::isCustomConfigurationCodeEnabled(),
+    '#default_value' => AddThis::getInstance()->isCustomConfigurationCodeEnabled(),
     '#required' => FALSE,
     '#description' => t('Use custom AddThis configuration code. If checked, custom configuration will be used instead of other configuration settings provided in AddThis administration user interface. Note that the Profile ID (pubid) will not be overwritten by custom configuration code.'),
   );
   $form['advanced_settings_fieldset'][AddThis::CUSTOM_CONFIGURATION_CODE_KEY] = array(
     '#type' => 'textarea',
     '#title' => t('AddThis custom configuration code'),
-    '#default_value' => AddThis::getCustomConfigurationCode(),
+    '#default_value' => AddThis::getInstance()->getCustomConfigurationCode(),
     '#required' => FALSE,
     '#description' => t('AddThis custom configuration code. See format at <a href="http://addthis.com/" target="_blank">AddThis.com</a>'),
   );

diff --git a/includes/addthis.block.inc b/includes/addthis.block.inc
index 11d94b0..614906d 100644 (file)
--- a/includes/addthis.block.inc
+++ b/includes/addthis.block.inc
@@ -22,8 +22,8 @@ function addthis_block_info() {
  */
 function addthis_block_view($blockName = '') {
   if ($blockName == AddThis::BLOCK_NAME) {
-    $widgetType = AddThis::getBlockWidgetType();
-    $markup = AddThis::getWidgetMarkup($widgetType);
+    $widgetType = AddThis::getInstance()->getBlockWidgetType();
+    $markup = AddThis::getInstance()->getWidgetMarkup($widgetType);
     return array(
       'subject' => '',
       'content' => $markup,
@@ -38,8 +38,8 @@ function addthis_block_configure($delta = '') {
   $form[AddThis::BLOCK_WIDGET_TYPE_KEY] = array(
     '#type' => 'select',
     '#title' => t('AddThis widget type'),
-    '#options' => AddThis::getWidgetTypes(),
-    '#default_value' => AddThis::getBlockWidgetType(),
+    '#options' => AddThis::getInstance()->getWidgetTypes(),
+    '#default_value' => AddThis::getInstance()->getBlockWidgetType(),
   );
   return $form;
 }

diff --git a/includes/addthis.field.inc b/includes/addthis.field.inc
index bf04582..2cd1653 100644 (file)
--- a/includes/addthis.field.inc
+++ b/includes/addthis.field.inc
@@ -54,7 +54,7 @@ function addthis_field_formatter_view($entity_type, $entity, $field, $instance,
 
   foreach ($items as $delta => $item) {
     $widgetType = $item['value'];
-    $markup = AddThis::getWidgetMarkup($widgetType, $entity);
+    $markup = AddThis::getInstance()->getWidgetMarkup($widgetType, $entity);
     $element[$delta] = array('#markup' => $markup);
   }
   return $element;
@@ -80,7 +80,7 @@ function addthis_field_widget_form(&$form, &$form_state, $field, $instance, $lan
   if ($instance['widget']['type'] == AddThis::WIDGET_TYPE) {
     $main_widget = $element + array(
       '#type' => 'select',
-      '#options' => AddThis::getWidgetTypes(),
+      '#options' => AddThis::getInstance()->getWidgetTypes(),
       '#default_value' => isset($items[$delta]) ? $items[$delta] : $instance['settings'][AddThis::STYLE_KEY],
     );
     $element['value'] = $main_widget;