BOINC / boinc

html/user/server_status.php

Doc Comments +17 added lines

@@ -88,17 +88,26 @@ 
 ";
 }
 
+/**
+ * @param string $name
+ */
 function item_xml($name, $val) {
     if (!$val) $val = 0;
     echo "   <$name>$val</$name>\n";
 }
 
+/**
+ * @param string $name
+ */
 function item_html($name, $val) {
     $name = tra($name);
     echo "<tr><td>$name</td><td>$val</td></tr>\n";
     //echo "<tr><td align=right>$name</td><td align=right>$val</td></tr>\n";
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_html($x) {
     page_head(tra("Project status"));
     $j = $x->jobs;
@@ -190,6 +199,9 @@ 
     page_tail();
 }
 
+/**
+ * @param stdClass $x
+ */
 function show_status_xml($x) {
     xml_header();
     echo "<server_status>\n<daemon_status>\n";
@@ -239,6 +251,11 @@ 
 ";
 }
 
+/**
+ * @param string $cmd
+ * @param string $pidname
+ * @param string $host
+ */
 function local_daemon_running($cmd, $pidname, $host) {
     if (!$pidname) {
         $cmd = trim($cmd);

Spacing +9 added lines, -9 removed lines

@@ -171,7 +171,7 @@ 
         $avg = round($app->info->avg, 2);
         $min = round($app->info->min, 2);
         $max = round($app->info->max, 2);
-        $x = $max?"$avg ($min - $max)":"---";
+        $x = $max ? "$avg ($min - $max)" : "---";
         $u = $app->info->users;
         echo "<tr>
             <td>$app->user_friendly_name</td>
@@ -244,7 +244,7 @@ 
         $cmd = trim($cmd);
         $x = explode(" ", $cmd);
         $prog = $x[0];
-        $pidname = $prog . '.pid';
+        $pidname = $prog.'.pid';
     }
     $path = "../../pid_$host/$pidname";
     if (is_file($path)) {
@@ -285,12 +285,12 @@ 
     }
     $master_host = $u["host"];
     if ($config->www_host) {
-        $web_host = trim((string) $config->www_host);
+        $web_host = trim((string)$config->www_host);
     } else {
         $web_host = $main_host;
     }
     if ($config->sched_host) {
-        $sched_host = trim((string) $config->sched_host);
+        $sched_host = trim((string)$config->sched_host);
     } else {
         $sched_host = $main_host;
     }
@@ -300,7 +300,7 @@ 
 
     // the upload and download servers are sort of daemons too
     //
-    $url = trim((string) $config->download_url);
+    $url = trim((string)$config->download_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
@@ -312,14 +312,14 @@ 
     } else {
         $have_remote = true;
     }
-    $url = trim((string) $config->upload_url);
+    $url = trim((string)$config->upload_url);
     $u = parse_url($url);
     $h = $u["host"];
     if ($h == $master_host) {
         $y = new StdClass;
         $y->cmd = "Upload server";
         $y->host = $h;
-        $y->status = !file_exists("../../stop_upload");;
+        $y->status = !file_exists("../../stop_upload"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -331,7 +331,7 @@ 
         $y = new StdClass;
         $y->cmd = "Scheduler";
         $y->host = $sched_host;
-        $y->status = !file_exists("../../stop_sched");;
+        $y->status = !file_exists("../../stop_sched"); ;
         $local_daemons[] = $y;
     } else {
         $have_remote = true;
@@ -347,7 +347,7 @@ 
             $disabled_daemons[] = $x;
             continue;
         }
-        $host = $d->host?(string)$d->host:$main_host;
+        $host = $d->host ? (string)$d->host : $main_host;
         if ($host != $web_host) {
             $have_remote = true;
             continue;

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

@@ -251,7 +251,7 @@
         $pid = file_get_contents($path);
         if ($pid) {
             $pid = trim($pid);
-            $out = Array();
+            $out = array();
             exec("ps -ww $pid", $out);
             foreach ($out as $y) {
                 if (strstr($y, (string)$pid)) return 1;

html/user/show_coproc.php

Doc Comments +3 added lines

@@ -25,6 +25,9 @@
 
 check_get_args(array("mode"));
 
+/**
+ * @param string $mode
+ */
 function filename($mode) {
     switch ($mode) {
     case 'host': return "cuda_hosts.dat";

Spacing +1 added lines, -1 removed lines

@@ -92,7 +92,7 @@
         echo $x;
         break;
     }
-    echo "</td><td align=right>".format_credit_large($y->credit),"</td><td align=right>$y->nresults</td></tr>\n";
+    echo "</td><td align=right>".format_credit_large($y->credit), "</td><td align=right>$y->nresults</td></tr>\n";
 }
 
 $mode = get_str('mode', true);

html/user/submit.php

Doc Comments +9 added lines

@@ -37,6 +37,9 @@ 
     return $n;
 }
 
+/**
+ * @param integer $state
+ */
 function show_all_link($batches, $state, $limit, $user, $app) {
     $n = state_count($batches, $state);
     if ($n > $limit) {
@@ -269,6 +272,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $app_id
+ */
 function check_admin_access($user, $app_id) {
     $user_submit = BoincUserSubmit::lookup_userid($user->id);
     if (!$user_submit) error_page("no access");
@@ -523,6 +529,9 @@ 
     page_tail();
 }
 
+/**
+ * @param null|integer $state
+ */
 function show_batches_in_state($batches, $state) {
     switch ($state) {
     case BATCH_STATE_IN_PROGRESS:

Braces +1 added lines, -1 removed lines

@@ -369,7 +369,7 @@
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }

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

@@ -308,7 +308,7 @@ 
     $wus = BoincWorkunit::enum("batch = $batch->id");
     $batch = get_batch_params($batch, $wus);
 
-    page_head("Batch $batch_id");
+    page_head("batch $batch_id");
     start_table();
     row2("name", $batch->name);
     row2("application", $app->name);
@@ -393,7 +393,7 @@ 
     $wu = BoincWorkunit::lookup_id($wuid);
     if (!$wu) error_page("no such job");
 
-    page_head("Job $wuid");
+    page_head("job $wuid");
 
     echo "
         <a href=workunit.php?wuid=$wuid>Workunit details</a> &middot;

Spacing +5 added lines, -5 removed lines

@@ -323,7 +323,7 @@ 
     }
     row2("GFLOP/hours, estimated", number_format(credit_to_gflop_hours($batch->credit_estimate), 2));
     row2("GFLOP/hours, actual", number_format(credit_to_gflop_hours($batch->credit_canonical), 2));
-    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6,2));
+    row2("Output File Size (MB)", number_format(batch_output_file_size($batch->id)/1e6, 2));
     end_table();
     if (batch_output_file_size($batch->id) <= 1e8) {
         $url = boinc_get_output_files_url($user, $batch_id);
@@ -357,9 +357,9 @@ 
         "Canonical instance<br><small>click to see result page on BOINC server</smallp>",
         "Download Results"
     );
-    foreach($wus as $wu) {
+    foreach ($wus as $wu) {
         $resultid = $wu->canonical_resultid;
-        $durl = boinc_get_wu_output_files_url($user,$wu->id);
+        $durl = boinc_get_wu_output_files_url($user, $wu->id);
         if ($resultid) {
             $x = "<a href=result.php?resultid=$resultid>$resultid</a>";
             $y = '<font color="green">completed</font>';
@@ -369,7 +369,7 @@ 
             $text = "---";
             if ($batch->state == BATCH_STATE_COMPLETE) {
                 $y = '<font color="red">failed</font>';
-            }   else {
+            } else {
                 $y = "in progress";
             }
         }
@@ -434,7 +434,7 @@ 
     $results = BoincResult::enum("workunitid=$wuid");
     $upload_dir = parse_config(get_config(), "<upload_dir>");
     $fanout = parse_config(get_config(), "<uldl_dir_fanout>");
-    foreach($results as $result) {
+    foreach ($results as $result) {
         echo "<tr>
             <td><a href=result.php?resultid=$result->id>$result->id &middot; $result->name </a></td>
             <td>".state_string($result)."</td>

html/user/team_forum.php

Doc Comments +3 added lines

@@ -57,6 +57,9 @@
     edit_form($user, $team, $forum, true);
 }
 
+/**
+ * @param boolean $first
+ */
 function edit_form($user, $team, $forum, $first) {
     page_head(tra("Team Message Board"));
     echo "

html/user/team_search.php

Doc Comments +3 added lines

@@ -30,6 +30,9 @@
 // list entries are of the form id => team,
 // where team includes a field "refcnt".
 // 
+/**
+ * @param integer $weight
+ */
 function merge_lists($list1, &$list2, $weight) {
     foreach($list1 as $team) {
         $id = $team->id;

Spacing +5 added lines, -5 removed lines

@@ -31,7 +31,7 @@ 
 // where team includes a field "refcnt".
 // 
 function merge_lists($list1, &$list2, $weight) {
-    foreach($list1 as $team) {
+    foreach ($list1 as $team) {
         $id = $team->id;
         if (array_key_exists($id, $list2)) {
             $list2[$id]->refcnt += $weight;
@@ -97,7 +97,7 @@ 
         if (defined("SHOW_NONVALIDATED_TEAMS")) {
             $user = BoincUser::lookup_id($team->userid);
             echo "<td>";
-            echo $user->email_validated?"Yes":"No";
+            echo $user->email_validated ? "Yes" : "No";
             echo "</td>\n";
         }
         echo "
@@ -137,7 +137,7 @@ 
     xml_header();
     echo "<teams>\n";
     sort_list($list);
-    foreach($list as $team) {
+    foreach ($list as $team) {
         show_team_xml($team);
     }
     echo "</teams>\n";
@@ -164,14 +164,14 @@ 
         merge_lists($list2, $list, 3);
         $tried = true;
     }
-    if (strlen($params->country) && $params->country!='None') {
+    if (strlen($params->country) && $params->country != 'None') {
         $country = BoincDb::escape_string($params->country);
         $list2 = get_teams("country = '$country'", $params->active);
         //echo "<br>country matches: ",sizeof($list2);
         merge_lists($list2, $list, 1);
         $tried = true;
     }
-    if ($params->type and $params->type>1) {
+    if ($params->type and $params->type > 1) {
         $list2 = get_teams("type=$params->type", $params->active);
         //echo "<br>type matches: ",sizeof($list2);
         merge_lists($list2, $list, 2);

drupal/sites/default/boinc/modules/contrib/jump/jump.views.inc

Indentation +4 added lines, -4 removed lines

@@ -9,9 +9,9 @@ 
  * Implementation of hook_views_plugins().
  */
 function jump_views_plugins() {
-  return array(
+    return array(
     'style' => array(
-      'jump_views' => array(
+        'jump_views' => array(
         'title' => t('Jump menu'),
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
@@ -20,7 +20,7 @@ 
         'uses fields' => TRUE,
         'uses options' => TRUE,
         'type' => 'normal',
-      ),
+        ),
     ),
-  );
+    );
 }

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

@@ -16,9 +16,9 @@
         'theme' => 'jump_views_plugin_style',
         'help' => t('Displays items as a select list jump menu.'),
         'handler' => 'jump_views_plugin_style',
-        'uses row plugin' => TRUE,
-        'uses fields' => TRUE,
-        'uses options' => TRUE,
+        'uses row plugin' => true,
+        'uses fields' => true,
+        'uses options' => true,
         'type' => 'normal',
       ),
     ),

drupal/sites/default/boinc/modules/contrib/jump/jump.views_default.inc

Indentation +64 added lines, -64 removed lines

@@ -9,20 +9,20 @@ 
  * Implementation of hook_views_default_views().
  */
 function jump_views_default_views() {
-  $view = new view;
-  $view->name = 'recent_nodes_jump_menu';
-  $view->description = 'Recent nodes in a jump menu.';
-  $view->tag = '';
-  $view->view_php = '';
-  $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
-  $view->disabled = TRUE;
-  $handler = $view->new_display('default', 'Defaults', 'default');
-  $handler->override_option('fields', array(
+    $view = new view;
+    $view->name = 'recent_nodes_jump_menu';
+    $view->description = 'Recent nodes in a jump menu.';
+    $view->tag = '';
+    $view->view_php = '';
+    $view->base_table = 'node';
+    $view->is_cacheable = FALSE;
+    $view->api_version = 2;
+    $view->disabled = TRUE;
+    $handler = $view->new_display('default', 'Defaults', 'default');
+    $handler->override_option('fields', array(
     'nid' => array(
-      'label' => 'Nid',
-      'alter' => array(
+        'label' => 'Nid',
+        'alter' => array(
         'alter_text' => 1,
         'text' => 'node/[nid]',
         'make_link' => 0,
@@ -38,17 +38,17 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 1,
-      'id' => 'nid',
-      'table' => 'node',
-      'field' => 'nid',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 1,
+        'id' => 'nid',
+        'table' => 'node',
+        'field' => 'nid',
+        'relationship' => 'none',
     ),
     'title' => array(
-      'label' => '',
-      'alter' => array(
+        'label' => '',
+        'alter' => array(
         'alter_text' => 0,
         'text' => '',
         'make_link' => 0,
@@ -64,60 +64,60 @@ 
         'ellipsis' => 1,
         'strip_tags' => 0,
         'html' => 0,
-      ),
-      'link_to_node' => 0,
-      'exclude' => 0,
-      'id' => 'title',
-      'table' => 'node',
-      'field' => 'title',
-      'relationship' => 'none',
+        ),
+        'link_to_node' => 0,
+        'exclude' => 0,
+        'id' => 'title',
+        'table' => 'node',
+        'field' => 'title',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('sorts', array(
+    ));
+    $handler->override_option('sorts', array(
     'changed' => array(
-      'order' => 'DESC',
-      'granularity' => 'second',
-      'id' => 'changed',
-      'table' => 'node',
-      'field' => 'changed',
-      'relationship' => 'none',
+        'order' => 'DESC',
+        'granularity' => 'second',
+        'id' => 'changed',
+        'table' => 'node',
+        'field' => 'changed',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('filters', array(
+    ));
+    $handler->override_option('filters', array(
     'status_extra' => array(
-      'operator' => '=',
-      'value' => '',
-      'group' => '0',
-      'exposed' => FALSE,
-      'expose' => array(
+        'operator' => '=',
+        'value' => '',
+        'group' => '0',
+        'exposed' => FALSE,
+        'expose' => array(
         'operator' => FALSE,
         'label' => '',
-      ),
-      'id' => 'status_extra',
-      'table' => 'node',
-      'field' => 'status_extra',
-      'relationship' => 'none',
+        ),
+        'id' => 'status_extra',
+        'table' => 'node',
+        'field' => 'status_extra',
+        'relationship' => 'none',
     ),
-  ));
-  $handler->override_option('access', array(
+    ));
+    $handler->override_option('access', array(
     'type' => 'none',
-  ));
-  $handler->override_option('cache', array(
+    ));
+    $handler->override_option('cache', array(
     'type' => 'none',
-  ));
-  $handler->override_option('style_plugin', 'jump_views');
-  $handler->override_option('style_options', array(
+    ));
+    $handler->override_option('style_plugin', 'jump_views');
+    $handler->override_option('style_options', array(
     'grouping' => '',
     'keys' => array(
-      'nid' => 'nid',
-      'title' => 0,
+        'nid' => 'nid',
+        'title' => 0,
     ),
     'first_item' => 'Recent nodes',
-  ));
-  $handler = $view->new_display('block', 'Block', 'block_1');
-  $handler->override_option('block_description', '');
-  $handler->override_option('block_caching', -1);
+    ));
+    $handler = $view->new_display('block', 'Block', 'block_1');
+    $handler->override_option('block_description', '');
+    $handler->override_option('block_caching', -1);
 
-  $views[$view->name] = $view;
-  return $views;
+    $views[$view->name] = $view;
+    return $views;
 }

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

@@ -15,9 +15,9 @@ 
   $view->tag = '';
   $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
+  $view->is_cacheable = false;
   $view->api_version = 2;
-  $view->disabled = TRUE;
+  $view->disabled = true;
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
     'nid' => array(
@@ -88,9 +88,9 @@ 
       'operator' => '=',
       'value' => '',
       'group' => '0',
-      'exposed' => FALSE,
+      'exposed' => false,
       'expose' => array(
-        'operator' => FALSE,
+        'operator' => false,
         'label' => '',
       ),
       'id' => 'status_extra',

drupal/sites/default/boinc/modules/contrib/jump/jump_views_plugin_style.inc

Indentation +63 added lines, -63 removed lines

@@ -7,11 +7,11 @@ 
 
 class jump_views_plugin_style extends views_plugin_style {
 
-  function render() {
+    function render() {
     // Build an array of field / field_alias pairs.
     $this->field_map = array();
     foreach ($this->view->field as $field_name => $object) {
-      $this-> field_map[$object->field_alias] = $field_name;
+        $this-> field_map[$object->field_alias] = $field_name;
     }
 
     // $keys contains the fields used to build up the path.
@@ -21,116 +21,116 @@ 
     // callback.
     $select = array();
     if (!empty($this->options['first_item'])) {
-      $select[0] = $this->options['first_item'];
+        $select[0] = $this->options['first_item'];
     }
 
     foreach ($this->view->result as $row) {
-      $select_key = array();
-      // For each field in the row, we first check if it's to be used
-      // as part of the select key, then run views token replacement
-      // on it. This allows for paths like node/n/revisions/6 to be built
-      // easily.
-      foreach ($row as $field => $value) {
+        $select_key = array();
+        // For each field in the row, we first check if it's to be used
+        // as part of the select key, then run views token replacement
+        // on it. This allows for paths like node/n/revisions/6 to be built
+        // easily.
+        foreach ($row as $field => $value) {
         if (in_array($this->field_map[$field], $keys)) {
-          $field_object = $this->view->field[$this->field_map[$field]];
-          // Re-implementing some of the code from views_handler_field.inc
-          // since we need to operate on $result, and to avoid using
-          // a row style or templates.
-          if (!empty($field_object->options['alter']['alter_text']) && !empty($field_object->options['alter']['text'])) {
+            $field_object = $this->view->field[$this->field_map[$field]];
+            // Re-implementing some of the code from views_handler_field.inc
+            // since we need to operate on $result, and to avoid using
+            // a row style or templates.
+            if (!empty($field_object->options['alter']['alter_text']) && !empty($field_object->options['alter']['text'])) {
             $tokens = $this->get_render_tokens($this->field_map[$field], $row);
             $value = $field_object->render_altered($tokens);
-          }
-          $select_key[] = $value;
+            }
+            $select_key[] = $value;
         }
-      }
-      // For the value of the select, just use the output of the row, but strip
-      // all markup first.
-      $select_key = implode('/', $select_key);
-      $raw_select_value = $this->row_plugin->render($row);
-      $select_value = trim(html_entity_decode(strip_tags($raw_select_value), ENT_QUOTES));
-      $select[$select_key] = $select_value;
+        }
+        // For the value of the select, just use the output of the row, but strip
+        // all markup first.
+        $select_key = implode('/', $select_key);
+        $raw_select_value = $this->row_plugin->render($row);
+        $select_value = trim(html_entity_decode(strip_tags($raw_select_value), ENT_QUOTES));
+        $select[$select_key] = $select_value;
     }
 
     return jump_quickly($select);
-  }
+    }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $options['keys'] = array('default' => array());
     $options['first_item'] = array('default' => '');
     return $options;
-  }
+    }
 
-  function options_form(&$form, $form_state) {
+    function options_form(&$form, $form_state) {
     parent::options_form($form, $form_state);
     $handlers = $this->display->handler->get_handlers('field');
     if (empty($handlers)) {
-      $form['error_markup'] = array(
+        $form['error_markup'] = array(
         '#value' => t('You need at least one field before you can configure your jump menu settings'),
         '#prefix' => '<div class="error form-item description">',
         '#suffix' => '</div>',
-      );
-      return;
+        );
+        return;
     }
     // Create an array of fields from the data we know.
     foreach ($handlers as $field => $handler) {
-      if ($label = $handler->label()) {
+        if ($label = $handler->label()) {
         $field_names[$field] = $label;
-      }
-      else {
+        }
+        else {
         $field_names[$field] = $handler->ui_name();
-      }
+        }
     }
     $form['keys'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Select keys'),
-      '#default_value' => $this->options['keys'],
-      '#description' => t("These fields will be used to build the path for each row, used as the 'key' in the select options, and will be automatically separated by '/'"),
-      '#options' => $field_names,
+        '#type' => 'checkboxes',
+        '#title' => t('Select keys'),
+        '#default_value' => $this->options['keys'],
+        '#description' => t("These fields will be used to build the path for each row, used as the 'key' in the select options, and will be automatically separated by '/'"),
+        '#options' => $field_names,
     );
     $form['first_item'] = array(
-      '#type' => 'textfield',
-      '#title' => 'First item',
-      '#default_value' => $this->options['first_item'],
-      '#description' => t('This will be used as the first item in your select list, for example <em>Choose one</em>'),
+        '#type' => 'textfield',
+        '#title' => 'First item',
+        '#default_value' => $this->options['first_item'],
+        '#description' => t('This will be used as the first item in your select list, for example <em>Choose one</em>'),
     );
-  }
+    }
 
-  /**
-   * Get the 'render' tokens to use for advanced rendering.
-   *
-   * This runs through all of the fields and arguments that
-   * are available and gets their values. This will then be
-   * used in one giant str_replace().
-   * Slightly modified from views_handler_field.inc
-   */
-  function get_render_tokens($field_name, $row) {
+    /**
+     * Get the 'render' tokens to use for advanced rendering.
+     *
+     * This runs through all of the fields and arguments that
+     * are available and gets their values. This will then be
+     * used in one giant str_replace().
+     * Slightly modified from views_handler_field.inc
+     */
+    function get_render_tokens($field_name, $row) {
     $tokens = array();
     if (!empty($this->view->build_info['substitutions'])) {
-      $tokens = $this->view->build_info['substitutions'];
+        $tokens = $this->view->build_info['substitutions'];
     }
 
     $count = 0;
     foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
-      $token = '%'. ++$count;
-      if (!isset($tokens[$token])) {
+        $token = '%'. ++$count;
+        if (!isset($tokens[$token])) {
         $tokens[$token] = '';
-      }
+        }
     }
 
     // Now add replacements for our fields.
     $options = array();
     $map = array_flip($this->field_map);
     foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
-      $map = array_flip($this->field_map);
-      if (isset($row->$map[$field])) {
+        $map = array_flip($this->field_map);
+        if (isset($row->$map[$field])) {
         $tokens["[$field]"] = $row->$map[$field];
-      }
-      else {
+        }
+        else {
         $tokens["[$field]"] = '';
-      }
+        }
     }
 
     return $tokens;
-  }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -112,7 +112,7 @@
 
     $count = 0;
     foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
-      $token = '%'. ++$count;
+      $token = '%'.++$count;
       if (!isset($tokens[$token])) {
         $tokens[$token] = '';
       }

Braces +2 added lines, -4 removed lines

@@ -76,8 +76,7 @@ 
     foreach ($handlers as $field => $handler) {
       if ($label = $handler->label()) {
         $field_names[$field] = $label;
-      }
-      else {
+      } else {
         $field_names[$field] = $handler->ui_name();
       }
     }
@@ -125,8 +124,7 @@ 
       $map = array_flip($this->field_map);
       if (isset($row->$map[$field])) {
         $tokens["[$field]"] = $row->$map[$field];
-      }
-      else {
+      } else {
         $tokens["[$field]"] = '';
       }
     }

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.node.inc

Indentation +102 added lines, -102 removed lines

@@ -13,64 +13,64 @@ 
  * Rewrite the taxonomy item on the node form.
  */
 function _forum_access_node_form(&$form, &$form_state) {
-  global $user;
-  $vid = _forum_access_get_vid();
+    global $user;
+    $vid = _forum_access_get_vid();
 
-  if (!isset($form['taxonomy'][$vid]['#options'])) {
+    if (!isset($form['taxonomy'][$vid]['#options'])) {
     return;
-  }
+    }
 
-  // True node administrators are all powerful and do NOT get their forms rewritten here.
-  if (user_access('administer nodes') && empty($user->_forum_access_moderator)) {
+    // True node administrators are all powerful and do NOT get their forms rewritten here.
+    if (user_access('administer nodes') && empty($user->_forum_access_moderator)) {
     return;
-  }
+    }
 
-  $roles = array_keys($user->roles);
-  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
-  while ($obj = db_fetch_object($result)) {
+    $roles = array_keys($user->roles);
+    $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
+    while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
-  }
+    }
 
-  // Also get all forums they happen to be able to moderate.
-  $result = db_query("SELECT a.number AS tid FROM {acl} a INNER JOIN {acl_user} u ON a.acl_id = u.acl_id WHERE a.module = 'forum_access' AND u.uid = %d", $user->uid);
-  while ($obj = db_fetch_object($result)) {
+    // Also get all forums they happen to be able to moderate.
+    $result = db_query("SELECT a.number AS tid FROM {acl} a INNER JOIN {acl_user} u ON a.acl_id = u.acl_id WHERE a.module = 'forum_access' AND u.uid = %d", $user->uid);
+    while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
-  }
+    }
 
-  // Ensure the forum they're trying to post to directly is allowed, otherwise
-  // there will be much confusion.
-  $forum_tid = arg(3);
-  if (isset($forum_tid) && is_numeric($forum_tid) && !isset($tids[$forum_tid])) {
+    // Ensure the forum they're trying to post to directly is allowed, otherwise
+    // there will be much confusion.
+    $forum_tid = arg(3);
+    if (isset($forum_tid) && is_numeric($forum_tid) && !isset($tids[$forum_tid])) {
     drupal_access_denied();
     module_invoke_all('exit');
     exit;
-  }
+    }
 
-  foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
+    foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
     if (!is_numeric($tid)) {
-      $options[$tid] = $name;
+        $options[$tid] = $name;
     }
     elseif (is_object($name)) {
-      foreach ($name->option as $sub_tid => $sub_name) {
+        foreach ($name->option as $sub_tid => $sub_name) {
         if (!empty($tids[$sub_tid])) {
-          $options[$tid]->option[$sub_tid] = $sub_name;
+            $options[$tid]->option[$sub_tid] = $sub_name;
+        }
         }
-      }
     }
     elseif ($tids[$tid]) {
-      $options[$tid] = $name;
+        $options[$tid] = $name;
+    }
     }
-  }
 
-  if ($options) {
+    if ($options) {
     $form['taxonomy'][$vid]['#options'] = $options;
-  }
-  else {
+    }
+    else {
     unset($form['taxonomy'][$vid]);
-  }
+    }
 
-  // Apply modifications for Moderators (by role or uid).
-  if (!empty($user->_forum_access_moderator)) {
+    // Apply modifications for Moderators (by role or uid).
+    if (!empty($user->_forum_access_moderator)) {
     // We gave this user the 'administer nodes' permission, which he doesn't
     // normally have. Remove controls that should be reserved to true node
     // administrators.
@@ -78,31 +78,31 @@ 
     $allowed_elements = variable_get('forum_access_allowed_node_edit_elements', array('nid', 'vid', 'uid', 'created', 'type', 'changed', 'title', 'shadow', 'body_field', 'revision_information', 'form_build_id', 'form_token', 'form_id', 'comment_settings', 'taxonomy', 'attachments'));
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
-      switch ($key) {
+        switch ($key) {
         case 'options':
           foreach (element_children($form[$key]) as $key2) {
             if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
+                $form[$key][$key2]['#access'] = FALSE;
+            }
             }
-          }
-          break;
+            break;
         case 'buttons':
           $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
+            if (!forum_access_access($tid, 'update')) {
             $form['buttons']['submit']['#access'] = FALSE;
             $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
+            }
+            if (!forum_access_access($tid, 'delete')) {
             $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
+            }
+            break;
         default:
           if (array_search($key, $allowed_elements) === FALSE) {
             $form[$key]['#access'] = FALSE;
-          }
-      }
+            }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -114,18 +114,18 @@ 
  * and sanitize the Administration options for users with Edit grants.
  */
 function _forum_access_comment_form(&$form, &$form_state) {
-  global $user;
-  if ($user->uid != 1 && isset($form['nid']['#value'])) {
+    global $user;
+    if ($user->uid != 1 && isset($form['nid']['#value'])) {
     $node = node_load($form['nid']['#value']);
     if ($tid = _forum_access_get_tid($node)) {
-      if (!forum_access_access($tid, 'comment_create')) {
+        if (!forum_access_access($tid, 'comment_create')) {
         switch (arg(0)) {
-          case 'node':
+            case 'node':
               // Remove the in-line comment form, replace with text message to user.
               $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
+                $form['from'] = array(
+                    '#type'  => 'item',
+                    '#value' => 'You do not have permission to post comments in this forum.',);
             break;
             case 'comment':
                 if (arg(1)=='reply') {
@@ -135,38 +135,38 @@ 
                 }
             break;
         }//switch arg(0)
-      }
-      else {
+        }
+        else {
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
-          foreach (element_children($form['admin']) as $key) {
+            foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {
-              $form['admin'][$key]['#access'] = FALSE;
+                $form['admin'][$key]['#access'] = FALSE;
             }
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
 }
 
 /*
  * Give the user the 'administer nodes' and 'administer comments' permissions for this request.
  */
 function _forum_access_enable_moderator() {
-  global $user;
-  $rid = _forum_access_get_moderator_rid();
-  $user->roles[$rid] = '(forum_access temporary)';
-  user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
+    global $user;
+    $rid = _forum_access_get_moderator_rid();
+    $user->roles[$rid] = '(forum_access temporary)';
+    user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
 }
 
 /*
  * Remove the moderator permissions.
  */
 function _forum_access_disable_moderator() {
-  global $user;
-  $rid = _forum_access_get_moderator_rid();
-  unset($user->roles[$rid]);
-  user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
+    global $user;
+    $rid = _forum_access_get_moderator_rid();
+    unset($user->roles[$rid]);
+    user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
 }
 
 /*
@@ -174,26 +174,26 @@ 
  * then create it.
  */
 function _forum_access_get_moderator_rid($verbose = FALSE) {
-  $rid = forum_access_query_moderator_rid();
-  if ($rid !== NULL) {
+    $rid = forum_access_query_moderator_rid();
+    if ($rid !== NULL) {
     if (db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE rid = %d", $rid)) == 1) {
-      return $rid;
+        return $rid;
+    }
     }
-  }
-  module_load_include('admin.inc', 'forum_access');
-  return _forum_access_create_moderator_rid($verbose);
+    module_load_include('admin.inc', 'forum_access');
+    return _forum_access_create_moderator_rid($verbose);
 }
 
 /*
  * Return the roles for forum_access_node_access_explain().
  */
 function _forum_access_get_all_roles() {
-  $roles = user_roles();
-  $moderator_rid = forum_access_query_moderator_rid();
-  if (isset($roles[$moderator_rid])) {
+    $roles = user_roles();
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (isset($roles[$moderator_rid])) {
     $roles[$moderator_rid] .= ' '. t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
-  }
-  return $roles;
+    }
+    return $roles;
 }
 
 /**
@@ -201,42 +201,42 @@ 
  * remove those that aren't accessible to the user (pre-D6.17).
  */
 function _forum_access_preprocess_comment(&$variables) {
-  global $user;
-  if (!empty($user->_forum_access_moderator)) {
+    global $user;
+    if (!empty($user->_forum_access_moderator)) {
     _forum_access_enable_moderator(); // this allows us to retrieve the comment links (without setting precedent!)
-  }
+    }
 
-  $tid = $variables['node']->tid;
-  $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
-  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
+    $tid = $variables['node']->tid;
+    $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
+    if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
     _forum_access_disable_moderator();
-  }
+    }
 
-  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
+    if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
     unset($links['comment_reply']);
-  }
-  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
+    }
+    if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
     unset($links['comment_edit']);
-  }
-  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
+    }
+    if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
     unset($links['comment_delete']);
-  }
-  foreach (array_keys($links) as $link) {
+    }
+    foreach (array_keys($links) as $link) {
     if (!in_array($link, array('comment_reply', 'comment_edit', 'comment_delete'))) {
-      $link_preg_quote = preg_quote($link, '#');
-      if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
+        $link_preg_quote = preg_quote($link, '#');
+        if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
         unset($links[$link]); // eliminate possible additional unknown links that came in for 'administer_comments'
-      }
+        }
+    }
     }
-  }
 
-  drupal_alter('link', $links, $variables['node'], $variables['comment']);
+    drupal_alter('link', $links, $variables['node'], $variables['comment']);
 
-  if (empty($links)) {
+    if (empty($links)) {
     $links['comment_forbidden'] = array(
-      'title' => theme('comment_post_forbidden', $variables['node']),
-      'html'  => TRUE,
+        'title' => theme('comment_post_forbidden', $variables['node']),
+        'html'  => TRUE,
     );
-  }
-  $variables['links'] = theme('links', $links);
+    }
+    $variables['links'] = theme('links', $links);
 }

Switch Indentation +34 added lines, -34 removed lines

@@ -79,27 +79,27 @@ 
     $allowed_options = variable_get('forum_access_allowed_node_edit_options', array('status', 'sticky', 'subscriptions_notify'));
     foreach (element_children($form) as $key) {
       switch ($key) {
-        case 'options':
-          foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
-            }
-          }
-          break;
-        case 'buttons':
-          $tid = $form['taxonomy'][$vid]['#default_value'][0];
-          if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
-          }
-          if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
-          }
-          break;
-        default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+      case 'options':
+        foreach (element_children($form[$key]) as $key2) {
+          if (array_search($key2, $allowed_options) === FALSE) {
+            $form[$key][$key2]['#access'] = FALSE;
           }
+        }
+        break;
+      case 'buttons':
+        $tid = $form['taxonomy'][$vid]['#default_value'][0];
+        if (!forum_access_access($tid, 'update')) {
+          $form['buttons']['submit']['#access'] = FALSE;
+          $form['buttons']['preview']['#access'] = FALSE;
+        }
+        if (!forum_access_access($tid, 'delete')) {
+          $form['buttons']['delete']['#access'] = FALSE;
+        }
+        break;
+      default:
+        if (array_search($key, $allowed_elements) === FALSE) {
+          $form[$key]['#access'] = FALSE;
+        }
       }
     }
   }
@@ -120,20 +120,20 @@ 
     if ($tid = _forum_access_get_tid($node)) {
       if (!forum_access_access($tid, 'comment_create')) {
         switch (arg(0)) {
-          case 'node':
-              // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
-              $form['from'] = array(
-                  '#type'  => 'item',
-                  '#value' => 'You do not have permission to post comments in this forum.',);
-            break;
-            case 'comment':
-                if (arg(1)=='reply') {
-                    drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
-                    drupal_goto("node/$node->nid");
-                    exit;
-                }
-            break;
+        case 'node':
+            // Remove the in-line comment form, replace with text message to user.
+            $form = NULL;
+            $form['from'] = array(
+                '#type'  => 'item',
+                '#value' => 'You do not have permission to post comments in this forum.',);
+          break;
+        case 'comment':
+            if (arg(1)=='reply') {
+                drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
+                drupal_goto("node/$node->nid");
+                exit;
+            }
+        break;
         }//switch arg(0)
       }
       else {

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
   }
 
   $roles = array_keys($user->roles);
-  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_create = 1", $roles);
+  $result = db_query("SELECT tid FROM {forum_access} WHERE rid IN (".db_placeholders($roles).") AND grant_create = 1", $roles);
   while ($obj = db_fetch_object($result)) {
     $tids[$obj->tid] = $obj->tid;
   }
@@ -128,7 +128,7 @@ 
                   '#value' => 'You do not have permission to post comments in this forum.',);
             break;
             case 'comment':
-                if (arg(1)=='reply') {
+                if (arg(1) == 'reply') {
                     drupal_set_message(t("ERROR: You do not have permission to post comments in this forum."), 'error');
                     drupal_goto("node/$node->nid");
                     exit;
@@ -191,7 +191,7 @@ 
   $roles = user_roles();
   $moderator_rid = forum_access_query_moderator_rid();
   if (isset($roles[$moderator_rid])) {
-    $roles[$moderator_rid] .= ' '. t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
+    $roles[$moderator_rid] .= ' '.t('(!Forum_Access temporary role, does not need any grants.)', array('!Forum_Access' => 'Forum Access'));
   }
   return $roles;
 }
@@ -224,7 +224,7 @@ 
   foreach (array_keys($links) as $link) {
     if (!in_array($link, array('comment_reply', 'comment_edit', 'comment_delete'))) {
       $link_preg_quote = preg_quote($link, '#');
-      if (!preg_match('#<li class="[^"]*'. $link_preg_quote .'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
+      if (!preg_match('#<li class="[^"]*'.$link_preg_quote.'[^"]*"(.|\n)*</li>#U', $variables['links'])) {
         unset($links[$link]); // eliminate possible additional unknown links that came in for 'administer_comments'
       }
     }

Braces +4 added lines, -8 removed lines

@@ -49,23 +49,20 @@ 
   foreach ($form['taxonomy'][$vid]['#options'] as $tid => $name) {
     if (!is_numeric($tid)) {
       $options[$tid] = $name;
-    }
-    elseif (is_object($name)) {
+    } elseif (is_object($name)) {
       foreach ($name->option as $sub_tid => $sub_name) {
         if (!empty($tids[$sub_tid])) {
           $options[$tid]->option[$sub_tid] = $sub_name;
         }
       }
-    }
-    elseif ($tids[$tid]) {
+    } elseif ($tids[$tid]) {
       $options[$tid] = $name;
     }
   }
 
   if ($options) {
     $form['taxonomy'][$vid]['#options'] = $options;
-  }
-  else {
+  } else {
     unset($form['taxonomy'][$vid]);
   }
 
@@ -135,8 +132,7 @@ 
                 }
             break;
         }//switch arg(0)
-      }
-      else {
+      } else {
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
           foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {

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

@@ -81,24 +81,24 @@ 
       switch ($key) {
         case 'options':
           foreach (element_children($form[$key]) as $key2) {
-            if (array_search($key2, $allowed_options) === FALSE) {
-              $form[$key][$key2]['#access'] = FALSE;
+            if (array_search($key2, $allowed_options) === false) {
+              $form[$key][$key2]['#access'] = false;
             }
           }
           break;
         case 'buttons':
           $tid = $form['taxonomy'][$vid]['#default_value'][0];
           if (!forum_access_access($tid, 'update')) {
-            $form['buttons']['submit']['#access'] = FALSE;
-            $form['buttons']['preview']['#access'] = FALSE;
+            $form['buttons']['submit']['#access'] = false;
+            $form['buttons']['preview']['#access'] = false;
           }
           if (!forum_access_access($tid, 'delete')) {
-            $form['buttons']['delete']['#access'] = FALSE;
+            $form['buttons']['delete']['#access'] = false;
           }
           break;
         default:
-          if (array_search($key, $allowed_elements) === FALSE) {
-            $form[$key]['#access'] = FALSE;
+          if (array_search($key, $allowed_elements) === false) {
+            $form[$key]['#access'] = false;
           }
       }
     }
@@ -122,7 +122,7 @@ 
         switch (arg(0)) {
           case 'node':
               // Remove the in-line comment form, replace with text message to user.
-              $form = NULL;
+              $form = null;
               $form['from'] = array(
                   '#type'  => 'item',
                   '#value' => 'You do not have permission to post comments in this forum.',);
@@ -140,7 +140,7 @@ 
         if (isset($form['admin']) && !empty($user->_forum_access_moderator)) {
           foreach (element_children($form['admin']) as $key) {
             if ($key != 'status') {
-              $form['admin'][$key]['#access'] = FALSE;
+              $form['admin'][$key]['#access'] = false;
             }
           }
         }
@@ -156,7 +156,7 @@ 
   global $user;
   $rid = _forum_access_get_moderator_rid();
   $user->roles[$rid] = '(forum_access temporary)';
-  user_access('', NULL, TRUE); // clear the permissions cache to activate the new role
+  user_access('', null, true); // clear the permissions cache to activate the new role
 }
 
 /*
@@ -166,16 +166,16 @@ 
   global $user;
   $rid = _forum_access_get_moderator_rid();
   unset($user->roles[$rid]);
-  user_access('', NULL, TRUE); // clear the permissions cache to revert to normal
+  user_access('', null, true); // clear the permissions cache to revert to normal
 }
 
 /*
  * Retrieve the rid of the Forum Moderator role; if the role does not exist,
  * then create it.
  */
-function _forum_access_get_moderator_rid($verbose = FALSE) {
+function _forum_access_get_moderator_rid($verbose = false) {
   $rid = forum_access_query_moderator_rid();
-  if ($rid !== NULL) {
+  if ($rid !== null) {
     if (db_result(db_query("SELECT COUNT(rid) FROM {role} WHERE rid = %d", $rid)) == 1) {
       return $rid;
     }
@@ -208,17 +208,17 @@ 
 
   $tid = $variables['node']->tid;
   $links = module_invoke_all('link', 'comment', $variables['comment'], 0);
-  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == NULL) {
+  if (!empty($user->_forum_access_moderator) && arg(0) == 'node' && arg(2) == null) {
     _forum_access_disable_moderator();
   }
 
-  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', NULL, FALSE))) {
+  if (isset($links['comment_reply']) && (!preg_match('#<li class="[^"]*comment_reply[^"]*".*</li>#U', $variables['links']) || !user_access('post comments') || !forum_access_access($tid, 'comment_create', null, false))) {
     unset($links['comment_reply']);
   }
-  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', NULL, FALSE) && !comment_access('edit', $variables['comment'])) {
+  if (isset($links['comment_edit']) && !forum_access_access($tid, 'update', null, false) && !comment_access('edit', $variables['comment'])) {
     unset($links['comment_edit']);
   }
-  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', NULL, FALSE) && !user_access('administer comments')) {
+  if (isset($links['comment_delete']) && !forum_access_access($tid, 'delete', null, false) && !user_access('administer comments')) {
     unset($links['comment_delete']);
   }
   foreach (array_keys($links) as $link) {
@@ -235,7 +235,7 @@ 
   if (empty($links)) {
     $links['comment_forbidden'] = array(
       'title' => theme('comment_post_forbidden', $variables['node']),
-      'html'  => TRUE,
+      'html'  => true,
     );
   }
   $variables['links'] = theme('links', $links);