BOINC / boinc

drupal/sites/default/boinc/modules/contrib/forum_access/forum_access.module

Indentation +301 added lines, -301 removed lines

@@ -15,8 +15,8 @@ 
  * roles as ACLs, so rids translate directly to gids.
  */
 function forum_access_node_grants($user, $op) {
-  $grants['forum_access'] = array_keys($user->roles);
-  return $grants;
+    $grants['forum_access'] = array_keys($user->roles);
+    return $grants;
 }
 
 /**
@@ -26,51 +26,51 @@ 
  * Checks to see if maybe we're being disabled.
  */
 function forum_access_node_access_records($node) {
-  if (!forum_access_enabled()) {
+    if (!forum_access_enabled()) {
     return;
-  }
+    }
 
-  static $grants = array();
-  static $node_admins;
-  $tid = _forum_access_get_tid($node);
+    static $grants = array();
+    static $node_admins;
+    $tid = _forum_access_get_tid($node);
 
-  // Set proper grants for nodecomment comment nodes.
-  if (isset($node->comment_target_nid)) {
+    // Set proper grants for nodecomment comment nodes.
+    if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
-      $tid = $changed_tid; // the topic node hasn't been saved yet!
+        $tid = $changed_tid; // the topic node hasn't been saved yet!
     }
     else {
-      $node = node_load($node->comment_target_nid);
-      $tid = _forum_access_get_tid($node);
+        $node = node_load($node->comment_target_nid);
+        $tid = _forum_access_get_tid($node);
+    }
     }
-  }
 
-  if ($tid) {
+    if ($tid) {
     if (!isset($grants[$tid])) {
-      if (!isset($node_admins)) {
+        if (!isset($node_admins)) {
         $node_admins = user_roles(FALSE, 'administer nodes');
-      }
-      $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
-      while ($grant = db_fetch_object($result)) {
+        }
+        $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
+        while ($grant = db_fetch_object($result)) {
         if (isset($node_admins[$grant->rid])) {
-          continue; // Don't provide any useless grants!
+            continue; // Don't provide any useless grants!
         }
         $grants[$tid][] = array(
-          'realm' => 'forum_access',
-          'gid' => $grant->rid,
-          'grant_view' => $grant->grant_view,
-          'grant_update' => $grant->grant_update,
-          'grant_delete' => $grant->grant_delete,
-          'grant_comment_create' => $grant->grant_comment_create,
-          'priority' => $grant->priority,
+            'realm' => 'forum_access',
+            'gid' => $grant->rid,
+            'grant_view' => $grant->grant_view,
+            'grant_update' => $grant->grant_update,
+            'grant_delete' => $grant->grant_delete,
+            'grant_comment_create' => $grant->grant_comment_create,
+            'priority' => $grant->priority,
         );
-      }
-      //drupal_set_message("forum_access_node_access_records($node->nid) (tid=$tid) returns ". var_export($grants[$tid], TRUE), 'status');
+        }
+        //drupal_set_message("forum_access_node_access_records($node->nid) (tid=$tid) returns ". var_export($grants[$tid], TRUE), 'status');
     }
     if (isset($grants[$tid])) {
-      return $grants[$tid];
+        return $grants[$tid];
+    }
     }
-  }
 }
 
 /**
@@ -80,60 +80,60 @@ 
  * and comment/delete/% where needed.
  */
 function forum_access_init() {
-  global $user;
-  if ($user->uid == 1) {
+    global $user;
+    if ($user->uid == 1) {
     return;
-  }
+    }
 
-  switch (arg(0)) {
+    switch (arg(0)) {
     case 'comment':
       if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
         return; // disable comment access control
-      }
-      if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
+        }
+        if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
         if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
-          $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
-          $comment = _comment_load($cid);
-          $nid = $comment->nid;
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we need Moderator permissions now, so we can moderate
-          // this comment.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-          $grant_normal_access = TRUE;
-        }
-      }
-      break;
+            $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
+            $comment = _comment_load($cid);
+            $nid = $comment->nid;
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we need Moderator permissions now, so we can moderate
+            // this comment.
+            // We won't provide full Administrator access, though: we'll remove
+            // author and timestamp, for example.
+            $grant_normal_access = TRUE;
+        }
+        }
+        break;
 
     case 'node':
       if (is_numeric(arg(1))) {
         if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we already get limited edit capabilities from NA, but
-          // we need some more, e.g. publish/unpublish and comment status.
-          // In order to get these controls on the form, we need Moderator
-          // permissions now.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
+            $access[] = 'update';
+            $nid = arg(1);
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we already get limited edit capabilities from NA, but
+            // we need some more, e.g. publish/unpublish and comment status.
+            // In order to get these controls on the form, we need Moderator
+            // permissions now.
+            // We won't provide full Administrator access, though: we'll remove
+            // author and timestamp, for example.
         }
         if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
-          $access = array();
-          $nid = arg(1);
-          // This is the delete confirmation page. We don't need any
-          // additional permissions, but we'll assert 'view' access below.
+            $access = array();
+            $nid = arg(1);
+            // This is the delete confirmation page. We don't need any
+            // additional permissions, but we'll assert 'view' access below.
         }
         if (arg(2) == NULL && !user_access('administer comments')) { // node/%
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we'll get the 'Edit' link automatically from NA, but
-          // we'll need Moderator permissions, so that we can add the edit/delete
-          // comment links (*after* we've identified the other comment links).
+            $access[] = 'update';
+            $nid = arg(1);
+            // If the node turns out to be in a forum where we have update/delete
+            // access, then we'll get the 'Edit' link automatically from NA, but
+            // we'll need Moderator permissions, so that we can add the edit/delete
+            // comment links (*after* we've identified the other comment links).
         }
-      }
-      break;
+        }
+        break;
 
     case 'community':
         if (arg(1)=='forum') {
@@ -155,30 +155,30 @@ 
             }// is_numeric(arg(2))
         }// arg(1)==forum
     break;
-  }// switch
-  if (isset($nid)) {
+    }// switch
+    if (isset($nid)) {
     $node = node_load($nid);
     if ($tid = _forum_access_get_tid($node)) {
-      if (!forum_access_access($tid, 'view')) {
+        if (!forum_access_access($tid, 'view')) {
         drupal_access_denied();
         module_invoke_all('exit');
         exit;
-      }
-      foreach ($access as $a) {
+        }
+        foreach ($access as $a) {
         $faa = forum_access_access($tid, $a);
         $grant_moderator_access = $faa > 1;
         $grant_normal_access = !empty($grant_normal_access) && $faa > 0;
         if ($grant_normal_access || $grant_moderator_access) {
-          $user->_forum_access_moderator = $grant_moderator_access;
-          if (arg(0) == 'comment' || arg(0) == 'node' && arg(2) == 'edit') {
+            $user->_forum_access_moderator = $grant_moderator_access;
+            if (arg(0) == 'comment' || arg(0) == 'node' && arg(2) == 'edit') {
             module_load_include('node.inc', 'forum_access');
             _forum_access_enable_moderator();
             break;
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
 }
 
 /**
@@ -187,50 +187,50 @@ 
  * Alter the node/comment create/edit forms and various admin forms.
  */
 function forum_access_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
+    if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+    }
+    elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+    }
+    elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+    }
+    elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+    }
+    elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+    }
+    elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+    }
+    elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+    }
+    elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+    }
+    elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+    }
+    elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+    }
+    elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
-  }
+    }
 }
 
 /**
@@ -241,41 +241,41 @@ 
  * taxonomy. There should be.
  */
 function forum_access_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
-  global $user;
-  $sql = NULL;
-  switch ($primary_field) {
+    global $user;
+    $sql = NULL;
+    switch ($primary_field) {
     case 'tid':
       if ($user->uid == 1
         || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
         || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
         break;
-      }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+        }
+        if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+        }
+        else {
         $required_access = 'view';
-      }
-      $roles = implode(', ', array_keys($user->roles));
-      $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
+        }
+        $roles = implode(', ', array_keys($user->roles));
+        $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
                       LEFT JOIN {acl} acl_fa ON acl_fa.number = $primary_table.tid AND acl_fa.module = 'forum_access'
                       LEFT JOIN {acl_user} aclu_fa ON aclu_fa.acl_id = acl_fa.acl_id AND aclu_fa.uid = $user->uid";
-      $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
-      $sql['distinct'] = 1;
-      break;
+        $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
+        $sql['distinct'] = 1;
+        break;
 
     case 'rid':
       if (strpos($query, 'FROM {role}') === FALSE
         || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
         break;
-      }
-      $moderator_rid = forum_access_query_moderator_rid();
-      if (!empty($moderator_rid)) {
+        }
+        $moderator_rid = forum_access_query_moderator_rid();
+        if (!empty($moderator_rid)) {
         $sql['where'] = "$primary_table.rid <> $moderator_rid";
-      }
-      break;
-  }
-  return $sql;
+        }
+        break;
+    }
+    return $sql;
 }
 
 /**
@@ -284,43 +284,43 @@ 
  * Add ACL data to fresh forum posts.
  */
 function forum_access_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  static $old_tid = NULL;
-  // This is modeled after forum_nodeapi():
-  $vid = _forum_access_get_vid();
-  $vocabulary = taxonomy_vocabulary_load($vid);
-  if (empty($vocabulary) || !in_array($node->type, $vocabulary->nodes)) {
+    static $old_tid = NULL;
+    // This is modeled after forum_nodeapi():
+    $vid = _forum_access_get_vid();
+    $vocabulary = taxonomy_vocabulary_load($vid);
+    if (empty($vocabulary) || !in_array($node->type, $vocabulary->nodes)) {
     if ($op == 'insert' && isset($node->comment_target_nid)) {
-      // Set moderator on nodecomment.
-      $topic_node = node_load($node->comment_target_nid);
-      if ($topic_tid = _forum_access_get_tid($topic_node)) {
+        // Set moderator on nodecomment.
+        $topic_node = node_load($node->comment_target_nid);
+        if ($topic_tid = _forum_access_get_tid($topic_node)) {
         $acl_id = acl_get_id_by_number('forum_access', $topic_tid);
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-      }
+        }
     }
     return;
-  }
+    }
 
-  switch ($op) {
+    switch ($op) {
     case 'presave':
       $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
-      break;
+        break;
 
     case 'update':
       if (!empty($old_tid)) {
         if (!empty($node->tid) && $node->tid == $old_tid) {
-          return;
+            return;
         }
         acl_node_clear_acls($node->nid, 'forum_access');
 
         if (module_exists('nodecomment')) {
-          _forum_access_changed_tid($node->tid);
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
+            _forum_access_changed_tid($node->tid);
+            $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+            while ($row = db_fetch_object($result)) {
             acl_node_clear_acls($row->cid, 'forum_access');
-          }
+            }
+        }
         }
-      }
-      // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
+        // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
 
     case 'insert':
       if (!empty($node->tid)) {
@@ -328,27 +328,27 @@ 
         acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
 
         if (isset($old_tid) && module_exists('nodecomment')) {
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
+            $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+            while ($row = db_fetch_object($result)) {
             acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
             node_access_acquire_grants(node_load($row->cid));
-          }
+            }
         }
-      }
-      $old_tid = NULL;
-      break;
-  }
+        }
+        $old_tid = NULL;
+        break;
+    }
 }
 
 /**
  * Get an array of moderator UIDs or NULL.
  */
 function forum_access_get_moderator_uids($tid) {
-  if ($acl_id = acl_get_id_by_number('forum_access', $tid)) {
+    if ($acl_id = acl_get_id_by_number('forum_access', $tid)) {
     if ($uids = acl_get_uids($acl_id)) {
-      return $uids;
+        return $uids;
+    }
     }
-  }
 }
 
 /**
@@ -361,21 +361,21 @@ 
  * and thus it is disabled by default. Set the variable to TRUE to enable.
  */
 function forum_access_preprocess_forum_list(&$variables) {
-  if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
+    if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
     static $users;
     foreach ($variables['forums'] as $tid => $forum) {
-      $moderators = array();
-      if ($uids = forum_access_get_moderator_uids($tid)) {
+        $moderators = array();
+        if ($uids = forum_access_get_moderator_uids($tid)) {
         foreach ($uids as $uid) {
-          if (!isset($users[$uid])) {
+            if (!isset($users[$uid])) {
             $users[$uid] = user_load(array('uid' => $uid));
-          }
-          $moderators[$uid] = $users[$uid];
+            }
+            $moderators[$uid] = $users[$uid];
+        }
         }
-      }
-      $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+        $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+    }
     }
-  }
 }
 
 /**
@@ -385,17 +385,17 @@ 
  * 'create' permission.
  */
 function forum_access_preprocess_forums(&$variables) {
-  if (!forum_access_access($variables['tid'], 'create') && !empty($variables['links'])) {
+    if (!forum_access_access($variables['tid'], 'create') && !empty($variables['links'])) {
     foreach ($variables['links'] as $key => $link) {
-      if (isset($link['href']) && substr($link['href'], 0, 9) == 'node/add/') {
+        if (isset($link['href']) && substr($link['href'], 0, 9) == 'node/add/') {
         unset($variables['links'][$key]);
-      }
+        }
+    }
     }
-  }
 }
 
 if (!variable_get('forum_access_D5_legacy_mode', FALSE)) {
-  // LEGACY-MODE disables these methods
+    // LEGACY-MODE disables these methods
 
 /**
  * Implementation of hook_link_alter().
@@ -404,42 +404,42 @@ 
  * 'comment_create' permission; for comments, add any missing links (D6.17+).
  */
 function forum_access_link_alter(&$links, $node, $comment = NULL) {
-  global $user;
-  static $user1, $recursing = FALSE, $stored_links;
+    global $user;
+    static $user1, $recursing = FALSE, $stored_links;
 
-  // If we are being called recursively, store the $links and return.
-  if ($recursing) {
+    // If we are being called recursively, store the $links and return.
+    if ($recursing) {
     $stored_links = $links;
     return;
-  }
-  if ($user->uid == 1 || !($tid = _forum_access_get_tid($node))) {
+    }
+    if ($user->uid == 1 || !($tid = _forum_access_get_tid($node))) {
     return;
-  }
-  if (empty($comment)) {
+    }
+    if (empty($comment)) {
     // Check links for the node.
     if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create')) {
-      unset($links['comment_add']);
-      // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
-          unset($links['quote']);
-      }
-    }
-  }
-  else {
+        unset($links['comment_add']);
+        // Hack to manually remove quote link
+        if ( isset($links['quote']) ) {
+            unset($links['quote']);
+        }
+    }
+    }
+    else {
     // Check links for the comment.
     $required_keys = array(
-      'comment_create' => 'comment_reply',
-      'update' => 'comment_edit',
-      'delete' => 'comment_delete',
+        'comment_create' => 'comment_reply',
+        'update' => 'comment_edit',
+        'delete' => 'comment_delete',
     );
     foreach ($required_keys as $access => $key) {
-      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
+        if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+        }
+        elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
-      }
+        }
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
@@ -448,48 +448,48 @@ 
     }
     
     if (isset($required_keys['comment_create']) && !user_access('post comments')) {
-      unset($required_keys['comment_create']);
+        unset($required_keys['comment_create']);
     }
     if (!empty($link_is_missing)) {
-      // One of the $required_links should be present, because the current
-      // user has the corresponding permission, but it isn't.
-      // We temporarily switch to UID 1 to 'harvest' all comment links.
-      if (!isset($user1)) {
+        // One of the $required_links should be present, because the current
+        // user has the corresponding permission, but it isn't.
+        // We temporarily switch to UID 1 to 'harvest' all comment links.
+        if (!isset($user1)) {
         $user1 = user_load(1);
-      }
-      $saved_user = $user;
-      session_save_session(FALSE);
-      $user = $user1;
-
-      // With UID 1 we call hook_link(). This should give us the full set of
-      // links that the site admin sees.
-      $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
-
-      $user = $saved_user;
-      session_save_session(TRUE);
-
-      // Remove the links from $admin_links that are not in the reduced
-      // set of $required_links AND not available to the current user anyway.
-      // Afterwards, $admin_links should have the same content as $links, plus
-      // one or more additional links from the original set in $required_links.
-      foreach ($admin_links as $key => $target) {
+        }
+        $saved_user = $user;
+        session_save_session(FALSE);
+        $user = $user1;
+
+        // With UID 1 we call hook_link(). This should give us the full set of
+        // links that the site admin sees.
+        $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
+
+        $user = $saved_user;
+        session_save_session(TRUE);
+
+        // Remove the links from $admin_links that are not in the reduced
+        // set of $required_links AND not available to the current user anyway.
+        // Afterwards, $admin_links should have the same content as $links, plus
+        // one or more additional links from the original set in $required_links.
+        foreach ($admin_links as $key => $target) {
         if (!in_array($key, $required_keys) && !array_key_exists($key, $links)) {
-          unset($admin_links[$key]);
-        }
-      }
-
-      // As the real current user, call hook_link_alter on the admin links.
-      // First we set a static variable so that the next time this function is
-      // called it will store a copy of the links at their current state. Then
-      // we pull those links which have not been link_alter'ed by any modules
-      // that come after forum_access.
-      $recursing = TRUE;
-      drupal_alter('link', $admin_links, $node, $comment);
-      $recursing = FALSE;
-      // Now return the stored links.
-      $links = $stored_links;
-    }
-  }// if empty($comment)
+            unset($admin_links[$key]);
+        }
+        }
+
+        // As the real current user, call hook_link_alter on the admin links.
+        // First we set a static variable so that the next time this function is
+        // called it will store a copy of the links at their current state. Then
+        // we pull those links which have not been link_alter'ed by any modules
+        // that come after forum_access.
+        $recursing = TRUE;
+        drupal_alter('link', $admin_links, $node, $comment);
+        $recursing = FALSE;
+        // Now return the stored links.
+        $links = $stored_links;
+    }
+    }// if empty($comment)
 }
 
 /**
@@ -499,10 +499,10 @@ 
  * (after _forum_access_comment_form()).
  */
 function forum_access_preprocess_box(&$variables) {
-  $tr = 't';
-  if (empty($variables['content']) && ($variables['title'] == $tr('Post new comment') || $variables['title'] == $tr('Reply'))) {
+    $tr = 't';
+    if (empty($variables['content']) && ($variables['title'] == $tr('Post new comment') || $variables['title'] == $tr('Reply'))) {
     $variables['title'] = '';
-  }
+    }
 }
 
 /**
@@ -512,10 +512,10 @@ 
  * remove those that aren't accessible to the user.
  */
 function forum_access_preprocess_comment(&$variables) {
-  if (version_compare(VERSION, '6.17', '<') && isset($variables['node']->tid)) {
+    if (version_compare(VERSION, '6.17', '<') && isset($variables['node']->tid)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_preprocess_comment($variables);
-  }
+    }
 }
 
 } // End of !LEGACY-MODE
@@ -524,11 +524,11 @@ 
  * This is also required by ACL module.
  */
 function forum_access_enabled($set = NULL) {
-  static $enabled = TRUE;
-  if ($set !== NULL) {
+    static $enabled = TRUE;
+    if ($set !== NULL) {
     $enabled = $set;
-  }
-  return $enabled;
+    }
+    return $enabled;
 }
 
 /**
@@ -545,63 +545,63 @@ 
  *   2     - access granted for forum moderator
  */
 function forum_access_access($tid, $type, $account = NULL, $administer_nodes_sees_everything = TRUE) {
-  static $cache = array();
-  if (!$account) {
+    static $cache = array();
+    if (!$account) {
     global $user;
     $account = $user;
-  }
+    }
 
-  if ($account->uid == 1 ||
+    if ($account->uid == 1 ||
       $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== FALSE) {
     return 1;
-  }
+    }
 
-  if (!isset($cache[$account->uid][$tid][$type])) {
+    if (!isset($cache[$account->uid][$tid][$type])) {
     if (!user_access('access content', $account)) {
-      return $cache[$account->uid][$tid][$type] = FALSE;
+        return $cache[$account->uid][$tid][$type] = FALSE;
     }
 
     $roles = array_keys($account->roles);
     $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_". $type ." = 1 AND tid = %d", array_merge($roles, array($tid))));
 
     if ($result) {
-      $cache[$account->uid][$tid][$type] = 1;
+        $cache[$account->uid][$tid][$type] = 1;
     }
     else {
-      // check our moderators too
-      $acl_id = acl_get_id_by_number('forum_access', $tid);
-      $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
-      if ($result) {
+        // check our moderators too
+        $acl_id = acl_get_id_by_number('forum_access', $tid);
+        $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
+        if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+        }
+        else {
         $cache[$account->uid][$tid][$type] = FALSE;
-      }
+        }
     }
-  }
-  return $cache[$account->uid][$tid][$type];
+    }
+    return $cache[$account->uid][$tid][$type];
 }
 
 /**
  * Implementation of hook_user().
  */
 function forum_access_user($op, &$edit, &$account, $category = NULL) {
-  switch ($op) {
+    switch ($op) {
     case 'validate':
       $rid = forum_access_query_moderator_rid();
-      if (!empty($rid)) {
+        if (!empty($rid)) {
         if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
-          $roles = user_roles();
-          $variables = array(
+            $roles = user_roles();
+            $variables = array(
             '@Forum_Access' => 'Forum Access',
             '%Role' => $roles[$rid],
-          );
-          drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
-          unset($edit['roles'][$rid]);
+            );
+            drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
+            unset($edit['roles'][$rid]);
+        }
         }
-      }
-      break;
-  }
+        break;
+    }
 }
 
 /**
@@ -610,15 +610,15 @@ 
  * Remove the 'Forum' menu item if no forums are visible.
  */
 function forum_access_menu_alter(&$items) {
-  if (!empty($items['forum'])) {
+    if (!empty($items['forum'])) {
     //dpm($items['forum'], 'hook_menu_alter($items[\'forum\'])');
     if (!empty($items['forum']['access callback']) || $items['forum']['access arguments'][0] != 'access content') {
-      drupal_set_message(t('Unexpected access specification for the %forum menu path; @Forum_Access cannot control its access.', array('%forum' => 'forum', '@Forum_Access' => 'Forum Access')), 'error');
-      return;
+        drupal_set_message(t('Unexpected access specification for the %forum menu path; @Forum_Access cannot control its access.', array('%forum' => 'forum', '@Forum_Access' => 'Forum Access')), 'error');
+        return;
     }
     $items['forum']['access callback'] = '_forum_access_forum_access_callback';
     $items['forum']['access arguments'] = array(1);
-  }
+    }
 }
 
 /**
@@ -629,7 +629,7 @@ 
  * one role that can access at least one forum.
  */
 function _forum_access_forum_access_callback($tid = NULL) {
-  return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
+    return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
 }
 
 /**
@@ -639,37 +639,37 @@ 
  * at least one forum.
  */
 function _forum_access_access_any_forum($account = NULL) {
-  global $user;
-  static $return = array();
+    global $user;
+    static $return = array();
 
-  if (!isset($account)) {
+    if (!isset($account)) {
     $account = $user;
-  }
+    }
 
-  if (!isset($return[$account->uid])) {
+    if (!isset($return[$account->uid])) {
     if ($account->uid == 1) {
-      return $return[$account->uid] = TRUE;
+        return $return[$account->uid] = TRUE;
     }
     if (!user_access('access content', $account)) {
-      return $return[$account->uid] = FALSE;
+        return $return[$account->uid] = FALSE;
     }
     $rids = variable_get('forum_access_rids', NULL);
     if (!isset($rids)) {
-      $rids = array();
-      $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
-      while ($role = db_fetch_object($result)) {
+        $rids = array();
+        $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
+        while ($role = db_fetch_object($result)) {
         $rids[] = $role->rid;
-      }
-      variable_set('forum_access_rids', $rids);
+        }
+        variable_set('forum_access_rids', $rids);
     }
     foreach ($rids as $rid) {
-      if (isset($account->roles[$rid])) {
+        if (isset($account->roles[$rid])) {
         return $return[$account->uid] = TRUE;
-      }
+        }
     }
     $return[$account->uid] = FALSE;
-  }
-  return $return[$account->uid];
+    }
+    return $return[$account->uid];
 }
 
 /**
@@ -678,18 +678,18 @@ 
  * Delete {forum_access} records when forums are deleted.
  */
 function forum_access_taxonomy($op, $type, $array = NULL) {
-  //dpm($array, "hook_taxonomy($op, $type)");
-  if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
+    //dpm($array, "hook_taxonomy($op, $type)");
+    if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
     db_query("DELETE FROM {forum_access} WHERE tid = %d", $array['tid']);
     variable_del('forum_access_rids'); // clear cache
-  }
+    }
 }
 
 /**
  * Return forum.module's forum vocabulary ID.
  */
 function _forum_access_get_vid() {
-  return variable_get('forum_nav_vocabulary', '');
+    return variable_get('forum_nav_vocabulary', '');
 }
 
 /**
@@ -697,51 +697,51 @@ 
  * exist.
  */
 function forum_access_query_moderator_rid() {
-  return variable_get('forum_access_moderator_rid', NULL);
+    return variable_get('forum_access_moderator_rid', NULL);
 }
 
 /**
  * Return the forum tid or FALSE.
  */
 function _forum_access_get_tid($node) {
-  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
+    return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
 }
 
 /**
  * Save and return the $tid.
  */
 function _forum_access_changed_tid($tid = NULL) {
-  static $saved_tid = NULL;
-  if (!empty($tid)) {
+    static $saved_tid = NULL;
+    if (!empty($tid)) {
     $saved_tid = $tid;
-  }
-  return $saved_tid;
+    }
+    return $saved_tid;
 }
 
 /**
  * Implementation of hook_node_access_explain().
  */
 function forum_access_node_access_explain($row) {
-  static $roles = NULL;
-  if ($row->realm == 'forum_access') {
+    static $roles = NULL;
+    if ($row->realm == 'forum_access') {
     if (!isset($roles)) {
-      module_load_include('node.inc', 'forum_access');
-      $roles = _forum_access_get_all_roles();
+        module_load_include('node.inc', 'forum_access');
+        $roles = _forum_access_get_all_roles();
     }
     if (isset($roles[$row->gid])) {
-      return array($roles[$row->gid]);
+        return array($roles[$row->gid]);
     }
     return array('(unknown gid)');
-  }
+    }
 }
 
 /**
  * Implementation of hook_acl_explain().
  */
 function forum_access_acl_explain($acl_id, $name, $number, $users = NULL) {
-  if (empty($users)) {
+    if (empty($users)) {
     return "ACL (id=$acl_id) would grant access to nodes in forum/$number.";
-  }
-  return "ACL (id=$acl_id) grants access to nodes in forum/$number to the listed user(s).";
+    }
+    return "ACL (id=$acl_id) grants access to nodes in forum/$number to the listed user(s).";
 }
 

Switch Indentation +134 added lines, -134 removed lines

@@ -86,75 +86,75 @@ 
   }
 
   switch (arg(0)) {
-    case 'comment':
-      if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
-        return; // disable comment access control
-      }
-      if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
-        if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
-          $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
-          $comment = _comment_load($cid);
-          $nid = $comment->nid;
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we need Moderator permissions now, so we can moderate
-          // this comment.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-          $grant_normal_access = TRUE;
-        }
+  case 'comment':
+    if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
+      return; // disable comment access control
+    }
+    if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
+      if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
+        $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
+        $comment = _comment_load($cid);
+        $nid = $comment->nid;
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we need Moderator permissions now, so we can moderate
+        // this comment.
+        // We won't provide full Administrator access, though: we'll remove
+        // author and timestamp, for example.
+        $grant_normal_access = TRUE;
       }
-      break;
+    }
+    break;
 
-    case 'node':
-      if (is_numeric(arg(1))) {
-        if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we already get limited edit capabilities from NA, but
-          // we need some more, e.g. publish/unpublish and comment status.
-          // In order to get these controls on the form, we need Moderator
-          // permissions now.
-          // We won't provide full Administrator access, though: we'll remove
-          // author and timestamp, for example.
-        }
-        if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
-          $access = array();
-          $nid = arg(1);
-          // This is the delete confirmation page. We don't need any
-          // additional permissions, but we'll assert 'view' access below.
-        }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
-          $access[] = 'update';
-          $nid = arg(1);
-          // If the node turns out to be in a forum where we have update/delete
-          // access, then we'll get the 'Edit' link automatically from NA, but
-          // we'll need Moderator permissions, so that we can add the edit/delete
-          // comment links (*after* we've identified the other comment links).
-        }
+  case 'node':
+    if (is_numeric(arg(1))) {
+      if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
+        $access[] = 'update';
+        $nid = arg(1);
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we already get limited edit capabilities from NA, but
+        // we need some more, e.g. publish/unpublish and comment status.
+        // In order to get these controls on the form, we need Moderator
+        // permissions now.
+        // We won't provide full Administrator access, though: we'll remove
+        // author and timestamp, for example.
       }
-      break;
-
-    case 'community':
-        if (arg(1)=='forum') {
-            if (is_numeric(arg(2))) {
-                $tid=arg(2);
-                // Obtain the tid from a URL path containing
-                // community/forum/%tid, this will prevent users from
-                // loading forums they are not allowed to access.
-                // However, only tid>1 are terms we care about. (This
-                // allows forum_tweaks mark-read functionality to
-                // work.)
-                if (isset($tid) and ($tid>1)) {
-                    if (!forum_access_access($tid, 'view')) {
-                        drupal_access_denied();
-                        module_invoke_all('exit');
-                        exit;
-                    }
-                }// isset($tid)
-            }// is_numeric(arg(2))
-        }// arg(1)==forum
+      if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
+        $access = array();
+        $nid = arg(1);
+        // This is the delete confirmation page. We don't need any
+        // additional permissions, but we'll assert 'view' access below.
+      }
+      if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        $access[] = 'update';
+        $nid = arg(1);
+        // If the node turns out to be in a forum where we have update/delete
+        // access, then we'll get the 'Edit' link automatically from NA, but
+        // we'll need Moderator permissions, so that we can add the edit/delete
+        // comment links (*after* we've identified the other comment links).
+      }
+    }
     break;
+
+  case 'community':
+      if (arg(1)=='forum') {
+          if (is_numeric(arg(2))) {
+              $tid=arg(2);
+              // Obtain the tid from a URL path containing
+              // community/forum/%tid, this will prevent users from
+              // loading forums they are not allowed to access.
+              // However, only tid>1 are terms we care about. (This
+              // allows forum_tweaks mark-read functionality to
+              // work.)
+              if (isset($tid) and ($tid>1)) {
+                  if (!forum_access_access($tid, 'view')) {
+                      drupal_access_denied();
+                      module_invoke_all('exit');
+                      exit;
+                  }
+              }// isset($tid)
+          }// is_numeric(arg(2))
+      }// arg(1)==forum
+  break;
   }// switch
   if (isset($nid)) {
     $node = node_load($nid);
@@ -244,36 +244,36 @@ 
   global $user;
   $sql = NULL;
   switch ($primary_field) {
-    case 'tid':
-      if ($user->uid == 1
-        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
-        || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
-        break;
-      }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
-        $required_access = 'create';
-      }
-      else {
-        $required_access = 'view';
-      }
-      $roles = implode(', ', array_keys($user->roles));
-      $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
+  case 'tid':
+    if ($user->uid == 1
+      || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
+      || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
+      break;
+    }
+    if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+      $required_access = 'create';
+    }
+    else {
+      $required_access = 'view';
+    }
+    $roles = implode(', ', array_keys($user->roles));
+    $sql['join'] = "LEFT JOIN {forum_access} fa ON $primary_table.tid = fa.tid
                       LEFT JOIN {acl} acl_fa ON acl_fa.number = $primary_table.tid AND acl_fa.module = 'forum_access'
                       LEFT JOIN {acl_user} aclu_fa ON aclu_fa.acl_id = acl_fa.acl_id AND aclu_fa.uid = $user->uid";
-      $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
-      $sql['distinct'] = 1;
-      break;
+    $sql['where'] = "(fa.grant_$required_access >= 1 AND fa.rid IN ($roles)) OR fa.tid IS NULL OR aclu_fa.uid = $user->uid";
+    $sql['distinct'] = 1;
+    break;
 
-    case 'rid':
-      if (strpos($query, 'FROM {role}') === FALSE
-        || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
-        break;
-      }
-      $moderator_rid = forum_access_query_moderator_rid();
-      if (!empty($moderator_rid)) {
-        $sql['where'] = "$primary_table.rid <> $moderator_rid";
-      }
+  case 'rid':
+    if (strpos($query, 'FROM {role}') === FALSE
+      || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
       break;
+    }
+    $moderator_rid = forum_access_query_moderator_rid();
+    if (!empty($moderator_rid)) {
+      $sql['where'] = "$primary_table.rid <> $moderator_rid";
+    }
+    break;
   }
   return $sql;
 }
@@ -301,42 +301,42 @@ 
   }
 
   switch ($op) {
-    case 'presave':
-      $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
-      break;
+  case 'presave':
+    $old_tid = db_result(db_query('SELECT tid FROM {forum} WHERE nid = %d', $node->nid));
+    break;
 
-    case 'update':
-      if (!empty($old_tid)) {
-        if (!empty($node->tid) && $node->tid == $old_tid) {
-          return;
-        }
-        acl_node_clear_acls($node->nid, 'forum_access');
+  case 'update':
+    if (!empty($old_tid)) {
+      if (!empty($node->tid) && $node->tid == $old_tid) {
+        return;
+      }
+      acl_node_clear_acls($node->nid, 'forum_access');
 
-        if (module_exists('nodecomment')) {
-          _forum_access_changed_tid($node->tid);
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
-            acl_node_clear_acls($row->cid, 'forum_access');
-          }
+      if (module_exists('nodecomment')) {
+        _forum_access_changed_tid($node->tid);
+        $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+        while ($row = db_fetch_object($result)) {
+          acl_node_clear_acls($row->cid, 'forum_access');
         }
       }
-      // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
-
-    case 'insert':
-      if (!empty($node->tid)) {
-        $acl_id = acl_get_id_by_number('forum_access', $node->tid);
-        acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
-
-        if (isset($old_tid) && module_exists('nodecomment')) {
-          $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
-          while ($row = db_fetch_object($result)) {
-            acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
-            node_access_acquire_grants(node_load($row->cid));
-          }
+    }
+    // Deliberate no break -- for changed and for previously unassigned terms we need an insert.
+
+  case 'insert':
+    if (!empty($node->tid)) {
+      $acl_id = acl_get_id_by_number('forum_access', $node->tid);
+      acl_node_add_acl($node->nid, $acl_id, 1, 1, 1);
+
+      if (isset($old_tid) && module_exists('nodecomment')) {
+        $result = db_query('SELECT cid FROM {node_comments} WHERE nid = %d', $node->nid);
+        while ($row = db_fetch_object($result)) {
+          acl_node_add_acl($row->cid, $acl_id, 1, 1, 1);
+          node_access_acquire_grants(node_load($row->cid));
         }
       }
-      $old_tid = NULL;
-      break;
+    }
+    $old_tid = NULL;
+    break;
   }
 }
 
@@ -587,20 +587,20 @@ 
  */
 function forum_access_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
-    case 'validate':
-      $rid = forum_access_query_moderator_rid();
-      if (!empty($rid)) {
-        if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
-          $roles = user_roles();
-          $variables = array(
-            '@Forum_Access' => 'Forum Access',
-            '%Role' => $roles[$rid],
-          );
-          drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
-          unset($edit['roles'][$rid]);
-        }
+  case 'validate':
+    $rid = forum_access_query_moderator_rid();
+    if (!empty($rid)) {
+      if (isset($edit['roles'][$rid]) && $edit['roles'][$rid]) {
+        $roles = user_roles();
+        $variables = array(
+          '@Forum_Access' => 'Forum Access',
+          '%Role' => $roles[$rid],
+        );
+        drupal_set_message(t('The %Role role is reserved for internal use by the @Forum_Access module! It was not assigned.', $variables), 'warning');
+        unset($edit['roles'][$rid]);
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +8 added lines, -8 removed lines

@@ -136,16 +136,16 @@ 
       break;
 
     case 'community':
-        if (arg(1)=='forum') {
+        if (arg(1) == 'forum') {
             if (is_numeric(arg(2))) {
-                $tid=arg(2);
+                $tid = arg(2);
                 // Obtain the tid from a URL path containing
                 // community/forum/%tid, this will prevent users from
                 // loading forums they are not allowed to access.
                 // However, only tid>1 are terms we care about. (This
                 // allows forum_tweaks mark-read functionality to
                 // work.)
-                if (isset($tid) and ($tid>1)) {
+                if (isset($tid) and ($tid > 1)) {
                     if (!forum_access_access($tid, 'view')) {
                         drupal_access_denied();
                         module_invoke_all('exit');
@@ -187,7 +187,7 @@ 
  * Alter the node/comment create/edit forms and various admin forms.
  */
 function forum_access_form_alter(&$form, &$form_state, $form_id) {
-  if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
+  if (isset($form['type']['#value']) && $form['type']['#value'].'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
   }
@@ -266,7 +266,7 @@ 
 
     case 'rid':
       if (strpos($query, 'FROM {role}') === FALSE
-        || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
+        || strpos($_GET['q'].'/', 'admin/content/forum/') === 0) {
         break;
       }
       $moderator_rid = forum_access_query_moderator_rid();
@@ -420,7 +420,7 @@ 
     if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create')) {
       unset($links['comment_add']);
       // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
+      if (isset($links['quote'])) {
           unset($links['quote']);
       }
     }
@@ -443,7 +443,7 @@ 
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
-    if ( (!(isset($links['comment_reply']))) AND isset($links['quote']) ) {
+    if ((!(isset($links['comment_reply']))) AND isset($links['quote'])) {
         unset($links['quote']);
     }
     
@@ -562,7 +562,7 @@ 
     }
 
     $roles = array_keys($account->roles);
-    $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (". db_placeholders($roles) .") AND grant_". $type ." = 1 AND tid = %d", array_merge($roles, array($tid))));
+    $result = db_result(db_query("SELECT tid FROM {forum_access} WHERE rid IN (".db_placeholders($roles).") AND grant_".$type." = 1 AND tid = %d", array_merge($roles, array($tid))));
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;

Braces +24 added lines, -36 removed lines

@@ -38,8 +38,7 @@ 
   if (isset($node->comment_target_nid)) {
     if ($changed_tid = _forum_access_changed_tid()) {
       $tid = $changed_tid; // the topic node hasn't been saved yet!
-    }
-    else {
+    } else {
       $node = node_load($node->comment_target_nid);
       $tid = _forum_access_get_tid($node);
     }
@@ -91,7 +90,8 @@ 
         return; // disable comment access control
       }
       if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
-        if (is_numeric($cid = arg(2))) { // comment/edit/%, comment/delete/%
+        if (is_numeric($cid = arg(2))) {
+// comment/edit/%, comment/delete/%
           $access[] = (arg(1) == 'edit' ? 'update' : 'delete');
           $comment = _comment_load($cid);
           $nid = $comment->nid;
@@ -107,7 +107,8 @@ 
 
     case 'node':
       if (is_numeric(arg(1))) {
-        if (arg(2) == 'edit' && !user_access('administer nodes')) { // node/%/edit
+        if (arg(2) == 'edit' && !user_access('administer nodes')) {
+// node/%/edit
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -118,13 +119,15 @@ 
           // We won't provide full Administrator access, though: we'll remove
           // author and timestamp, for example.
         }
-        if (arg(2) == 'delete' && !user_access('administer nodes')) { // node/%/delete
+        if (arg(2) == 'delete' && !user_access('administer nodes')) {
+// node/%/delete
           $access = array();
           $nid = arg(1);
           // This is the delete confirmation page. We don't need any
           // additional permissions, but we'll assert 'view' access below.
         }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        if (arg(2) == NULL && !user_access('administer comments')) {
+// node/%
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -190,44 +193,34 @@ 
   if (isset($form['type']['#value']) && $form['type']['#value'] .'_node_form' == $form_id) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
-  }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  } elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
-  }
-  elseif ($form_id == 'forum_overview') {
+  } elseif ($form_id == 'forum_overview') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_overview($form, $form_state);
-  }
-  elseif ($form_id == 'forum_form_container') {
+  } elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, TRUE);
-  }
-  elseif ($form_id == 'forum_form_forum') {
+  } elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_form($form, $form_state, FALSE);
-  }
-  elseif ($form_id == 'forum_admin_settings') {
+  } elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_forum_admin_settings_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_role') {
+  } elseif ($form_id == 'user_admin_role') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_role_form($form, $form_state);
-  }
-  elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
+  } elseif ($form_id == 'content_access_admin_settings' && empty($_POST)) {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_content_access_admin_form();
-  }
-  elseif ($form_id == 'user_admin_perm') {
+  } elseif ($form_id == 'user_admin_perm') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_perm_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_admin_account') {
+  } elseif ($form_id == 'user_admin_account') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_admin_account_form($form, $form_state);
-  }
-  elseif ($form_id == 'user_profile_form') {
+  } elseif ($form_id == 'user_profile_form') {
     module_load_include('admin.inc', 'forum_access');
     _forum_access_user_profile_form($form, $form_state);
   }
@@ -252,8 +245,7 @@ 
       }
       if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
         $required_access = 'create';
-      }
-      else {
+      } else {
         $required_access = 'view';
       }
       $roles = implode(', ', array_keys($user->roles));
@@ -424,8 +416,7 @@ 
           unset($links['quote']);
       }
     }
-  }
-  else {
+  } else {
     // Check links for the comment.
     $required_keys = array(
       'comment_create' => 'comment_reply',
@@ -436,8 +427,7 @@ 
       if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
-      }
-      elseif (!array_key_exists($key, $links)) {
+      } elseif (!array_key_exists($key, $links)) {
         $link_is_missing = TRUE;
       }
     }
@@ -566,15 +556,13 @@ 
 
     if ($result) {
       $cache[$account->uid][$tid][$type] = 1;
-    }
-    else {
+    } else {
       // check our moderators too
       $acl_id = acl_get_id_by_number('forum_access', $tid);
       $result = db_result(db_query("SELECT uid FROM {acl_user} WHERE acl_id = %d AND uid = %d", $acl_id, $account->uid));
       if ($result) {
         $cache[$account->uid][$tid][$type] = 2;
-      }
-      else {
+      } else {
         $cache[$account->uid][$tid][$type] = FALSE;
       }
     }

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

@@ -48,7 +48,7 @@ 
   if ($tid) {
     if (!isset($grants[$tid])) {
       if (!isset($node_admins)) {
-        $node_admins = user_roles(FALSE, 'administer nodes');
+        $node_admins = user_roles(false, 'administer nodes');
       }
       $result = db_query('SELECT * FROM {forum_access} WHERE tid = %d', $tid);
       while ($grant = db_fetch_object($result)) {
@@ -87,7 +87,7 @@ 
 
   switch (arg(0)) {
     case 'comment':
-      if (variable_get('forum_access_D5_legacy_mode', FALSE)) {
+      if (variable_get('forum_access_D5_legacy_mode', false)) {
         return; // disable comment access control
       }
       if ((arg(1) == 'edit' || arg(1) == 'delete') && !user_access('administer comments')) {
@@ -100,7 +100,7 @@ 
           // this comment.
           // We won't provide full Administrator access, though: we'll remove
           // author and timestamp, for example.
-          $grant_normal_access = TRUE;
+          $grant_normal_access = true;
         }
       }
       break;
@@ -124,7 +124,7 @@ 
           // This is the delete confirmation page. We don't need any
           // additional permissions, but we'll assert 'view' access below.
         }
-        if (arg(2) == NULL && !user_access('administer comments')) { // node/%
+        if (arg(2) == null && !user_access('administer comments')) { // node/%
           $access[] = 'update';
           $nid = arg(1);
           // If the node turns out to be in a forum where we have update/delete
@@ -191,7 +191,7 @@ 
     module_load_include('node.inc', 'forum_access');
     _forum_access_node_form($form, $form_state);
   }
-  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', FALSE)) {
+  elseif ($form_id == 'comment_form' && !variable_get('forum_access_D5_legacy_mode', false)) {
     module_load_include('node.inc', 'forum_access');
     _forum_access_comment_form($form, $form_state);
   }
@@ -201,11 +201,11 @@ 
   }
   elseif ($form_id == 'forum_form_container') {
     module_load_include('admin.inc', 'forum_access');
-    _forum_access_forum_form($form, $form_state, TRUE);
+    _forum_access_forum_form($form, $form_state, true);
   }
   elseif ($form_id == 'forum_form_forum') {
     module_load_include('admin.inc', 'forum_access');
-    _forum_access_forum_form($form, $form_state, FALSE);
+    _forum_access_forum_form($form, $form_state, false);
   }
   elseif ($form_id == 'forum_admin_settings') {
     module_load_include('admin.inc', 'forum_access');
@@ -242,15 +242,15 @@ 
  */
 function forum_access_db_rewrite_sql($query, $primary_table, $primary_field, $args) {
   global $user;
-  $sql = NULL;
+  $sql = null;
   switch ($primary_field) {
     case 'tid':
       if ($user->uid == 1
-        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === FALSE
+        || user_access('administer nodes') && strpos($_GET['q'], 'node/add/forum') === false
         || user_access('administer forums') && $_GET['q'] == 'admin/content/forum') {
         break;
       }
-      if (strpos($_GET['q'], 'node/add/forum') !== FALSE) {
+      if (strpos($_GET['q'], 'node/add/forum') !== false) {
         $required_access = 'create';
       }
       else {
@@ -265,7 +265,7 @@ 
       break;
 
     case 'rid':
-      if (strpos($query, 'FROM {role}') === FALSE
+      if (strpos($query, 'FROM {role}') === false
         || strpos($_GET['q'] .'/', 'admin/content/forum/') === 0) {
         break;
       }
@@ -283,8 +283,8 @@ 
  *
  * Add ACL data to fresh forum posts.
  */
-function forum_access_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
-  static $old_tid = NULL;
+function forum_access_nodeapi(&$node, $op, $teaser = null, $page = null) {
+  static $old_tid = null;
   // This is modeled after forum_nodeapi():
   $vid = _forum_access_get_vid();
   $vocabulary = taxonomy_vocabulary_load($vid);
@@ -335,7 +335,7 @@ 
           }
         }
       }
-      $old_tid = NULL;
+      $old_tid = null;
       break;
   }
 }
@@ -361,7 +361,7 @@ 
  * and thus it is disabled by default. Set the variable to TRUE to enable.
  */
 function forum_access_preprocess_forum_list(&$variables) {
-  if (variable_get('forum_access_provide_moderators_template_variable', FALSE)) {
+  if (variable_get('forum_access_provide_moderators_template_variable', false)) {
     static $users;
     foreach ($variables['forums'] as $tid => $forum) {
       $moderators = array();
@@ -373,7 +373,7 @@ 
           $moderators[$uid] = $users[$uid];
         }
       }
-      $forum->forum_access_moderators = (empty($moderators) ? NULL : $moderators);
+      $forum->forum_access_moderators = (empty($moderators) ? null : $moderators);
     }
   }
 }
@@ -394,7 +394,7 @@ 
   }
 }
 
-if (!variable_get('forum_access_D5_legacy_mode', FALSE)) {
+if (!variable_get('forum_access_D5_legacy_mode', false)) {
   // LEGACY-MODE disables these methods
 
 /**
@@ -403,9 +403,9 @@ 
  * For nodes, remove the 'Add new comment' link, if the user does not have the
  * 'comment_create' permission; for comments, add any missing links (D6.17+).
  */
-function forum_access_link_alter(&$links, $node, $comment = NULL) {
+function forum_access_link_alter(&$links, $node, $comment = null) {
   global $user;
-  static $user1, $recursing = FALSE, $stored_links;
+  static $user1, $recursing = false, $stored_links;
 
   // If we are being called recursively, store the $links and return.
   if ($recursing) {
@@ -438,12 +438,12 @@ 
         unset($required_keys[$access]);
       }
       elseif (!array_key_exists($key, $links)) {
-        $link_is_missing = TRUE;
+        $link_is_missing = true;
       }
     }
 
     // Hack to manually remove quote link if comment_reply link is no longer set
-    if ( (!(isset($links['comment_reply']))) AND isset($links['quote']) ) {
+    if ( (!(isset($links['comment_reply']))) and isset($links['quote']) ) {
         unset($links['quote']);
     }
     
@@ -458,7 +458,7 @@ 
         $user1 = user_load(1);
       }
       $saved_user = $user;
-      session_save_session(FALSE);
+      session_save_session(false);
       $user = $user1;
 
       // With UID 1 we call hook_link(). This should give us the full set of
@@ -466,7 +466,7 @@ 
       $admin_links = module_invoke_all('link', 'comment', $comment, array_key_exists('comment_parent', $links));
 
       $user = $saved_user;
-      session_save_session(TRUE);
+      session_save_session(true);
 
       // Remove the links from $admin_links that are not in the reduced
       // set of $required_links AND not available to the current user anyway.
@@ -483,9 +483,9 @@ 
       // called it will store a copy of the links at their current state. Then
       // we pull those links which have not been link_alter'ed by any modules
       // that come after forum_access.
-      $recursing = TRUE;
+      $recursing = true;
       drupal_alter('link', $admin_links, $node, $comment);
-      $recursing = FALSE;
+      $recursing = false;
       // Now return the stored links.
       $links = $stored_links;
     }
@@ -523,9 +523,9 @@ 
 /**
  * This is also required by ACL module.
  */
-function forum_access_enabled($set = NULL) {
-  static $enabled = TRUE;
-  if ($set !== NULL) {
+function forum_access_enabled($set = null) {
+  static $enabled = true;
+  if ($set !== null) {
     $enabled = $set;
   }
   return $enabled;
@@ -544,7 +544,7 @@ 
  *   1     - access granted
  *   2     - access granted for forum moderator
  */
-function forum_access_access($tid, $type, $account = NULL, $administer_nodes_sees_everything = TRUE) {
+function forum_access_access($tid, $type, $account = null, $administer_nodes_sees_everything = true) {
   static $cache = array();
   if (!$account) {
     global $user;
@@ -552,13 +552,13 @@ 
   }
 
   if ($account->uid == 1 ||
-      $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== FALSE) {
+      $administer_nodes_sees_everything && user_access('administer nodes', $account) && array_search($type, array('view', 'update', 'delete')) !== false) {
     return 1;
   }
 
   if (!isset($cache[$account->uid][$tid][$type])) {
     if (!user_access('access content', $account)) {
-      return $cache[$account->uid][$tid][$type] = FALSE;
+      return $cache[$account->uid][$tid][$type] = false;
     }
 
     $roles = array_keys($account->roles);
@@ -575,7 +575,7 @@ 
         $cache[$account->uid][$tid][$type] = 2;
       }
       else {
-        $cache[$account->uid][$tid][$type] = FALSE;
+        $cache[$account->uid][$tid][$type] = false;
       }
     }
   }
@@ -585,7 +585,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function forum_access_user($op, &$edit, &$account, $category = NULL) {
+function forum_access_user($op, &$edit, &$account, $category = null) {
   switch ($op) {
     case 'validate':
       $rid = forum_access_query_moderator_rid();
@@ -628,7 +628,7 @@ 
  * no forum or container is specified will return TRUE if the user has at least
  * one role that can access at least one forum.
  */
-function _forum_access_forum_access_callback($tid = NULL) {
+function _forum_access_forum_access_callback($tid = null) {
   return (!$tid && _forum_access_access_any_forum()) || forum_access_access($tid, 'view');
 }
 
@@ -638,7 +638,7 @@ 
  * Returns TRUE if the user has at least one role that can access
  * at least one forum.
  */
-function _forum_access_access_any_forum($account = NULL) {
+function _forum_access_access_any_forum($account = null) {
   global $user;
   static $return = array();
 
@@ -648,12 +648,12 @@ 
 
   if (!isset($return[$account->uid])) {
     if ($account->uid == 1) {
-      return $return[$account->uid] = TRUE;
+      return $return[$account->uid] = true;
     }
     if (!user_access('access content', $account)) {
-      return $return[$account->uid] = FALSE;
+      return $return[$account->uid] = false;
     }
-    $rids = variable_get('forum_access_rids', NULL);
+    $rids = variable_get('forum_access_rids', null);
     if (!isset($rids)) {
       $rids = array();
       $result = db_query("SELECT fa.rid FROM {forum_access} fa WHERE fa.grant_view > 0 GROUP BY fa.rid");
@@ -664,10 +664,10 @@ 
     }
     foreach ($rids as $rid) {
       if (isset($account->roles[$rid])) {
-        return $return[$account->uid] = TRUE;
+        return $return[$account->uid] = true;
       }
     }
-    $return[$account->uid] = FALSE;
+    $return[$account->uid] = false;
   }
   return $return[$account->uid];
 }
@@ -677,7 +677,7 @@ 
  *
  * Delete {forum_access} records when forums are deleted.
  */
-function forum_access_taxonomy($op, $type, $array = NULL) {
+function forum_access_taxonomy($op, $type, $array = null) {
   //dpm($array, "hook_taxonomy($op, $type)");
   if ($type = 'term' && $op == 'delete' && $array['vid'] == _forum_access_get_vid()) {
     db_query("DELETE FROM {forum_access} WHERE tid = %d", $array['tid']);
@@ -697,21 +697,21 @@ 
  * exist.
  */
 function forum_access_query_moderator_rid() {
-  return variable_get('forum_access_moderator_rid', NULL);
+  return variable_get('forum_access_moderator_rid', null);
 }
 
 /**
  * Return the forum tid or FALSE.
  */
 function _forum_access_get_tid($node) {
-  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : FALSE));
+  return (isset($node->forum_tid) ? $node->forum_tid : (isset($node->tid) ? $node->tid : false));
 }
 
 /**
  * Save and return the $tid.
  */
-function _forum_access_changed_tid($tid = NULL) {
-  static $saved_tid = NULL;
+function _forum_access_changed_tid($tid = null) {
+  static $saved_tid = null;
   if (!empty($tid)) {
     $saved_tid = $tid;
   }
@@ -722,7 +722,7 @@ 
  * Implementation of hook_node_access_explain().
  */
 function forum_access_node_access_explain($row) {
-  static $roles = NULL;
+  static $roles = null;
   if ($row->realm == 'forum_access') {
     if (!isset($roles)) {
       module_load_include('node.inc', 'forum_access');
@@ -738,7 +738,7 @@ 
 /**
  * Implementation of hook_acl_explain().
  */
-function forum_access_acl_explain($acl_id, $name, $number, $users = NULL) {
+function forum_access_acl_explain($acl_id, $name, $number, $users = null) {
   if (empty($users)) {
     return "ACL (id=$acl_id) would grant access to nodes in forum/$number.";
   }

drupal/sites/default/boinc/modules/contrib/i18nviews/includes/i18nviews.views.inc

Indentation +14 added lines, -14 removed lines

@@ -1,47 +1,47 @@
 <?php
 
 function i18nviews_views_data() {
-  $data['node']['content_negotiation'] = array(
+    $data['node']['content_negotiation'] = array(
     'group' => t('Node translation'),
     'title' => t('Content negotiation'),
     'help' => t('Removes the nodes that are not valid according to the content selection mode.'),
     'filter' => array(
-      'handler' => 'content_negotiation_filter_handler',
+        'handler' => 'content_negotiation_filter_handler',
     ),
-  );
-  return $data;
+    );
+    return $data;
 }
 
 /**
  * Implementation of hook_views_handlers
  */
 function i18nviews_views_handlers() {
-  return array(
+    return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+        'path' => drupal_get_path('module', 'i18nviews') . '/includes',
     ),
     'handlers' => array(
-      'content_negotiation_filter_handler' => array(
+        'content_negotiation_filter_handler' => array(
         'parent' => 'views_handler_filter',
-      ),
+        ),
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_views_plugins().
  */
 function i18nviews_views_plugins() {
-  $path = drupal_get_path('module', 'i18nviews') . '/includes';
-  return array(
+    $path = drupal_get_path('module', 'i18nviews') . '/includes';
+    return array(
     'module' => 'i18nviews',
     'localization' => array(
-      'i18nstrings' => array(
+        'i18nstrings' => array(
         'title' => t('Views translation module'),
         'help' => t("Use the locale system as implemented by the Views translation module."),
         'handler' => 'views_plugin_localization_i18nstrings',
         'path' => $path,
-      ),
+        ),
     ),
-  );
+    );
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 function i18nviews_views_handlers() {
   return array(
     'info' => array(
-      'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+      'path' => drupal_get_path('module', 'i18nviews').'/includes',
     ),
     'handlers' => array(
       'content_negotiation_filter_handler' => array(
@@ -32,7 +32,7 @@ 
  * Implementation of hook_views_plugins().
  */
 function i18nviews_views_plugins() {
-  $path = drupal_get_path('module', 'i18nviews') . '/includes';
+  $path = drupal_get_path('module', 'i18nviews').'/includes';
   return array(
     'module' => 'i18nviews',
     'localization' => array(

drupal/sites/default/boinc/modules/contrib/i18nviews/includes/content_negotiation_filter_handler.inc

Indentation +5 added lines, -5 removed lines

@@ -1,18 +1,18 @@
 <?php
 
 class content_negotiation_filter_handler extends views_handler_filter {
-  function query() {
+    function query() {
     $this->ensure_my_table();
     $where = i18n_db_rewrite_where($this->table_alias, 'node');
     if (!empty($where)) {
-      $this->query->add_where($this->options['group'], $where);
+        $this->query->add_where($this->options['group'], $where);
+    }
     }
-  }
 
-  function option_definition() {
+    function option_definition() {
     $options = parent::option_definition();
     $options['operator']['default'] = '';
     $options['value']['default'] = '';
     return $options;
-  }
+    }
 }

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.admin.inc

Indentation +244 added lines, -244 removed lines

@@ -9,16 +9,16 @@ 
  * Form builder for Wysiwyg profile form.
  */
 function wysiwyg_profile_form($form_state, $profile) {
-  // Merge in defaults.
-  $profile = (array) $profile;
-  $profile += array(
+    // Merge in defaults.
+    $profile = (array) $profile;
+    $profile += array(
     'format' => 0,
     'editor' => '',
-  );
-  if (empty($profile['settings'])) {
+    );
+    if (empty($profile['settings'])) {
     $profile['settings'] = array();
-  }
-  $profile['settings'] += array(
+    }
+    $profile['settings'] += array(
     'default' => TRUE,
     'user_choose' => FALSE,
     'show_toggle' => TRUE,
@@ -42,264 +42,264 @@ 
     'css_setting' => 'theme',
     'css_path' => NULL,
     'css_classes' => NULL,
-  );
-  $profile = (object) $profile;
+    );
+    $profile = (object) $profile;
 
-  $formats = filter_formats();
-  $editor = wysiwyg_get_editor($profile->editor);
-  drupal_set_title(t('%editor profile for %format', array('%editor' => $editor['title'], '%format' => $formats[$profile->format]->name)));
+    $formats = filter_formats();
+    $editor = wysiwyg_get_editor($profile->editor);
+    drupal_set_title(t('%editor profile for %format', array('%editor' => $editor['title'], '%format' => $formats[$profile->format]->name)));
 
-  $form['format'] = array('#type' => 'value', '#value' => $profile->format);
-  $form['input_format'] = array('#type' => 'value', '#value' => $formats[$profile->format]->name);
-  $form['editor'] = array('#type' => 'value', '#value' => $profile->editor);
+    $form['format'] = array('#type' => 'value', '#value' => $profile->format);
+    $form['input_format'] = array('#type' => 'value', '#value' => $formats[$profile->format]->name);
+    $form['editor'] = array('#type' => 'value', '#value' => $profile->editor);
 
-  $form['basic'] = array(
+    $form['basic'] = array(
     '#type' => 'fieldset',
     '#title' => t('Basic setup'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $form['basic']['default'] = array(
+    $form['basic']['default'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enabled by default'),
     '#default_value' => $profile->settings['default'],
     '#return_value' => 1,
     '#description' => t('The default editor state for users having access to this profile. Users are able to override this state if the next option is enabled.'),
-  );
+    );
 
-  $form['basic']['user_choose'] = array(
+    $form['basic']['user_choose'] = array(
     '#type' => 'checkbox',
     '#title' => t('Allow users to choose default'),
     '#default_value' => $profile->settings['user_choose'],
     '#return_value' => 1,
     '#description' => t('If allowed, users will be able to choose their own editor default state in their user account settings.'),
-  );
+    );
 
-  $form['basic']['show_toggle'] = array(
+    $form['basic']['show_toggle'] = array(
     '#type' => 'checkbox',
     '#title' => t('Show <em>enable/disable rich text</em> toggle link'),
     '#default_value' => $profile->settings['show_toggle'],
     '#return_value' => 1,
     '#description' => t('Whether or not to show the <em>enable/disable rich text</em> toggle link below a textarea. If disabled, the user setting or global default is used (see above).'),
-  );
+    );
 
-  $form['basic']['theme'] = array(
+    $form['basic']['theme'] = array(
     '#type' => 'hidden',
     '#value' => $profile->settings['theme'],
-  );
+    );
 
-  $form['basic']['language'] = array(
+    $form['basic']['language'] = array(
     '#type' => 'select',
     '#title' => t('Interface language'),
     '#default_value' => $profile->settings['language'],
-  );
-  // @see _locale_prepare_predefined_list()
-  require_once './includes/locale.inc';
-  $predefined = _locale_get_predefined_list();
-  foreach ($predefined as $key => $value) {
+    );
+    // @see _locale_prepare_predefined_list()
+    require_once './includes/locale.inc';
+    $predefined = _locale_get_predefined_list();
+    foreach ($predefined as $key => $value) {
     // Include native name in output, if possible
     if (count($value) > 1) {
-      $tname = t($value[0]);
-      $predefined[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
+        $tname = t($value[0]);
+        $predefined[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
     }
     else {
-      $predefined[$key] = t($value[0]);
+        $predefined[$key] = t($value[0]);
+    }
     }
-  }
-  asort($predefined);
-  $form['basic']['language']['#options'] = $predefined;
+    asort($predefined);
+    $form['basic']['language']['#options'] = $predefined;
 
-  $form['buttons'] = array(
+    $form['buttons'] = array(
     '#type' => 'fieldset',
     '#title' => t('Buttons and plugins'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
     '#tree' => TRUE,
     '#theme' => 'wysiwyg_admin_button_table',
-  );
+    );
 
-  $plugins = wysiwyg_get_plugins($profile->editor);
-  // Generate the button list.
-  foreach ($plugins as $name => $meta) {
+    $plugins = wysiwyg_get_plugins($profile->editor);
+    // Generate the button list.
+    foreach ($plugins as $name => $meta) {
     if (isset($meta['buttons']) && is_array($meta['buttons'])) {
-      foreach ($meta['buttons'] as $button => $title) {
+        foreach ($meta['buttons'] as $button => $title) {
         $icon = '';
         if (!empty($meta['path'])) {
-          // @todo Button icon locations are different in editors, editor versions,
-          //   and contrib/custom plugins (like Image Assist, f.e.).
-          $img_src = $meta['path'] . "/images/$name.gif";
-          // Handle plugins that have more than one button.
-          if (!file_exists($img_src)) {
+            // @todo Button icon locations are different in editors, editor versions,
+            //   and contrib/custom plugins (like Image Assist, f.e.).
+            $img_src = $meta['path'] . "/images/$name.gif";
+            // Handle plugins that have more than one button.
+            if (!file_exists($img_src)) {
             $img_src = $meta['path'] . "/images/$button.gif";
-          }
-          $icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : '';
+            }
+            $icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : '';
         }
         $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title);
         $title = (!empty($icon) ? $icon . ' ' . $title : $title);
         $form['buttons'][$name][$button] = array(
-          '#type' => 'checkbox',
-          '#title' => $title,
-          '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE,
+            '#type' => 'checkbox',
+            '#title' => $title,
+            '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE,
         );
-      }
+        }
     }
     else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
-      foreach ($meta['extensions'] as $extension => $title) {
+        foreach ($meta['extensions'] as $extension => $title) {
         $form['buttons'][$name][$extension] = array(
-          '#type' => 'checkbox',
-          '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title,
-          '#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : FALSE,
+            '#type' => 'checkbox',
+            '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title,
+            '#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : FALSE,
         );
-      }
+        }
+    }
     }
-  }
 
-  $form['appearance'] = array(
+    $form['appearance'] = array(
     '#type' => 'fieldset',
     '#title' => t('Editor appearance'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $form['appearance']['toolbar_loc'] = array(
+    $form['appearance']['toolbar_loc'] = array(
     '#type' => 'select',
     '#title' => t('Toolbar location'),
     '#default_value' => $profile->settings['toolbar_loc'],
     '#options' => array('bottom' => t('Bottom'), 'top' => t('Top')),
     '#description' => t('This option controls whether the editor toolbar is displayed above or below the editing area.'),
-  );
+    );
 
-  $form['appearance']['toolbar_align'] = array(
+    $form['appearance']['toolbar_align'] = array(
     '#type' => 'select',
     '#title' => t('Button alignment'),
     '#default_value' => $profile->settings['toolbar_align'],
     '#options' => array('center' => t('Center'), 'left' => t('Left'), 'right' => t('Right')),
     '#description' => t('This option controls the alignment of icons in the editor toolbar.'),
-  );
+    );
 
-  $form['appearance']['path_loc'] = array(
+    $form['appearance']['path_loc'] = array(
     '#type' => 'select',
     '#title' => t('Path location'),
     '#default_value' => $profile->settings['path_loc'],
     '#options' => array('none' => t('Hide'), 'top' => t('Top'), 'bottom' => t('Bottom')),
     '#description' => t('Where to display the path to HTML elements (i.e. <code>body > table > tr > td</code>).'),
-  );
+    );
 
-  $form['appearance']['resizing'] = array(
+    $form['appearance']['resizing'] = array(
     '#type' => 'checkbox',
     '#title' => t('Enable resizing button'),
     '#default_value' => $profile->settings['resizing'],
     '#return_value' => 1,
     '#description' => t('This option gives you the ability to enable/disable the resizing button. If enabled, the Path location toolbar must be set to "Top" or "Bottom" in order to display the resize icon.'),
-  );
+    );
 
-  $form['output'] = array(
+    $form['output'] = array(
     '#type' => 'fieldset',
     '#title' => t('Cleanup and output'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $form['output']['verify_html'] = array(
+    $form['output']['verify_html'] = array(
     '#type' => 'checkbox',
     '#title' => t('Verify HTML'),
     '#default_value' => $profile->settings['verify_html'],
     '#return_value' => 1,
     '#description' => t('If enabled, potentially malicious code like <code>&lt;HEAD&gt;</code> tags will be removed from HTML contents.'),
-  );
+    );
 
-  $form['output']['preformatted'] = array(
+    $form['output']['preformatted'] = array(
     '#type' => 'checkbox',
     '#title' => t('Preformatted'),
     '#default_value' => $profile->settings['preformatted'],
     '#return_value' => 1,
     '#description' => t('If enabled, the editor will insert TAB characters on tab and preserve other whitespace characters just like a PRE element in HTML does.'),
-  );
+    );
 
-  $form['output']['convert_fonts_to_spans'] = array(
+    $form['output']['convert_fonts_to_spans'] = array(
     '#type' => 'checkbox',
     '#title' => t('Convert &lt;font&gt; tags to styles'),
     '#default_value' => $profile->settings['convert_fonts_to_spans'],
     '#return_value' => 1,
     '#description' => t('If enabled, HTML tags declaring the font size, font family, font color and font background color will be replaced by inline CSS styles.'),
-  );
+    );
 
-  $form['output']['remove_linebreaks'] = array(
+    $form['output']['remove_linebreaks'] = array(
     '#type' => 'checkbox',
     '#title' => t('Remove linebreaks'),
     '#default_value' => $profile->settings['remove_linebreaks'],
     '#return_value' => 1,
     '#description' => t('If enabled, the editor will remove most linebreaks from contents. Disabling this option could avoid conflicts with other input filters.'),
-  );
+    );
 
-  $form['output']['apply_source_formatting'] = array(
+    $form['output']['apply_source_formatting'] = array(
     '#type' => 'checkbox',
     '#title' => t('Apply source formatting'),
     '#default_value' => $profile->settings['apply_source_formatting'],
     '#return_value' => 1,
     '#description' => t('If enabled, the editor will re-format the HTML source code. Disabling this option could avoid conflicts with other input filters.'),
-  );
+    );
 
-  $form['output']['paste_auto_cleanup_on_paste'] = array(
+    $form['output']['paste_auto_cleanup_on_paste'] = array(
     '#type' => 'checkbox',
     '#title' => t('Force cleanup on standard paste'),
     '#default_value' => $profile->settings['paste_auto_cleanup_on_paste'],
     '#return_value' => 1,
     '#description' => t('If enabled, the default paste function (CTRL-V or SHIFT-INS) behaves like the "paste from word" plugin function.'),
-  );
+    );
 
-  $form['css'] = array(
+    $form['css'] = array(
     '#type' => 'fieldset',
     '#title' => t('CSS'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
-  );
+    );
 
-  $form['css']['block_formats'] = array(
+    $form['css']['block_formats'] = array(
     '#type' => 'textfield',
     '#title' => t('Block formats'),
     '#default_value' => $profile->settings['block_formats'],
     '#size' => 40,
     '#maxlength' => 250,
     '#description' => t('Comma separated list of HTML block formats. Possible values: <code>@format-list</code>.', array('@format-list' => 'p,h1,h2,h3,h4,h5,h6,div,blockquote,address,pre,code,dt,dd')),
-  );
+    );
 
-  $form['css']['css_setting'] = array(
+    $form['css']['css_setting'] = array(
     '#type' => 'select',
     '#title' => t('Editor CSS'),
     '#default_value' => $profile->settings['css_setting'],
     '#options' => array('theme' => t('Use theme CSS'), 'self' => t('Define CSS'), 'none' => t('Editor default CSS')),
     '#description' => t('Defines the CSS to be used in the editor area.<br />Use theme CSS - loads stylesheets from current site theme.<br/>Define CSS - enter path for stylesheet files below.<br />Editor default CSS - uses default stylesheets from editor.'),
-  );
+    );
 
-  $form['css']['css_path'] = array(
+    $form['css']['css_path'] = array(
     '#type' => 'textfield',
     '#title' => t('CSS path'),
     '#default_value' => $profile->settings['css_path'],
     '#size' => 40,
     '#maxlength' => 255,
     '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '<br />' . t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)') . '<br />' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
-  );
+    );
 
-  $form['css']['css_classes'] = array(
+    $form['css']['css_classes'] = array(
     '#type' => 'textarea',
     '#title' => t('CSS classes'),
     '#default_value' => $profile->settings['css_classes'],
     '#description' => t('Optionally define CSS classes for the "Font style" dropdown list.<br />Enter one class on each line in the format: !format. Example: !example<br />If left blank, CSS classes are automatically imported from all loaded stylesheet(s).', array('!format' => '<code>[title]=[class]</code>', '!example' => 'My heading=header1')),
-  );
+    );
 
-  $form['submit'] = array(
+    $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Save'),
     '#weight' => 100,
-  );
-  $form['cancel'] = array(
+    );
+    $form['cancel'] = array(
     '#value' => l(t('Cancel'), 'admin/settings/wysiwyg'),
     '#weight' => 110,
-  );
+    );
 
-  return $form;
+    return $form;
 }
 
 /**
@@ -308,258 +308,258 @@ 
  * @see wysiwyg_profile_form()
  */
 function wysiwyg_profile_form_submit($form, &$form_state) {
-  $values = $form_state['values'];
-  if (isset($values['buttons'])) {
+    $values = $form_state['values'];
+    if (isset($values['buttons'])) {
     // Store only enabled buttons for each plugin.
     foreach ($values['buttons'] as $plugin => $buttons) {
-      $values['buttons'][$plugin] = array_filter($values['buttons'][$plugin]);
+        $values['buttons'][$plugin] = array_filter($values['buttons'][$plugin]);
     }
     // Store only enabled plugins.
     $values['buttons'] = array_filter($values['buttons']);
-  }
-  // Remove any white-space from 'block_formats' setting, since editor
-  // implementations rely on a comma-separated list to explode().
-  $values['block_formats'] = preg_replace('@\s+@', '', $values['block_formats']);
-
-  // Remove input format name.
-  $format = $values['format'];
-  $input_format = $values['input_format'];
-  $editor = $values['editor'];
-  unset($values['format'], $values['input_format'], $values['editor']);
-
-  // Remove FAPI values.
-  // @see system_settings_form_submit()
-  unset($values['submit'], $values['form_id'], $values['op'], $values['form_token'], $values['form_build_id']);
-
-  // Determine if this is an update.
-  if (!db_result(db_query("SELECT 1 FROM {wysiwyg} WHERE format = %d", $format))) {
+    }
+    // Remove any white-space from 'block_formats' setting, since editor
+    // implementations rely on a comma-separated list to explode().
+    $values['block_formats'] = preg_replace('@\s+@', '', $values['block_formats']);
+
+    // Remove input format name.
+    $format = $values['format'];
+    $input_format = $values['input_format'];
+    $editor = $values['editor'];
+    unset($values['format'], $values['input_format'], $values['editor']);
+
+    // Remove FAPI values.
+    // @see system_settings_form_submit()
+    unset($values['submit'], $values['form_id'], $values['op'], $values['form_token'], $values['form_build_id']);
+
+    // Determine if this is an update.
+    if (!db_result(db_query("SELECT 1 FROM {wysiwyg} WHERE format = %d", $format))) {
     $update = array();
-  }
-  else {
+    }
+    else {
     $update = array('format');
-  }
-  $wysiwyg = new stdClass();
-  $wysiwyg->format = $format;
-  $wysiwyg->editor = $editor;
-  $wysiwyg->settings = $values;
+    }
+    $wysiwyg = new stdClass();
+    $wysiwyg->format = $format;
+    $wysiwyg->editor = $editor;
+    $wysiwyg->settings = $values;
 
-  // Insert new profile data.
-  drupal_write_record('wysiwyg', $wysiwyg, $update);
+    // Insert new profile data.
+    drupal_write_record('wysiwyg', $wysiwyg, $update);
 
-  drupal_set_message(t('Wysiwyg profile for %format has been saved.', array('%format' => $input_format)));
+    drupal_set_message(t('Wysiwyg profile for %format has been saved.', array('%format' => $input_format)));
 
-  $form_state['redirect'] = 'admin/settings/wysiwyg';
+    $form_state['redirect'] = 'admin/settings/wysiwyg';
 }
 
 /**
  * Layout for the buttons in the Wysiwyg Editor profile form.
  */
 function theme_wysiwyg_admin_button_table($form) {
-  $buttons = array();
+    $buttons = array();
 
-  // Flatten forms array.
-  foreach (element_children($form) as $name) {
+    // Flatten forms array.
+    foreach (element_children($form) as $name) {
     foreach (element_children($form[$name]) as $button) {
-      $buttons[] = drupal_render($form[$name][$button]);
+        $buttons[] = drupal_render($form[$name][$button]);
+    }
     }
-  }
 
-  // Split checkboxes into rows with 3 columns.
-  $total = count($buttons);
-  $rows = array();
-  for ($i = 0; $i < $total; $i++) {
+    // Split checkboxes into rows with 3 columns.
+    $total = count($buttons);
+    $rows = array();
+    for ($i = 0; $i < $total; $i++) {
     $row = array();
     $row[] = array('data' => $buttons[$i]);
     if (isset($buttons[++$i])) {
-      $row[] = array('data' => $buttons[$i]);
+        $row[] = array('data' => $buttons[$i]);
     }
     if (isset($buttons[++$i])) {
-      $row[] = array('data' => $buttons[$i]);
+        $row[] = array('data' => $buttons[$i]);
     }
     $rows[] = $row;
-  }
+    }
 
-  $output = theme('table', array(), $rows, array('width' => '100%'));
+    $output = theme('table', array(), $rows, array('width' => '100%'));
 
-  return $output;
+    return $output;
 }
 
 /**
  * Display overview of setup Wysiwyg Editor profiles; menu callback.
  */
 function wysiwyg_profile_overview() {
-  include_once './includes/install.inc';
+    include_once './includes/install.inc';
 
-  // Check which wysiwyg editors are installed.
-  $editors = wysiwyg_get_all_editors();
-  $count = count($editors);
-  $status = array();
-  $options = array('' => t('No editor'));
+    // Check which wysiwyg editors are installed.
+    $editors = wysiwyg_get_all_editors();
+    $count = count($editors);
+    $status = array();
+    $options = array('' => t('No editor'));
 
-  foreach ($editors as $name => $editor) {
+    foreach ($editors as $name => $editor) {
     $status[$name] = array(
-      'severity' => (isset($editor['error']) ? REQUIREMENT_ERROR : ($editor['installed'] ? REQUIREMENT_OK : REQUIREMENT_INFO)),
-      'title' => t('<a href="!vendor-url">@editor</a> (<a href="!download-url">Download</a>)', array('!vendor-url' => $editor['vendor url'], '@editor' => $editor['title'], '!download-url' => $editor['download url'])),
-      'value' => (isset($editor['installed version']) ? $editor['installed version'] : t('Not installed.')),
-      'description' => (isset($editor['error']) ? $editor['error'] : ''),
+        'severity' => (isset($editor['error']) ? REQUIREMENT_ERROR : ($editor['installed'] ? REQUIREMENT_OK : REQUIREMENT_INFO)),
+        'title' => t('<a href="!vendor-url">@editor</a> (<a href="!download-url">Download</a>)', array('!vendor-url' => $editor['vendor url'], '@editor' => $editor['title'], '!download-url' => $editor['download url'])),
+        'value' => (isset($editor['installed version']) ? $editor['installed version'] : t('Not installed.')),
+        'description' => (isset($editor['error']) ? $editor['error'] : ''),
     );
     if ($editor['installed']) {
-      $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
+        $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
     }
     else {
-      // Build on-site installation instructions.
-      // @todo Setup $library in wysiwyg_load_editor() already.
-      $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
-      $targs = array(
+        // Build on-site installation instructions.
+        // @todo Setup $library in wysiwyg_load_editor() already.
+        $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
+        $targs = array(
         '@editor-path' => $editor['editor path'],
         '@library-filepath' => $editor['library path'] . '/' . (isset($editor['libraries'][$library]['files'][0]) ? $editor['libraries'][$library]['files'][0] : key($editor['libraries'][$library]['files'])),
-      );
-      $instructions = '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs) . '</p>';
-      $instructions .= '<p>' . t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs) . '</p>';
+        );
+        $instructions = '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs) . '</p>';
+        $instructions .= '<p>' . t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs) . '</p>';
 
-      $status[$name]['description'] .= $instructions;
-      $count--;
+        $status[$name]['description'] .= $instructions;
+        $count--;
     }
     // In case there is an error, always show installation instructions.
     if (isset($editor['error'])) {
-      $show_instructions = TRUE;
+        $show_instructions = TRUE;
+    }
     }
-  }
-  if (!$count) {
+    if (!$count) {
     $show_instructions = TRUE;
-  }
-  $form['status'] = array(
+    }
+    $form['status'] = array(
     '#type' => 'fieldset',
     '#title' => t('Installation instructions'),
     '#collapsible' => TRUE,
     '#collapsed' => !isset($show_instructions),
     '#description' => (!$count ? t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''),
     '#weight' => 10,
-  );
-  $form['status']['report'] = array('#value' => theme('status_report', $status));
+    );
+    $form['status']['report'] = array('#value' => theme('status_report', $status));
 
-  if (!$count) {
+    if (!$count) {
     return $form;
-  }
+    }
 
-  $formats = filter_formats();
-  // Reset Wysiwyg cache
-  $profiles = wysiwyg_profile_load_all(TRUE);
-  $form['formats'] = array(
+    $formats = filter_formats();
+    // Reset Wysiwyg cache
+    $profiles = wysiwyg_profile_load_all(TRUE);
+    $form['formats'] = array(
     '#type' => 'item',
     '#description' => t('To assign a different editor to a text format, click "delete" to remove the existing first.'),
     '#tree' => TRUE,
-  );
+    );
 
-  $enable_save = FALSE;
-  $in_code_only = FALSE;
-  foreach ($formats as $id => $format) {
+    $enable_save = FALSE;
+    $in_code_only = FALSE;
+    foreach ($formats as $id => $format) {
     $form['formats'][$id]['name'] = array(
-      '#value' => check_plain($format->name),
+        '#value' => check_plain($format->name),
     );
     // Only display editor selection for associated input formats to avoid
     // confusion about disabled selection.
     if (isset($profiles[$id]) && !empty($profiles[$id]->editor)) {
-      $in_code_only = !empty($profiles[$id]->in_code_only);
-      $form['formats'][$id]['editor'] = array(
+        $in_code_only = !empty($profiles[$id]->in_code_only);
+        $form['formats'][$id]['editor'] = array(
         '#value' => $options[$profiles[$id]->editor],
-      );
-      if ($in_code_only) {
+        );
+        if ($in_code_only) {
         $form['formats'][$id]['name']['#value'] .= ' <em>(' . t('From: !module module', array('!module' => $profiles[$id]->export_module)) . ')</em>';
-      }
+        }
     }
     else {
-      $form['formats'][$id]['editor'] = array(
+        $form['formats'][$id]['editor'] = array(
         '#type' => 'select',
         '#default_value' => '',
         '#options' => $options,
-      );
-      $enable_save = TRUE;
+        );
+        $enable_save = TRUE;
     }
     if (isset($profiles[$id]) && !empty($profiles[$id]->editor)) {
-      $edit = !empty($profiles[$id]->in_code_only)?t('Override'):t('Edit');
-      $form['formats'][$id]['edit'] = array(
+        $edit = !empty($profiles[$id]->in_code_only)?t('Override'):t('Edit');
+        $form['formats'][$id]['edit'] = array(
         '#value' => l($edit, "admin/settings/wysiwyg/profile/$id/edit"),
-      );
-      // Only display delete/revert links for wysiwyg loaded from the database
-      if (!$in_code_only) {
+        );
+        // Only display delete/revert links for wysiwyg loaded from the database
+        if (!$in_code_only) {
         $delete = (empty($profiles[$id]->type) || $profiles[$id]->type == t('Normal'))?t('Delete'):t('Revert');
         $form['formats'][$id]['delete'] = array(
-          '#value' => l($delete, "admin/settings/wysiwyg/profile/$id/delete"),
+            '#value' => l($delete, "admin/settings/wysiwyg/profile/$id/delete"),
         );
-      }
+        }
+    }
     }
-  }
 
-  // Submitting the form when no editors can be selected causes errors.
-  if ($enable_save) {
+    // Submitting the form when no editors can be selected causes errors.
+    if ($enable_save) {
     $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
-  }
-  return $form;
+    }
+    return $form;
 }
 
 /**
  * Return HTML for the Wysiwyg profile overview form.
  */
 function theme_wysiwyg_profile_overview($form) {
-  if (!isset($form['formats'])) {
+    if (!isset($form['formats'])) {
     return;
-  }
-  $output = '';
-  $header = array(t('Input format'), t('Editor'), array('data' => t('Operations'), 'colspan' => 3));
-  $rows = array();
-  foreach (element_children($form['formats']) as $item) {
+    }
+    $output = '';
+    $header = array(t('Input format'), t('Editor'), array('data' => t('Operations'), 'colspan' => 3));
+    $rows = array();
+    foreach (element_children($form['formats']) as $item) {
     $format = &$form['formats'][$item];
     $rows[] = array(
-      drupal_render($format['name']),
-      drupal_render($format['editor']),
-      isset($format['edit']) ? drupal_render($format['edit']) : '',
-      isset($format['export']) ? drupal_render($format['export']) : '',
-      isset($format['delete']) ? drupal_render($format['delete']) : '',
-    );
-  }
-  $form['formats']['table']['#value'] = theme('table', $header, $rows);
-  $output .= drupal_render($form);
-  return $output;
+        drupal_render($format['name']),
+        drupal_render($format['editor']),
+        isset($format['edit']) ? drupal_render($format['edit']) : '',
+        isset($format['export']) ? drupal_render($format['export']) : '',
+        isset($format['delete']) ? drupal_render($format['delete']) : '',
+    );
+    }
+    $form['formats']['table']['#value'] = theme('table', $header, $rows);
+    $output .= drupal_render($form);
+    return $output;
 }
 
 /**
  * Submit callback for Wysiwyg profile overview form.
  */
 function wysiwyg_profile_overview_submit($form, &$form_state) {
-  foreach ($form_state['values']['formats'] as $format => $values) {
+    foreach ($form_state['values']['formats'] as $format => $values) {
     db_query("UPDATE {wysiwyg} SET editor = '%s' WHERE format = %d", $values['editor'], $format);
     if (!db_affected_rows()) {
-      db_query("INSERT INTO {wysiwyg} (format, editor) VALUES (%d, '%s')", $format, $values['editor']);
+        db_query("INSERT INTO {wysiwyg} (format, editor) VALUES (%d, '%s')", $format, $values['editor']);
+    }
     }
-  }
 }
 
 /**
  * Delete editor profile confirmation form.
  */
 function wysiwyg_profile_delete_confirm(&$form_state, $profile) {
-  $formats = filter_formats();
-  $format = $formats[$profile->format];
-  $form['format'] = array('#type' => 'value', '#value' => $format);
-  if (isset($profile->type) && $profile->type == t('Overridden')) {
+    $formats = filter_formats();
+    $format = $formats[$profile->format];
+    $form['format'] = array('#type' => 'value', '#value' => $format);
+    if (isset($profile->type) && $profile->type == t('Overridden')) {
     $form['revert'] = array(
-      '#type' => 'value',
-      '#value' => TRUE,
+        '#type' => 'value',
+        '#value' => TRUE,
     );
     return confirm_form(
-      $form,
-      t('Are you sure you want to revert the profile settings for %name?', array('%name' => $format->name)),
-      'admin/settings/wysiwyg',
-      t('This action cannot be undone.'), t('Revert'), t('Cancel')
+        $form,
+        t('Are you sure you want to revert the profile settings for %name?', array('%name' => $format->name)),
+        'admin/settings/wysiwyg',
+        t('This action cannot be undone.'), t('Revert'), t('Cancel')
     );
-  }
-  return confirm_form(
+    }
+    return confirm_form(
     $form,
     t('Are you sure you want to remove the profile for %name?', array('%name' => $format->name)),
     'admin/settings/wysiwyg',
     t('This action cannot be undone.'), t('Remove'), t('Cancel')
-  );
+    );
 }
 
 /**
@@ -568,16 +568,16 @@ 
  * @see wysiwyg_profile_delete_confirm()
  */
 function wysiwyg_profile_delete_confirm_submit($form, &$form_state) {
-  $format = $form_state['values']['format'];
-  $wysiwyg = new stdClass();
-  $wysiwyg->format = $format->format;
-  wysiwyg_profile_delete($wysiwyg);
-  if (!empty($form_state['values']['revert'])) {
+    $format = $form_state['values']['format'];
+    $wysiwyg = new stdClass();
+    $wysiwyg->format = $format->format;
+    wysiwyg_profile_delete($wysiwyg);
+    if (!empty($form_state['values']['revert'])) {
     drupal_set_message(t('Wysiwyg profile settings for %name has been reverted.', array('%name' => $format->name)));
-  }
-  else {
+    }
+    else {
     drupal_set_message(t('Wysiwyg profile for %name has been deleted.', array('%name' => $format->name)));
-  }
-  $form_state['redirect'] = 'admin/settings/wysiwyg';
+    }
+    $form_state['redirect'] = 'admin/settings/wysiwyg';
 }
 

Braces +6 added lines, -12 removed lines

@@ -102,8 +102,7 @@ 
     if (count($value) > 1) {
       $tname = t($value[0]);
       $predefined[$key] = ($tname == $value[1]) ? $tname : "$tname ($value[1])";
-    }
-    else {
+    } else {
       $predefined[$key] = t($value[0]);
     }
   }
@@ -143,8 +142,7 @@ 
           '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE,
         );
       }
-    }
-    else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
+    } else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
       foreach ($meta['extensions'] as $extension => $title) {
         $form['buttons'][$name][$extension] = array(
           '#type' => 'checkbox',
@@ -334,8 +332,7 @@ 
   // Determine if this is an update.
   if (!db_result(db_query("SELECT 1 FROM {wysiwyg} WHERE format = %d", $format))) {
     $update = array();
-  }
-  else {
+  } else {
     $update = array('format');
   }
   $wysiwyg = new stdClass();
@@ -405,8 +402,7 @@ 
     );
     if ($editor['installed']) {
       $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
-    }
-    else {
+    } else {
       // Build on-site installation instructions.
       // @todo Setup $library in wysiwyg_load_editor() already.
       $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
@@ -467,8 +463,7 @@ 
       if ($in_code_only) {
         $form['formats'][$id]['name']['#value'] .= ' <em>(' . t('From: !module module', array('!module' => $profiles[$id]->export_module)) . ')</em>';
       }
-    }
-    else {
+    } else {
       $form['formats'][$id]['editor'] = array(
         '#type' => 'select',
         '#default_value' => '',
@@ -574,8 +569,7 @@ 
   wysiwyg_profile_delete($wysiwyg);
   if (!empty($form_state['values']['revert'])) {
     drupal_set_message(t('Wysiwyg profile settings for %name has been reverted.', array('%name' => $format->name)));
-  }
-  else {
+  } else {
     drupal_set_message(t('Wysiwyg profile for %name has been deleted.', array('%name' => $format->name)));
   }
   $form_state['redirect'] = 'admin/settings/wysiwyg';

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

@@ -19,9 +19,9 @@ 
     $profile['settings'] = array();
   }
   $profile['settings'] += array(
-    'default' => TRUE,
-    'user_choose' => FALSE,
-    'show_toggle' => TRUE,
+    'default' => true,
+    'user_choose' => false,
+    'show_toggle' => true,
     'theme' => 'advanced',
     'language' => 'en',
     'access' => 1,
@@ -30,18 +30,18 @@ 
     'toolbar_loc' => 'top',
     'toolbar_align' => 'left',
     'path_loc' => 'bottom',
-    'resizing' => TRUE,
+    'resizing' => true,
     // Also available, but buggy in TinyMCE 2.x: blockquote,code,dt,dd,samp.
     'block_formats' => 'p,address,pre,h2,h3,h4,h5,h6,div',
-    'verify_html' => TRUE,
-    'preformatted' => FALSE,
-    'convert_fonts_to_spans' => TRUE,
-    'remove_linebreaks' => TRUE,
-    'apply_source_formatting' => FALSE,
-    'paste_auto_cleanup_on_paste' => FALSE,
+    'verify_html' => true,
+    'preformatted' => false,
+    'convert_fonts_to_spans' => true,
+    'remove_linebreaks' => true,
+    'apply_source_formatting' => false,
+    'paste_auto_cleanup_on_paste' => false,
     'css_setting' => 'theme',
-    'css_path' => NULL,
-    'css_classes' => NULL,
+    'css_path' => null,
+    'css_classes' => null,
   );
   $profile = (object) $profile;
 
@@ -56,8 +56,8 @@ 
   $form['basic'] = array(
     '#type' => 'fieldset',
     '#title' => t('Basic setup'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   $form['basic']['default'] = array(
@@ -113,9 +113,9 @@ 
   $form['buttons'] = array(
     '#type' => 'fieldset',
     '#title' => t('Buttons and plugins'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
-    '#tree' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
+    '#tree' => true,
     '#theme' => 'wysiwyg_admin_button_table',
   );
 
@@ -140,7 +140,7 @@ 
         $form['buttons'][$name][$button] = array(
           '#type' => 'checkbox',
           '#title' => $title,
-          '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE,
+          '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : false,
         );
       }
     }
@@ -149,7 +149,7 @@ 
         $form['buttons'][$name][$extension] = array(
           '#type' => 'checkbox',
           '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title,
-          '#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : FALSE,
+          '#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : false,
         );
       }
     }
@@ -158,8 +158,8 @@ 
   $form['appearance'] = array(
     '#type' => 'fieldset',
     '#title' => t('Editor appearance'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   $form['appearance']['toolbar_loc'] = array(
@@ -197,8 +197,8 @@ 
   $form['output'] = array(
     '#type' => 'fieldset',
     '#title' => t('Cleanup and output'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   $form['output']['verify_html'] = array(
@@ -252,8 +252,8 @@ 
   $form['css'] = array(
     '#type' => 'fieldset',
     '#title' => t('CSS'),
-    '#collapsible' => TRUE,
-    '#collapsed' => TRUE,
+    '#collapsible' => true,
+    '#collapsed' => true,
   );
 
   $form['css']['block_formats'] = array(
@@ -422,16 +422,16 @@ 
     }
     // In case there is an error, always show installation instructions.
     if (isset($editor['error'])) {
-      $show_instructions = TRUE;
+      $show_instructions = true;
     }
   }
   if (!$count) {
-    $show_instructions = TRUE;
+    $show_instructions = true;
   }
   $form['status'] = array(
     '#type' => 'fieldset',
     '#title' => t('Installation instructions'),
-    '#collapsible' => TRUE,
+    '#collapsible' => true,
     '#collapsed' => !isset($show_instructions),
     '#description' => (!$count ? t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''),
     '#weight' => 10,
@@ -444,15 +444,15 @@ 
 
   $formats = filter_formats();
   // Reset Wysiwyg cache
-  $profiles = wysiwyg_profile_load_all(TRUE);
+  $profiles = wysiwyg_profile_load_all(true);
   $form['formats'] = array(
     '#type' => 'item',
     '#description' => t('To assign a different editor to a text format, click "delete" to remove the existing first.'),
-    '#tree' => TRUE,
+    '#tree' => true,
   );
 
-  $enable_save = FALSE;
-  $in_code_only = FALSE;
+  $enable_save = false;
+  $in_code_only = false;
   foreach ($formats as $id => $format) {
     $form['formats'][$id]['name'] = array(
       '#value' => check_plain($format->name),
@@ -474,7 +474,7 @@ 
         '#default_value' => '',
         '#options' => $options,
       );
-      $enable_save = TRUE;
+      $enable_save = true;
     }
     if (isset($profiles[$id]) && !empty($profiles[$id]->editor)) {
       $edit = !empty($profiles[$id]->in_code_only)?t('Override'):t('Edit');
@@ -545,7 +545,7 @@ 
   if (isset($profile->type) && $profile->type == t('Overridden')) {
     $form['revert'] = array(
       '#type' => 'value',
-      '#value' => TRUE,
+      '#value' => true,
     );
     return confirm_form(
       $form,

Spacing +14 added lines, -14 removed lines

@@ -10,7 +10,7 @@ 
  */
 function wysiwyg_profile_form($form_state, $profile) {
   // Merge in defaults.
-  $profile = (array) $profile;
+  $profile = (array)$profile;
   $profile += array(
     'format' => 0,
     'editor' => '',
@@ -43,7 +43,7 @@ 
     'css_path' => NULL,
     'css_classes' => NULL,
   );
-  $profile = (object) $profile;
+  $profile = (object)$profile;
 
   $formats = filter_formats();
   $editor = wysiwyg_get_editor($profile->editor);
@@ -128,15 +128,15 @@ 
         if (!empty($meta['path'])) {
           // @todo Button icon locations are different in editors, editor versions,
           //   and contrib/custom plugins (like Image Assist, f.e.).
-          $img_src = $meta['path'] . "/images/$name.gif";
+          $img_src = $meta['path']."/images/$name.gif";
           // Handle plugins that have more than one button.
           if (!file_exists($img_src)) {
-            $img_src = $meta['path'] . "/images/$button.gif";
+            $img_src = $meta['path']."/images/$button.gif";
           }
-          $icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : '';
+          $icon = file_exists($img_src) ? '<img src="'.base_path().$img_src.'" title="'.$button.'" style="border: 1px solid grey; vertical-align: middle;" />' : '';
         }
         $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title);
-        $title = (!empty($icon) ? $icon . ' ' . $title : $title);
+        $title = (!empty($icon) ? $icon.' '.$title : $title);
         $form['buttons'][$name][$button] = array(
           '#type' => 'checkbox',
           '#title' => $title,
@@ -279,7 +279,7 @@ 
     '#default_value' => $profile->settings['css_path'],
     '#size' => 40,
     '#maxlength' => 255,
-    '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.') . '<br />' . t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)') . '<br />' . t('Example:') . ' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
+    '#description' => t('If "Define CSS" was selected above, enter path to a CSS file or a list of CSS files separated by a comma.').'<br />'.t('Available tokens: <code>%b</code> (base path, eg: <code>/</code>), <code>%t</code> (path to theme, eg: <code>themes/garland</code>)').'<br />'.t('Example:').' css/editor.css,/themes/garland/style.css,%b%t/style.css,http://example.com/external.css',
   );
 
   $form['css']['css_classes'] = array(
@@ -404,7 +404,7 @@ 
       'description' => (isset($editor['error']) ? $editor['error'] : ''),
     );
     if ($editor['installed']) {
-      $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
+      $options[$name] = $editor['title'].(isset($editor['installed version']) ? ' '.$editor['installed version'] : '');
     }
     else {
       // Build on-site installation instructions.
@@ -412,10 +412,10 @@ 
       $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
       $targs = array(
         '@editor-path' => $editor['editor path'],
-        '@library-filepath' => $editor['library path'] . '/' . (isset($editor['libraries'][$library]['files'][0]) ? $editor['libraries'][$library]['files'][0] : key($editor['libraries'][$library]['files'])),
+        '@library-filepath' => $editor['library path'].'/'.(isset($editor['libraries'][$library]['files'][0]) ? $editor['libraries'][$library]['files'][0] : key($editor['libraries'][$library]['files'])),
       );
-      $instructions = '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs) . '</p>';
-      $instructions .= '<p>' . t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs) . '</p>';
+      $instructions = '<p>'.t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs).'</p>';
+      $instructions .= '<p>'.t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs).'</p>';
 
       $status[$name]['description'] .= $instructions;
       $count--;
@@ -465,7 +465,7 @@ 
         '#value' => $options[$profiles[$id]->editor],
       );
       if ($in_code_only) {
-        $form['formats'][$id]['name']['#value'] .= ' <em>(' . t('From: !module module', array('!module' => $profiles[$id]->export_module)) . ')</em>';
+        $form['formats'][$id]['name']['#value'] .= ' <em>('.t('From: !module module', array('!module' => $profiles[$id]->export_module)).')</em>';
       }
     }
     else {
@@ -477,13 +477,13 @@ 
       $enable_save = TRUE;
     }
     if (isset($profiles[$id]) && !empty($profiles[$id]->editor)) {
-      $edit = !empty($profiles[$id]->in_code_only)?t('Override'):t('Edit');
+      $edit = !empty($profiles[$id]->in_code_only) ?t('Override') : t('Edit');
       $form['formats'][$id]['edit'] = array(
         '#value' => l($edit, "admin/settings/wysiwyg/profile/$id/edit"),
       );
       // Only display delete/revert links for wysiwyg loaded from the database
       if (!$in_code_only) {
-        $delete = (empty($profiles[$id]->type) || $profiles[$id]->type == t('Normal'))?t('Delete'):t('Revert');
+        $delete = (empty($profiles[$id]->type) || $profiles[$id]->type == t('Normal')) ?t('Delete') : t('Revert');
         $form['formats'][$id]['delete'] = array(
           '#value' => l($delete, "admin/settings/wysiwyg/profile/$id/delete"),
         );

drupal/sites/default/boinc/modules/contrib/wysiwyg/plugins/break.inc

Indentation +3 added lines, -3 removed lines

@@ -9,13 +9,13 @@
  * Implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_break_plugin() {
-  $plugins['break'] = array(
+    $plugins['break'] = array(
     'title' => t('Teaser break'),
     'vendor url' => 'http://drupal.org/project/wysiwyg',
     'icon file' => 'break.gif',
     'icon title' => t('Separate the teaser and body of this content'),
     'settings' => array(),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.dialog.inc

Indentation +33 added lines, -33 removed lines

@@ -9,25 +9,25 @@ 
  * Menu callback; Output a wysiwyg plugin dialog page.
  */
 function wysiwyg_dialog($plugin, $instance) {
-  $plugins = wysiwyg_get_all_plugins();
-  if (!isset($plugins[$plugin])) {
+    $plugins = wysiwyg_get_all_plugins();
+    if (!isset($plugins[$plugin])) {
     return drupal_access_denied();
-  }
-  $callback = $plugin . '_wysiwyg_dialog';
-  if (!function_exists($callback)) {
+    }
+    $callback = $plugin . '_wysiwyg_dialog';
+    if (!function_exists($callback)) {
     return drupal_not_found();
-  }
+    }
 
-  // Suppress admin menu.
-  module_invoke('admin_menu', 'suppress');
-  // Add editor instance id to Drupal.settings.
-  $settings = array(
+    // Suppress admin menu.
+    module_invoke('admin_menu', 'suppress');
+    // Add editor instance id to Drupal.settings.
+    $settings = array(
     'plugin' => $plugin,
     'instance' => $instance,
-  );
-  drupal_add_js(array('wysiwyg' => $settings), 'setting');
+    );
+    drupal_add_js(array('wysiwyg' => $settings), 'setting');
 
-  echo theme('wysiwyg_dialog_page', $callback($instance));
+    echo theme('wysiwyg_dialog_page', $callback($instance));
 }
 
 /**
@@ -38,26 +38,26 @@ 
  * @see template_preprocess()
  */
 function template_preprocess_wysiwyg_dialog_page(&$variables) {
-  // Construct page title
-  $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
+    // Construct page title
+    $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal'));
 
-  $variables['head_title']        = implode(' | ', $head_title);
-  $variables['base_path']         = base_path();
-  $variables['front_page']        = url();
-  // @todo Would a breadcrumb make sense / possible at all?
-  // $variables['breadcrumb']        = theme('breadcrumb', drupal_get_breadcrumb());
-  $variables['head']              = drupal_get_html_head();
-  $variables['help']              = theme('help');
-  $variables['language']          = $GLOBALS['language'];
-  $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
-  $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
-  $variables['site_name']         = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
-  $variables['css']               = drupal_add_css();
-  $variables['styles']            = drupal_get_css();
-  $variables['scripts']           = drupal_get_js();
-  $variables['tabs']              = theme('menu_local_tasks');
-  $variables['title']             = drupal_get_title();
-  // Closure should be filled last.
-  $variables['closure']           = theme('closure');
+    $variables['head_title']        = implode(' | ', $head_title);
+    $variables['base_path']         = base_path();
+    $variables['front_page']        = url();
+    // @todo Would a breadcrumb make sense / possible at all?
+    // $variables['breadcrumb']        = theme('breadcrumb', drupal_get_breadcrumb());
+    $variables['head']              = drupal_get_html_head();
+    $variables['help']              = theme('help');
+    $variables['language']          = $GLOBALS['language'];
+    $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
+    $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
+    $variables['site_name']         = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
+    $variables['css']               = drupal_add_css();
+    $variables['styles']            = drupal_get_css();
+    $variables['scripts']           = drupal_get_js();
+    $variables['tabs']              = theme('menu_local_tasks');
+    $variables['title']             = drupal_get_title();
+    // Closure should be filled last.
+    $variables['closure']           = theme('closure');
 }
 

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
   if (!isset($plugins[$plugin])) {
     return drupal_access_denied();
   }
-  $callback = $plugin . '_wysiwyg_dialog';
+  $callback = $plugin.'_wysiwyg_dialog';
   if (!function_exists($callback)) {
     return drupal_not_found();
   }

drupal/sites/default/boinc/modules/contrib/wysiwyg/wysiwyg.api.php

Indentation +23 added lines, -23 removed lines

@@ -36,11 +36,11 @@ 
  *   plugin meta-information as values.
  */
 function hook_wysiwyg_plugin($editor, $version) {
-  switch ($editor) {
+    switch ($editor) {
     case 'tinymce':
       if ($version > 3) {
         return array(
-          'myplugin' => array(
+            'myplugin' => array(
             // A URL to the plugin's homepage.
             'url' => 'http://drupal.org/project/img_assist',
             // The full path to the native editor plugin, no trailing slash.
@@ -54,19 +54,19 @@ 
             // match the corresponding JavaScript implementation. The value is
             // is displayed on the editor configuration form only.
             'buttons' => array(
-              'img_assist' => t('Image Assist'),
+                'img_assist' => t('Image Assist'),
             ),
             // A list of editor extensions provided by this native plugin.
             // Extensions are not displayed as buttons and touch the editor's
             // internals, so you should know what you are doing.
             'extensions' => array(
-              'imce' => t('IMCE'),
+                'imce' => t('IMCE'),
             ),
             // A list of global, native editor configuration settings to
             // override. To be used rarely and only when required.
             'options' => array(
-              'file_browser_callback' => 'imceImageBrowser',
-              'inline_styles' => TRUE,
+                'file_browser_callback' => 'imceImageBrowser',
+                'inline_styles' => TRUE,
             ),
             // Boolean whether the editor needs to load this plugin. When TRUE,
             // the editor will automatically load the plugin based on the 'path'
@@ -81,13 +81,13 @@ 
             'internal' => TRUE,
             // TinyMCE-specific: Additional HTML elements to allow in the markup.
             'extended_valid_elements' => array(
-              'img[class|src|border=0|alt|title|width|height|align|name|style]',
+                'img[class|src|border=0|alt|title|width|height|align|name|style]',
+            ),
             ),
-          ),
         );
-      }
-      break;
-  }
+        }
+        break;
+    }
 }
 
 /**
@@ -101,12 +101,12 @@ 
  *   Wysiwyg module.
  */
 function hook_wysiwyg_include_directory($type) {
-  switch ($type) {
+    switch ($type) {
     case 'plugins':
       // You can just return $type, if you place your Wysiwyg plugins into a
       // sub-directory named 'plugins'.
       return $type;
-  }
+    }
 }
 
 /**
@@ -136,7 +136,7 @@ 
  *   Meta information about the buttons provided by this plugin.
  */
 function hook_INCLUDE_plugin() {
-  $plugins['awesome'] = array(
+    $plugins['awesome'] = array(
     // The plugin's title; defaulting to its internal name ('awesome').
     'title' => t('Awesome plugin'),
     // The (vendor) homepage of this plugin; defaults to ''.
@@ -165,11 +165,11 @@ 
     ),
     // TinyMCE-specific: Additional HTML elements to allow in the markup.
     'extended_valid_elements' => array(
-      'tag1[attribute1|attribute2]',
-      'tag2[attribute3|attribute4]',
+        'tag1[attribute1|attribute2]',
+        'tag2[attribute3|attribute4]',
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 
 /**
@@ -196,11 +196,11 @@ 
  *   - theme: The name of the editor theme/skin.
  */
 function hook_wysiwyg_editor_settings_alter(&$settings, $context) {
-  // Each editor has its own collection of native settings that may be extended
-  // or overridden. Please consult the respective official vendor documentation
-  // for details.
-  if ($context['profile']->editor == 'tinymce') {
+    // Each editor has its own collection of native settings that may be extended
+    // or overridden. Please consult the respective official vendor documentation
+    // for details.
+    if ($context['profile']->editor == 'tinymce') {
     // Supported values to JSON data types.
     $settings['cleanup_on_startup'] = TRUE;
-  }
+    }
 }

Switch Indentation +53 added lines, -53 removed lines

@@ -37,56 +37,56 @@ 
  */
 function hook_wysiwyg_plugin($editor, $version) {
   switch ($editor) {
-    case 'tinymce':
-      if ($version > 3) {
-        return array(
-          'myplugin' => array(
-            // A URL to the plugin's homepage.
-            'url' => 'http://drupal.org/project/img_assist',
-            // The full path to the native editor plugin, no trailing slash.
-            // Ignored when 'internal' is set to TRUE below.
-            'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
-            // The name of the plugin's main JavaScript file.
-            // Ignored when 'internal' is set to TRUE below.
-            // Default value depends on which editor the plugin is for.
-            'filename' => 'editor_plugin.js',
-            // A list of buttons provided by this native plugin. The key has to
-            // match the corresponding JavaScript implementation. The value is
-            // is displayed on the editor configuration form only.
-            'buttons' => array(
-              'img_assist' => t('Image Assist'),
-            ),
-            // A list of editor extensions provided by this native plugin.
-            // Extensions are not displayed as buttons and touch the editor's
-            // internals, so you should know what you are doing.
-            'extensions' => array(
-              'imce' => t('IMCE'),
-            ),
-            // A list of global, native editor configuration settings to
-            // override. To be used rarely and only when required.
-            'options' => array(
-              'file_browser_callback' => 'imceImageBrowser',
-              'inline_styles' => TRUE,
-            ),
-            // Boolean whether the editor needs to load this plugin. When TRUE,
-            // the editor will automatically load the plugin based on the 'path'
-            // variable provided. If FALSE, the plugin either does not need to
-            // be loaded or is already loaded by something else on the page.
-            // Most plugins should define TRUE here.
-            'load' => TRUE,
-            // Boolean whether this plugin is a native plugin, i.e. shipped with
-            // the editor. Definition must be ommitted for plugins provided by
-            // other modules. TRUE means 'path' and 'filename' above are ignored
-            // and the plugin is instead loaded from the editor's plugin folder.
-            'internal' => TRUE,
-            // TinyMCE-specific: Additional HTML elements to allow in the markup.
-            'extended_valid_elements' => array(
-              'img[class|src|border=0|alt|title|width|height|align|name|style]',
-            ),
+  case 'tinymce':
+    if ($version > 3) {
+      return array(
+        'myplugin' => array(
+          // A URL to the plugin's homepage.
+          'url' => 'http://drupal.org/project/img_assist',
+          // The full path to the native editor plugin, no trailing slash.
+          // Ignored when 'internal' is set to TRUE below.
+          'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
+          // The name of the plugin's main JavaScript file.
+          // Ignored when 'internal' is set to TRUE below.
+          // Default value depends on which editor the plugin is for.
+          'filename' => 'editor_plugin.js',
+          // A list of buttons provided by this native plugin. The key has to
+          // match the corresponding JavaScript implementation. The value is
+          // is displayed on the editor configuration form only.
+          'buttons' => array(
+            'img_assist' => t('Image Assist'),
           ),
-        );
-      }
-      break;
+          // A list of editor extensions provided by this native plugin.
+          // Extensions are not displayed as buttons and touch the editor's
+          // internals, so you should know what you are doing.
+          'extensions' => array(
+            'imce' => t('IMCE'),
+          ),
+          // A list of global, native editor configuration settings to
+          // override. To be used rarely and only when required.
+          'options' => array(
+            'file_browser_callback' => 'imceImageBrowser',
+            'inline_styles' => TRUE,
+          ),
+          // Boolean whether the editor needs to load this plugin. When TRUE,
+          // the editor will automatically load the plugin based on the 'path'
+          // variable provided. If FALSE, the plugin either does not need to
+          // be loaded or is already loaded by something else on the page.
+          // Most plugins should define TRUE here.
+          'load' => TRUE,
+          // Boolean whether this plugin is a native plugin, i.e. shipped with
+          // the editor. Definition must be ommitted for plugins provided by
+          // other modules. TRUE means 'path' and 'filename' above are ignored
+          // and the plugin is instead loaded from the editor's plugin folder.
+          'internal' => TRUE,
+          // TinyMCE-specific: Additional HTML elements to allow in the markup.
+          'extended_valid_elements' => array(
+            'img[class|src|border=0|alt|title|width|height|align|name|style]',
+          ),
+        ),
+      );
+    }
+    break;
   }
 }
 
@@ -102,10 +102,10 @@ 
  */
 function hook_wysiwyg_include_directory($type) {
   switch ($type) {
-    case 'plugins':
-      // You can just return $type, if you place your Wysiwyg plugins into a
-      // sub-directory named 'plugins'.
-      return $type;
+  case 'plugins':
+    // You can just return $type, if you place your Wysiwyg plugins into a
+    // sub-directory named 'plugins'.
+    return $type;
   }
 }
 

Spacing +3 added lines, -3 removed lines

@@ -45,7 +45,7 @@ 
             'url' => 'http://drupal.org/project/img_assist',
             // The full path to the native editor plugin, no trailing slash.
             // Ignored when 'internal' is set to TRUE below.
-            'path' => drupal_get_path('module', 'img_assist') . '/drupalimage',
+            'path' => drupal_get_path('module', 'img_assist').'/drupalimage',
             // The name of the plugin's main JavaScript file.
             // Ignored when 'internal' is set to TRUE below.
             // Default value depends on which editor the plugin is for.
@@ -150,13 +150,13 @@ 
     'icon title' => t('Do something'),
     // An alternative path to the integration JavaScript; defaults to
     // '[path-to-module]/[plugins-directory]/[plugin-name]'.
-    'js path' => drupal_get_path('module', 'mymodule') . '/awesomeness',
+    'js path' => drupal_get_path('module', 'mymodule').'/awesomeness',
     // An alternative filename of the integration JavaScript; defaults to
     // '[plugin-name].js'.
     'js file' => 'awesome.js',
     // An alternative path to the integration stylesheet; defaults to
     // '[path-to-module]/[plugins-directory]/[plugin-name]'.
-    'css path' => drupal_get_path('module', 'mymodule') . '/awesomeness',
+    'css path' => drupal_get_path('module', 'mymodule').'/awesomeness',
     // An alternative filename of the integration stylesheet; defaults to
     // '[plugin-name].css'.
     'css file' => 'awesome.css',

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

@@ -66,19 +66,19 @@ 
             // override. To be used rarely and only when required.
             'options' => array(
               'file_browser_callback' => 'imceImageBrowser',
-              'inline_styles' => TRUE,
+              'inline_styles' => true,
             ),
             // Boolean whether the editor needs to load this plugin. When TRUE,
             // the editor will automatically load the plugin based on the 'path'
             // variable provided. If FALSE, the plugin either does not need to
             // be loaded or is already loaded by something else on the page.
             // Most plugins should define TRUE here.
-            'load' => TRUE,
+            'load' => true,
             // Boolean whether this plugin is a native plugin, i.e. shipped with
             // the editor. Definition must be ommitted for plugins provided by
             // other modules. TRUE means 'path' and 'filename' above are ignored
             // and the plugin is instead loaded from the editor's plugin folder.
-            'internal' => TRUE,
+            'internal' => true,
             // TinyMCE-specific: Additional HTML elements to allow in the markup.
             'extended_valid_elements' => array(
               'img[class|src|border=0|alt|title|width|height|align|name|style]',
@@ -201,6 +201,6 @@ 
   // for details.
   if ($context['profile']->editor == 'tinymce') {
     // Supported values to JSON data types.
-    $settings['cleanup_on_startup'] = TRUE;
+    $settings['cleanup_on_startup'] = true;
   }
 }

drupal/sites/default/boinc/modules/contrib/forum_tweaks/forum_tweaks.module

Indentation +5 added lines, -5 removed lines

@@ -17,14 +17,14 @@
  * Implementation of hook_menu().
  */
 function forum_tweaks_menu() {
-  // Note that this comes straight out of the Advanced Forum module. As such,
-  // it should be removed should said module be added at a future point in time
-  $items['community/forum/%/read'] = array(
+    // Note that this comes straight out of the Advanced Forum module. As such,
+    // it should be removed should said module be added at a future point in time
+    $items['community/forum/%/read'] = array(
     'access callback' => 'forum_tweaks_markasread_access',
     'page arguments' => array(2),
     'page callback' => 'forum_tweaks_markasread',
     'type' => MENU_CALLBACK,
     'file' => 'includes/mark-read.inc',
-  );
-  return $items;
+    );
+    return $items;
 }

drupal/sites/default/boinc/modules/contrib/forum_tweaks/includes/mark-read.inc

Indentation +27 added lines, -27 removed lines

@@ -13,31 +13,31 @@ 
  * Either fill a $links array or return a string version of the link to mark read.
  */
 function forum_tweaks_get_mark_read_link($tid = 0, &$links = array()) {
-  if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) {
+    if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) {
     if ($tid) {
-      $links['mark-read']['title'] = t('Mark all topics read');
-      $links['mark-read']['href'] = "community/forum/{$tid}/read";
+        $links['mark-read']['title'] = t('Mark all topics read');
+        $links['mark-read']['href'] = "community/forum/{$tid}/read";
 
-      return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
+        return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
     }
     else {
-      $links['mark-read']['title'] = t('Mark all forums read');
-      $links['mark-read']['href'] = "community/forum/0/read";
+        $links['mark-read']['title'] = t('Mark all forums read');
+        $links['mark-read']['href'] = "community/forum/0/read";
 
-      return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+        return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+    }
     }
-  }
 }
 
 /**
  * Marks all posts in forums or in a given forum as read by the current user.
  */
 function forum_tweaks_markasread($current_forum_id = 0) {
-  global $user;
+    global $user;
 
-  // See if we're on a forum or on the forum overview
-  // Path will be /forum/markasread or /forum/markasread/tid
-  if ($current_forum_id) {
+    // See if we're on a forum or on the forum overview
+    // Path will be /forum/markasread or /forum/markasread/tid
+    if ($current_forum_id) {
     // Delete the current history entries so already visited nodes get updated.
     $sql = "DELETE h
             FROM {history} AS h
@@ -58,26 +58,26 @@ 
 
     // Readpath integration
     if (module_exists('readpath')) {
-      readpath_clear_readpath();
+        readpath_clear_readpath();
     }
 
     drupal_set_message(t('All content in this forum has been marked as read'));
     drupal_goto('community/forum/' . $current_forum_id);
-  }
+    }
 
-  // We are on the forum overview, requesting all forums be marked read
-  $forum_vocabulary_id = variable_get('forum_nav_vocabulary', '');
+    // We are on the forum overview, requesting all forums be marked read
+    $forum_vocabulary_id = variable_get('forum_nav_vocabulary', '');
 
-  // Delete the current history entries so already visited nodes get updated.
-  $sql = "DELETE h
+    // Delete the current history entries so already visited nodes get updated.
+    $sql = "DELETE h
           FROM {history} AS h
             INNER JOIN {term_node} AS tn ON (h.nid = tn.nid)
             INNER JOIN {term_data} AS td ON (td.tid = tn.tid)
           WHERE h.uid = %d AND td.vid = %d";
-  db_query($sql, $user->uid, $forum_vocabulary_id);
+    db_query($sql, $user->uid, $forum_vocabulary_id);
 
-  // Update the history table with all forum nodes newer than the cutoff.
-  $sql = "INSERT INTO {history} (uid, nid, timestamp)
+    // Update the history table with all forum nodes newer than the cutoff.
+    $sql = "INSERT INTO {history} (uid, nid, timestamp)
           SELECT DISTINCT %d, n.nid, %d
           FROM {node} AS n
             INNER JOIN {term_node} AS tn ON n.nid=tn.nid
@@ -85,12 +85,12 @@ 
             INNER JOIN {term_data} AS td ON tn.tid = td.tid
           WHERE (n.changed > %d OR ncs.last_comment_timestamp > %d) AND td.vid = %d";
 
-  $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id);
+    $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id);
 
-  db_query($sql, $args);
+    db_query($sql, $args);
 
-  drupal_set_message(t('All forum content has been marked as read'));
-  drupal_goto('community/forum');
+    drupal_set_message(t('All forum content has been marked as read'));
+    drupal_goto('community/forum');
 }
 
 /**
@@ -101,6 +101,6 @@ 
  * cached and re-used for other users.
  */
 function forum_tweaks_markasread_access() {
-  global $user;
-  return user_access('access content') && $user->uid;
+    global $user;
+    return user_access('access content') && $user->uid;
 }

Spacing +3 added lines, -3 removed lines

@@ -18,13 +18,13 @@ 
       $links['mark-read']['title'] = t('Mark all topics read');
       $links['mark-read']['href'] = "community/forum/{$tid}/read";
 
-      return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
+      return l(t('Mark all topics read').'<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
     }
     else {
       $links['mark-read']['title'] = t('Mark all forums read');
       $links['mark-read']['href'] = "community/forum/0/read";
 
-      return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+      return l(t('Mark all forums read').'<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
     }
   }
 }
@@ -62,7 +62,7 @@ 
     }
 
     drupal_set_message(t('All content in this forum has been marked as read'));
-    drupal_goto('community/forum/' . $current_forum_id);
+    drupal_goto('community/forum/'.$current_forum_id);
   }
 
   // We are on the forum overview, requesting all forums be marked read

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       $links['mark-read']['href'] = "community/forum/{$tid}/read";
 
       return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
-    }
-    else {
+    } else {
       $links['mark-read']['title'] = t('Mark all forums read');
       $links['mark-read']['href'] = "community/forum/0/read";
 

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

@@ -18,13 +18,13 @@
       $links['mark-read']['title'] = t('Mark all topics read');
       $links['mark-read']['href'] = "community/forum/{$tid}/read";
 
-      return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE));
+      return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => true));
     }
     else {
       $links['mark-read']['title'] = t('Mark all forums read');
       $links['mark-read']['href'] = "community/forum/0/read";
 
-      return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE));
+      return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => true));
     }
   }
 }