BOINC / boinc

drupal/sites/all/themes/zen/zen-internals/template.zen.inc

Indentation +15 added lines, -15 removed lines

@@ -14,26 +14,26 @@
  * If the user is silly and enables Zen as the theme, manually add some stylesheets.
  */
 function _zen_preprocess_page(&$vars, $hook) {
-  $directory = _zen_path() . '/zen-internals/css';
+    $directory = _zen_path() . '/zen-internals/css';
 
-  // Add default styles.
-  if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
+    // Add default styles.
+    if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
     drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all');
-  }
-  else {
+    }
+    else {
     drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all');
-  }
-  // Add print styles.
-  drupal_add_css($directory . '/print.css', 'theme', 'print');
+    }
+    // Add print styles.
+    drupal_add_css($directory . '/print.css', 'theme', 'print');
 
-  // Regenerate the stylesheets.
-  $vars['css'] = drupal_add_css();
-  $vars['styles'] = drupal_get_css();
+    // Regenerate the stylesheets.
+    $vars['css'] = drupal_add_css();
+    $vars['styles'] = drupal_get_css();
 
-  // Add IE styles.
-  $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
-  $base_path = base_path() . $directory;
-  $vars['styles'] .= <<< IE_STYLES
+    // Add IE styles.
+    $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
+    $base_path = base_path() . $directory;
+    $vars['styles'] .= <<< IE_STYLES
 <!--[if IE]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie.css$query_string" /><![endif]-->
 <!--[if lte IE 6]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie6.css$query_string" /><![endif]-->
 

Spacing +6 added lines, -6 removed lines

@@ -14,25 +14,25 @@
  * If the user is silly and enables Zen as the theme, manually add some stylesheets.
  */
 function _zen_preprocess_page(&$vars, $hook) {
-  $directory = _zen_path() . '/zen-internals/css';
+  $directory = _zen_path().'/zen-internals/css';
 
   // Add default styles.
   if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
-    drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all');
+    drupal_add_css($directory.'/zen-fixed.css', 'theme', 'all');
   }
   else {
-    drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all');
+    drupal_add_css($directory.'/zen-liquid.css', 'theme', 'all');
   }
   // Add print styles.
-  drupal_add_css($directory . '/print.css', 'theme', 'print');
+  drupal_add_css($directory.'/print.css', 'theme', 'print');
 
   // Regenerate the stylesheets.
   $vars['css'] = drupal_add_css();
   $vars['styles'] = drupal_get_css();
 
   // Add IE styles.
-  $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
-  $base_path = base_path() . $directory;
+  $query_string = '?'.substr(variable_get('css_js_query_string', '0'), 0, 1);
+  $base_path = base_path().$directory;
   $vars['styles'] .= <<< IE_STYLES
 <!--[if IE]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie.css$query_string" /><![endif]-->
 <!--[if lte IE 6]><link type="text/css" rel="stylesheet" media="all" href="$base_path/ie6.css$query_string" /><![endif]-->

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
   // Add default styles.
   if (theme_get_setting('zen_layout') == 'zen-columns-fixed') {
     drupal_add_css($directory . '/zen-fixed.css', 'theme', 'all');
-  }
-  else {
+  } else {
     drupal_add_css($directory . '/zen-liquid.css', 'theme', 'all');
   }
   // Add print styles.

drupal/sites/all/themes/zen/zen-internals/template.comment.inc

Indentation +27 added lines, -27 removed lines

@@ -13,46 +13,46 @@
  *   The name of the template being rendered ("comment" in this case.)
  */
 function _zen_preprocess_comment(&$vars, $hook) {
-  // In Drupal 7, $date has been renamed to $created.
-  $vars['created'] = $vars['date'];
+    // In Drupal 7, $date has been renamed to $created.
+    $vars['created'] = $vars['date'];
 
-  // If comment subjects are disabled, don't display them.
-  if (variable_get('comment_subject_field_' . $vars['node']->type, 1) == 0) {
+    // If comment subjects are disabled, don't display them.
+    if (variable_get('comment_subject_field_' . $vars['node']->type, 1) == 0) {
     $vars['title'] = '';
-  }
+    }
 
-  // New comment.
-  if ($vars['comment']->new) {
+    // New comment.
+    if ($vars['comment']->new) {
     $vars['classes_array'][] = 'comment-new';
-  }
-  // Add an "unpublished" flag.
-  if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) {
+    }
+    // Add an "unpublished" flag.
+    if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) {
     $vars['unpublished'] = TRUE;
     $vars['classes_array'][] = $vars['status'];
-  }
-  else {
+    }
+    else {
     $vars['unpublished'] = FALSE;
-  }
-  // Zebra striping.
-  if ($vars['id'] == 1) {
+    }
+    // Zebra striping.
+    if ($vars['id'] == 1) {
     $vars['classes_array'][] = 'first';
-  }
-  if ($vars['id'] == $vars['node']->comment_count) {
+    }
+    if ($vars['id'] == $vars['node']->comment_count) {
     $vars['classes_array'][] = 'last';
-  }
-  $vars['classes_array'][] = $vars['zebra'];
-  if ($vars['comment']->uid == 0) {
+    }
+    $vars['classes_array'][] = $vars['zebra'];
+    if ($vars['comment']->uid == 0) {
     // Comment is by an anonymous user.
     $vars['classes_array'][] = 'comment-by-anonymous';
-  }
-  else {
+    }
+    else {
     if ($vars['comment']->uid == $vars['node']->uid) {
-      // Comment is by the node author.
-      $vars['classes_array'][] = 'comment-by-node-author';
+        // Comment is by the node author.
+        $vars['classes_array'][] = 'comment-by-node-author';
     }
     if ($vars['comment']->uid == $GLOBALS['user']->uid) {
-      // Comment was posted by current user.
-      $vars['classes_array'][] = 'comment-by-viewer';
+        // Comment was posted by current user.
+        $vars['classes_array'][] = 'comment-by-viewer';
+    }
     }
-  }
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
   $vars['created'] = $vars['date'];
 
   // If comment subjects are disabled, don't display them.
-  if (variable_get('comment_subject_field_' . $vars['node']->type, 1) == 0) {
+  if (variable_get('comment_subject_field_'.$vars['node']->type, 1) == 0) {
     $vars['title'] = '';
   }
 

Braces +2 added lines, -4 removed lines

@@ -29,8 +29,7 @@ 
   if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) {
     $vars['unpublished'] = TRUE;
     $vars['classes_array'][] = $vars['status'];
-  }
-  else {
+  } else {
     $vars['unpublished'] = FALSE;
   }
   // Zebra striping.
@@ -44,8 +43,7 @@ 
   if ($vars['comment']->uid == 0) {
     // Comment is by an anonymous user.
     $vars['classes_array'][] = 'comment-by-anonymous';
-  }
-  else {
+  } else {
     if ($vars['comment']->uid == $vars['node']->uid) {
       // Comment is by the node author.
       $vars['classes_array'][] = 'comment-by-node-author';

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -27,11 +27,11 @@
   }
   // Add an "unpublished" flag.
   if ($vars['comment']->status == COMMENT_NOT_PUBLISHED) {
-    $vars['unpublished'] = TRUE;
+    $vars['unpublished'] = true;
     $vars['classes_array'][] = $vars['status'];
   }
   else {
-    $vars['unpublished'] = FALSE;
+    $vars['unpublished'] = false;
   }
   // Zebra striping.
   if ($vars['id'] == 1) {

drupal/sites/all/themes/zen/template.php

Indentation +242 added lines, -242 removed lines

@@ -13,7 +13,7 @@ 
 
 // Auto-rebuild the theme registry during theme development.
 if (theme_get_setting('zen_rebuild_registry')) {
-  drupal_rebuild_theme_registry();
+    drupal_rebuild_theme_registry();
 }
 
 
@@ -21,9 +21,9 @@ 
  * Implements HOOK_theme().
  */
 function zen_theme(&$existing, $type, $theme, $path) {
-  // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
-  return _zen_theme($existing, $type, $theme, $path);
+    // When #341140 is fixed, replace _zen_path() with drupal_get_path().
+    include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+    return _zen_theme($existing, $type, $theme, $path);
 }
 
 /**
@@ -35,33 +35,33 @@ 
  *   A string containing the breadcrumb output.
  */
 function zen_breadcrumb($breadcrumb) {
-  // Determine if we are to display the breadcrumb.
-  $show_breadcrumb = theme_get_setting('zen_breadcrumb');
-  if ($show_breadcrumb == 'yes' || $show_breadcrumb == 'admin' && arg(0) == 'admin') {
+    // Determine if we are to display the breadcrumb.
+    $show_breadcrumb = theme_get_setting('zen_breadcrumb');
+    if ($show_breadcrumb == 'yes' || $show_breadcrumb == 'admin' && arg(0) == 'admin') {
 
     // Optionally get rid of the homepage link.
     $show_breadcrumb_home = theme_get_setting('zen_breadcrumb_home');
     if (!$show_breadcrumb_home) {
-      array_shift($breadcrumb);
+        array_shift($breadcrumb);
     }
 
     // Return the breadcrumb with separators.
     if (!empty($breadcrumb)) {
-      $breadcrumb_separator = theme_get_setting('zen_breadcrumb_separator');
-      $trailing_separator = $title = '';
-      if (theme_get_setting('zen_breadcrumb_title')) {
+        $breadcrumb_separator = theme_get_setting('zen_breadcrumb_separator');
+        $trailing_separator = $title = '';
+        if (theme_get_setting('zen_breadcrumb_title')) {
         if ($title = drupal_get_title()) {
-          $trailing_separator = $breadcrumb_separator;
+            $trailing_separator = $breadcrumb_separator;
         }
-      }
-      elseif (theme_get_setting('zen_breadcrumb_trailing')) {
+        }
+        elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
-      }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+        }
+        return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
     }
-  }
-  // Otherwise, return an empty string.
-  return '';
+    }
+    // Otherwise, return an empty string.
+    return '';
 }
 
 /**
@@ -90,27 +90,27 @@ 
  *   A string containing an unordered list of links.
  */
 function zen_links($links, $attributes = array('class' => 'links'), $heading = '') {
-  global $language;
-  $output = '';
+    global $language;
+    $output = '';
 
-  if (count($links) > 0) {
+    if (count($links) > 0) {
     // Treat the heading first if it is present to prepend it to the
     // list of links.
     if (!empty($heading)) {
-      if (is_string($heading)) {
+        if (is_string($heading)) {
         // Prepare the array that will be used when the passed heading
         // is a string.
         $heading = array(
-          'text' => $heading,
-          // Set the default level of the heading.
-          'level' => 'h2',
+            'text' => $heading,
+            // Set the default level of the heading.
+            'level' => 'h2',
         );
-      }
-      $output .= '<' . $heading['level'];
-      if (!empty($heading['class'])) {
+        }
+        $output .= '<' . $heading['level'];
+        if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
-      }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+        }
+        $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
     }
 
     $output .= '<ul'. drupal_attributes($attributes) .'>';
@@ -119,89 +119,89 @@ 
     $i = 1;
 
     foreach ($links as $key => $link) {
-      $class = $key;
+        $class = $key;
 
-      // Add first, last and active classes to the list of links to help out themers.
-      if ($i == 1) {
+        // Add first, last and active classes to the list of links to help out themers.
+        if ($i == 1) {
         $class .= ' first';
-      }
-      if ($i == $num_links) {
+        }
+        if ($i == $num_links) {
         $class .= ' last';
-      }
-      if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
+        }
+        if (isset($link['href']) && ($link['href'] == $_GET['q'] || ($link['href'] == '<front>' && drupal_is_front_page()))
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
-      }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+        }
+        $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
 
-      if (isset($link['href'])) {
+        if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
         $output .= l($link['title'], $link['href'], $link);
-      }
-      else if (!empty($link['title'])) {
+        }
+        else if (!empty($link['title'])) {
         // Some links are actually not links, but we wrap these in <span> for adding title and class attributes
         if (empty($link['html'])) {
-          $link['title'] = check_plain($link['title']);
+            $link['title'] = check_plain($link['title']);
         }
         $span_attributes = '';
         if (isset($link['attributes'])) {
-          $span_attributes = drupal_attributes($link['attributes']);
+            $span_attributes = drupal_attributes($link['attributes']);
         }
         $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
-      }
+        }
 
-      $i++;
-      $output .= "</li>\n";
+        $i++;
+        $output .= "</li>\n";
     }
 
     $output .= '</ul>';
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
  * Implements theme_menu_item_link()
  */
 function zen_menu_item_link($link) {
-  if (empty($link['localized_options'])) {
+    if (empty($link['localized_options'])) {
     $link['localized_options'] = array();
-  }
+    }
 
-  // If an item is a LOCAL TASK, render it as a tab
-  if ($link['type'] & MENU_IS_LOCAL_TASK) {
+    // If an item is a LOCAL TASK, render it as a tab
+    if ($link['type'] & MENU_IS_LOCAL_TASK) {
     $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
     $link['localized_options']['html'] = TRUE;
-  }
+    }
 
-  return l($link['title'], $link['href'], $link['localized_options']);
+    return l($link['title'], $link['href'], $link['localized_options']);
 }
 
 /**
  * Duplicate of theme_menu_local_tasks() but adds clearfix to tabs.
  */
 function zen_menu_local_tasks() {
-  $output = '';
+    $output = '';
 
-  // CTools requires a different set of local task functions.
-  if (module_exists('ctools')) {
+    // CTools requires a different set of local task functions.
+    if (module_exists('ctools')) {
     ctools_include('menu');
     $primary = ctools_menu_primary_local_tasks();
     $secondary = ctools_menu_secondary_local_tasks();
-  }
-  else {
+    }
+    else {
     $primary = menu_primary_local_tasks();
     $secondary = menu_secondary_local_tasks();
-  }
+    }
 
-  if ($primary) {
+    if ($primary) {
     $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
-  }
-  if ($secondary) {
+    }
+    if ($secondary) {
     $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
-  }
+    }
 
-  return $output;
+    return $output;
 }
 
 /**
@@ -218,32 +218,32 @@ 
  * @see zen_show_blocks_discovery()
  */
 function zen_blocks($region, $show_blocks = NULL) {
-  // Since Drupal 6 doesn't pass $show_blocks to theme_blocks, we manually call
-  // theme('blocks', NULL, $show_blocks) so that this function can remember the
-  // value on later calls.
-  static $render_sidebars = TRUE;
-  if (!is_null($show_blocks)) {
+    // Since Drupal 6 doesn't pass $show_blocks to theme_blocks, we manually call
+    // theme('blocks', NULL, $show_blocks) so that this function can remember the
+    // value on later calls.
+    static $render_sidebars = TRUE;
+    if (!is_null($show_blocks)) {
     $render_sidebars = $show_blocks;
-  }
+    }
 
-  // If zen_blocks was called with a NULL region, its likely we were just
-  // setting the $render_sidebars static variable.
-  if ($region) {
+    // If zen_blocks was called with a NULL region, its likely we were just
+    // setting the $render_sidebars static variable.
+    if ($region) {
     $output = '';
 
     // If $renders_sidebars is FALSE, don't render any region whose name begins
     // with "sidebar_".
     if ($render_sidebars || (strpos($region, 'sidebar_') !== 0)) {
-      // Allow context module to set blocks.
-      if (function_exists('context_blocks')) {
+        // Allow context module to set blocks.
+        if (function_exists('context_blocks')) {
         $output = context_blocks($region);
-      }
-      else {
+        }
+        else {
         foreach (block_list($region) as $key => $block) {
-          // $key == module_delta
-          $output .= theme('block', $block);
+            // $key == module_delta
+            $output .= theme('block', $block);
+        }
         }
-      }
     }
 
     // Add any content assigned to this region through drupal_set_content() calls.
@@ -255,11 +255,11 @@ 
     // Set the theme hook suggestions.
     $hook = array('region_' . $region);
     if (strpos($region, 'sidebar_') === 0) {
-      $hook[] = 'region_sidebar';
+        $hook[] = 'region_sidebar';
     }
     $hook[] = 'region';
     return $output ? theme($hook, $elements) : '';
-  }
+    }
 }
 
 /**
@@ -271,11 +271,11 @@ 
  * @see zen_blocks()
  */
 function zen_show_blocks_discovery(&$vars) {
-  if ($vars['show_blocks'] == FALSE) {
+    if ($vars['show_blocks'] == FALSE) {
     // Allow zen_blocks() to statically cache the $show_blocks variable. A TRUE
     // value is assumed, so we only need to override when $show_blocks is FALSE.
     theme('blocks', NULL, FALSE);
-  }
+    }
 }
 
 /**
@@ -287,25 +287,25 @@ 
  *   The name of the template being rendered.
  */
 function zen_preprocess(&$vars, $hook) {
-  // In D6, the page.tpl uses a different variable name to hold the classes.
-  $key = ($hook == 'page' || $hook == 'maintenance_page') ? 'body_classes' : 'classes';
+    // In D6, the page.tpl uses a different variable name to hold the classes.
+    $key = ($hook == 'page' || $hook == 'maintenance_page') ? 'body_classes' : 'classes';
 
-  // Create a D7-standard classes_array variable.
-  if (array_key_exists($key, $vars)) {
+    // Create a D7-standard classes_array variable.
+    if (array_key_exists($key, $vars)) {
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
-      unset($vars[$key]);
+        $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+        unset($vars[$key]);
+    }
     }
-  }
-  else {
+    else {
     $vars['classes_array'] = array($hook);
-  }
-  // Add support for Skinr
-  if (!empty($vars['skinr']) && array_key_exists('classes_array', $vars)) {
+    }
+    // Add support for Skinr
+    if (!empty($vars['skinr']) && array_key_exists('classes_array', $vars)) {
     $vars['classes_array'][] = $vars['skinr'];
-  }
+    }
 }
 
 /**
@@ -317,82 +317,82 @@ 
  *   The name of the template being rendered ("page" in this case.)
  */
 function zen_preprocess_page(&$vars, $hook) {
-  // If the user is silly and enables Zen as the theme, add some styles.
-  if ($GLOBALS['theme'] == 'zen') {
+    // If the user is silly and enables Zen as the theme, add some styles.
+    if ($GLOBALS['theme'] == 'zen') {
     include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
-  }
-  // Add conditional stylesheets.
-  elseif (!module_exists('conditional_styles')) {
+    }
+    // Add conditional stylesheets.
+    elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
     $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
     $vars['styles'] .= $vars['conditional_styles'];
-  }
+    }
 
-  // Classes for body element. Allows advanced theming based on context
-  // (home page, node of certain type, etc.)
-  // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+    // Classes for body element. Allows advanced theming based on context
+    // (home page, node of certain type, etc.)
+    // Remove the mostly useless page-ARG0 class.
+    if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
-  }
-  if (!$vars['is_front']) {
+    }
+    if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
     $vars['classes_array'][] = drupal_html_class('page-' . $path);
     // Add unique class for each website section.
     list($section, ) = explode('/', $path, 2);
     if (arg(0) == 'node') {
-      if (arg(1) == 'add') {
+        if (arg(1) == 'add') {
         $section = 'node-add';
-      }
-      elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
+        }
+        elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
         $section = 'node-' . arg(2);
-      }
+        }
     }
     $vars['classes_array'][] = drupal_html_class('section-' . $section);
-  }
-  if (theme_get_setting('zen_wireframes')) {
+    }
+    if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
-  }
-  // We need to re-do the $layout and body classes because
-  // template_preprocess_page() assumes sidebars are named 'left' and 'right'.
-  $vars['layout'] = 'none';
-  if (!empty($vars['sidebar_first'])) {
+    }
+    // We need to re-do the $layout and body classes because
+    // template_preprocess_page() assumes sidebars are named 'left' and 'right'.
+    $vars['layout'] = 'none';
+    if (!empty($vars['sidebar_first'])) {
     $vars['layout'] = 'first';
-  }
-  if (!empty($vars['sidebar_second'])) {
+    }
+    if (!empty($vars['sidebar_second'])) {
     $vars['layout'] = ($vars['layout'] == 'first') ? 'both' : 'second';
-  }
-  // If the layout is 'none', then template_preprocess_page() will already have
-  // set a 'no-sidebars' class since it won't find a 'left' or 'right' sidebar.
-  if ($vars['layout'] != 'none') {
+    }
+    // If the layout is 'none', then template_preprocess_page() will already have
+    // set a 'no-sidebars' class since it won't find a 'left' or 'right' sidebar.
+    if ($vars['layout'] != 'none') {
     // Remove the incorrect 'no-sidebars' class.
     if ($index = array_search('no-sidebars', $vars['classes_array'])) {
-      unset($vars['classes_array'][$index]);
+        unset($vars['classes_array'][$index]);
     }
     // Set the proper layout body classes.
     if ($vars['layout'] == 'both') {
-      $vars['classes_array'][] = 'two-sidebars';
+        $vars['classes_array'][] = 'two-sidebars';
     }
     else {
-      $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+        $vars['classes_array'][] = 'one-sidebar';
+        $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+    }
     }
-  }
-  // Store the menu item since it has some useful information.
-  $vars['menu_item'] = menu_get_item();
-  switch ($vars['menu_item']['page_callback']) {
+    // Store the menu item since it has some useful information.
+    $vars['menu_item'] = menu_get_item();
+    switch ($vars['menu_item']['page_callback']) {
     case 'views_page':
       // Is this a Views page?
       $vars['classes_array'][] = 'page-views';
-      break;
+        break;
     case 'page_manager_page_execute':
     case 'page_manager_node_view':
     case 'page_manager_contact_site':
       // Is this a Panels page?
       $vars['classes_array'][] = 'page-panels';
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -404,17 +404,17 @@ 
  *   The name of the template being rendered ("maintenance_page" in this case.)
  */
 function zen_preprocess_maintenance_page(&$vars, $hook) {
-  // If Zen is the maintenance theme, add some styles.
-  if ($GLOBALS['theme'] == 'zen') {
+    // If Zen is the maintenance theme, add some styles.
+    if ($GLOBALS['theme'] == 'zen') {
     include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
-  }
-  // Add conditional stylesheets.
-  elseif (!module_exists('conditional_styles')) {
+    }
+    // Add conditional stylesheets.
+    elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
     $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
     $vars['styles'] .= $vars['conditional_styles'];
-  }
+    }
 }
 
 /**
@@ -426,67 +426,67 @@ 
  *   The name of the template being rendered ("node" in this case.)
  */
 function zen_preprocess_node(&$vars, $hook) {
-  // Create the build_mode variable.
-  switch ($vars['node']->build_mode) {
+    // Create the build_mode variable.
+    switch ($vars['node']->build_mode) {
     case NODE_BUILD_NORMAL:
       if ($vars['node']->build_mode === NODE_BUILD_NORMAL) {
         $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full';
-      }
-      else {
+        }
+        else {
         $vars['build_mode'] = $vars['node']->build_mode;
-      }
-      break;
+        }
+        break;
     case NODE_BUILD_PREVIEW:
       $vars['build_mode'] = 'preview';
-      break;
+        break;
     case NODE_BUILD_SEARCH_INDEX:
       $vars['build_mode'] = 'search_index';
-      break;
+        break;
     case NODE_BUILD_SEARCH_RESULT:
       $vars['build_mode'] = 'search_result';
-      break;
+        break;
     case NODE_BUILD_RSS:
       $vars['build_mode'] = 'rss';
-      break;
+        break;
     case NODE_BUILD_PRINT:
       $vars['build_mode'] = 'print';
-      break;
+        break;
     default:
       $vars['build_mode'] = $vars['node']->build_mode;
-  }
+    }
 
-  // Create the user_picture variable.
-  $vars['user_picture'] = $vars['picture'];
+    // Create the user_picture variable.
+    $vars['user_picture'] = $vars['picture'];
 
-  // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+    // Create the Drupal 7 $display_submitted variable.
+    $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
 
-  // Special classes for nodes.
-  // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
-  if ($vars['promote']) {
+    // Special classes for nodes.
+    // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
+    $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+    if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
-  }
-  if ($vars['sticky']) {
+    }
+    if ($vars['sticky']) {
     $vars['classes_array'][] = 'node-sticky';
-  }
-  if (!$vars['status']) {
+    }
+    if (!$vars['status']) {
     $vars['classes_array'][] = 'node-unpublished';
     $vars['unpublished'] = TRUE;
-  }
-  else {
+    }
+    else {
     $vars['unpublished'] = FALSE;
-  }
-  if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {
+    }
+    if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {
     $vars['classes_array'][] = 'node-by-viewer'; // Node is authored by current user.
-  }
-  if ($vars['teaser']) {
+    }
+    if ($vars['teaser']) {
     $vars['classes_array'][] = 'node-teaser'; // Node is displayed as teaser.
-  }
-  if (isset($vars['preview'])) {
+    }
+    if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
-  }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+    }
+    $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
 }
 
 /**
@@ -498,8 +498,8 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
-  _zen_preprocess_comment($vars, $hook);
+    include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+    _zen_preprocess_comment($vars, $hook);
 }
 
 /**
@@ -511,18 +511,18 @@ 
  * @see region.tpl.php
  */
 function zen_preprocess_region(&$vars, $hook) {
-  // Create the $content variable that templates expect.
-  $vars['content'] = $vars['elements']['#children'];
-  $vars['region'] = $vars['elements']['#region'];
+    // Create the $content variable that templates expect.
+    $vars['content'] = $vars['elements']['#children'];
+    $vars['region'] = $vars['elements']['#region'];
 
-  // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+    // Setup the default classes.
+    $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
 
-  // Sidebar regions get a couple extra classes.
-  if (strpos($vars['region'], 'sidebar_') === 0) {
+    // Sidebar regions get a couple extra classes.
+    if (strpos($vars['region'], 'sidebar_') === 0) {
     $vars['classes_array'][] = 'column';
     $vars['classes_array'][] = 'sidebar';
-  }
+    }
 }
 
 /**
@@ -534,36 +534,36 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_preprocess_block(&$vars, $hook) {
-  $block = $vars['block'];
+    $block = $vars['block'];
 
-  // Drupal 7 uses a $content variable instead of $block->content.
-  $vars['content'] = $block->content;
-  // Drupal 7 should use a $title variable instead of $block->subject.
-  $vars['title'] = $block->subject;
+    // Drupal 7 uses a $content variable instead of $block->content.
+    $vars['content'] = $block->content;
+    // Drupal 7 should use a $title variable instead of $block->subject.
+    $vars['title'] = $block->subject;
 
-  // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
-  // Classes describing the position of the block within the region.
-  if ($vars['block_id'] == 1) {
+    // Special classes for blocks.
+    $vars['classes_array'][] = 'block-' . $block->module;
+    // Classes describing the position of the block within the region.
+    if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
-  }
-  if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
+    }
+    if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
-  }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
-  $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+    }
+    $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+    $vars['classes_array'][] = $vars['zebra'];
+    $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
+    $vars['classes_array'][] = 'count-' . $vars['id'];
 
-  // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+    // Create the block ID.
+    $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
 
-  $vars['edit_links_array'] = array();
-  if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
+    $vars['edit_links_array'] = array();
+    if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
     include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
-  }
+    }
 }
 
 /**
@@ -575,10 +575,10 @@ 
  *   The name of the template being rendered.
  */
 function zen_process(&$vars, $hook) {
-  // Don't clobber Views 3 classes.
-  if (array_key_exists('classes_array', $vars) && !array_key_exists('classes', $vars)) {
+    // Don't clobber Views 3 classes.
+    if (array_key_exists('classes_array', $vars) && !array_key_exists('classes', $vars)) {
     $vars['classes'] = implode(' ', $vars['classes_array']);
-  }
+    }
 }
 
 /**
@@ -590,22 +590,22 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+    $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {
-  /**
-   * Prepare a string for use as a valid class name.
-   *
-   * Do not pass one string containing multiple classes as they will be
-   * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
-   *
-   * @param $class
-   *   The class name to clean.
-   * @return
-   *   The cleaned class name.
-   */
-  function drupal_html_class($class) {
+    /**
+     * Prepare a string for use as a valid class name.
+     *
+     * Do not pass one string containing multiple classes as they will be
+     * incorrectly concatenated with dashes, i.e. "one two" will become "one-two".
+     *
+     * @param $class
+     *   The class name to clean.
+     * @return
+     *   The cleaned class name.
+     */
+    function drupal_html_class($class) {
     // By default, we filter using Drupal's coding standards.
     $class = strtr(drupal_strtolower($class), array(' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => ''));
 
@@ -623,19 +623,19 @@ 
     $class = preg_replace('/[^\x{002D}\x{0030}-\x{0039}\x{0041}-\x{005A}\x{005F}\x{0061}-\x{007A}\x{00A1}-\x{FFFF}]/u', '', $class);
 
     return $class;
-  }
+    }
 } /* End of drupal_html_class conditional definition. */
 
 if (!function_exists('drupal_html_id')) {
-  /**
-   * Prepare a string for use as a valid HTML ID and guarantee uniqueness.
-   *
-   * @param $id
-   *   The ID to clean.
-   * @return
-   *   The cleaned ID.
-   */
-  function drupal_html_id($id) {
+    /**
+     * Prepare a string for use as a valid HTML ID and guarantee uniqueness.
+     *
+     * @param $id
+     *   The ID to clean.
+     * @return
+     *   The cleaned ID.
+     */
+    function drupal_html_id($id) {
     $id = strtr(drupal_strtolower($id), array(' ' => '-', '_' => '-', '[' => '-', ']' => ''));
 
     // As defined in http://www.w3.org/TR/html4/types.html#type-name, HTML IDs can
@@ -647,7 +647,7 @@ 
     $id = preg_replace('/[^A-Za-z0-9\-_]/', '', $id);
 
     return $id;
-  }
+    }
 } /* End of drupal_html_id conditional definition. */
 
 /**
@@ -657,12 +657,12 @@ 
  * replace _zen_path() with drupal_get_path('theme', 'zen').
  */
 function _zen_path() {
-  static $path = FALSE;
-  if (!$path) {
+    static $path = FALSE;
+    if (!$path) {
     $matches = drupal_system_listing('zen\.info$', 'themes', 'name', 0);
     if (!empty($matches['zen']->filename)) {
-      $path = dirname($matches['zen']->filename);
+        $path = dirname($matches['zen']->filename);
+    }
     }
-  }
-  return $path;
+    return $path;
 }

Switch Indentation +34 added lines, -34 removed lines

@@ -382,16 +382,16 @@ 
   // Store the menu item since it has some useful information.
   $vars['menu_item'] = menu_get_item();
   switch ($vars['menu_item']['page_callback']) {
-    case 'views_page':
-      // Is this a Views page?
-      $vars['classes_array'][] = 'page-views';
-      break;
-    case 'page_manager_page_execute':
-    case 'page_manager_node_view':
-    case 'page_manager_contact_site':
-      // Is this a Panels page?
-      $vars['classes_array'][] = 'page-panels';
-      break;
+  case 'views_page':
+    // Is this a Views page?
+    $vars['classes_array'][] = 'page-views';
+    break;
+  case 'page_manager_page_execute':
+  case 'page_manager_node_view':
+  case 'page_manager_contact_site':
+    // Is this a Panels page?
+    $vars['classes_array'][] = 'page-panels';
+    break;
   }
 }
 
@@ -428,31 +428,31 @@ 
 function zen_preprocess_node(&$vars, $hook) {
   // Create the build_mode variable.
   switch ($vars['node']->build_mode) {
-    case NODE_BUILD_NORMAL:
-      if ($vars['node']->build_mode === NODE_BUILD_NORMAL) {
-        $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full';
-      }
-      else {
-        $vars['build_mode'] = $vars['node']->build_mode;
-      }
-      break;
-    case NODE_BUILD_PREVIEW:
-      $vars['build_mode'] = 'preview';
-      break;
-    case NODE_BUILD_SEARCH_INDEX:
-      $vars['build_mode'] = 'search_index';
-      break;
-    case NODE_BUILD_SEARCH_RESULT:
-      $vars['build_mode'] = 'search_result';
-      break;
-    case NODE_BUILD_RSS:
-      $vars['build_mode'] = 'rss';
-      break;
-    case NODE_BUILD_PRINT:
-      $vars['build_mode'] = 'print';
-      break;
-    default:
+  case NODE_BUILD_NORMAL:
+    if ($vars['node']->build_mode === NODE_BUILD_NORMAL) {
+      $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full';
+    }
+    else {
       $vars['build_mode'] = $vars['node']->build_mode;
+    }
+    break;
+  case NODE_BUILD_PREVIEW:
+    $vars['build_mode'] = 'preview';
+    break;
+  case NODE_BUILD_SEARCH_INDEX:
+    $vars['build_mode'] = 'search_index';
+    break;
+  case NODE_BUILD_SEARCH_RESULT:
+    $vars['build_mode'] = 'search_result';
+    break;
+  case NODE_BUILD_RSS:
+    $vars['build_mode'] = 'rss';
+    break;
+  case NODE_BUILD_PRINT:
+    $vars['build_mode'] = 'print';
+    break;
+  default:
+    $vars['build_mode'] = $vars['node']->build_mode;
   }
 
   // Create the user_picture variable.

Braces +9 added lines, -18 removed lines

@@ -53,8 +53,7 @@ 
         if ($title = drupal_get_title()) {
           $trailing_separator = $breadcrumb_separator;
         }
-      }
-      elseif (theme_get_setting('zen_breadcrumb_trailing')) {
+      } elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
       }
       return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
@@ -137,8 +136,7 @@ 
       if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
         $output .= l($link['title'], $link['href'], $link);
-      }
-      else if (!empty($link['title'])) {
+      } else if (!empty($link['title'])) {
         // Some links are actually not links, but we wrap these in <span> for adding title and class attributes
         if (empty($link['html'])) {
           $link['title'] = check_plain($link['title']);
@@ -188,8 +186,7 @@ 
     ctools_include('menu');
     $primary = ctools_menu_primary_local_tasks();
     $secondary = ctools_menu_secondary_local_tasks();
-  }
-  else {
+  } else {
     $primary = menu_primary_local_tasks();
     $secondary = menu_secondary_local_tasks();
   }
@@ -237,8 +234,7 @@ 
       // Allow context module to set blocks.
       if (function_exists('context_blocks')) {
         $output = context_blocks($region);
-      }
-      else {
+      } else {
         foreach (block_list($region) as $key => $block) {
           // $key == module_delta
           $output .= theme('block', $block);
@@ -298,8 +294,7 @@ 
       $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
       unset($vars[$key]);
     }
-  }
-  else {
+  } else {
     $vars['classes_array'] = array($hook);
   }
   // Add support for Skinr
@@ -344,8 +339,7 @@ 
     if (arg(0) == 'node') {
       if (arg(1) == 'add') {
         $section = 'node-add';
-      }
-      elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
+      } elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
         $section = 'node-' . arg(2);
       }
     }
@@ -373,8 +367,7 @@ 
     // Set the proper layout body classes.
     if ($vars['layout'] == 'both') {
       $vars['classes_array'][] = 'two-sidebars';
-    }
-    else {
+    } else {
       $vars['classes_array'][] = 'one-sidebar';
       $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
     }
@@ -431,8 +424,7 @@ 
     case NODE_BUILD_NORMAL:
       if ($vars['node']->build_mode === NODE_BUILD_NORMAL) {
         $vars['build_mode'] = $vars['teaser'] ? 'teaser' : 'full';
-      }
-      else {
+      } else {
         $vars['build_mode'] = $vars['node']->build_mode;
       }
       break;
@@ -473,8 +465,7 @@ 
   if (!$vars['status']) {
     $vars['classes_array'][] = 'node-unpublished';
     $vars['unpublished'] = TRUE;
-  }
-  else {
+  } else {
     $vars['unpublished'] = FALSE;
   }
   if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {

Upper-Lower-Casing +8 added lines, -8 removed lines

@@ -171,7 +171,7 @@ 
   // If an item is a LOCAL TASK, render it as a tab
   if ($link['type'] & MENU_IS_LOCAL_TASK) {
     $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
-    $link['localized_options']['html'] = TRUE;
+    $link['localized_options']['html'] = true;
   }
 
   return l($link['title'], $link['href'], $link['localized_options']);
@@ -217,11 +217,11 @@ 
  *
  * @see zen_show_blocks_discovery()
  */
-function zen_blocks($region, $show_blocks = NULL) {
+function zen_blocks($region, $show_blocks = null) {
   // Since Drupal 6 doesn't pass $show_blocks to theme_blocks, we manually call
   // theme('blocks', NULL, $show_blocks) so that this function can remember the
   // value on later calls.
-  static $render_sidebars = TRUE;
+  static $render_sidebars = true;
   if (!is_null($show_blocks)) {
     $render_sidebars = $show_blocks;
   }
@@ -271,10 +271,10 @@ 
  * @see zen_blocks()
  */
 function zen_show_blocks_discovery(&$vars) {
-  if ($vars['show_blocks'] == FALSE) {
+  if ($vars['show_blocks'] == false) {
     // Allow zen_blocks() to statically cache the $show_blocks variable. A TRUE
     // value is assumed, so we only need to override when $show_blocks is FALSE.
-    theme('blocks', NULL, FALSE);
+    theme('blocks', null, false);
   }
 }
 
@@ -472,10 +472,10 @@ 
   }
   if (!$vars['status']) {
     $vars['classes_array'][] = 'node-unpublished';
-    $vars['unpublished'] = TRUE;
+    $vars['unpublished'] = true;
   }
   else {
-    $vars['unpublished'] = FALSE;
+    $vars['unpublished'] = false;
   }
   if ($vars['uid'] && $vars['uid'] == $GLOBALS['user']->uid) {
     $vars['classes_array'][] = 'node-by-viewer'; // Node is authored by current user.
@@ -657,7 +657,7 @@ 
  * replace _zen_path() with drupal_get_path('theme', 'zen').
  */
 function _zen_path() {
-  static $path = FALSE;
+  static $path = false;
   if (!$path) {
     $matches = drupal_system_listing('zen\.info$', 'themes', 'name', 0);
     if (!empty($matches['zen']->filename)) {

Spacing +34 added lines, -34 removed lines

@@ -22,7 +22,7 @@ 
  */
 function zen_theme(&$existing, $type, $theme, $path) {
   // When #341140 is fixed, replace _zen_path() with drupal_get_path().
-  include_once './' . _zen_path() . '/zen-internals/template.theme-registry.inc';
+  include_once './'._zen_path().'/zen-internals/template.theme-registry.inc';
   return _zen_theme($existing, $type, $theme, $path);
 }
 
@@ -57,7 +57,7 @@ 
       elseif (theme_get_setting('zen_breadcrumb_trailing')) {
         $trailing_separator = $breadcrumb_separator;
       }
-      return '<div class="breadcrumb">' . implode($breadcrumb_separator, $breadcrumb) . "$trailing_separator$title</div>";
+      return '<div class="breadcrumb">'.implode($breadcrumb_separator, $breadcrumb)."$trailing_separator$title</div>";
     }
   }
   // Otherwise, return an empty string.
@@ -106,14 +106,14 @@ 
           'level' => 'h2',
         );
       }
-      $output .= '<' . $heading['level'];
+      $output .= '<'.$heading['level'];
       if (!empty($heading['class'])) {
         $output .= drupal_attributes(array('class' => $heading['class']));
       }
-      $output .= '>' . check_plain($heading['text']) . '</' . $heading['level'] . '>';
+      $output .= '>'.check_plain($heading['text']).'</'.$heading['level'].'>';
     }
 
-    $output .= '<ul'. drupal_attributes($attributes) .'>';
+    $output .= '<ul'.drupal_attributes($attributes).'>';
 
     $num_links = count($links);
     $i = 1;
@@ -132,7 +132,7 @@ 
           && (empty($link['language']) || $link['language']->language == $language->language)) {
         $class .= ' active';
       }
-      $output .= '<li'. drupal_attributes(array('class' => $class)) .'>';
+      $output .= '<li'.drupal_attributes(array('class' => $class)).'>';
 
       if (isset($link['href'])) {
         // Pass in $link as $options, they share the same keys.
@@ -147,7 +147,7 @@ 
         if (isset($link['attributes'])) {
           $span_attributes = drupal_attributes($link['attributes']);
         }
-        $output .= '<span'. $span_attributes .'>'. $link['title'] .'</span>';
+        $output .= '<span'.$span_attributes.'>'.$link['title'].'</span>';
       }
 
       $i++;
@@ -170,7 +170,7 @@ 
 
   // If an item is a LOCAL TASK, render it as a tab
   if ($link['type'] & MENU_IS_LOCAL_TASK) {
-    $link['title'] = '<span class="tab">' . check_plain($link['title']) . '</span>';
+    $link['title'] = '<span class="tab">'.check_plain($link['title']).'</span>';
     $link['localized_options']['html'] = TRUE;
   }
 
@@ -195,10 +195,10 @@ 
   }
 
   if ($primary) {
-    $output .= '<ul class="tabs primary clearfix">' . $primary . '</ul>';
+    $output .= '<ul class="tabs primary clearfix">'.$primary.'</ul>';
   }
   if ($secondary) {
-    $output .= '<ul class="tabs secondary clearfix">' . $secondary . '</ul>';
+    $output .= '<ul class="tabs secondary clearfix">'.$secondary.'</ul>';
   }
 
   return $output;
@@ -253,7 +253,7 @@ 
     $elements['#region'] = $region;
 
     // Set the theme hook suggestions.
-    $hook = array('region_' . $region);
+    $hook = array('region_'.$region);
     if (strpos($region, 'sidebar_') === 0) {
       $hook[] = 'region_sidebar';
     }
@@ -295,7 +295,7 @@ 
     // Views (and possibly other modules) have templates with a $classes
     // variable that isn't a string, so we leave those variables alone.
     if (is_string($vars[$key])) {
-      $vars['classes_array'] = explode(' ', $hook . ' ' . $vars[$key]);
+      $vars['classes_array'] = explode(' ', $hook.' '.$vars[$key]);
       unset($vars[$key]);
     }
   }
@@ -319,37 +319,37 @@ 
 function zen_preprocess_page(&$vars, $hook) {
   // If the user is silly and enables Zen as the theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 
   // Classes for body element. Allows advanced theming based on context
   // (home page, node of certain type, etc.)
   // Remove the mostly useless page-ARG0 class.
-  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'. drupal_strtolower(arg(0))), $vars['classes_array'])) {
+  if ($index = array_search(preg_replace('![^abcdefghijklmnopqrstuvwxyz0-9-_]+!s', '', 'page-'.drupal_strtolower(arg(0))), $vars['classes_array'])) {
     unset($vars['classes_array'][$index]);
   }
   if (!$vars['is_front']) {
     // Add unique class for each page.
     $path = drupal_get_path_alias($_GET['q']);
-    $vars['classes_array'][] = drupal_html_class('page-' . $path);
+    $vars['classes_array'][] = drupal_html_class('page-'.$path);
     // Add unique class for each website section.
-    list($section, ) = explode('/', $path, 2);
+    list($section,) = explode('/', $path, 2);
     if (arg(0) == 'node') {
       if (arg(1) == 'add') {
         $section = 'node-add';
       }
       elseif (is_numeric(arg(1)) && (arg(2) == 'edit' || arg(2) == 'delete')) {
-        $section = 'node-' . arg(2);
+        $section = 'node-'.arg(2);
       }
     }
-    $vars['classes_array'][] = drupal_html_class('section-' . $section);
+    $vars['classes_array'][] = drupal_html_class('section-'.$section);
   }
   if (theme_get_setting('zen_wireframes')) {
     $vars['classes_array'][] = 'with-wireframes'; // Optionally add the wireframes style.
@@ -376,7 +376,7 @@ 
     }
     else {
       $vars['classes_array'][] = 'one-sidebar';
-      $vars['classes_array'][] = 'sidebar-' . $vars['layout'];
+      $vars['classes_array'][] = 'sidebar-'.$vars['layout'];
     }
   }
   // Store the menu item since it has some useful information.
@@ -406,13 +406,13 @@ 
 function zen_preprocess_maintenance_page(&$vars, $hook) {
   // If Zen is the maintenance theme, add some styles.
   if ($GLOBALS['theme'] == 'zen') {
-    include_once './' . _zen_path() . '/zen-internals/template.zen.inc';
+    include_once './'._zen_path().'/zen-internals/template.zen.inc';
     _zen_preprocess_page($vars, $hook);
   }
   // Add conditional stylesheets.
   elseif (!module_exists('conditional_styles')) {
     $language = $GLOBALS['language']->direction == LANGUAGE_RTL ? '_rtl' : '';
-    $vars['conditional_styles'] = variable_get('conditional_styles_' . $GLOBALS['theme'] . $language, '');
+    $vars['conditional_styles'] = variable_get('conditional_styles_'.$GLOBALS['theme'].$language, '');
     $vars['styles'] .= $vars['conditional_styles'];
   }
 }
@@ -459,11 +459,11 @@ 
   $vars['user_picture'] = $vars['picture'];
 
   // Create the Drupal 7 $display_submitted variable.
-  $vars['display_submitted'] = theme_get_setting('toggle_node_info_' . $vars['node']->type);
+  $vars['display_submitted'] = theme_get_setting('toggle_node_info_'.$vars['node']->type);
 
   // Special classes for nodes.
   // Class for node type: "node-type-page", "node-type-story", "node-type-my-custom-type", etc.
-  $vars['classes_array'][] = drupal_html_class('node-type-' . $vars['type']);
+  $vars['classes_array'][] = drupal_html_class('node-type-'.$vars['type']);
   if ($vars['promote']) {
     $vars['classes_array'][] = 'node-promoted';
   }
@@ -486,7 +486,7 @@ 
   if (isset($vars['preview'])) {
     $vars['classes_array'][] = 'node-preview';
   }
-  $vars['classes_array'][] = 'build-mode-' . $vars['build_mode'] ;
+  $vars['classes_array'][] = 'build-mode-'.$vars['build_mode'];
 }
 
 /**
@@ -498,7 +498,7 @@ 
  *   The name of the template being rendered ("comment" in this case.)
  */
 function zen_preprocess_comment(&$vars, $hook) {
-  include_once './' . _zen_path() . '/zen-internals/template.comment.inc';
+  include_once './'._zen_path().'/zen-internals/template.comment.inc';
   _zen_preprocess_comment($vars, $hook);
 }
 
@@ -516,7 +516,7 @@ 
   $vars['region'] = $vars['elements']['#region'];
 
   // Setup the default classes.
-  $vars['classes_array'] = array('region', 'region-' . str_replace('_', '-', $vars['region']));
+  $vars['classes_array'] = array('region', 'region-'.str_replace('_', '-', $vars['region']));
 
   // Sidebar regions get a couple extra classes.
   if (strpos($vars['region'], 'sidebar_') === 0) {
@@ -542,7 +542,7 @@ 
   $vars['title'] = $block->subject;
 
   // Special classes for blocks.
-  $vars['classes_array'][] = 'block-' . $block->module;
+  $vars['classes_array'][] = 'block-'.$block->module;
   // Classes describing the position of the block within the region.
   if ($vars['block_id'] == 1) {
     $vars['classes_array'][] = 'first';
@@ -550,17 +550,17 @@ 
   if (!function_exists('context_blocks') && count(block_list($vars['block']->region)) == $vars['block_id']) {
     $vars['classes_array'][] = 'last';
   }
-  $vars['classes_array'][] = 'region-' . $vars['block_zebra'];
+  $vars['classes_array'][] = 'region-'.$vars['block_zebra'];
   $vars['classes_array'][] = $vars['zebra'];
-  $vars['classes_array'][] = 'region-count-' . $vars['block_id'];
-  $vars['classes_array'][] = 'count-' . $vars['id'];
+  $vars['classes_array'][] = 'region-count-'.$vars['block_id'];
+  $vars['classes_array'][] = 'count-'.$vars['id'];
 
   // Create the block ID.
-  $vars['block_html_id'] = 'block-' . $block->module . '-' . $block->delta;
+  $vars['block_html_id'] = 'block-'.$block->module.'-'.$block->delta;
 
   $vars['edit_links_array'] = array();
   if (theme_get_setting('zen_block_editing') && user_access('administer blocks')) {
-    include_once './' . _zen_path() . '/zen-internals/template.block-editing.inc';
+    include_once './'._zen_path().'/zen-internals/template.block-editing.inc';
     zen_preprocess_block_editing($vars, $hook);
     $vars['classes_array'][] = 'with-block-editing';
   }
@@ -590,7 +590,7 @@ 
  *   The name of the template being rendered ("block" in this case.)
  */
 function zen_process_block(&$vars, $hook) {
-  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">' . implode(' ', $vars['edit_links_array']) . '</div>' : '';
+  $vars['edit_links'] = !empty($vars['edit_links_array']) ? '<div class="edit">'.implode(' ', $vars['edit_links_array']).'</div>' : '';
 }
 
 if (!function_exists('drupal_html_class')) {

drupal/sites/all/themes/zen/theme-settings.php

Indentation +44 added lines, -44 removed lines

@@ -15,51 +15,51 @@ 
  */
 function zen_settings($saved_settings, $subtheme_defaults = array()) {
 
-  // Add the form's CSS
-  drupal_add_css(drupal_get_path('theme', 'zen') . '/zen-internals/css/theme-settings.css', 'theme');
+    // Add the form's CSS
+    drupal_add_css(drupal_get_path('theme', 'zen') . '/zen-internals/css/theme-settings.css', 'theme');
 
-  // Add javascript to show/hide optional settings
-  drupal_add_js(drupal_get_path('theme', 'zen') . '/zen-internals/js/theme-settings.js', 'theme');
+    // Add javascript to show/hide optional settings
+    drupal_add_js(drupal_get_path('theme', 'zen') . '/zen-internals/js/theme-settings.js', 'theme');
 
-  // Get the default values from the .info file.
-  $defaults = zen_theme_get_default_settings('zen');
+    // Get the default values from the .info file.
+    $defaults = zen_theme_get_default_settings('zen');
 
-  // Allow a subtheme to override the default values.
-  $defaults = array_merge($defaults, $subtheme_defaults);
+    // Allow a subtheme to override the default values.
+    $defaults = array_merge($defaults, $subtheme_defaults);
 
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
+    // Merge the saved variables and their default values.
+    $settings = array_merge($defaults, $saved_settings);
 
-  /*
+    /*
    * Create the form using Forms API
    */
-  $form['zen-div-opening'] = array(
+    $form['zen-div-opening'] = array(
     '#value'         => '<div id="zen-settings">',
-  );
+    );
 
-  $form['zen_block_editing'] = array(
+    $form['zen_block_editing'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Show block editing on hover'),
     '#description'   => t('When hovering over a block, privileged users will see block editing links.'),
     '#default_value' => $settings['zen_block_editing'],
-  );
+    );
 
-  $form['breadcrumb'] = array(
+    $form['breadcrumb'] = array(
     '#type'          => 'fieldset',
     '#title'         => t('Breadcrumb settings'),
     '#attributes'    => array('id' => 'zen-breadcrumb'),
-  );
-  $form['breadcrumb']['zen_breadcrumb'] = array(
+    );
+    $form['breadcrumb']['zen_breadcrumb'] = array(
     '#type'          => 'select',
     '#title'         => t('Display breadcrumb'),
     '#default_value' => $settings['zen_breadcrumb'],
     '#options'       => array(
-                          'yes'   => t('Yes'),
-                          'admin' => t('Only in admin section'),
-                          'no'    => t('No'),
+                            'yes'   => t('Yes'),
+                            'admin' => t('Only in admin section'),
+                            'no'    => t('No'),
                         ),
-  );
-  $form['breadcrumb']['zen_breadcrumb_separator'] = array(
+    );
+    $form['breadcrumb']['zen_breadcrumb_separator'] = array(
     '#type'          => 'textfield',
     '#title'         => t('Breadcrumb separator'),
     '#description'   => t('Text only. Don’t forget to include spaces.'),
@@ -67,61 +67,61 @@ 
     '#size'          => 5,
     '#maxlength'     => 10,
     '#prefix'        => '<div id="div-zen-breadcrumb-collapse">', // jquery hook to show/hide optional widgets
-  );
-  $form['breadcrumb']['zen_breadcrumb_home'] = array(
+    );
+    $form['breadcrumb']['zen_breadcrumb_home'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Show home page link in breadcrumb'),
     '#default_value' => $settings['zen_breadcrumb_home'],
-  );
-  $form['breadcrumb']['zen_breadcrumb_trailing'] = array(
+    );
+    $form['breadcrumb']['zen_breadcrumb_trailing'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Append a separator to the end of the breadcrumb'),
     '#default_value' => $settings['zen_breadcrumb_trailing'],
     '#description'   => t('Useful when the breadcrumb is placed just before the title.'),
-  );
-  $form['breadcrumb']['zen_breadcrumb_title'] = array(
+    );
+    $form['breadcrumb']['zen_breadcrumb_title'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Append the content title to the end of the breadcrumb'),
     '#default_value' => $settings['zen_breadcrumb_title'],
     '#description'   => t('Useful when the breadcrumb is not placed just before the title.'),
     '#suffix'        => '</div>', // #div-zen-breadcrumb
-  );
+    );
 
-  $form['themedev'] = array(
+    $form['themedev'] = array(
     '#type'          => 'fieldset',
     '#title'         => t('Theme development settings'),
     '#attributes'    => array('id' => 'zen-themedev'),
-  );
-  $form['themedev']['zen_rebuild_registry'] = array(
+    );
+    $form['themedev']['zen_rebuild_registry'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Rebuild theme registry on every page.'),
     '#default_value' => $settings['zen_rebuild_registry'],
     '#description'   => t('During theme development, it can be very useful to continuously <a href="!link">rebuild the theme registry</a>. WARNING: this is a huge performance penalty and must be turned off on production websites.', array('!link' => 'http://drupal.org/node/173880#theme-registry')),
     '#prefix'        => '<div id="div-zen-registry"><strong>' . t('Theme registry:') . '</strong>',
     '#suffix'        => '</div>',
-  );
-  $form['themedev']['zen_layout'] = array(
+    );
+    $form['themedev']['zen_layout'] = array(
     '#type'          => 'radios',
     '#title'         => t('Layout method'),
     '#options'       => array(
-                          'zen-columns-liquid' => t('Liquid layout') . ' <small>(layout-liquid.css)</small>',
-                          'zen-columns-fixed' => t('Fixed layout') . ' <small>(layout-fixed.css)</small>',
+                            'zen-columns-liquid' => t('Liquid layout') . ' <small>(layout-liquid.css)</small>',
+                            'zen-columns-fixed' => t('Fixed layout') . ' <small>(layout-fixed.css)</small>',
                         ),
     '#default_value' => $settings['zen_layout'],
-  );
-  $form['themedev']['zen_wireframes'] = array(
+    );
+    $form['themedev']['zen_wireframes'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Display borders around main layout elements'),
     '#default_value' => $settings['zen_wireframes'],
     '#description'   => t('<a href="!link">Wireframes</a> are useful when prototyping a website.', array('!link' => 'http://www.boxesandarrows.com/view/html_wireframes_and_prototypes_all_gain_and_no_pain')),
     '#prefix'        => '<div id="div-zen-wireframes"><strong>' . t('Wireframes:') . '</strong>',
     '#suffix'        => '</div>',
-  );
+    );
 
-  $form['zen-div-closing'] = array(
+    $form['zen-div-closing'] = array(
     '#value'         => '</div>',
-  );
+    );
 
-  // Return the form
-  return $form;
+    // Return the form
+    return $form;
 }

Spacing +7 added lines, -7 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 // Include the definition of zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/zen-internals/template.theme-registry.inc';
+include_once './'.drupal_get_path('theme', 'zen').'/zen-internals/template.theme-registry.inc';
 
 
 /**
@@ -16,10 +16,10 @@ 
 function zen_settings($saved_settings, $subtheme_defaults = array()) {
 
   // Add the form's CSS
-  drupal_add_css(drupal_get_path('theme', 'zen') . '/zen-internals/css/theme-settings.css', 'theme');
+  drupal_add_css(drupal_get_path('theme', 'zen').'/zen-internals/css/theme-settings.css', 'theme');
 
   // Add javascript to show/hide optional settings
-  drupal_add_js(drupal_get_path('theme', 'zen') . '/zen-internals/js/theme-settings.js', 'theme');
+  drupal_add_js(drupal_get_path('theme', 'zen').'/zen-internals/js/theme-settings.js', 'theme');
 
   // Get the default values from the .info file.
   $defaults = zen_theme_get_default_settings('zen');
@@ -97,15 +97,15 @@ 
     '#title'         => t('Rebuild theme registry on every page.'),
     '#default_value' => $settings['zen_rebuild_registry'],
     '#description'   => t('During theme development, it can be very useful to continuously <a href="!link">rebuild the theme registry</a>. WARNING: this is a huge performance penalty and must be turned off on production websites.', array('!link' => 'http://drupal.org/node/173880#theme-registry')),
-    '#prefix'        => '<div id="div-zen-registry"><strong>' . t('Theme registry:') . '</strong>',
+    '#prefix'        => '<div id="div-zen-registry"><strong>'.t('Theme registry:').'</strong>',
     '#suffix'        => '</div>',
   );
   $form['themedev']['zen_layout'] = array(
     '#type'          => 'radios',
     '#title'         => t('Layout method'),
     '#options'       => array(
-                          'zen-columns-liquid' => t('Liquid layout') . ' <small>(layout-liquid.css)</small>',
-                          'zen-columns-fixed' => t('Fixed layout') . ' <small>(layout-fixed.css)</small>',
+                          'zen-columns-liquid' => t('Liquid layout').' <small>(layout-liquid.css)</small>',
+                          'zen-columns-fixed' => t('Fixed layout').' <small>(layout-fixed.css)</small>',
                         ),
     '#default_value' => $settings['zen_layout'],
   );
@@ -114,7 +114,7 @@ 
     '#title'         => t('Display borders around main layout elements'),
     '#default_value' => $settings['zen_wireframes'],
     '#description'   => t('<a href="!link">Wireframes</a> are useful when prototyping a website.', array('!link' => 'http://www.boxesandarrows.com/view/html_wireframes_and_prototypes_all_gain_and_no_pain')),
-    '#prefix'        => '<div id="div-zen-wireframes"><strong>' . t('Wireframes:') . '</strong>',
+    '#prefix'        => '<div id="div-zen-wireframes"><strong>'.t('Wireframes:').'</strong>',
     '#suffix'        => '</div>',
   );
 

drupal/sites/all/themes/zen/STARTERKIT/template.php

Indentation +5 added lines, -5 removed lines

@@ -65,13 +65,13 @@
  * Implementation of HOOK_theme().
  */
 function STARTERKIT_theme(&$existing, $type, $theme, $path) {
-  $hooks = zen_theme($existing, $type, $theme, $path);
-  // Add your theme hooks like this:
-  /*
+    $hooks = zen_theme($existing, $type, $theme, $path);
+    // Add your theme hooks like this:
+    /*
   $hooks['hook_name_here'] = array( // Details go here );
   */
-  // @TODO: Needs detailed comments. Patches welcome!
-  return $hooks;
+    // @TODO: Needs detailed comments. Patches welcome!
+    return $hooks;
 }
 
 /**

drupal/sites/all/themes/zen/STARTERKIT/theme-settings.php

Indentation +13 added lines, -13 removed lines

@@ -13,17 +13,17 @@ 
  */
 function STARTERKIT_settings($saved_settings) {
 
-  // Get the default values from the .info file.
-  $defaults = zen_theme_get_default_settings('STARTERKIT');
+    // Get the default values from the .info file.
+    $defaults = zen_theme_get_default_settings('STARTERKIT');
 
-  // Merge the saved variables and their default values.
-  $settings = array_merge($defaults, $saved_settings);
+    // Merge the saved variables and their default values.
+    $settings = array_merge($defaults, $saved_settings);
 
-  /*
+    /*
    * Create the form using Forms API: http://api.drupal.org/api/6
    */
-  $form = array();
-  /* -- Delete this line if you want to use this setting
+    $form = array();
+    /* -- Delete this line if you want to use this setting
   $form['STARTERKIT_example'] = array(
     '#type'          => 'checkbox',
     '#title'         => t('Use this sample setting'),
@@ -32,12 +32,12 @@ 
   );
   // */
 
-  // Add the base theme's settings.
-  $form += zen_settings($saved_settings, $defaults);
+    // Add the base theme's settings.
+    $form += zen_settings($saved_settings, $defaults);
 
-  // Remove some of the base theme's settings.
-  unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
+    // Remove some of the base theme's settings.
+    unset($form['themedev']['zen_layout']); // We don't need to select the base stylesheet.
 
-  // Return the form
-  return $form;
+    // Return the form
+    return $form;
 }

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // Include the definition of zen_settings() and zen_theme_get_default_settings().
-include_once './' . drupal_get_path('theme', 'zen') . '/theme-settings.php';
+include_once './'.drupal_get_path('theme', 'zen').'/theme-settings.php';
 
 
 /**

html/user/merge_by_name.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
         }
         $error = merge_hosts($host, $newest_host);
         if (!$error) {
-            echo "<br>".tra("Merged %1 into %2",$host->id,$newest_host->id)."\n";
+            echo "<br>".tra("Merged %1 into %2", $host->id, $newest_host->id)."\n";
         } else {
             echo "<br>$error\n";
         }
@@ -52,10 +52,10 @@ 
 function merge_by_name($userid) {
     $hosts = array();
     $host_list = BoincHost::enum("userid=$userid");
-    foreach($host_list as $host) {
+    foreach ($host_list as $host) {
         $hosts[$host->domain_name][] = $host;
     }
-    foreach($hosts as $hlist) {
+    foreach ($hosts as $hlist) {
         merge_name($hlist);
     }
 }

html/user/host_edit_action.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 $nhosts = get_int("nhosts");
 $hostid = get_int("id_0");
 $latest_host = get_host($hostid, $user);
-for ($i=1; $i<$nhosts; $i++) {
+for ($i = 1; $i < $nhosts; $i++) {
     $var = "id_$i";
     $hostid = get_int($var, true);
     if (!$hostid) continue;

html/user/team_edit_action.php

Spacing +1 added lines, -1 removed lines

@@ -54,7 +54,7 @@
 if (!is_valid_country($country)) {
     error_page(tra("bad country"));
 }
-$joinable = post_str('joinable', true)?1:0;
+$joinable = post_str('joinable', true) ? 1 : 0;
 
 $t = BoincTeam::lookup("name='$team_name'");
 if ($t && $t->id != $teamid) {