Club Drupal

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

Version 7.x-3.5

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

- Issue #1729884 by lund.mikkel: Translations of max items collide with other translations.

- Issue #1734858 by Jaws, pc-wurm: Create localized_options array in calendar_menu_local_tasks_alter() if it does not exist.

- Issue #2008554 by coredumperror: Properly display week numbers in mini calendar view.

- Issue #1471400 by RoSk0, Garrett Albright: Fix illegal offset in template_preprocess_calendar_month().

- Issue #1792368 by rdela, Day template missing % after $first_column_width

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

version = "7.x-3.5"

datestamp = "1413299943"

	if (!isset($item['localized_options'])) {

          $item['localized_options'] = array();

        }

      '#options' => array(

         0 => t('Unlimited'),

         1 => format_plural( 1, '1 item', '@count items'),

         3 => format_plural( 3, '1 item', '@count items'),

         5 => format_plural( 5, '1 item', '@count items'),

        10 => format_plural(10, '1 item', '@count items'),

      ),

    if (!empty($this->date_info->style_with_weekno)) {

      $path = calendar_granularity_path($this->view, 'week');

      if (!empty($path)) {

        $url = $path . '/' . $this->date_info->year . '-W' . $week;

        $weekno = l($week, $url, array('query' => !empty($this->date_info->append) ? $this->date_info->append : ''));

      }

      else {

        // Do not link week numbers, if Week views are disabled.

        $weekno = $week;

      }

      $rows[$week][] = array(

        'data' => $weekno,

        'class' => 'mini week',

        'id' => $this->view->name . '-weekno-' . $curday_date,

      );

    }

}

  <col width="<?php print $first_column_width?>%"></col>

    // If this row is already rendered, don't do anything.

    if (!isset($row['data'])) {

      foreach ($row as $day => $data) {

        $cell = $data['data'];

        // If this cell is already rendered, like the weekno column,

        // move to the next item.

        if (!is_array($cell)) {

          $month_rows[$weekno][$day]['data'] = $cell;

          continue;

        }

        $data = $cell['datebox'];

        if ($cell['empty']) {

          $data .= $cell['empty'];

        }

        else {

          $data .= implode($cell['all_day']);

          foreach ($cell['items'] as $hour => $item) {

            $data .= implode($item);

          }

          $data .= $cell['link'];

        }

        if ($view->date_info->mini) {

          $month_rows[$weekno][$day]['data'] = $data;

        }

        else {

          $month_rows[$weekno][$day]['data'] = '<div class="inner">' . $data . '</div>';

/**

 * Hook to extend CKEditor security allowed tags list.

 *

 * This hook is invoked from ckeditor_filter_xss() where text is filtered from potentially insecure tags.

 */

function hook_ckeditor_filter_xss_allowed_tags() {

  // Return an array of additional allowed tags

}

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

version = "7.x-1.16"

datestamp = "1413311935"

module_load_include('inc', 'ckeditor', 'includes/ckeditor.user');

  $query_string = '?' . variable_get('css_js_query_string', '0');

  global $user, $theme;

      // By default sessions are not started automatically for anonymous users.

      // Start one for editing content so that we had a consistent token that is used in XSS filter.

      if (isset($field['#entity']) && !empty($field['#entity']->created) && empty($user->uid)) {

        drupal_session_start();

        $_SESSION['ckeditor_anonymous_user'] = true;

        drupal_page_is_cacheable(FALSE);

      }

  header('Content-Type: text/plain; charset=utf-8');

  if (!isset($_POST['text']) || !is_string($_POST['text']) || !isset($_POST['input_format']) || !is_string($_POST['input_format']) || !isset($_POST['token']) || !drupal_valid_token($_POST['token'], 'ckeditorAjaxCall', FALSE)) {

    // Built-in filter module, a special case where we would like to strip XSS and nothing more

        // Sources of inspiration:

        // http://www.w3.org/TR/html4/index/elements.html

        // http://www.w3.org/TR/html-markup/elements.html

        // https://developer.mozilla.org/en-US/docs/Web/HTML/Element

        $base_allowed_tags = array('a','abbr','acronym','address','area','article','aside','audio','b','base','basefont',

          'bdi','bdo','big','blockquote','body','br','button','canvas','caption','center','cite','code','col','colgroup',

          'command','datalist','dd','del','details','dfn','dialog','dir','div','dl','dt','em','fieldset','figcaption',

          'figure','font','footer','form','h1','h2','h3','h4','h5','h6','head','header','hgroup','hr','html','i','img',

          'input','ins','isindex','kbd','keygen','label','legend','li','main','map','mark','menu','menuitem','meter',

          'nav','noframes','noscript','ol','optgroup','option','output','p','param','pre','progress','q','rp','rt',

          'ruby','s','samp','section','select','small','source','span','strike','strong','sub','summary','sup','table',

          'tbody','td','textarea','tfoot','th','thead','time','title','tr','track','tt','u','ul','var','video','wbr',

        );

        // Get tags allowed in filter settings

        $filter_allowed_tags = preg_split('/\s+|<|>/', $object->settings['allowed_html'], -1, PREG_SPLIT_NO_EMPTY);

        // Combine allowed tags

        $tags = array_merge($base_allowed_tags, $filter_allowed_tags);

        // Tags provided by hook

        $hooks_allowed_tags = module_invoke_all('ckeditor_filter_xss_allowed_tags');

        if (!empty($hooks_allowed_tags) && is_array($hooks_allowed_tags)){

          foreach($hooks_allowed_tags as $tag ){

            if (!empty($tag) && is_string($tag) && !in_array($tag,$tags)){

              array_push($tags,$tag);

            }

          }

        }

Nodeaccess 7.x-1.4

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

Issue #436918: Aliases are not being saved for disabled roles, port to D7.

Issue #2187571 by e.escribano, jshirkey: Fix node type grant tab choice.

Nodeaccess 7.x-1.3

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

Issue #2173497: Remove undefined variable rows.

Nodeaccess 7.x-1.2

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

Issue #2173497: remove undefined variable rid.

; Information added by Drupal.org packaging script on 2014-10-06

version = "7.x-1.4"

datestamp = "1412639629"

      'grant_view' => 0,

      'grant_update' => 0,

      'grant_delete' => 0,

      return t("You can set grants for individual users. Enter a name or a partial name in the box and click Search or press return. You must check the 'Keep?' checkbox if you want to keep the user for granting. Note that user grants are in addition to those coming from roles.");

    if ($node->nid && isset($allowed_types[$node->type]) && !empty($allowed_types[$node->type]) &&

      'render element'  => 'form',

    '#description' => t('If you are only using this access control module, you can safely ignore this. If you are using multiple access control modules, and you want the grants given on individual nodes to override any grants given by other modules, you should check this box.'),

    '#description' => t('The selected roles will be listed on individual node grants. If you wish for certain roles to be hidden from users on the node grants tab, make sure they are not selected here. You may also provide an alias for each role to be displayed to the user and a weight to order them by. This is useful if your roles have machine-readable names not intended for human users.'),

    else {

      // Otherwise, we only save alias if one was specified.

      if ($val['alias']) {

        $alias_prefs[$id]['name'] = $val['alias'];

        $alias_prefs[$id]['weight'] = $val['weight'];

      }

    }

 * Theme function for nodeaccess_admin_form.

  $form = $variables['form'];

  $rows = array();

  foreach (element_children($form) as $rid) {

    // Classify the weight element for TableDrag.

    $form[$rid]['weight']['#attributes']['class'] = array('roles-order-weight');

    // Mark the table row as draggable for TableDrag.

    $row = array(

      'data' => array(),

      'class' => array('draggable'),

    );

    // Render the table columns.

    $row['data'][] = drupal_render($form[$rid]['allow']);

    $row['data'][] = drupal_render($form[$rid]['alias']);

    $row['data'][] = drupal_render($form[$rid]['weight']);

  $header = array(t('Allow Role'), t('Alias'), t('Weight'));

  $output .= theme('table', array(

    'header' => $header,

    'rows' => $rows,

    'attributes' => array('id' => 'roles-order'),

  ));

  $output .= drupal_render_children($form);

  // Attach TableDrag to the table ID and contained weight elements.

  drupal_add_tabledrag('roles-order', 'order', 'sibling', 'roles-order-weight');

    $result = db_query("SELECT r.rid, nra.name, na.grant_view, na.grant_update, na.grant_delete

      FROM {role} r

      LEFT JOIN {nodeaccess_role_alias} nra ON r.rid = nra.rid

      LEFT JOIN {node_access} na ON r.rid = na.gid AND na.realm = :realm AND na.nid = :nid

      ORDER BY nra.weight, nra.name", array(':realm' => 'nodeaccess_rid', ':nid' => $node->nid));

    $results = db_query("SELECT uid, name, grant_view, grant_update, grant_delete

      FROM {node_access}

      LEFT JOIN {users} ON uid = gid

      WHERE nid = :nid AND realm = :realm

      ORDER BY name", array(

            $form_values['uid'][$uid][$grant_type] = db_query_range("SELECT count(*) FROM {node_access} na LEFT JOIN {users_roles} r ON na.gid = r.rid WHERE nid = :nid AND realm = :realm AND uid = :uid AND $grant_type = 1",

              db_query_range("SELECT count(*) FROM {node_access} na WHERE nid = :nid AND realm = :realm AND gid = :gid AND $grant_type = 1",

  $role_aliases = nodeaccess_get_role_aliases();

  // Replace names with aliases.

  foreach ($role_names as $rid => $name) {

    if (isset($role_aliases[$rid]['alias'])) {

      $role_names[$rid] = $role_aliases[$rid]['alias'];

    }

  }

  // Setup default keys that are required by node_access_write_grants().

  $grant_defaults = array(

    'gid' => 0,

    'realm' => 'nodeaccess_rid',

    'grant_view' => 0,

    'grant_update' => 0,

    'grant_delete' => 0,

    'priority' => variable_get('nodeaccess-priority', 0),

  );

    // Node has no own grants, use defaults if published.

    if ($node->status) {

      $grants = $default;

    }

    else {

      // Otherwise, check access to unpublished content for authenticated and

      // anonymous users.

      $role_perms = user_role_permissions(array(

        DRUPAL_ANONYMOUS_RID => DRUPAL_ANONYMOUS_RID,

        DRUPAL_AUTHENTICATED_RID => DRUPAL_AUTHENTICATED_RID,

      ));

      // Anonymous user setting.

      $grants = array();

      $grants[] = array(

        'gid' => DRUPAL_ANONYMOUS_RID,

        'grant_view' => isset($role_perms[DRUPAL_ANONYMOUS_RID]['bypass node access']) ?

          intval($role_perms[DRUPAL_ANONYMOUS_RID]['bypass node access']) : 0,

      );

      // Authenticated user setting.

      $grants[] = array(

        'gid' => DRUPAL_AUTHENTICATED_RID,

        'grant_view' => isset($role_perms[DRUPAL_AUTHENTICATED_RID]['bypass node access']) ?

          intval($role_perms[DRUPAL_AUTHENTICATED_RID]['bypass node access']) : 0,

      );

  foreach ($grants as $id => $grant) {

    // Merge missing default grant keys.

    $grants[$id] = $grants[$id] + $grant_defaults;

  }

 * Mark module to be in process of disabling.

 *

 * Prevents entries being saved to node_access while module is being disabled.

 *

 * @param mixed $set

 *   A boolean set or NULL to not change status.

    'grant_view' => 0,

    'grant_update' => 0,

    'grant_delete' => 0,

 * Retrieve role aliases.

 *

 * @return array or role aliases indexed by rid.

  $sql = 'SELECT r.rid, r.name, a.name AS alias, a.weight

    FROM {role} r

    LEFT JOIN {nodeaccess_role_alias} a ON r.rid = a.rid

    ORDER BY a.weight, r.weight, a.name, r.name';

  $results = db_query($sql);

 * Save a role alias.

 *

 * @param array $edit

 *   An array of aliases to save, indexed by rid.