[gh-18] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@484 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/pagepreview/LICENSE.txt

+GNU GENERAL PUBLIC LICENSE
+
+              Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+                  Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+           GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+               MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+               NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+          END OF TERMS AND CONDITIONS

sites/all/modules/pagepreview/pagepreview.info

+; $Id$
+name = Page Preview
+description = Allows node previews to be viewed as fully-rendered pages.
+core = 7.x

sites/all/modules/pagepreview/pagepreview.install

+<?php
+// $Id$
+
+/**
+ * @file
+ * Install functions for the Page Preview module.
+ */
+
+/**
+ * Implements hook_install().
+ *
+ * Set module weight to so that pagepreview_init() can run early.
+ */
+function pagepreview_install() {
+  db_update('system')
+    ->fields(array(
+      'weight' => -1,
+    ))
+    ->condition('name', 'pagepreview', '=')
+    ->execute();
+}

sites/all/modules/pagepreview/pagepreview.module

+<?php
+// $Id$
+
+/**
+ * @file
+ * An alternative node previewing system for the node add/edit form.
+ */
+
+/**
+ * Implements hook_menu().
+ */
+function pagepreview_menu() {
+  $items['pagepreview/%'] = array(
+    'title' => 'Page Preview',
+    'description' => 'Menu callback for rendering a full-page preview.',
+    'page callback' => 'pagepreview_get_preview',
+    'page arguments' => array(1),
+    'access arguments' => array('access content'),
+    'type' => MENU_CALLBACK,
+  );
+  return $items;
+}
+
+/**
+ * Implements hook_form_alter().
+ *
+ * Replaces the default submit callback for the "Preview" button.
+ */
+function pagepreview_form_alter(&$form, &$form_state, $form_id) {
+  if ($form['#id'] == 'page-node-form') {
+    if ($form['actions']['preview']) {
+      $form['actions']['preview']['#submit'] = array('pagepreview_node_form_build_preview');
+    }
+  }
+}
+
+/**
+ * Alternate submit callback for the node form "Preview" button.
+ */
+function pagepreview_node_form_build_preview($form, &$form_state) {
+  $node = node_form_submit_build_node($form, $form_state);
+  $node->pagepreview = TRUE;
+
+  // Get the expected URL alias from Pathauto, if applicable.
+  if (module_exists('pathauto') && $node->path['pathauto']) {
+    module_load_include('inc', 'pathauto');
+    $src = "node/" . $node->nid;
+    $alias = pathauto_create_alias('node', 'return', $src, array('node' => $node), $node->type, $node->language);
+    if ($alias) {
+      $node->path['alias'] = $alias;
+    }
+  }
+
+  // Cache the temporary node and active the preview area of the node form.
+  cache_set('pagepreview:' . $form['form_token']['#default_value'], $node, 'cache_page', CACHE_TEMPORARY);
+
+  $form_state['node_preview'] = '<iframe class="pagepreview-preview" style="width:100%; height: 480px;" src="' . base_path() . 'pagepreview/' . $form['#token'] . '"></iframe>';
+  $form_state['rebuild'] = TRUE;
+}
+
+/**
+ * Implements hook_init().
+ *
+ * We need drupal_is_front_page() to reflect the page being previewed, not the
+ * path of the pagepreview callback. Since the result of drupal_is_front_page()
+ * is statically cached, we have to call it first and trick it.
+ */
+function pagepreview_init() {
+  // We only want to do this on pagepreview requests.
+  $path = $_GET['q'];
+  $parts = explode('/', $path);
+  if ($parts[0] == 'pagepreview' && isset($parts[1])) {
+    // Get the cached temporary node.
+    $form_token = drupal_get_token($parts[1]);
+    $cache = cache_get('pagepreview:' . $form_token, 'cache_page');
+
+    // If we can't find a cached node, might as well quit here.
+    if (!$cache) {
+      print t('There was a problem generating the preview. Please review the form for error and try again.');
+      exit;
+    }
+
+    // Switch $_GET['q'] to the expected path, call drupal_is_front_page() to
+    // set the static cache, the switch $_GET['q'] back to the original.
+    $node = $cache->data;
+    if ($node->nid) {
+      $_GET['q'] = 'node/' . $node->nid;
+    }
+    drupal_is_front_page();
+    $_GET['q'] = $path;
+
+    // Meanwhile, don't allow the preview result to be cached.
+    $GLOBALS['conf']['cache'] = FALSE;
+  }
+}
+
+/**
+ * Menu callback for "pagepreview/%".
+ *
+ * Directly prints a rendered page based on the cached temporary node.
+ *
+ * @param $token
+ *   The value of $form['#token']. This is generally the form ID.
+ */
+function pagepreview_get_preview($token) {
+  // Get the cached temporary node.
+  $form_token = drupal_get_token($token);
+  $cache = cache_get('pagepreview:' . $form_token, 'cache_page');
+  $node = $cache->data;
+  drupal_set_title($node->title);
+
+  // Overrides $_GET['q'] so that other elements on the page can react to the
+  // proper path context.
+  if ($node->nid) {
+    $_GET['q'] = 'node/' . $node->nid;
+  }
+  elseif (!empty($node->path['alias'])) {
+    $_GET['q'] = trim($node->path['alias'], '/');
+  }
+  elseif (!empty($node->path['old_alias'])) {
+    $_GET['q'] = trim($node->path['old_alias'], '/');
+  }
+
+  $preview = pagepreview_render_preview($node);
+
+  // Switch to the anonymous user for page rendering.
+  // TODO: make this configurable.
+  global $user;
+  $original_user = $user;
+  drupal_save_session(FALSE);
+  $user = user_load(0);
+
+  // Suppress fancy stuff like admin and admin_menu.module for the preview.
+  module_invoke_all('suppress');
+
+  drupal_deliver_page(drupal_render($preview));
+
+  $user = $original_user;
+  drupal_save_session(TRUE);
+}
+
+/**
+ * Replacement function for node_preview().
+ *
+ * Instead of calling theme('node_preview') to get the node output, we call
+ * node_view directly.
+ *
+ * @see theme_node_preview()
+ */
+function pagepreview_render_preview($node) {
+  if (node_access('create', $node) || node_access('update', $node)) {
+    _field_invoke_multiple('load', 'node', array($node->nid => $node));
+    // Load the user's name when needed.
+    if (isset($node->name)) {
+      // The use of isset() is mandatory in the context of user IDs, because
+      // user ID 0 denotes the anonymous user.
+      if ($user = user_load_by_name($node->name)) {
+        $node->uid = $user->uid;
+        $node->picture = $user->picture;
+      }
+      else {
+        $node->uid = 0; // anonymous user
+      }
+    }
+    elseif ($node->uid) {
+      $user = user_load($node->uid);
+      $node->name = $user->name;
+      $node->picture = $user->picture;
+    }
+
+    $node->changed = REQUEST_TIME;
+    $nodes = array($node->nid => $node);
+    field_attach_prepare_view('node', $nodes, 'full');
+
+    // Display a preview of the node.
+    if (!form_get_errors()) {
+      $node->in_preview = TRUE;
+      // If enabled, allow page_manager.module to handle node rendering.
+      if (module_exists('page_manager')) {
+        module_load_include('inc', 'page_manager', 'plugins/tasks/node_view');
+        $output = page_manager_node_view_page($node);
+      }
+      else {
+        $output = node_view($node, 'full');
+      }
+      unset($node->in_preview);
+      // Rather than the default t('Preview') allow user to see more acurate rendering
+      drupal_set_title($node->title, PASS_THROUGH);
+    }
+
+    return $output;
+  }
+}

sites/all/themes/unl_wdn/template.php

 <?php
 
-function unl_wdn_preprocess_html(&$vars, $hook)
-{
+function unl_wdn_preprocess_html(&$vars, $hook) {
   /**
    * Change the <title> tag to UNL format: UNL | Department | Section | Page
    */
   $head_title[] = 'Home';
-  
+
   $trail = menu_get_active_trail();
   foreach ($trail as $item) {
     if ($item['type'] & MENU_VISIBLE_IN_BREADCRUMB) {
@@ -20,20 +19,26 @@ function unl_wdn_preprocess_html(&$vars, $hook)
       }
     }
   }
-  
+
   // Change 'Home' to be $site_name
   array_unshift($head_title, str_replace( 'Home', variable_get('site_name', 'Department'), array_shift($head_title)));
-  
+
   //Prepend UNL
   if (variable_get('site_name') != 'UNL') {
     array_unshift($head_title, 'UNL');
   }
-  
+
   $vars['head_title'] = implode(' | ', $head_title);
 }
 
-function unl_wdn_preprocess_page(&$vars, $hook)
-{
+function unl_wdn_preprocess_node(&$vars) {
+  // Drupal doesn't correctly set the $page flag for the preview on node/add/page which results in the <h2> being displayed in modules/node/node.tpl.php
+  if (isset($vars['elements']['#node']->op) && $vars['elements']['#node']->op == 'Preview') {
+    $vars['page'] = true;
+  }
+}
+
+function unl_wdn_preprocess_page(&$vars, $hook) {
   //Unset the sidebars if on a user page (i.e. user profile or imce file browser)
   if (arg(0) == 'user') {
     $vars['page']['sidebar_first'] = array();
@@ -41,127 +46,123 @@ function unl_wdn_preprocess_page(&$vars, $hook)
   }
 }
 
-function unl_wdn_get_instance()
-{
-    static $instance;
-    if (!$instance) {
-        set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/lib/php');
-        require_once "UNL/Templates.php";
-        
-        UNL_Templates::$options['version'] = UNL_Templates::VERSION3;
-        if (theme_get_setting('toggle_main_menu')) {
-            $instance = UNL_Templates::factory('Fixed');
-        } else {
-            $instance = UNL_Templates::factory('Document');
-        }
+function unl_wdn_get_instance() {
+  static $instance;
+  if (!$instance) {
+    set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/lib/php');
+    require_once "UNL/Templates.php";
+
+    UNL_Templates::$options['version'] = UNL_Templates::VERSION3;
+    if (theme_get_setting('toggle_main_menu')) {
+      $instance = UNL_Templates::factory('Fixed');
+    }
+    else {
+      $instance = UNL_Templates::factory('Document');
     }
-    
-    return $instance;
+  }
+
+  return $instance;
 }
 
 require_once dirname(__FILE__) . '/includes/form.inc';
 
-function unl_wdn_breadcrumb($variables)
-{
-    $breadcrumbs = $variables['breadcrumb'];
-    
-    if (count($breadcrumbs) == 0) {
-        $breadcrumbs[] = '<a href="">' . unl_get_site_name_abbreviated() . '</a>';
-    } else {
-        //Change 'Home' to be $site_name
-        array_unshift($breadcrumbs,
-                      str_replace('Home', unl_get_site_name_abbreviated(),
-                      array_shift($breadcrumbs)));
-    }
-    
-    //Add the intermediate breadcrumbs if they exist
-    $intermediateBreadcrumbs = theme_get_setting('intermediate_breadcrumbs');
-    if (is_array($intermediateBreadcrumbs)) {
-      krsort($intermediateBreadcrumbs);
-      foreach ($intermediateBreadcrumbs as $intermediateBreadcrumb) {
-        if ($intermediateBreadcrumb['text'] && $intermediateBreadcrumb['href']) {
-          array_unshift($breadcrumbs, '<a href="' . $intermediateBreadcrumb['href'] . '">' . $intermediateBreadcrumb['text'] . '</a>');
-        }
+function unl_wdn_breadcrumb($variables) {
+  $breadcrumbs = $variables['breadcrumb'];
+
+  if (count($breadcrumbs) == 0) {
+    $breadcrumbs[] = '<a href="">' . unl_get_site_name_abbreviated() . '</a>';
+  }
+  else {
+    //Change 'Home' to be $site_name
+    array_unshift($breadcrumbs,
+                  str_replace('Home', unl_get_site_name_abbreviated(),
+                  array_shift($breadcrumbs)));
+  }
+
+  //Add the intermediate breadcrumbs if they exist
+  $intermediateBreadcrumbs = theme_get_setting('intermediate_breadcrumbs');
+  if (is_array($intermediateBreadcrumbs)) {
+    krsort($intermediateBreadcrumbs);
+    foreach ($intermediateBreadcrumbs as $intermediateBreadcrumb) {
+      if ($intermediateBreadcrumb['text'] && $intermediateBreadcrumb['href']) {
+        array_unshift($breadcrumbs, '<a href="' . $intermediateBreadcrumb['href'] . '">' . $intermediateBreadcrumb['text'] . '</a>');
       }
     }
-    
-    //Prepend UNL
-    if (variable_get('site_name') != 'UNL') {
-        array_unshift($breadcrumbs, '<a href="http://www.unl.edu/">UNL</a>');
-    }
-    
-    //Append title of current page -- http://drupal.org/node/133242
-    if (!drupal_is_front_page()) {
-        $breadcrumbs[] = drupal_get_title();
-    }
-    
-    $html = '<ul>' . PHP_EOL;
-    foreach ($breadcrumbs as $breadcrumb) {
-        $html .= '<li>' .  $breadcrumb . '</li>';
-    }
-    $html .= '</ul>';
-    
-    return $html;
+  }
+
+  //Prepend UNL
+  if (variable_get('site_name') != 'UNL') {
+    array_unshift($breadcrumbs, '<a href="http://www.unl.edu/">UNL</a>');
+  }
+
+  //Append title of current page -- http://drupal.org/node/133242
+  if (!drupal_is_front_page()) {
+    $breadcrumbs[] = drupal_get_title();
+  }
+
+  $html = '<ul>' . PHP_EOL;
+  foreach ($breadcrumbs as $breadcrumb) {
+    $html .= '<li>' .  $breadcrumb . '</li>';
+  }
+  $html .= '</ul>';
+
+  return $html;
 }
 
-function unl_wdn_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL)
-{
-    if ($extra_class) {
-        return '<li class="' . $extra_class . '">' . $link . $menu . '</li>' . "\n";
-    } else {
-        return '<li>' . $link . $menu . '</li>' . PHP_EOL;
-    }
+function unl_wdn_menu_item($link, $has_children, $menu = '', $in_active_trail = FALSE, $extra_class = NULL) {
+  if ($extra_class) {
+    return '<li class="' . $extra_class . '">' . $link . $menu . '</li>' . "\n";
+  }
+  else {
+    return '<li>' . $link . $menu . '</li>' . PHP_EOL;
+  }
 }
 
-function unl_wdn_menu_tree($variables)
-{
-    $tree = $variables['tree'];
-    return '<ul>' . $tree . '</ul>' . PHP_EOL;
+function unl_wdn_menu_tree($variables) {
+  $tree = $variables['tree'];
+  return '<ul>' . $tree . '</ul>' . PHP_EOL;
 }
 
-function unl_wdn_menu_local_tasks($variables)
-{
-    $output = '';
-    
-    if (!empty($variables['primary'])) {
-        $variables['primary']['#prefix'] = '<ul class="wdn_tabs cms_tabs disableSwitching">';
-        $variables['primary']['#suffix'] = '</ul>';
-        $output .= drupal_render($variables['primary']);
-    }
-    if (!empty($variables['secondary'])) {
-        $variables['secondary']['#prefix'] = '<ul class="wdn_tabs cms_tabs disableSwitching">';
-        $variables['secondary']['#suffix'] = '</ul>';
-        $output .= drupal_render($variables['secondary']);
-    }
-    
-    return $output;
+function unl_wdn_menu_local_tasks($variables) {
+  $output = '';
+
+  if (!empty($variables['primary'])) {
+    $variables['primary']['#prefix'] = '<ul class="wdn_tabs cms_tabs disableSwitching">';
+    $variables['primary']['#suffix'] = '</ul>';
+    $output .= drupal_render($variables['primary']);
+  }
+  if (!empty($variables['secondary'])) {
+    $variables['secondary']['#prefix'] = '<ul class="wdn_tabs cms_tabs disableSwitching">';
+    $variables['secondary']['#suffix'] = '</ul>';
+    $output .= drupal_render($variables['secondary']);
+  }
+
+  return $output;
 }
 
-function unl_wdn_menu_local_task($variables)
-{
-    $link = $variables['element']['#link'];
-    $link_text = $link['title'];
-
-    if (!empty($variables['element']['#active'])) {
-        // If the link does not contain HTML already, check_plain() it now.
-        // After we set 'html'=TRUE the link will not be sanitized by l().
-        if (empty($link['localized_options']['html'])) {
-            $link['title'] = check_plain($link['title']);
-        }
-        $link['localized_options']['html'] = TRUE;
-        $link_text = t('!local-task-title !active', array('!local-task-title' => $link['title'], '!active' => ''));
+function unl_wdn_menu_local_task($variables) {
+  $link = $variables['element']['#link'];
+  $link_text = $link['title'];
+
+  if (!empty($variables['element']['#active'])) {
+    // If the link does not contain HTML already, check_plain() it now.
+    // After we set 'html'=TRUE the link will not be sanitized by l().
+    if (empty($link['localized_options']['html'])) {
+      $link['title'] = check_plain($link['title']);
     }
-    return '<li' . (!empty($variables['element']['#active']) ? ' class="selected"' : '') . '>' . l($link_text, $link['href'], $link['localized_options']) . "</li>\n";
+    $link['localized_options']['html'] = TRUE;
+    $link_text = t('!local-task-title !active', array('!local-task-title' => $link['title'], '!active' => ''));
+  }
+  return '<li' . (!empty($variables['element']['#active']) ? ' class="selected"' : '') . '>' . l($link_text, $link['href'], $link['localized_options']) . "</li>\n";
 }
 
-function unl_wdn_status_messages($variables)
-{
-    $display = $variables['display'];
-    
-    $output = '';
-    foreach (drupal_get_messages($display) as $type => $messages) {
-        $type = ucfirst($type);
-        $output .= <<<EOF
+function unl_wdn_status_messages($variables) {
+  $display = $variables['display'];
+
+  $output = '';
+  foreach (drupal_get_messages($display) as $type => $messages) {
+    $type = ucfirst($type);
+    $output .= <<<EOF
 <div class="wdn_notice">
     <div class="close">
         <a href="#" title="Close this notice">Close this notice</a>
@@ -169,44 +170,45 @@ function unl_wdn_status_messages($variables)
     <div class="message">
         <h3>$type</h3>
 EOF;
-        if (count($messages) > 1) {
-            $output .= '<ul>' . PHP_EOL;
-            foreach ($messages as $message) {
-                $output .= '<li>' . $message . '</li>' . PHP_EOL;
-            }
-            $output .= '</ul>' . PHP_EOL;
-        } else {
-            $output .= $messages[0];
-        }
-        $output .= <<<EOF
+    if (count($messages) > 1) {
+      $output .= '<ul>' . PHP_EOL;
+      foreach ($messages as $message) {
+        $output .= '<li>' . $message . '</li>' . PHP_EOL;
+      }
+      $output .= '</ul>' . PHP_EOL;
+    }
+    else {
+      $output .= $messages[0];
+    }
+    $output .= <<<EOF
     </div>
 </div>
 EOF;
-    }
-    
-    if (!$output) {
-        return '';
-    }
-    
-    $output = <<<EOF
+  }
+
+  if (!$output) {
+    return '';
+  }
+
+  $output = <<<EOF
 <script type="text/javascript">
 WDN.initializePlugin('notice');
 </script>
 $output
 EOF;
-    
-    return $output;
+
+  return $output;
 }
 
 /**
  * Return the abbreviated site name, assuming it has been set and we're not on the front page.
  * Otherwise, it returns the full site name.
  */
-function unl_get_site_name_abbreviated()
-{
-	if (!drupal_is_front_page() && theme_get_setting('site_name_abbreviation')) {
-        return theme_get_setting('site_name_abbreviation');
-	} else {
-        return variable_get('site_name', 'Department');
-	}
+function unl_get_site_name_abbreviated() {
+  if (!drupal_is_front_page() && theme_get_setting('site_name_abbreviation')) {
+    return theme_get_setting('site_name_abbreviation');
+  }
+  else {
+    return variable_get('site_name', 'Department');
+  }
 }