Club Drupal

# 7.x-4.0-alpha3

Major changes

- Configuration possible to blocks. [#1694868]

- Fixed tracking not working. [#1919156]

- Added DOM loading and basic include.

- Changed loading of widget.js be done only when a display is rendered.

Minor changes

- Coding standard fixes. Still more to do.

- Changing label text to describe compact menu enabled services.

- Fixed https loading of basic button. [#1734752]

- Fixed test on clickback tracking settings. [#2164647]

- Removed block dependency [#1814428]

- Updated AddThis js version from 250 to 300.

- Removed some files[] from the info because they did not contain classes. [#2151315]

======

; Information added by Drupal.org packaging script on 2014-01-15

version = "7.x-4.0-alpha3"

datestamp = "1389775420"

  variable_del(AddThis::WIDGET_JS_LOAD_TYPE);

}

/**

 * Remove old WIDGET_JS_ASYNC variable.

 */

function addthis_update_7401() {

  variable_del('addthis_widget_async');

      // If addthis settings are provided a display is loaded.

      if (typeof Drupal.settings.addthis != 'undefined') {

        if (typeof Drupal.settings.addthis.load_type != 'undefined') {

          if (Drupal.settings.addthis.load_type == 'async') {

            addthis.init();

          }

          if (Drupal.settings.addthis.load_type == 'domready') {

            $.getScript(

              Drupal.settings.addthis.widget_url,

              function(data, textStatus) {});

          }

          // Trigger ready on ajax attach.

          if (context != window.document && window.addthis != null) {

            window.addthis.ost = 0;

            window.addthis.ready();

          }

  }

if (module_exists('block')) {

  module_load_include('inc', 'addthis', 'includes/addthis.block');

}

/**

 * Create a addthis settings form.

 */

function _addthis_settings_form($form = array(), &$form_state, $display_type = NULL, $display_settings = NULL) {

  // Toggle variables

  $no_js = FALSE;

  // Default display type if not set in the parameters.

  $display_type = (isset($display_type)) ? $display_type : 'addthis_disabled';

  // Load setting type from the form_state.

  if (isset($form_state['values']['addthis_settings']['type'])) {

    $display_type = $form_state['values']['addthis_settings']['type'];

  }

  // Container used as the replace for ajax.

  $form['#type'] = 'container';

  $form['#attributes'] = array();

  $form['#id'] = 'addthis_settings';

  // The list of formatters.

  $formatter_options = AddThis::getInstance()->getDisplayTypes();

  $form['type'] = array(

    '#type' => 'select',

    '#title' => t('Formatter for @title', array('@title' => 'AddThis block')),

    '#title_display' => 'invisible',

    '#options' => $formatter_options,

    '#default_value' => $display_type,

    '#parents' => array('addthis_settings', 'type'),

    '#attributes' => array('class' => array('addthis-display-type')),

    '#ajax' => array(

      'callback' => '_addthis_settings_form_submit_callback',

      'wrapper' => 'addthis_settings',

      'name' => 'switch_display',

      'event' => 'change',

    )

  );

  if ($no_js) {

    $form['choose'] = array(

      '#type' => 'submit',

      '#name' => 'Switch display',

      '#value' => 'Switch display',

      '#op' => 'switch_display',

      '#id' => 'switch-display',

      '#submit' => array('_addthis_settings_form_submit'),

    );

  }

  // Formatter settings.

  // Check the currently selected formatter, and merge persisted values for

  // formatter settings.

  $formatter_type = $display_type;

  // Get the settings if set.

  $settings = $display_settings;

  $formatter_settings = field_info_formatter_settings($formatter_type);

  $settings += $formatter_settings;

  $field = array();

  $instance = array();

  $view_mode = 'block';

  $instance['display'][$view_mode]['type'] = $formatter_type;

  $formatter = field_info_formatter_types($formatter_type);

  $instance['display'][$view_mode]['module'] = $formatter['module'];

  $instance['display'][$view_mode]['settings'] = $settings;

  $settings_form = array();

  $function = $formatter['module'] . '_field_formatter_settings_form';

  if (function_exists($function)) {

    $settings_form = $function($field, $instance, $view_mode, $form, $form_state);

    $settings_form['#tree'] = TRUE;

    $settings_form['#parents'] = array('addthis_settings', 'settings');

  }

  $form['settings'] = $settings_form;

  return $form;

}

function _addthis_settings_form_submit($form, &$form_state) {

  $form_state['rebuild'] = TRUE;

}

function _addthis_settings_form_submit_callback($form, &$form_state) {

  $form_state['rebuild'] = TRUE;

  return $form['addthis_settings']['form'];

}

  public static function getInfo() {

    $edit_basic[AddThis::CLICKBACK_TRACKING_ENABLED_KEY] = TRUE;

  public static function getInfo() {

  $addthis = AddThis::getInstance();

  $button_img = $addthis->transformToSecureUrl($button_img);

  $element['#attributes'] += $addthis->getAddThisAttributesMarkup($options);

; Information added by Drupal.org packaging script on 2014-01-15

version = "7.x-4.0-alpha3"

datestamp = "1389775420"

  // AddThis attribute and parameter names (as defined in AddThis APIs).

  // Persistent variable keys.

  const BLOCK_WIDGET_SETTINGS_KEY = 'addthis_block_widget_settings';

  const WIDGET_JS_LOAD_TYPE = 'addthis_widget_load_type';

  // Twitter.

  // External resources.

  const DEFAULT_BOOKMARK_URL = 'http://www.addthis.com/bookmark.php?v=300';

  const DEFAULT_WIDGET_JS_URL = 'http://s7.addthis.com/js/300/addthis_widget.js';

  const DEFAULT_WIDGET_JS_LOAD_TYPE = 'async';

  // Internal resources.

  // Widget types.

  // Styles.

   * Get the singleton instance of the AddThis class.

   *

   *   Instance of AddThis.

    module_load_include('php', 'addthis', 'classes/AddThisWidgetJs');

      $add_this = new AddThis();

      $add_this->setJson(new AddThisJson());

      self::$instance = $add_this;

  /**

   * Set the json object.

   */

    // Load resources.

    self::$instance->includeWidgetJs();

    self::$instance->addConfigurationOptionsJs();

  /**

   * Add the AddThis Widget JavaScript to the page.

   */

    $widgetjs = new AddThisWidgetJs(self::getWidgetUrl());

    $widgetjs->addAttribute('pubid', $this->getProfileId());

    if (self::getWidgetJsLoadType() != 'include') {

      $widgetjs->addAttribute(self::getWidgetJsLoadType(), '1');

    $url = $widgetjs->getFullUrl();

    switch (self::getWidgetJsLoadType()) {

      // Load as DOM is ready.

      case 'domready':

        drupal_add_js(

          array(

            'addthis' => array(

              'widget_url' => $url,

              'load_type' => self::getWidgetJsLoadType(),

            ),

          ),

          'setting'

        );

        break;

      // Load as async.

      case 'async':

        drupal_add_js(

          array(

            'addthis' => array(

              'load_type' => self::getWidgetJsLoadType(),

            ),

          ),

          'setting'

        );

        drupal_add_js(

          $url,

          array(

            'type' => 'external',

            'scope' => 'footer',

          )

        );

        break;

      // Load as include in the page.

      default:

        drupal_add_js(

          $url,

          array(

            'type' => 'external',

            'scope' => 'footer',

          )

        );

        break;

    // Add local internal behaviours.

    drupal_add_js(

      drupal_get_path('module', 'addthis') . '/addthis.js',

      array(

        'type' => 'file',

        'scope' => 'footer',

    );

  }

  /**

   * Load function for widget information.

   *

   * Loading widget information only once.

   */

  public function includeWidgetJs() {

    static $loaded;

    if (!isset($loaded)) {

      $loaded = TRUE;

      $this::addWidgetJs();

      return TRUE;

    return FALSE;

        'pubid' => $this->getProfileId(),

  public function getBlockDisplaySettings() {

    return variable_get(self::BLOCK_WIDGET_SETTINGS_KEY, array());

  }

  /**

   * Return the type of loading.

   *

   * @return string

   *   Retuns domready or async.

   */

  public function getWidgetJsLoadType() {

    return variable_get(self::WIDGET_JS_LOAD_TYPE, self::DEFAULT_WIDGET_JS_LOAD_TYPE);

  /**

   * Get the url for the AddThis Widget.

   */

    $url = ($this->currentlyOnHttps() ?

      $this->getBaseWidgetJsUrl() : // Not https url.

      $this->transformToSecureUrl($this->getBaseWidgetJsUrl()) // Transformed to https url.

    );

    return check_url($url);

  /**

   * Request if we are currently on a https connection.

   *

   * @return True if we are currently on a https connection.

   */

  public function currentlyOnHttps() {

    return (strpos($base_root, 'https://') !== FALSE) ? TRUE : FALSE;

  }

  /**

   * Transform a url to secure url with https prefix.

   */

  public function transformToSecureUrl($url) {

    if ($this->currentlyOnHttps()) {

<?php

/**

 * @file

 * Class to manage a WidgetJs url.

 */

class AddThisWidgetJs {

  protected $url;

  protected $attributes = array();

  /**

   * Sepecify the url through the construct.

   */

  public function __construct($url) {

    $this->url = $url;

  }

  /**

   * Add a attribute to the querystring.

   */

  public function addAttribute($name, $value) {

    $this->attributes[$name] = $value;

  }

  /**

   * Remove a attribute from the querystring.

   */

  public function removeAttribute($name) {

    if (isset($attributes[$name])) {

      unset($attributes[$name]);

    }

  }

  /**

   * Get the full url for the widgetjs.

   */

  public function getFullUrl() {

    $querystring_elements = array();

    foreach ($this->attributes as $key => $value) {

      $querystring_elements[] = $key . '=' . $value;

    }

    $querystring = implode('&', $querystring_elements);

    return $this->url . '#' . $querystring;

  }

}

/**

 * Form handler for admin_settings_form.

 */

    '#type' => 'textfield',

    '#title' => t('Branding text'),

    '#description' => t('Additional branding message to be rendered in the upper-right-hand corner of the compact menus.<br />Should be less than 15 characters in most cases to render properly.'),

    '#default_value' => AddThis::getInstance()->getCoBrand(),

    '#required' => FALSE,

    '#maxlength' => 15,

    '#type' => 'textfield',

    '#title' => t('Header text color'),

    '#default_value' => AddThis::getInstance()->getUiHeaderColor(),

    '#description' => t('Something like #FFFFFF'),

    '#size' => 8,

    '#maxlength' => 7,

    '#required' => FALSE,

    '#type' => 'textfield',

    '#title' => t('Header background color'),

    '#default_value' => AddThis::getInstance()->getUiHeaderBackgroundColor(),

    '#description' => t('Something like #000000'),

    '#size' => 8,

    '#maxlength' => 7,

    '#required' => FALSE,

    '#title' => t('Compact menu enabled services'),

    '#type' => 'fieldset',

    '#title' => t('Additional configuration'),

    '#collapsible' => TRUE,

    '#collapsed' => TRUE,

    '#type' => 'checkbox',

    '#title' => t('Use standard AddThis stylesheet'),

    '#description' => t('If not checked, AddThis will not load standard CSS file, allowing you to style everything yourself without incurring the cost of an additional load.'),

    '#default_value' => AddThis::getInstance()->isStandardCssEnabled(),

    '#required' => FALSE,

    '#type' => 'checkbox',

    '#title' => t('508 compliant'),

    '#description' => 'If checked, clicking the AddThis button will open a new window to a page that is keyboard navigable.',

    '#default_value' => AddThis::getInstance()->get508Compliant(),

    '#required' => FALSE,

    '#type' => 'checkbox',

    '#title' => t('Use addressbook'),

    '#description' => 'If checked, the user will be able import their contacts from popular webmail services when using AddThis\'s email sharing.',

    '#default_value' => AddThis::getInstance()->isAddressbookEnabled(),

    '#required' => FALSE,

    '#type' => 'fieldset',

    '#title' => t('Analytics & Tracking'),

    '#collapsible' => TRUE,

    '#collapsed' => $can_track_clicks ? TRUE : FALSE,

    $rdf_description = '<span class="admin-disabled">' . t('The RDF module needs to be enabled to support Facebook Like tracking support.<br />Enable the module on <a href="!modules">modules</a> page.',

    '#type' => 'checkbox',

    '#title' => t('Enable Facebook Like tracking'),

    '#description' => filter_xss($rdf_description, array('span')),

    '#default_value' => AddThis::getInstance()->isFacebookLikeCountSupportEnabled(),

    '#required' => FALSE,

    '#disabled' => !$rdf_enabled,

  // Google Analytics and Google Social Tracking support.

/**

 * Form handler for admin_settings_advanced_form.

 */

    '#type' => 'fieldset',

    '#title' => t('Service URLs'),

    '#collapsible' => TRUE,

    '#collapsed' => TRUE,

    '#type' => 'textfield',

    '#title' => t('AddThis bookmark URL'),

    '#default_value' => AddThis::getInstance()->getBaseBookmarkUrl(),

    '#required' => TRUE,

    '#type' => 'textfield',

    '#title' => t('AddThis services stylesheet URL'),

    '#default_value' => AddThis::getInstance()->getServicesCssUrl(),

    '#required' => TRUE,

    '#type' => 'textfield',

    '#title' => t('AddThis services json URL'),

    '#default_value' => AddThis::getInstance()->getServicesJsonUrl(),

    '#required' => TRUE,

    '#type' => 'textfield',

    '#title' => t('AddThis javascript widget URL'),

    '#default_value' => AddThis::getInstance()->getBaseWidgetJsUrl(),

    '#required' => TRUE,

  $form['advanced_settings_fieldset'][AddThis::WIDGET_JS_LOAD_TYPE] = array(

    '#type' => 'select',

    '#title' => t('When to load the widget js.'),

    '#options' => array(

      'async' => t('When the page loads, but load assets asynchronously. (default)'),

      'include' => t('When the page loads.'),

      'domready' => t('When the DOM is ready at the script dynamicly.'),

    ),

    '#default_value' => AddThis::getInstance()->getWidgetJsLoadType(),

    '#required' => FALSE,

  );

    $widget_settings = AddThis::getInstance()->getBlockDisplaySettings();

    $block_options = array(

      '#block' => AddThis::BLOCK_NAME,

      '#display' => array(

        'settings' => $widget_settings,

      )

    );

    $markup = AddThis::getInstance()->getDisplayMarkup($widget_type, $block_options);

  AddThis::getInstance()->includeWidgetJs();

  return array();

  variable_set(AddThis::BLOCK_WIDGET_TYPE_KEY, $edit['addthis_settings']['type']);

  variable_set(AddThis::BLOCK_WIDGET_SETTINGS_KEY, $edit['addthis_settings']['settings']);

}

/**

 * Callback submit.

 */

function _addthis_settings_form_block_submit($form, &$form_state) {

  $form_state['rebuild'] = TRUE;

}

/**

 * Callback to return ajax replace part.

 */

function _addthis_settings_form_block_submit_callback($form, &$form_state) {

  return $form['settings']['addthis_settings']['form'];

}

/**

 * Implements hook_form_FORM_ID_alter().

 */

function addthis_form_block_admin_configure_alter(&$form, &$form_state) {

  if ($form['module']['#value'] == 'addthis' && $form['delta']['#value'] == 'addthis_block') {

    form_load_include($form_state, 'inc', 'addthis', 'addthis.block');

    $form['#cache'] = TRUE;

    $form['settings']['addthis_settings'] = array(

      '#type' => 'fieldset',

      '#title' => 'Display settings',

    );

    // Retrieve settings.

    $addthis_settings['type'] = AddThis::getInstance()->getBlockDisplayType();

    $addthis_settings['settings'] = AddThis::getInstance()->getBlockDisplaySettings();

    // Create a addthis settings form based on the available configuration.

    $element = _addthis_settings_form(

      isset($form['addthis_settings']['form']) ? $form['addthis_settings']['form'] : array(),

      $form_state,

      isset($addthis_settings['type']) ? $addthis_settings['type'] : NULL,

      isset($addthis_settings['settings']) ? $addthis_settings['settings'] : NULL

    );

    // Change the submit and callback because our handling is different and the

    // form structure is different form the default implementation.

    $element['type']['#submit'] = array('_addthis_settings_form_block_submit');

    $element['type']['#ajax']['callback'] = '_addthis_settings_form_block_submit_callback';

    $form['settings']['addthis_settings']['form'] = $element;

    array_unshift($form['#submit'], '_addthis_settings_form_block_submit');

  }

  return $form;

Nodeaccess 7.x-1.1

===================

Issue #2146209: Show localized role names in Grant tab.

Issue #306541: Strange behavior about anonymous content management.

Issues #2033711 and #2075033: Anonymous access for existing nodes

(fix by k4v and Blackice2999).

Issues #2040967 and #2037225: Unpublished access ignore set. User

reference access fix.

Issue #1414256 by rv0: enable 'Keep?' for new users (fix by rv0).

Issue #1444040 by natuk: Access to unpublished nodes.

Issue #306541 by gianfrasoft: Strange behavior anonymous content management.

Issue #1496280 by rv0: Don't enforce default "View" access setting.

Issue #1088920 by Peasoup: Undefined offset fix (fix by rv0).

Issue #1200556 by xjm: D7 IA standards, use admin/config/people path.

Issue #1846786 by jcmc: Correct the admin path in info file.

Issue #1285150 by jmart: Undefined index: keys in nodeaccess_grants_form().

Issue #1082262 by aquaseal: Undefined $rows in nodeaccess_grants_form().

Issue #1155706 by tristanmatthews: Undefined index in nodeaccess_access().

; Information added by Drupal.org packaging script on 2014-01-14

version = "7.x-1.2"

datestamp = "1389723809"

  // Retrieve role names for columns.

  $role_names = user_roles();

        $row[] = $role_names[$key] . drupal_render($form['rid'][$key]['name']);