BOINC / boinc

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

Switch Indentation +87 added lines, -87 removed lines

@@ -49,62 +49,62 @@ 
  */
 function jump_block($op = 'list', $delta = 0, $edit = array()) {
   switch ($op) {
-    case 'list':
-      $blocks = array();
-      foreach (menu_get_menus() as $name => $title) {
-        $blocks['menu-' . $name] = array(
-          'info' => t('Jump menu: !menu', array('!menu' => $name))
-        );
-      }
+  case 'list':
+    $blocks = array();
+    foreach (menu_get_menus() as $name => $title) {
+      $blocks['menu-' . $name] = array(
+        'info' => t('Jump menu: !menu', array('!menu' => $name))
+      );
+    }
 
-      $vocs = taxonomy_get_vocabularies();
-      foreach ($vocs as $vid => $vocabulary) {
-        $blocks['taxo-' . $vid] = array(
-          'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
-        );
-      }
-      return $blocks;
-    case 'configure':
-      $form = array();
-      $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
-        '#type' => 'checkbox',
-        '#title' => t('Show active page in jump menu.'),
-        '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
-        '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
+    $vocs = taxonomy_get_vocabularies();
+    foreach ($vocs as $vid => $vocabulary) {
+      $blocks['taxo-' . $vid] = array(
+        'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
       );
-      // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
-      return $form;
-    case 'save':
-      variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
-      variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
-      variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
-      variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
-      break;
-    case 'view':
-      // The first 5 characters of $delta should be one of:
-      //    menu-
-      //    taxo-
-      $subject = '';
-      $jumpmenu_type = substr($delta, 0, 4);
-      $jumpmenu_name = substr($delta, 5);
-      $active = jump_get_active_setting($delta);
-      if ($jumpmenu_type == 'menu') {
-        $form = jump_quickly($jumpmenu_name, 'menu', $active);
+    }
+    return $blocks;
+  case 'configure':
+    $form = array();
+    $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
+      '#type' => 'checkbox',
+      '#title' => t('Show active page in jump menu.'),
+      '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
+      '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
+    );
+    // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
+    return $form;
+  case 'save':
+    variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
+    variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
+    variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
+    variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
+    break;
+  case 'view':
+    // The first 5 characters of $delta should be one of:
+    //    menu-
+    //    taxo-
+    $subject = '';
+    $jumpmenu_type = substr($delta, 0, 4);
+    $jumpmenu_name = substr($delta, 5);
+    $active = jump_get_active_setting($delta);
+    if ($jumpmenu_type == 'menu') {
+      $form = jump_quickly($jumpmenu_name, 'menu', $active);
 
-        // Use the menu label as the default block subject
-        $menus = menu_get_menus();
-        $subject = $menus[$jumpmenu_name];
-      }
-      else if ($jumpmenu_type == 'taxo') {
-        $form = jump_quickly($jumpmenu_name, 'taxo', $active);
+      // Use the menu label as the default block subject
+      $menus = menu_get_menus();
+      $subject = $menus[$jumpmenu_name];
+    }
+    else if ($jumpmenu_type == 'taxo') {
+      $form = jump_quickly($jumpmenu_name, 'taxo', $active);
 
-        // Use the vocabulary name as the default block subject
-        $vocab = taxonomy_vocabulary_load($jumpmenu_name);
-        $subject = $vocab->name;
-      }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
-      return array('subject' => $subject, 'content' => $form);
-      break;
+      // Use the vocabulary name as the default block subject
+      $vocab = taxonomy_vocabulary_load($jumpmenu_name);
+      $subject = $vocab->name;
+    }
+    if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+    return array('subject' => $subject, 'content' => $form);
+    break;
   }
 }
 
@@ -309,52 +309,52 @@ 
  */
 function jump_form_alter(&$form, $form_state, $form_id) {
   switch ($form_id) {
-    case 'block_admin_configure':
-      if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
-        $delta = $form['delta']['#value'];
-        ahah_helper_register($form, $form_state);
-        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
-        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
+  case 'block_admin_configure':
+    if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
+      $delta = $form['delta']['#value'];
+      ahah_helper_register($form, $form_state);
+      $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
+      $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
 
-        $form['block_settings']['jump_wrapper'] = array(
-          '#prefix' => '<div id="jump-wrapper">',
-          '#suffix' => '</div>',
-          '#type' => 'markup'
-        );
-        $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+      $form['block_settings']['jump_wrapper'] = array(
+        '#prefix' => '<div id="jump-wrapper">',
+        '#suffix' => '</div>',
+        '#type' => 'markup'
+      );
+      $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
+        '#default_value' => $default_jump_use_js,
+        '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+        '#ahah' => array(
+          'event' => 'change',
+          'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
+          'wrapper' => 'jump-wrapper',
+        ),
+      );
+      if ($default_jump_use_js === 1) {
+        $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
           '#type' => 'checkbox',
-          '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
-          '#default_value' => $default_jump_use_js,
-          '#disabled' => ($default_jump_add_select === 1) ? TRUE : FALSE,
+          '#title' => t('Add an empty select option into the list of options'),
+          '#default_value' => $default_jump_add_select,
+          '#weight' => 1,
           '#ahah' => array(
             'event' => 'change',
             'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
             'wrapper' => 'jump-wrapper',
           ),
         );
-        if ($default_jump_use_js === 1) {
-          $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
-            '#type' => 'checkbox',
-            '#title' => t('Add an empty select option into the list of options'),
-            '#default_value' => $default_jump_add_select,
-            '#weight' => 1,
-            '#ahah' => array(
-              'event' => 'change',
-              'path' => ahah_helper_path(array('block_settings', 'jump_wrapper')),
-              'wrapper' => 'jump-wrapper',
-            ),
+        if ($default_jump_add_select === 1) {
+          $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
+            '#type' => 'textfield',
+            '#title' => t('Text to use for the empty select option'),
+            '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
+            '#weight' => 2
           );
-          if ($default_jump_add_select === 1) {
-            $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
-              '#type' => 'textfield',
-              '#title' => t('Text to use for the empty select option'),
-              '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
-              '#weight' => 2
-            );
-          }
         }
       }
-      break;
+    }
+    break;
   }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -52,33 +52,33 @@ 
     case 'list':
       $blocks = array();
       foreach (menu_get_menus() as $name => $title) {
-        $blocks['menu-' . $name] = array(
+        $blocks['menu-'.$name] = array(
           'info' => t('Jump menu: !menu', array('!menu' => $name))
         );
       }
 
       $vocs = taxonomy_get_vocabularies();
       foreach ($vocs as $vid => $vocabulary) {
-        $blocks['taxo-' . $vid] = array(
+        $blocks['taxo-'.$vid] = array(
           'info' => t('Jump menu: !voc', array('!voc' => $vocabulary->name))
         );
       }
       return $blocks;
     case 'configure':
       $form = array();
-      $form['block_settings']['jump_activepageinmenu_' . $delta] = array(
+      $form['block_settings']['jump_activepageinmenu_'.$delta] = array(
         '#type' => 'checkbox',
         '#title' => t('Show active page in jump menu.'),
-        '#default_value' => variable_get('jump_activepageinmenu_' . $delta, 1),
+        '#default_value' => variable_get('jump_activepageinmenu_'.$delta, 1),
         '#description' => t('This setting will force the jump menu to show the current page as the default selection in this block\'s jump menu.'),
       );
       // Do the rest of the form additions in hook_form_alter() since we can't do ahah here.
       return $form;
     case 'save':
-      variable_set('jump_activepageinmenu_' . $delta, $edit['jump_activepageinmenu_' . $delta]);
-      variable_set('jump_use_js_' . $delta, $edit['jump_use_js_' . $delta]);
-      variable_set('jump_add_select_' . $delta, $edit['jump_add_select_' . $delta]);
-      variable_set('jump_add_select_text_' . $delta, $edit['jump_add_select_text_' . $delta]);
+      variable_set('jump_activepageinmenu_'.$delta, $edit['jump_activepageinmenu_'.$delta]);
+      variable_set('jump_use_js_'.$delta, $edit['jump_use_js_'.$delta]);
+      variable_set('jump_add_select_'.$delta, $edit['jump_add_select_'.$delta]);
+      variable_set('jump_add_select_text_'.$delta, $edit['jump_add_select_text_'.$delta]);
       break;
     case 'view':
       // The first 5 characters of $delta should be one of:
@@ -102,7 +102,7 @@ 
         $vocab = taxonomy_vocabulary_load($jumpmenu_name);
         $subject = $vocab->name;
       }
-      if (variable_get('jump_use_js_' . $delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump') . '/jump.js');
+      if (variable_get('jump_use_js_'.$delta, 0) === 1) drupal_add_js(drupal_get_path('module', 'jump').'/jump.js');
       return array('subject' => $subject, 'content' => $form);
       break;
   }
@@ -125,7 +125,7 @@ 
  */
 function jump_quickly($name = 'navigation', $type = 'menu', $active = -1, $override = '') {
   // Reconstruct the $delta
-  $delta = $type . '-' . $name;
+  $delta = $type.'-'.$name;
   if ($active === -1) {
     $active = variable_get('jump_activepageinmenu', 1);
   }
@@ -153,7 +153,7 @@ 
   static $num_jump_forms = 0;
   $num_jump_forms++;
 
-  return drupal_get_form('jump_quickly_form_' . $num_jump_forms, $options, $menu_state);
+  return drupal_get_form('jump_quickly_form_'.$num_jump_forms, $options, $menu_state);
 }
 
 /**
@@ -188,15 +188,15 @@ 
     '#type' => 'submit',
     '#value' => t('Go')
   );
-  if (variable_get('jump_use_js_' . $menu_state['delta'], 0) === 1) {
+  if (variable_get('jump_use_js_'.$menu_state['delta'], 0) === 1) {
     // Give each menu a unique name.
-    $form['#attributes']['name'] = 'jumpquickly' . $menu_state['delta'];
+    $form['#attributes']['name'] = 'jumpquickly'.$menu_state['delta'];
     $form['#attributes']['class'] .= ' js-enabled';
 //    unset($form['submit']);
-    if (variable_get('jump_add_select_' . $menu_state['delta'], 0) === 1) {
+    if (variable_get('jump_add_select_'.$menu_state['delta'], 0) === 1) {
       $form['jump_goto']['#attributes']['class'] = 'first-no-jump';
       // Add the extra empty select option to the top of the array.
-      $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_' . $menu_state['delta'], t('Select Option'))) + $options;
+      $form['jump_goto']['#options'] = array('' => variable_get('jump_add_select_text_'.$menu_state['delta'], t('Select Option'))) + $options;
       $form['jump_goto']['#default_value'] = (array_key_exists($default, $options)) ? $default : '';
     }
   }
@@ -249,7 +249,7 @@ 
   foreach ($tree as $data) {
     if (!$data['link']['hidden']) {
       $href = ($data['link']['href'] == '<front>') ? $front : $data['link']['href'];
-      $href = (isset($data['link']['options']['fragment'])) ? $href . '#' . $data['link']['options']['fragment'] : $href;
+      $href = (isset($data['link']['options']['fragment'])) ? $href.'#'.$data['link']['options']['fragment'] : $href;
       $options[$href] = $data['link']['title'];
     }
   }
@@ -313,15 +313,15 @@ 
       if ($form['module']['#value'] === 'jump' && function_exists('ahah_helper_register')) {
         $delta = $form['delta']['#value'];
         ahah_helper_register($form, $form_state);
-        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_' . $delta])) ? variable_get('jump_use_js_' . $delta, 0) : $form_state['storage']['jump_use_js_' . $delta];
-        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_' . $delta])) ? variable_get('jump_add_select_' . $delta, 0) : $form_state['storage']['jump_add_select_' . $delta];
+        $default_jump_use_js = (!isset($form_state['storage']['jump_use_js_'.$delta])) ? variable_get('jump_use_js_'.$delta, 0) : $form_state['storage']['jump_use_js_'.$delta];
+        $default_jump_add_select = (!isset($form_state['storage']['jump_add_select_'.$delta])) ? variable_get('jump_add_select_'.$delta, 0) : $form_state['storage']['jump_add_select_'.$delta];
 
         $form['block_settings']['jump_wrapper'] = array(
           '#prefix' => '<div id="jump-wrapper">',
           '#suffix' => '</div>',
           '#type' => 'markup'
         );
-        $form['block_settings']['jump_wrapper']['jump_use_js_' . $delta] = array(
+        $form['block_settings']['jump_wrapper']['jump_use_js_'.$delta] = array(
           '#type' => 'checkbox',
           '#title' => t('Hide the submit button and use Javascript to automatically jump to the selected menu item'),
           '#default_value' => $default_jump_use_js,
@@ -333,7 +333,7 @@ 
           ),
         );
         if ($default_jump_use_js === 1) {
-          $form['block_settings']['jump_wrapper']['jump_add_select_' . $delta] = array(
+          $form['block_settings']['jump_wrapper']['jump_add_select_'.$delta] = array(
             '#type' => 'checkbox',
             '#title' => t('Add an empty select option into the list of options'),
             '#default_value' => $default_jump_add_select,
@@ -345,10 +345,10 @@ 
             ),
           );
           if ($default_jump_add_select === 1) {
-            $form['block_settings']['jump_wrapper']['jump_add_select_text_' . $delta] = array(
+            $form['block_settings']['jump_wrapper']['jump_add_select_text_'.$delta] = array(
               '#type' => 'textfield',
               '#title' => t('Text to use for the empty select option'),
-              '#default_value' => variable_get('jump_add_select_text_' . $delta, t('Select Option')),
+              '#default_value' => variable_get('jump_add_select_text_'.$delta, t('Select Option')),
               '#weight' => 2
             );
           }
@@ -366,7 +366,7 @@ 
  */
 function jump_get_active_setting($delta) {
   $active_site_default = variable_get('jump_activepageinmenu', 1);
-  $active = variable_get('jump_activepageinmenu_' . $delta, $active_site_default);
+  $active = variable_get('jump_activepageinmenu_'.$delta, $active_site_default);
   return $active;
 }
 

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +67 added lines, -67 removed lines

@@ -14,7 +14,7 @@ 
 function _forum_access_forum_form(&$form, &$form_state, $is_container) {
   $tid = (isset($form['tid']['#value']) ? $form['tid']['#value'] : NULL);
   if (isset($tid) && !forum_access_access($tid, 'view', NULL, FALSE)) {
-    drupal_access_denied();  // Deny access if the user doesn't have View access.
+    drupal_access_denied(); // Deny access if the user doesn't have View access.
     module_invoke_all('exit');
     exit;
   }
@@ -39,18 +39,18 @@ 
 
   $tr = 't';
   $variables = array(
-    '!access_content'                 => '<em>'. l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
-    '!access_comments'                => '<em>'. l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!create_forum_topics'            => '<em>'. l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!post_comments'                  => '<em>'. l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!post_comments_without_approval' => '<em>'. l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!edit_own_forum_topics'          => '<em>'. l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!edit_any_forum_topics'          => '<em>'. l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_own_forum_topics'        => '<em>'. l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!delete_any_forum_topics'        => '<em>'. l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_comments'            => '<em>'. l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)) .'</em>',
-    '!administer_forums'              => '<em>'. l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)) .'</em>',
-    '!administer_nodes'               => '<em>'. l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)) .'</em>',
+    '!access_content'                 => '<em>'.l($tr('access content'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
+    '!access_comments'                => '<em>'.l($tr('access comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!create_forum_topics'            => '<em>'.l($tr('create forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!post_comments'                  => '<em>'.l($tr('post comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!post_comments_without_approval' => '<em>'.l($tr('post comments without approval'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!edit_own_forum_topics'          => '<em>'.l($tr('edit own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!edit_any_forum_topics'          => '<em>'.l($tr('edit any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_own_forum_topics'        => '<em>'.l($tr('delete own forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!delete_any_forum_topics'        => '<em>'.l($tr('delete any forum topics'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_comments'            => '<em>'.l($tr('administer comments'), 'admin/user/permissions', array('fragment' => 'module-comment', 'html' => TRUE)).'</em>',
+    '!administer_forums'              => '<em>'.l($tr('administer forums'), 'admin/user/permissions', array('fragment' => 'module-forum', 'html' => TRUE)).'</em>',
+    '!administer_nodes'               => '<em>'.l($tr('administer nodes'), 'admin/user/permissions', array('fragment' => 'module-node', 'html' => TRUE)).'</em>',
   );
   if (!$is_container) {
     $form['forum_access']['permissions'] = array(
@@ -61,15 +61,15 @@ 
     );
     $form['forum_access']['permissions'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note that users need') .'<ul style="margin-top: 0"><li>'.
-                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables) .'</li><li>'.
-                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables) .'</li><li>'.
-                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'. t('Drupal 5 legacy mode') .'"' : 'strong'))) .'</li><li>'.
-                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables) .'</li><li>'.
-                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables) .'</li><li>'.
-                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables) .'</li><li>'.
-                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables) .'</li></ul>'.
-                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables) .'</div>',
+      '#value' => '<div>'.t('Note that users need').'<ul style="margin-top: 0"><li>'.
+                           t('the !access_content and !access_comments permissions <strong>AND <em>View</em></strong> to be able to see this forum and its content at all,', $variables).'</li><li>'.
+                           t('the !create_forum_topics (and similar) permissions <strong>AND <em>Post</em></strong> to be able to create forum content, and', $variables).'</li><li>'.
+                           t('the !post_comments and (probably) !post_comments_without_approval permission <!TAG>AND <em>Comment</em></!TAG> to be able to post comments/replies;', $variables + array('!TAG' => (variable_get('forum_access_D5_legacy_mode', FALSE) ? 'del title="'.t('Drupal 5 legacy mode').'"' : 'strong'))).'</li><li>'.
+                           t('the !edit_own_forum_topics or !edit_any_forum_topics (and similar) permissions <strong>AND (<em>Edit</em> AND <em>Comment</em></strong>) can be added if desired, <strong>plus</strong>', $variables).'</li><li>'.
+                           t('the !delete_own_forum_topics or !delete_any_forum_topics (and similar) permissions (<strong>OR <em>Delete</em></strong>) if desired;', $variables).'</li><li>'.
+                           t('the !administer_comments (global!) permission <strong>OR <em>Edit</em>/<em>Delete</em></strong> to be able to edit/delete comments;', $variables).'</li><li>'.
+                           t('the !administer_forums permission <strong>AND <em>View</em></strong> to be able to administer forums (and change access!).', $variables).'</li></ul>'.
+                           t('Furthermore note that content which is not published is treated in a different way by Drupal: it can be viewed only by its author or by users with the !administer_nodes permission. Unpublished comments and replies are accessible to users with <strong><em>Edit</em> OR <em>Delete</em></strong>, <strong>OR</strong> with the !administer_comments permission, but they are never counted on the forum page.', $variables).'</div>',
     );
   }
 
@@ -82,7 +82,7 @@ 
       '#collapsed' => empty($template_tid),
   );
   $form['forum_access']['template']['taxonomy'][$vid] = taxonomy_form($vid, array($template_tid), '');
-  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['. t('Load') .']'));
+  $form['forum_access']['template']['taxonomy'][$vid]['#description'] = t("Select a forum and click !Load to retrieve that forum's settings as a starting point for this forum or container.", array('!Load' => '['.t('Load').']'));
   $form['forum_access']['template']['load_button'] = array(
     '#type' => 'button',
     '#name' => 'load_template',
@@ -205,7 +205,7 @@ 
     );
   }
 
-  drupal_add_css(drupal_get_path('module', 'forum_access') .'/forum_access.css');
+  drupal_add_css(drupal_get_path('module', 'forum_access').'/forum_access.css');
 
   // Find our moderator ACL:
   if (isset($tid)) {  // edit, not new
@@ -222,12 +222,12 @@ 
     $form['forum_access']['acl'] = acl_edit_form($acl_id, t('Moderators'));
     $form['forum_access']['acl'][] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Moderators receive all grants above.') .'</div>',
+      '#value' => '<div>'.t('Moderators receive all grants above.').'</div>',
       '#weight' => -1,
     );
     $form['forum_access']['acl']['note'] = array(
       '#type' => 'markup',
-      '#value' => '<div>'. t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))) .'</div>',
+      '#value' => '<div>'.t('Note: Changes to moderators are not saved until you click [!Save] below.', array('!Save' => $tr('Save'))).'</div>',
     );
     $form['forum_access']['acl']['#after_build'][] = '_forum_access_forum_form_after_build_acl0';
     $form['forum_access']['acl']['#after_build'] = array_reverse($form['forum_access']['acl']['#after_build']);
@@ -251,11 +251,11 @@ 
       '!Content_Access' => l('Content Access', 'http://drupal.org/project/content_access'),
       '@Content_Access' => 'Content Access',
       '!ACL' => 'ACL',
-      '!module_list' => '<ul><li>'. implode($na_modules, '</li><li>') .'</li></ul>',
+      '!module_list' => '<ul><li>'.implode($na_modules, '</li><li>').'</li></ul>',
     );
     $form['forum_access']['interference'][] = array(
       '#type' => 'item',
-      '#value' => '<p>'. t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables) .'</p>',
+      '#value' => '<p>'.t("Besides !Forum_Access (and !ACL) you have installed the following node access module(s): !module_list   The grants of every module are combined for each node. Access can only be granted, not removed &mdash; if a certain module grants a permission, the other(s) cannot deny it.", $variables).'</p>',
       '#description' => t('Forums can contain other content types besides %content_type; !Forum_Access will contribute the grants defined above to every node in this forum, but other node access control modules may also contribute their grants, especially to nodes of types other than %content_type.', $variables),
     );
 
@@ -282,25 +282,25 @@ 
           '#attributes' => array('class' => 'error'),
         );
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables) ." $specifically</div>",
+          '#value' => '<div>'.t('You have set the !Content_Access module to control access to content of type %content_type&mdash;this can interfere with proper operation of !Forum_Access!', $variables)." $specifically</div>",
         );
         if ($ca_priority == $fa_priority) {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables) .'</div>',
+            '#value' => '<div>'.t("Unless you really know what you're doing, we recommend that you go to the !link page and clear all checkboxes. This will instruct @Content_Access to leave the %content_type nodes alone. However, if you put nodes of other content types into forums as well, then these content types will continue to have this problem.", $variables).'</div>',
           );
         }
         else {
           $form['forum_access']['interference']['by_content_access'][] = array(
-            '#value' => '<div>'. t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables) .'</div>',
+            '#value' => '<div>'.t("The priority of @Content_Access ($ca_priority) is higher than the priority of !Forum_Access ($fa_priority), which means the latter is <strong>completely disabled</strong> for the %content_type type! Unless you really know what you're doing, we recommend that you go to the !link page, change the priority (under %Advanced) to 0, and clear all checkboxes.", $variables).'</div>',
           );
         }
         $form['forum_access']['interference']['by_content_access'][] = array(
-          '#value' => '<div>'. t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables) .'</div>',
+          '#value' => '<div>'.t("Alternatively, you can give !Forum_Access priority over @Content_Access by either raising the priority of !Forum_Access in every forum above the priority of @Content_Access, or by lowering the priority of @Content_Access for the content types in question below the priority of !Forum_Access.", $variables).'</div>',
         );
       }
       else {
         $form['forum_access']['interference'][] = array(
-          '#value' => '<p>'. t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables) .'</p>',
+          '#value' => '<p>'.t('Note: You have installed the !Content_Access module, which has the capability to grant access to content that would otherwise be protected by !Forum_Access. Be careful when configuring @Content_Access!', $variables).'</p>',
         );
       }
     }
@@ -331,7 +331,7 @@ 
       '!DNA'                 => 'DNA',
       '!debug_mode'          => l('debug mode', 'admin/settings/devel', array('fragment' => 'edit-devel-node-access-debug-mode')),
       '!dna_summary'         => l('devel/node_access/summary', 'devel/node_access/summary'),
-      '!Rebuild_permissions' => '['. $tr('Rebuild permissions') .']',
+      '!Rebuild_permissions' => '['.$tr('Rebuild permissions').']',
       '!Post_settings_link'  => l('admin/content/node-settings', 'admin/content/node-settings'),
       '!Forum_Access_'       => l('Forum Access', 'http://drupal.org/project/issues/forum_access'),
       '!ACL_'                => l('ACL', 'http://drupal.org/project/issues/acl'),
@@ -344,26 +344,26 @@ 
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'.    t("In case of problems, follow these steps until you've got it worked out:") .'<ol style="margin-top: 0"><li>'.
-                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables) .'</li><li>'.
-        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables) .'</li><li>' : '') .
-                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables) .'</li><li>'.
-                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables) .'</li><li>'.
-                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables) .'</li><li>'.
-                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables) .'</li><li>'.
-                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables) .'</li><li>'.
-                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.") .'</li></ol></div>',
+      '#value' => '<div>'.t("In case of problems, follow these steps until you've got it worked out:").'<ol style="margin-top: 0"><li>'.
+                              t("Update to the 'recommended' !Forum_Access and !ACL releases for your version of Drupal.", $variables).'</li><li>'.
+        (count($na_modules) ? t("Read %Module_interference above and update your other node access modules.", $variables).'</li><li>' : '').
+                              t("Check the release notes of the development snapshots for issues that might have been fixed in !Forum_Access-dev or !ACL-dev since the latest release.", $variables).'</li><li>'.
+                              t("Install the %devel_node_access module (!DNA, part of the !Devel module) and enable its !debug_mode: !DNA will show you all the grants that actually control your nodes in a footer block on each node's page.", $variables).'</li><li>'.
+                              t("Additional insight can be gained from !dna_summary and by enabling the second !DNA block.", $variables).'</li><li>'.
+                              t("Click !Rebuild_permissions on !Post_settings_link and check DNA for changes.", $variables).'</li><li>'.
+                              t("Check the issues queues of !Forum_Access_ and !ACL_ for existing reports and possible solutions.", $variables).'</li><li>'.
+                              t("If all of this hasn't helped, then pick ONE node that is misbehaving, look at it using an account that can see the node (and that should NOT have access if that's your problem!), create a new issue in the issues queue, describe the problem... <ul><li> what did you do? </li><li> what did you expect? </li><li> what happened instead? </li></ul> ... and <strong>attach a screenshot of all the DNA records</strong> for that one node. <br /> Be sure to indicate paths (URLs) for every page and module that you mention.").'</li></ol></div>',
     );
     $form['forum_access']['troubleshooting'][] = array(
       '#type' => 'item',
-      '#value' => '<div>'. t("Note: You should not keep the !Devel module enabled on a production site.", $variables) .'</div>',
+      '#value' => '<div>'.t("Note: You should not keep the !Devel module enabled on a production site.", $variables).'</div>',
     );
   }
 
   if (!$is_container && isset($tid) && !node_access_needs_rebuild()) {
     $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
-    $limit = 20;   // from _node_access_rebuild_batch_operation()
-    $threshold = variable_get('forum_access_batch_threshold', $limit);  // change the variable if you want
+    $limit = 20; // from _node_access_rebuild_batch_operation()
+    $threshold = variable_get('forum_access_batch_threshold', $limit); // change the variable if you want
     $form['forum_access']['update_limit'] = array(
       '#type' => 'value',
       '#value' => $limit,
@@ -441,7 +441,7 @@ 
   $element_children = element_children($element);
   foreach ($element_children as $rid) {
     if ($rid == $moderator_rid) {
-      $element[$rid]['#prefix'] = '<span title="'. t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')) .'" class="forum-access-temporary-moderator">';
+      $element[$rid]['#prefix'] = '<span title="'.t("This is the (temporary) @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and is only used temporarily by @Forum_Access &mdash; do NOT give this role to any user!", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments'), '@Forum_Access' => 'Forum Access')).'" class="forum-access-temporary-moderator">';
       $element[$rid]['#suffix'] = "</span>";
       $element[$rid]['#default_value'] = TRUE;
       $element[$rid]['#disabled'] = TRUE;
@@ -452,19 +452,19 @@ 
     elseif ($element['#parents'][1] == 'comment_create') {
     }
     elseif ($element['#parents'][1] == 'view' && isset($permissions[$rid]['administer forums'])) {
-      $element[$rid]['#title'] = '<em>'. $element[$rid]['#title'] .'</em>';
-      $element[$rid]['#prefix'] = '<span title="'. t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))) .'">';
+      $element[$rid]['#title'] = '<em>'.$element[$rid]['#title'].'</em>';
+      $element[$rid]['#prefix'] = '<span title="'.t("This role has the '@administer_forums' permission, and granting '@View' enables the role holders to change the settings on this page, including @Access_control!", array('@administer_forums' => $tr('administer forums'), '@View' => t('View'), '@Access_control' => t('Access control'))).'">';
       if (isset($permissions[$rid]['administer nodes'])) {
-        $element[$rid]['#prefix'] = str_replace('">', ' '. t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))) .'">', $element[$rid]['#prefix']);
+        $element[$rid]['#prefix'] = str_replace('">', ' '.t("Because the role also has the '@administer_nodes' permission, it has full access to all nodes either way.", array('@administer_nodes' => $tr('administer nodes'))).'">', $element[$rid]['#prefix']);
       }
       $element[$rid]['#suffix'] = "</span>";
     }
     elseif (isset($permissions[$rid]['administer nodes'])) {
       $element[$rid]['#disabled'] = TRUE;
       $element[$rid]['#default_value'] = TRUE;
-      $element[$rid]['#prefix'] = '<span title="'. ($rid != $moderator_rid
+      $element[$rid]['#prefix'] = '<span title="'.($rid != $moderator_rid
                                                     ? t("This role has the '@administer_nodes' permission and thus full access to all nodes.", array('@administer_nodes' => $tr('administer nodes')))
-                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))) .'">';
+                                                    : t("This is the @Forum_Moderator role; it has the '@administer_nodes' and '@administer_comments' permissions and thus full access to all nodes and comments.", array('@Forum_Moderator' => t('Forum Moderator'), '@administer_nodes' => $tr('administer nodes'), '@administer_comments' => $tr('administer comments')))).'">';
       $element[$rid]['#suffix'] = "</span>";
     }
   }
@@ -560,12 +560,12 @@ 
     variable_del('forum_access_new_template_tid');
   }
   module_load_include('node.inc', 'forum_access');
-  $moderator_rid = _forum_access_get_moderator_rid(TRUE);  // create the moderators role if it doesn't exist
+  $moderator_rid = _forum_access_get_moderator_rid(TRUE); // create the moderators role if it doesn't exist
 
   // check for changes
   $is_changed = $is_new = strpos($_GET['q'], 'admin/content/forum/add/') === 0;
   $is_changed = $is_changed || !empty($access['force_update']);
-  $form_initial_values = $form;  // avoid Coder warning
+  $form_initial_values = $form; // avoid Coder warning
   $form_initial_values = $form_initial_values['forum_access'];
   foreach (array('view', 'create', 'comment_create', 'update', 'delete') as $grant_type) {
     if (isset($form_initial_values[$grant_type])) {
@@ -610,11 +610,11 @@ 
     }
     else {
       db_query("INSERT INTO {forum_access} (tid, rid, grant_view, grant_update, grant_delete, grant_create, grant_comment_create, priority) VALUES (%d, %d, %d, %d, %d, %d, %d, %d)",
-      $tid, $rid, (bool) $checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
+      $tid, $rid, (bool)$checked, !empty($access['update'][$rid]), !empty($access['delete'][$rid]), !empty($access['create'][$rid]), !empty($access['comment_create'][$rid]), $fa_priority);
     }
   }
   $tr = 't';
-  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'. $tid);
+  $link = l($tr('edit'), 'admin/content/forum/edit/forum/'.$tid);
   watchdog('access', 'Changed grants for %forum forum.', array('%forum' => $form_state['values']['name']), WATCHDOG_NOTICE, $link);
 
   if (!$is_new && $form_state['values']['form_id'] != 'forum_form_container') {
@@ -628,10 +628,10 @@ 
       $context = array();
       $pending_error_messages = drupal_get_messages('error', FALSE);
       $our_error_message_index = (isset($pending_error_messages['error']) ? count($pending_error_messages['error']) : 0);
-      _forum_access_update_batch_finished(FALSE, array(), array());       // add our error message (in case we die underway)
+      _forum_access_update_batch_finished(FALSE, array(), array()); // add our error message (in case we die underway)
       _forum_access_update_batch_operation($tid, 999999, 1, $context);
-      $pending_error_messages = drupal_get_messages('error', TRUE);       // still alive, get and clear all 'error' messages
-      unset($pending_error_messages['error'][$our_error_message_index]);  // remove our error message
+      $pending_error_messages = drupal_get_messages('error', TRUE); // still alive, get and clear all 'error' messages
+      unset($pending_error_messages['error'][$our_error_message_index]); // remove our error message
       foreach ($pending_error_messages['error'] as $message) {            // replay any others
         drupal_set_message($message, 'error');
       }
@@ -644,7 +644,7 @@ 
       $count = db_result(db_query("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON tn.vid = n.vid WHERE tn.tid = %d", $tid));
       $batch = array(
         'title' => t('Updating content access permissions'),
-        'file' => drupal_get_path('module', 'forum_access') .'/forum_access.admin.inc',
+        'file' => drupal_get_path('module', 'forum_access').'/forum_access.admin.inc',
         'operations' => array(
           array('_forum_access_update_batch_operation', array($tid, $limit, $count)),
         ),
@@ -654,7 +654,7 @@ 
     }
   }
 
-  variable_del('forum_access_rids');  // clear cache
+  variable_del('forum_access_rids'); // clear cache
 }
 
 /**
@@ -687,7 +687,7 @@ 
 
   // Multistep processing : report progress.
   if ($context['sandbox']['progress'] != $context['sandbox']['max']) {
-    $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max'];
+    $context['finished'] = $context['sandbox']['progress']/$context['sandbox']['max'];
   }
 }
 
@@ -829,8 +829,8 @@ 
   );
   if (arg(3) == 'forum') {
     drupal_set_message(t('Note: In Drupal, access can only be granted, not taken away. Whatever access you grant here will not be reflected in the !Forum_Access_link settings, but !Forum_Access can only allow <i>more</i> access, not less.', $variables)
-      .'<br /><span class="error">'. t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables) .'</span>'
-      .'<br />'. t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
+      .'<br /><span class="error">'.t('Specifically, any rights granted to the %anonymous_user and/or the %authenticated_user will <b>override</b> the settings of !Forum_Access!', $variables).'</span>'
+      .'<br />'.t('To avoid conflicts with !Forum_Access settings, you may want to lower the priority of !Content_Access (under %Advanced below) below the priority of !Forum_Access for the content types that you want to be controlled by !Forum_Access.', $variables), 'warning');
   }
   else {
     $vid = _forum_access_get_vid();
@@ -893,7 +893,7 @@ 
   if (isset($moderator_rid) && isset($form['account']['roles']['#options'][$moderator_rid])) {
     $form['account']['roles'][$moderator_rid] = array(
       '#type' => 'checkbox',
-      '#title' => $form['account']['roles']['#options'][$moderator_rid] .' ('. t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')) .')',
+      '#title' => $form['account']['roles']['#options'][$moderator_rid].' ('.t('reserved for internal use by the @Forum_Access module', array('@Forum_Access' => 'Forum Access')).')',
       '#default_value' => in_array($moderator_rid, $form['account']['roles']['#default_value']),
       '#disabled' => TRUE,
     );
@@ -930,8 +930,8 @@ 
     else {
       $msg = t('!Forum_Access cannot create the %role role!', $variables);
       watchdog('user', $msg, NULL, WATCHDOG_WARNING);
-      drupal_set_message($msg .' '. t('Is it already in use?'), 'error');
-      $role->name = $role_name .' '. $i;
+      drupal_set_message($msg.' '.t('Is it already in use?'), 'error');
+      $role->name = $role_name.' '.$i;
     }
   }
   $msg = t('!Forum_Access has given up and will not work correctly! Rename one of the roles listed above, so that !Forum_Access can use its name.', $variables);

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

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 +10 added lines, -10 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();
@@ -417,10 +417,10 @@ 
   }
   if (empty($comment)) {
     // Check links for the node.
-    if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create') && !(forum_access_access($tid, 'create') and ($node->uid==$user->uid)) ) {
+    if ($tid && isset($links['comment_add']) && !forum_access_access($tid, 'comment_create') && !(forum_access_access($tid, 'create') and ($node->uid == $user->uid))) {
       unset($links['comment_add']);
       // Hack to manually remove quote link
-      if ( isset($links['quote']) ) {
+      if (isset($links['quote'])) {
           unset($links['quote']);
       }
     }
@@ -433,7 +433,7 @@ 
       'delete' => 'comment_delete',
     );
     foreach ($required_keys as $access => $key) {
-      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid==$user->uid)) ) {
+      if (!forum_access_access($tid, $access) && !($access == 'update' && comment_access('edit', $comment)) && !($access == 'comment_create' && forum_access_access($tid, 'create') && ($node->uid == $user->uid))) {
         unset($links[$required_keys[$access]]);
         unset($required_keys[$access]);
       }
@@ -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;

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

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/i18nviews.module

Switch Indentation +10 added lines, -10 removed lines

@@ -15,10 +15,10 @@ 
  */
 function i18nviews_help($path, $arg) {
   switch ($path) {
-    case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
-      return $output;
+  case 'admin/modules#description' :
+    $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
+    $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+    return $output;
   }
 }
 
@@ -27,12 +27,12 @@ 
  */
 function i18nviews_locale($op = 'groups') {
   switch ($op) {
-    case 'groups':
-      return array('views' => t('Views'));
-    case 'info':
-      $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
-      $info['views']['format'] = TRUE;
-      return $info;
+  case 'groups':
+    return array('views' => t('Views'));
+  case 'info':
+    $info['views']['refresh callback'] = 'i18nviews_locale_refresh';
+    $info['views']['format'] = TRUE;
+    return $info;
   }
 }
 

Spacing +7 added lines, -7 removed lines

@@ -16,8 +16,8 @@ 
 function i18nviews_help($path, $arg) {
   switch ($path) {
     case 'admin/modules#description' :
-      $output = '<p>'. t('Supports translation for views strings: title, header, footer...') .'</p>';
-      $output .= '<p>'. t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))) .'</p>';
+      $output = '<p>'.t('Supports translation for views strings: title, header, footer...').'</p>';
+      $output .= '<p>'.t('To search and translate strings, use the <a href="@translate-interface">translation interface</a> pages.', array('@translate-interface' => url('admin/build/translate'))).'</p>';
       return $output;
   }
 }
@@ -89,7 +89,7 @@ 
 function i18nviews_views_api() {
   return array(
     'api' => '2.0',
-    'path' => drupal_get_path('module', 'i18nviews') . '/includes',
+    'path' => drupal_get_path('module', 'i18nviews').'/includes',
   );
 }
 
@@ -110,10 +110,10 @@ 
     // Also checking weird values for $display_id, see 277711
     if (!empty($view->display) && is_array($view->display) && is_string($display_id)) {
       $fields = _i18nviews_display_fields();
-      if(!empty($view->display[$display_id])) {
+      if (!empty($view->display[$display_id])) {
         $fields = _i18nviews_localize_array($view->name, $display_id, $view->display[$display_id]->handler->options, $fields);
       }
-      if($fields && !empty($view->display['default'])) {
+      if ($fields && !empty($view->display['default'])) {
         _i18nviews_localize_array($view->name, 'default', $view->display['default']->handler->options, $fields);
       }      
     }
@@ -159,7 +159,7 @@ 
   foreach ($field_names as $field) {
     if (!empty($data[$field])) {
       if ($update) {
-        $format = isset($data[$field . '_format']) ? $data[$field . '_format'] : NULL;
+        $format = isset($data[$field.'_format']) ? $data[$field.'_format'] : NULL;
         i18nstrings_update("views:$name:$group:$field", $data[$field], $format);
       }
       else {
@@ -209,7 +209,7 @@ 
     if (isset($form_state['values'][$field])) {
       $name = $form_state['view']->name;
       $group = $form_state['display_id'];
-      $format = isset($form_state['values'][$field . '_format']) ? $form_state['values'][$field . '_format'] : NULL;
+      $format = isset($form_state['values'][$field.'_format']) ? $form_state['values'][$field.'_format'] : NULL;
       i18nstrings_update("views:$name:$group:$field", $form_state['values'][$field], $format);
     }
   }

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/jwysiwyg.inc

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
  *   The installed editor version.
  */
 function wysiwyg_jwysiwyg_version($editor) {
-  $script = $editor['library path'] . '/jquery.wysiwyg.js';
+  $script = $editor['library path'].'/jquery.wysiwyg.js';
   if (!file_exists($script)) {
     return;
   }

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/fckeditor.inc

Spacing +11 added lines, -11 removed lines

@@ -50,7 +50,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
-  $library = $editor['library path'] . '/fckeditor.js';
+  $library = $editor['library path'].'/fckeditor.js';
   if (!file_exists($library)) {
     return;
   }
@@ -98,9 +98,9 @@ 
  */
 function wysiwyg_fckeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'EditorPath' => base_path() . $editor['library path'] . '/',
-    'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/',
-    'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
+    'EditorPath' => base_path().$editor['library path'].'/',
+    'SkinPath' => base_path().$editor['library path'].'/editor/skins/'.$theme.'/',
+    'CustomConfigurationsPath' => base_path().drupal_get_path('module', 'wysiwyg').'/editors/js/fckeditor.config.js',
     'Width' => '100%',
     'Height' => 420,
     'LinkBrowser' => FALSE,
@@ -180,7 +180,7 @@ 
       // Add path for native external plugins; internal ones do not need a path.
       if (empty($plugin['internal']) && isset($plugin['path'])) {
         // All native FCKeditor plugins use the filename fckplugin.js.
-        $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
+        $settings[$name]['path'] = base_path().$plugin['path'].'/';
       }
       if (!empty($plugin['languages'])) {
         $settings[$name]['languages'] = $plugin['languages'];
@@ -199,10 +199,10 @@ 
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
       'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+      'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'],
       'iconTitle' => $plugin['icon title'],
       // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+      'css' => base_path().$plugin['css path'].'/'.$plugin['css file'],
     );
   }
   return $settings;
@@ -244,7 +244,7 @@ 
       'internal' => TRUE,
     ),
     'autogrow' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'autogrow' => t('Autogrow'),
       ),
@@ -255,7 +255,7 @@ 
       'load' => TRUE,
     ),
     'bbcode' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'bbcode' => t('BBCode'),
       ),
@@ -263,7 +263,7 @@ 
       'load' => TRUE,
     ),
     'dragresizetable' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
       ),
@@ -271,7 +271,7 @@ 
       'load' => TRUE,
     ),
     'tablecommands' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
+      'path' => $editor['library path'].'/editor/plugins',
       'buttons' => array(
         'TableCellProp' => t('Table: Cell properties'),
         'TableInsertRowAfter' => t('Table: Insert row after'),

drupal/sites/default/boinc/modules/contrib/wysiwyg/editors/wymeditor.inc

Spacing +6 added lines, -6 removed lines

@@ -13,7 +13,7 @@ 
     'title' => 'WYMeditor',
     'vendor url' => 'http://www.wymeditor.org/',
     'download url' => 'http://www.wymeditor.org/download/',
-    'library path' => wysiwyg_get_path('wymeditor') . '/wymeditor',
+    'library path' => wysiwyg_get_path('wymeditor').'/wymeditor',
     'libraries' => array(
       'min' => array(
         'title' => 'Minified',
@@ -51,7 +51,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_wymeditor_version($editor) {
-  $script = $editor['library path'] . '/jquery.wymeditor.js';
+  $script = $editor['library path'].'/jquery.wymeditor.js';
   if (!file_exists($script)) {
     return;
   }
@@ -99,10 +99,10 @@ 
   // @todo Setup $library in wysiwyg_load_editor() already.
   $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
   $settings = array(
-    'basePath' => base_path() . $editor['library path'] . '/',
+    'basePath' => base_path().$editor['library path'].'/',
     'wymPath' => $editor['libraries'][$library]['files'][0],
     // @todo Does not work in Drupal; jQuery can live anywhere.
-    'jQueryPath' => base_path() . 'misc/jquery.js',
+    'jQueryPath' => base_path().'misc/jquery.js',
     'updateSelector' => '.form-submit',
     'skin' => $theme,
   );
@@ -136,7 +136,7 @@ 
               $settings['toolsItems'][] = array(
                 'name' => $button,
                 'title' => $plugins[$plugin][$type][$button],
-                'css' => 'wym_tools_' . $button,
+                'css' => 'wym_tools_'.$button,
               );
             }
           }
@@ -163,7 +163,7 @@ 
         $settings['containersItems'][] = array(
           'name' => strtoupper($tag),
           'title' => $containers[$tag],
-          'css' => 'wym_containers_' . $tag,
+          'css' => 'wym_containers_'.$tag,
         );
       }
     }