BOINC / boinc

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

Indentation +29 added lines, -29 removed lines

@@ -9,26 +9,26 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_nicedit_editor() {
-  $editor['nicedit'] = array(
+    $editor['nicedit'] = array(
     'title' => 'NicEdit',
     'vendor url' => 'http://nicedit.com',
     'download url' => 'http://nicedit.com/download.php',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Source',
         'files' => array('nicEdit.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_nicedit_version',
     'settings callback' => 'wysiwyg_nicedit_settings',
     'plugin callback' => 'wysiwyg_nicedit_plugins',
     'versions' => array(
-      '0.9' => array(
+        '0.9' => array(
         'js files' => array('nicedit.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -41,8 +41,8 @@ 
  *   The installed editor version.
  */
 function wysiwyg_nicedit_version($editor) {
-  // @see http://nicedit.com/forums/viewtopic.php?t=425
-  return '0.9';
+    // @see http://nicedit.com/forums/viewtopic.php?t=425
+    return '0.9';
 }
 
 /**
@@ -60,43 +60,43 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_nicedit_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'iconsPath' => base_path() . $editor['library path'] . '/nicEditorIcons.gif',
-  );
+    );
 
-  // Add configured buttons or all available.
-  $settings['buttonList'] = array();
-  if (!empty($config['buttons'])) {
+    // Add configured buttons or all available.
+    $settings['buttonList'] = array();
+    if (!empty($config['buttons'])) {
     $buttons = array();
     foreach ($config['buttons'] as $plugin) {
-      $buttons = array_merge($buttons, $plugin);
+        $buttons = array_merge($buttons, $plugin);
     }
     $settings['buttonList'] = array_keys($buttons);
-  }
+    }
 
-  // Add editor content stylesheet.
-  if (isset($config['css_setting'])) {
+    // Add editor content stylesheet.
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $css = path_to_theme() . '/style.css';
-      if (file_exists($css)) {
+        $css = path_to_theme() . '/style.css';
+        if (file_exists($css)) {
         $settings['externalCSS'] = base_path() . $css;
-      }
+        }
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+    }
     }
-  }
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_nicedit_plugins($editor) {
-  return array(
+    return array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
         'left' => t('Align left'), 'center' => t('Align center'), 'right' => t('Align right'),
@@ -111,9 +111,9 @@ 
         'link' => t('Link'), 'unlink' => t('Unlink'),
         'fontFormat' => t('HTML block format'), 'fontFamily' => t('Font'), 'fontSize' => t('Font size'),
         'xhtml' => t('Source code'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
+    );
 }
 

Spacing +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
  */
 function wysiwyg_nicedit_settings($editor, $config, $theme) {
   $settings = array(
-    'iconsPath' => base_path() . $editor['library path'] . '/nicEditorIcons.gif',
+    'iconsPath' => base_path().$editor['library path'].'/nicEditorIcons.gif',
   );
 
   // Add configured buttons or all available.
@@ -77,9 +77,9 @@ 
   // Add editor content stylesheet.
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $css = path_to_theme() . '/style.css';
+      $css = path_to_theme().'/style.css';
       if (file_exists($css)) {
-        $settings['externalCSS'] = base_path() . $css;
+        $settings['externalCSS'] = base_path().$css;
       }
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {

Braces +1 added lines, -2 removed lines

@@ -108,8 +108,7 @@
       if (file_exists($css)) {
         $settings['externalCSS'] = base_path() . $css;
       }
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }

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

@@ -112,7 +112,7 @@
         'fontFormat' => t('HTML block format'), 'fontFamily' => t('Font'), 'fontSize' => t('Font size'),
         'xhtml' => t('Source code'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
 }

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

Indentation +290 added lines, -290 removed lines

@@ -11,20 +11,20 @@ 
  * @todo wysiwyg_<editor>_alter() to add/inject optional libraries like gzip.
  */
 function wysiwyg_tinymce_editor() {
-  $editor['tinymce'] = array(
+    $editor['tinymce'] = array(
     'title' => 'TinyMCE',
     'vendor url' => 'http://tinymce.moxiecode.com',
     'download url' => 'http://tinymce.moxiecode.com/download.php',
     'library path' => wysiwyg_get_path('tinymce') . '/jscripts/tiny_mce',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Minified',
         'files' => array('tiny_mce.js'),
-      ),
-      'src' => array(
+        ),
+        'src' => array(
         'title' => 'Source',
         'files' => array('tiny_mce_src.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_tinymce_version',
     'themes callback' => 'wysiwyg_tinymce_themes',
@@ -32,42 +32,42 @@ 
     'plugin callback' => 'wysiwyg_tinymce_plugins',
     'plugin settings callback' => 'wysiwyg_tinymce_plugin_settings',
     'proxy plugin' => array(
-      'drupal' => array(
+        'drupal' => array(
         'load' => TRUE,
         'proxy' => TRUE,
-      ),
+        ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_tinymce_proxy_plugin_settings',
     'versions' => array(
-      '2.1' => array(
+        '2.1' => array(
         'js files' => array('tinymce-2.js'),
         'css files' => array('tinymce-2.css'),
         'download url' => 'http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430&release_id=557383',
-      ),
-      // @todo Starting from 3.3, tiny_mce.js may support JS aggregation.
-      '3.1' => array(
+        ),
+        // @todo Starting from 3.3, tiny_mce.js may support JS aggregation.
+        '3.1' => array(
         'js files' => array('tinymce-3.js'),
         'css files' => array('tinymce-3.css'),
         'libraries' => array(
-          '' => array(
+            '' => array(
             'title' => 'Minified',
             'files' => array(
-              'tiny_mce.js' => array('preprocess' => FALSE),
+                'tiny_mce.js' => array('preprocess' => FALSE),
             ),
-          ),
-          'jquery' => array(
+            ),
+            'jquery' => array(
             'title' => 'jQuery',
             'files' => array('tiny_mce_jquery.js'),
-          ),
-          'src' => array(
+            ),
+            'src' => array(
             'title' => 'Source',
             'files' => array('tiny_mce_src.js'),
-          ),
+            ),
+        ),
         ),
-      ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -80,19 +80,19 @@ 
  *   The installed editor version.
  */
 function wysiwyg_tinymce_version($editor) {
-  $script = $editor['library path'] . '/tiny_mce.js';
-  if (!file_exists($script)) {
+    $script = $editor['library path'] . '/tiny_mce.js';
+    if (!file_exists($script)) {
     return;
-  }
-  $script = fopen($script, 'r');
-  // Version is contained in the first 200 chars.
-  $line = fgets($script, 200);
-  fclose($script);
-  // 2.x: this.majorVersion="2";this.minorVersion="1.3"
-  // 3.x: majorVersion:'3',minorVersion:'2.0.1'
-  if (preg_match('@majorVersion[=:]["\'](\d).+?minorVersion[=:]["\']([\d\.]+)@', $line, $version)) {
+    }
+    $script = fopen($script, 'r');
+    // Version is contained in the first 200 chars.
+    $line = fgets($script, 200);
+    fclose($script);
+    // 2.x: this.majorVersion="2";this.minorVersion="1.3"
+    // 3.x: majorVersion:'3',minorVersion:'2.0.1'
+    if (preg_match('@majorVersion[=:]["\'](\d).+?minorVersion[=:]["\']([\d\.]+)@', $line, $version)) {
     return $version[1] . '.' . $version[2];
-  }
+    }
 }
 
 /**
@@ -108,7 +108,7 @@ 
  *   theme name.
  */
 function wysiwyg_tinymce_themes($editor, $profile) {
-  /*
+    /*
   $themes = array();
   $dir = $editor['library path'] . '/themes/';
   if (is_dir($dir) && $dh = opendir($dir)) {
@@ -122,7 +122,7 @@ 
   }
   return $themes;
   */
-  return array('advanced', 'simple');
+    return array('advanced', 'simple');
 }
 
 /**
@@ -140,7 +140,7 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_tinymce_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'button_tile_map' => TRUE, // @todo Add a setting for this.
     'document_base_url' => base_path(),
     'mode' => 'none',
@@ -158,49 +158,49 @@ 
     // HTML control characters and invisible characters. TinyMCE always converts
     // XML default characters '&', '<', '>'.
     'entities' => '160,nbsp,173,shy,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm',
-  );
-  if (isset($config['apply_source_formatting'])) {
+    );
+    if (isset($config['apply_source_formatting'])) {
     $settings['apply_source_formatting'] = $config['apply_source_formatting'];
-  }
-  if (isset($config['convert_fonts_to_spans'])) {
+    }
+    if (isset($config['convert_fonts_to_spans'])) {
     $settings['convert_fonts_to_spans'] = $config['convert_fonts_to_spans'];
-  }
-  if (isset($config['language'])) {
+    }
+    if (isset($config['language'])) {
     $settings['language'] = $config['language'];
-  }
-  if (isset($config['paste_auto_cleanup_on_paste'])) {
+    }
+    if (isset($config['paste_auto_cleanup_on_paste'])) {
     $settings['paste_auto_cleanup_on_paste'] = $config['paste_auto_cleanup_on_paste'];
-  }
-  if (isset($config['preformatted'])) {
+    }
+    if (isset($config['preformatted'])) {
     $settings['preformatted'] = $config['preformatted'];
-  }
-  if (isset($config['remove_linebreaks'])) {
+    }
+    if (isset($config['remove_linebreaks'])) {
     $settings['remove_linebreaks'] = $config['remove_linebreaks'];
-  }
-  if (isset($config['verify_html'])) {
+    }
+    if (isset($config['verify_html'])) {
     $settings['verify_html'] = (bool) $config['verify_html'];
-  }
+    }
 
-  if (!empty($config['css_classes'])) {
+    if (!empty($config['css_classes'])) {
     $settings['theme_advanced_styles'] = implode(';', array_filter(explode("\n", str_replace("\r", '', $config['css_classes']))));
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $settings['content_css'] = implode(',', wysiwyg_get_css());
+        $settings['content_css'] = implode(',', wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+    }
     }
-  }
 
-  // Find the enabled buttons and the button row they belong on.
-  // Also map the plugin metadata for each button.
-  // @todo What follows is a pain; needs a rewrite.
-  // $settings['buttons'] are stacked into $settings['theme_advanced_buttons1']
-  // later.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons']) && is_array($config['buttons'])) {
+    // Find the enabled buttons and the button row they belong on.
+    // Also map the plugin metadata for each button.
+    // @todo What follows is a pain; needs a rewrite.
+    // $settings['buttons'] are stacked into $settings['theme_advanced_buttons1']
+    // later.
+    $settings['buttons'] = array();
+    if (!empty($config['buttons']) && is_array($config['buttons'])) {
     // Only array keys in $settings['extensions'] matter; added to
     // $settings['plugins'] later.
     $settings['extensions'] = array();
@@ -213,54 +213,54 @@ 
 
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
+        foreach ($buttons as $button => $enabled) {
         // Iterate separately over buttons and extensions properties.
         foreach (array('buttons', 'extensions') as $type) {
-          // Skip unavailable plugins.
-          if (!isset($plugins[$plugin][$type][$button])) {
+            // Skip unavailable plugins.
+            if (!isset($plugins[$plugin][$type][$button])) {
             continue;
-          }
-          // Add buttons.
-          if ($type == 'buttons') {
+            }
+            // Add buttons.
+            if ($type == 'buttons') {
             $settings['buttons'][] = $button;
-          }
-          // Add external Drupal plugins to the list of extensions.
-          if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
+            }
+            // Add external Drupal plugins to the list of extensions.
+            if ($type == 'buttons' && !empty($plugins[$plugin]['proxy'])) {
             $settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $button)] = 1;
-          }
-          // Add external plugins to the list of extensions.
-          else if ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
+            }
+            // Add external plugins to the list of extensions.
+            else if ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
             $settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $plugin)] = 1;
-          }
-          // Add internal buttons that also need to be loaded as extension.
-          else if ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add internal buttons that also need to be loaded as extension.
+            else if ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
             $settings['extensions'][$plugin] = 1;
-          }
-          // Add plain extensions.
-          else if ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add plain extensions.
+            else if ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
             $settings['extensions'][$plugin] = 1;
-          }
-          // Allow plugins to add valid HTML elements.
-          if (!empty($plugins[$plugin]['extended_valid_elements'])) {
+            }
+            // Allow plugins to add valid HTML elements.
+            if (!empty($plugins[$plugin]['extended_valid_elements'])) {
             $settings['extended_valid_elements'] = array_merge($settings['extended_valid_elements'], $plugins[$plugin]['extended_valid_elements']);
-          }
-          // Allow plugins to add or override global configuration settings.
-          if (!empty($plugins[$plugin]['options'])) {
+            }
+            // Allow plugins to add or override global configuration settings.
+            if (!empty($plugins[$plugin]['options'])) {
             $settings = array_merge($settings, $plugins[$plugin]['options']);
-          }
+            }
+        }
         }
-      }
     }
     // Clean-up.
     $settings['extended_valid_elements'] = array_unique($settings['extended_valid_elements']);
     if ($settings['extensions']) {
-      $settings['plugins'] = array_keys($settings['extensions']);
+        $settings['plugins'] = array_keys($settings['extensions']);
     }
     unset($settings['extensions']);
-  }
+    }
 
-  // Add theme-specific settings.
-  switch ($theme) {
+    // Add theme-specific settings.
+    switch ($theme) {
     case 'advanced':
       $settings += array(
         'theme_advanced_resize_horizontal' => FALSE,
@@ -269,36 +269,36 @@ 
         'theme_advanced_resizing' => isset($config['resizing']) ? $config['resizing'] : 1,
         'theme_advanced_toolbar_location' => isset($config['toolbar_loc']) ? $config['toolbar_loc'] : 'top',
         'theme_advanced_toolbar_align' => isset($config['toolbar_align']) ? $config['toolbar_align'] : 'left',
-      );
-      if (isset($config['block_formats'])) {
+        );
+        if (isset($config['block_formats'])) {
         $settings['theme_advanced_blockformats'] = $config['block_formats'];
-      }
-      if (isset($settings['buttons'])) {
+        }
+        if (isset($settings['buttons'])) {
         // These rows explicitly need to be set to be empty, otherwise TinyMCE
         // loads its default buttons of the advanced theme for each row.
         $settings += array(
-          'theme_advanced_buttons1' => array(),
-          'theme_advanced_buttons2' => array(),
-          'theme_advanced_buttons3' => array(),
+            'theme_advanced_buttons1' => array(),
+            'theme_advanced_buttons2' => array(),
+            'theme_advanced_buttons3' => array(),
         );
         // @todo Allow to sort/arrange editor buttons.
         for ($i = 0; $i < count($settings['buttons']); $i++) {
-          $settings['theme_advanced_buttons1'][] = $settings['buttons'][$i];
+            $settings['theme_advanced_buttons1'][] = $settings['buttons'][$i];
         }
-      }
-      break;
-  }
-  unset($settings['buttons']);
+        }
+        break;
+    }
+    unset($settings['buttons']);
 
-  // Convert the config values into the form expected by TinyMCE.
-  $csv_settings = array('plugins', 'extended_valid_elements', 'theme_advanced_buttons1', 'theme_advanced_buttons2', 'theme_advanced_buttons3');
-  foreach ($csv_settings as $key) {
+    // Convert the config values into the form expected by TinyMCE.
+    $csv_settings = array('plugins', 'extended_valid_elements', 'theme_advanced_buttons1', 'theme_advanced_buttons2', 'theme_advanced_buttons3');
+    foreach ($csv_settings as $key) {
     if (isset($settings[$key]) && is_array($settings[$key])) {
-      $settings[$key] = implode(',', $settings[$key]);
+        $settings[$key] = implode(',', $settings[$key]);
+    }
     }
-  }
 
-  return $settings;
+    return $settings;
 }
 
 /**
@@ -308,46 +308,46 @@ 
  * directory) are loaded (once) upon initializing the editor.
  */
 function wysiwyg_tinymce_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     if (!empty($plugin['load'])) {
-      // Add path for native external plugins; internal ones are loaded
-      // automatically.
-      if (empty($plugin['internal']) && isset($plugin['path'])) {
+        // Add path for native external plugins; internal ones are loaded
+        // automatically.
+        if (empty($plugin['internal']) && isset($plugin['path'])) {
         // TinyMCE plugins commonly use the filename editor_plugin.js, but there
         // is no default. Previously, Wysiwyg's API documentation suggested to
         // have the 'path' contain the 'filename' property, so if 'filename' is
         // not defined, automatically extract it from 'path' for backwards
         // compatibility.
         if (!isset($plugin['filename'])) {
-          $parts = explode('/', $plugin['path']);
-          $plugin['filename'] = array_pop($parts);
-          $plugin['path'] = implode('/', $parts);
+            $parts = explode('/', $plugin['path']);
+            $plugin['filename'] = array_pop($parts);
+            $plugin['path'] = implode('/', $parts);
         }
         $settings[$name] = base_path() . $plugin['path'] . '/' . $plugin['filename'];
-      }
+        }
     }
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Build a JS settings array for Drupal plugins loaded via the proxy plugin.
  */
 function wysiwyg_tinymce_proxy_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
-      'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
-      'iconTitle' => $plugin['icon title'],
+        'title' => $plugin['title'],
+        'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+        'iconTitle' => $plugin['icon title'],
     );
     if (isset($plugin['css file'])) {
-      $settings[$name]['css'] = base_path() . $plugin['css path'] . '/' . $plugin['css file'];
+        $settings[$name]['css'] = base_path() . $plugin['css path'] . '/' . $plugin['css file'];
     }
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
@@ -362,28 +362,28 @@ 
  *   A plugin name.
  */
 function _wysiwyg_tinymce_plugin_name($op, $name) {
-  if ($op == 'add') {
+    if ($op == 'add') {
     if (strpos($name, '-') !== 0) {
-      return '-' . $name;
+        return '-' . $name;
     }
     return $name;
-  }
-  else if ($op == 'remove') {
+    }
+    else if ($op == 'remove') {
     if (strpos($name, '-') === 0) {
-      return substr($name, 1);
+        return substr($name, 1);
     }
     return $name;
-  }
+    }
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_tinymce_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'path' => $editor['library path'] . '/themes/advanced',
-      'buttons' => array(
+        'path' => $editor['library path'] . '/themes/advanced',
+        'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
         'justifyleft' => t('Align left'), 'justifycenter' => t('Align center'), 'justifyright' => t('Align right'), 'justifyfull' => t('Justify'),
@@ -402,217 +402,217 @@ 
         'removeformat' => t('Remove format'),
         'charmap' => t('Character map'),
         'help' => t('Help'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
     'advhr' => array(
-      'path' => $editor['library path'] . '/plugins/advhr',
-      'buttons' => array('advhr' => t('Advanced horizontal rule')),
-      'extended_valid_elements' => array('hr[class|width|size|noshade]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/advhr',
+        'buttons' => array('advhr' => t('Advanced horizontal rule')),
+        'extended_valid_elements' => array('hr[class|width|size|noshade]'),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'advimage' => array(
-      'path' => $editor['library path'] . '/plugins/advimage',
-      'extensions' => array('advimage' => t('Advanced image')),
-      'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/advimage',
+        'extensions' => array('advimage' => t('Advanced image')),
+        'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'advlink' => array(
-      'path' => $editor['library path'] . '/plugins/advlink',
-      'extensions' => array('advlink' => t('Advanced link')),
-      'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/advlink',
+        'extensions' => array('advlink' => t('Advanced link')),
+        'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'autosave' => array(
-      'path' => $editor['library path'] . '/plugins/autosave',
-      'extensions' => array('autosave' => t('Auto save')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/autosave',
+        'extensions' => array('autosave' => t('Auto save')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'contextmenu' => array(
-      'path' => $editor['library path'] . '/plugins/contextmenu',
-      'extensions' => array('contextmenu' => t('Context menu')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/contextmenu',
+        'extensions' => array('contextmenu' => t('Context menu')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'directionality' => array(
-      'path' => $editor['library path'] . '/plugins/directionality',
-      'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/directionality',
+        'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'emotions' => array(
-      'path' => $editor['library path'] . '/plugins/emotions',
-      'buttons' => array('emotions' => t('Emotions')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/emotions',
+        'buttons' => array('emotions' => t('Emotions')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'font' => array(
-      'path' => $editor['library path'] . '/plugins/font',
-      'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
-      'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
-      'internal' => TRUE,
+        'path' => $editor['library path'] . '/plugins/font',
+        'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
+        'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
+        'internal' => TRUE,
     ),
     'fullscreen' => array(
-      'path' => $editor['library path'] . '/plugins/fullscreen',
-      'buttons' => array('fullscreen' => t('Fullscreen')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/fullscreen',
+        'buttons' => array('fullscreen' => t('Fullscreen')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'inlinepopups' => array(
-      'path' => $editor['library path'] . '/plugins/inlinepopups',
-      'extensions' => array('inlinepopups' => t('Inline popups')),
-      'options' => array(
+        'path' => $editor['library path'] . '/plugins/inlinepopups',
+        'extensions' => array('inlinepopups' => t('Inline popups')),
+        'options' => array(
         'dialog_type' => array('modal'),
-      ),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'insertdatetime' => array(
-      'path' => $editor['library path'] . '/plugins/insertdatetime',
-      'buttons' => array('insertdate' => t('Insert date'), 'inserttime' => t('Insert time')),
-      'options' => array(
+        'path' => $editor['library path'] . '/plugins/insertdatetime',
+        'buttons' => array('insertdate' => t('Insert date'), 'inserttime' => t('Insert time')),
+        'options' => array(
         'plugin_insertdate_dateFormat' => '%Y-%m-%d',
         'plugin_insertdate_timeFormat' => '%H:%M:%S',
-      ),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'layer' => array(
-      'path' => $editor['library path'] . '/plugins/layer',
-      'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/layer',
+        'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'paste' => array(
-      'path' => $editor['library path'] . '/plugins/paste',
-      'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/paste',
+        'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'preview' => array(
-      'path' => $editor['library path'] . '/plugins/preview',
-      'buttons' => array('preview' => t('Preview')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/preview',
+        'buttons' => array('preview' => t('Preview')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'print' => array(
-      'path' => $editor['library path'] . '/plugins/print',
-      'buttons' => array('print' => t('Print')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/print',
+        'buttons' => array('print' => t('Print')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'searchreplace' => array(
-      'path' => $editor['library path'] . '/plugins/searchreplace',
-      'buttons' => array('search' => t('Search'), 'replace' => t('Replace')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/searchreplace',
+        'buttons' => array('search' => t('Search'), 'replace' => t('Replace')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'style' => array(
-      'path' => $editor['library path'] . '/plugins/style',
-      'buttons' => array('styleprops' => t('Style properties')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/style',
+        'buttons' => array('styleprops' => t('Style properties')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'table' => array(
-      'path' => $editor['library path'] . '/plugins/table',
-      'buttons' => array('tablecontrols' => t('Table')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/table',
+        'buttons' => array('tablecontrols' => t('Table')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
-  );
-  if (version_compare($editor['installed version'], '3', '<')) {
+    );
+    if (version_compare($editor['installed version'], '3', '<')) {
     $plugins['flash'] = array(
-      'path' => $editor['library path'] . '/plugins/flash',
-      'buttons' => array('flash' => t('Flash')),
-      'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/flash',
+        'buttons' => array('flash' => t('Flash')),
+        'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
-  }
-  if (version_compare($editor['installed version'], '2.0.6', '>')) {
+    }
+    if (version_compare($editor['installed version'], '2.0.6', '>')) {
     $plugins['media'] = array(
-      'path' => $editor['library path'] . '/plugins/media',
-      'buttons' => array('media' => t('Media')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/media',
+        'buttons' => array('media' => t('Media')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
     $plugins['xhtmlxtras'] = array(
-      'path' => $editor['library path'] . '/plugins/xhtmlxtras',
-      'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/xhtmlxtras',
+        'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
-  }
-  if (version_compare($editor['installed version'], '3', '>')) {
+    }
+    if (version_compare($editor['installed version'], '3', '>')) {
     $plugins['bbcode'] = array(
-      'path' => $editor['library path'] . '/plugins/bbcode',
-      'extensions' => array('bbcode' => t('BBCode')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/bbcode',
+        'extensions' => array('bbcode' => t('BBCode')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
     if (version_compare($editor['installed version'], '3.3', '<')) {
-      $plugins['safari'] = array(
+        $plugins['safari'] = array(
         'path' => $editor['library path'] . '/plugins/safari',
         'extensions' => array('safari' => t('Safari compatibility')),
         'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
         'internal' => TRUE,
         'load' => TRUE,
-      );
+        );
     }
-  }
-  if (version_compare($editor['installed version'], '3.2.5', '>=')) {
+    }
+    if (version_compare($editor['installed version'], '3.2.5', '>=')) {
     $plugins['autoresize'] = array(
-      'path' => $editor['library path'] . '/plugins/autoresize',
-      'extensions' => array('autoresize' => t('Auto resize')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/autoresize',
+        'extensions' => array('autoresize' => t('Auto resize')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
-  }
-  if (version_compare($editor['installed version'], '3.3', '>=')) {
+    }
+    if (version_compare($editor['installed version'], '3.3', '>=')) {
     $plugins['advlist'] = array(
-      'path' => $editor['library path'] . '/plugins/advlist',
-      'extensions' => array('advlist' => t('Advanced list')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/advlist',
+        'extensions' => array('advlist' => t('Advanced list')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
-  }
-  if (version_compare($editor['installed version'], '3.2.6', '>=')) {
+    }
+    if (version_compare($editor['installed version'], '3.2.6', '>=')) {
     $plugins['wordcount'] = array(
-      'path' => $editor['library path'] . '/plugins/wordcount',
-      'extensions' => array('wordcount' => t('Word count')),
-      'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
-      'internal' => TRUE,
-      'load' => TRUE,
+        'path' => $editor['library path'] . '/plugins/wordcount',
+        'extensions' => array('wordcount' => t('Word count')),
+        'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
+        'internal' => TRUE,
+        'load' => TRUE,
     );
-  }
-  return $plugins;
+    }
+    return $plugins;
 }
 

Switch Indentation +23 added lines, -23 removed lines

@@ -261,32 +261,32 @@
 
   // Add theme-specific settings.
   switch ($theme) {
-    case 'advanced':
+  case 'advanced':
+    $settings += array(
+      'theme_advanced_resize_horizontal' => FALSE,
+      'theme_advanced_resizing_use_cookie' => FALSE,
+      'theme_advanced_path_location' => isset($config['path_loc']) ? $config['path_loc'] : 'bottom',
+      'theme_advanced_resizing' => isset($config['resizing']) ? $config['resizing'] : 1,
+      'theme_advanced_toolbar_location' => isset($config['toolbar_loc']) ? $config['toolbar_loc'] : 'top',
+      'theme_advanced_toolbar_align' => isset($config['toolbar_align']) ? $config['toolbar_align'] : 'left',
+    );
+    if (isset($config['block_formats'])) {
+      $settings['theme_advanced_blockformats'] = $config['block_formats'];
+    }
+    if (isset($settings['buttons'])) {
+      // These rows explicitly need to be set to be empty, otherwise TinyMCE
+      // loads its default buttons of the advanced theme for each row.
       $settings += array(
-        'theme_advanced_resize_horizontal' => FALSE,
-        'theme_advanced_resizing_use_cookie' => FALSE,
-        'theme_advanced_path_location' => isset($config['path_loc']) ? $config['path_loc'] : 'bottom',
-        'theme_advanced_resizing' => isset($config['resizing']) ? $config['resizing'] : 1,
-        'theme_advanced_toolbar_location' => isset($config['toolbar_loc']) ? $config['toolbar_loc'] : 'top',
-        'theme_advanced_toolbar_align' => isset($config['toolbar_align']) ? $config['toolbar_align'] : 'left',
+        'theme_advanced_buttons1' => array(),
+        'theme_advanced_buttons2' => array(),
+        'theme_advanced_buttons3' => array(),
       );
-      if (isset($config['block_formats'])) {
-        $settings['theme_advanced_blockformats'] = $config['block_formats'];
+      // @todo Allow to sort/arrange editor buttons.
+      for ($i = 0; $i < count($settings['buttons']); $i++) {
+        $settings['theme_advanced_buttons1'][] = $settings['buttons'][$i];
       }
-      if (isset($settings['buttons'])) {
-        // These rows explicitly need to be set to be empty, otherwise TinyMCE
-        // loads its default buttons of the advanced theme for each row.
-        $settings += array(
-          'theme_advanced_buttons1' => array(),
-          'theme_advanced_buttons2' => array(),
-          'theme_advanced_buttons3' => array(),
-        );
-        // @todo Allow to sort/arrange editor buttons.
-        for ($i = 0; $i < count($settings['buttons']); $i++) {
-          $settings['theme_advanced_buttons1'][] = $settings['buttons'][$i];
-        }
-      }
-      break;
+    }
+    break;
   }
   unset($settings['buttons']);
 

Spacing +35 added lines, -35 removed lines

@@ -15,7 +15,7 @@ 
     'title' => 'TinyMCE',
     'vendor url' => 'http://tinymce.moxiecode.com',
     'download url' => 'http://tinymce.moxiecode.com/download.php',
-    'library path' => wysiwyg_get_path('tinymce') . '/jscripts/tiny_mce',
+    'library path' => wysiwyg_get_path('tinymce').'/jscripts/tiny_mce',
     'libraries' => array(
       '' => array(
         'title' => 'Minified',
@@ -80,7 +80,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_tinymce_version($editor) {
-  $script = $editor['library path'] . '/tiny_mce.js';
+  $script = $editor['library path'].'/tiny_mce.js';
   if (!file_exists($script)) {
     return;
   }
@@ -91,7 +91,7 @@ 
   // 2.x: this.majorVersion="2";this.minorVersion="1.3"
   // 3.x: majorVersion:'3',minorVersion:'2.0.1'
   if (preg_match('@majorVersion[=:]["\'](\d).+?minorVersion[=:]["\']([\d\.]+)@', $line, $version)) {
-    return $version[1] . '.' . $version[2];
+    return $version[1].'.'.$version[2];
   }
 }
 
@@ -178,7 +178,7 @@ 
     $settings['remove_linebreaks'] = $config['remove_linebreaks'];
   }
   if (isset($config['verify_html'])) {
-    $settings['verify_html'] = (bool) $config['verify_html'];
+    $settings['verify_html'] = (bool)$config['verify_html'];
   }
 
   if (!empty($config['css_classes'])) {
@@ -324,7 +324,7 @@ 
           $plugin['filename'] = array_pop($parts);
           $plugin['path'] = implode('/', $parts);
         }
-        $settings[$name] = base_path() . $plugin['path'] . '/' . $plugin['filename'];
+        $settings[$name] = base_path().$plugin['path'].'/'.$plugin['filename'];
       }
     }
   }
@@ -340,11 +340,11 @@ 
     // 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'],
     );
     if (isset($plugin['css file'])) {
-      $settings[$name]['css'] = base_path() . $plugin['css path'] . '/' . $plugin['css file'];
+      $settings[$name]['css'] = base_path().$plugin['css path'].'/'.$plugin['css file'];
     }
   }
   return $settings;
@@ -364,7 +364,7 @@ 
 function _wysiwyg_tinymce_plugin_name($op, $name) {
   if ($op == 'add') {
     if (strpos($name, '-') !== 0) {
-      return '-' . $name;
+      return '-'.$name;
     }
     return $name;
   }
@@ -382,7 +382,7 @@ 
 function wysiwyg_tinymce_plugins($editor) {
   $plugins = array(
     'default' => array(
-      'path' => $editor['library path'] . '/themes/advanced',
+      'path' => $editor['library path'].'/themes/advanced',
       'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'strikethrough' => t('Strike-through'),
@@ -406,7 +406,7 @@ 
       'internal' => TRUE,
     ),
     'advhr' => array(
-      'path' => $editor['library path'] . '/plugins/advhr',
+      'path' => $editor['library path'].'/plugins/advhr',
       'buttons' => array('advhr' => t('Advanced horizontal rule')),
       'extended_valid_elements' => array('hr[class|width|size|noshade]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
@@ -414,7 +414,7 @@ 
       'load' => TRUE,
     ),
     'advimage' => array(
-      'path' => $editor['library path'] . '/plugins/advimage',
+      'path' => $editor['library path'].'/plugins/advimage',
       'extensions' => array('advimage' => t('Advanced image')),
       'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
@@ -422,7 +422,7 @@ 
       'load' => TRUE,
     ),
     'advlink' => array(
-      'path' => $editor['library path'] . '/plugins/advlink',
+      'path' => $editor['library path'].'/plugins/advlink',
       'extensions' => array('advlink' => t('Advanced link')),
       'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
@@ -430,49 +430,49 @@ 
       'load' => TRUE,
     ),
     'autosave' => array(
-      'path' => $editor['library path'] . '/plugins/autosave',
+      'path' => $editor['library path'].'/plugins/autosave',
       'extensions' => array('autosave' => t('Auto save')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'contextmenu' => array(
-      'path' => $editor['library path'] . '/plugins/contextmenu',
+      'path' => $editor['library path'].'/plugins/contextmenu',
       'extensions' => array('contextmenu' => t('Context menu')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'directionality' => array(
-      'path' => $editor['library path'] . '/plugins/directionality',
+      'path' => $editor['library path'].'/plugins/directionality',
       'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'emotions' => array(
-      'path' => $editor['library path'] . '/plugins/emotions',
+      'path' => $editor['library path'].'/plugins/emotions',
       'buttons' => array('emotions' => t('Emotions')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'font' => array(
-      'path' => $editor['library path'] . '/plugins/font',
+      'path' => $editor['library path'].'/plugins/font',
       'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
       'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
       'internal' => TRUE,
     ),
     'fullscreen' => array(
-      'path' => $editor['library path'] . '/plugins/fullscreen',
+      'path' => $editor['library path'].'/plugins/fullscreen',
       'buttons' => array('fullscreen' => t('Fullscreen')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'inlinepopups' => array(
-      'path' => $editor['library path'] . '/plugins/inlinepopups',
+      'path' => $editor['library path'].'/plugins/inlinepopups',
       'extensions' => array('inlinepopups' => t('Inline popups')),
       'options' => array(
         'dialog_type' => array('modal'),
@@ -482,7 +482,7 @@ 
       'load' => TRUE,
     ),
     'insertdatetime' => array(
-      'path' => $editor['library path'] . '/plugins/insertdatetime',
+      'path' => $editor['library path'].'/plugins/insertdatetime',
       'buttons' => array('insertdate' => t('Insert date'), 'inserttime' => t('Insert time')),
       'options' => array(
         'plugin_insertdate_dateFormat' => '%Y-%m-%d',
@@ -493,49 +493,49 @@ 
       'load' => TRUE,
     ),
     'layer' => array(
-      'path' => $editor['library path'] . '/plugins/layer',
+      'path' => $editor['library path'].'/plugins/layer',
       'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'paste' => array(
-      'path' => $editor['library path'] . '/plugins/paste',
+      'path' => $editor['library path'].'/plugins/paste',
       'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'preview' => array(
-      'path' => $editor['library path'] . '/plugins/preview',
+      'path' => $editor['library path'].'/plugins/preview',
       'buttons' => array('preview' => t('Preview')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'print' => array(
-      'path' => $editor['library path'] . '/plugins/print',
+      'path' => $editor['library path'].'/plugins/print',
       'buttons' => array('print' => t('Print')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'searchreplace' => array(
-      'path' => $editor['library path'] . '/plugins/searchreplace',
+      'path' => $editor['library path'].'/plugins/searchreplace',
       'buttons' => array('search' => t('Search'), 'replace' => t('Replace')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'style' => array(
-      'path' => $editor['library path'] . '/plugins/style',
+      'path' => $editor['library path'].'/plugins/style',
       'buttons' => array('styleprops' => t('Style properties')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
       'internal' => TRUE,
       'load' => TRUE,
     ),
     'table' => array(
-      'path' => $editor['library path'] . '/plugins/table',
+      'path' => $editor['library path'].'/plugins/table',
       'buttons' => array('tablecontrols' => t('Table')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
       'internal' => TRUE,
@@ -544,7 +544,7 @@ 
   );
   if (version_compare($editor['installed version'], '3', '<')) {
     $plugins['flash'] = array(
-      'path' => $editor['library path'] . '/plugins/flash',
+      'path' => $editor['library path'].'/plugins/flash',
       'buttons' => array('flash' => t('Flash')),
       'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash',
@@ -554,14 +554,14 @@ 
   }
   if (version_compare($editor['installed version'], '2.0.6', '>')) {
     $plugins['media'] = array(
-      'path' => $editor['library path'] . '/plugins/media',
+      'path' => $editor['library path'].'/plugins/media',
       'buttons' => array('media' => t('Media')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
       'internal' => TRUE,
       'load' => TRUE,
     );
     $plugins['xhtmlxtras'] = array(
-      'path' => $editor['library path'] . '/plugins/xhtmlxtras',
+      'path' => $editor['library path'].'/plugins/xhtmlxtras',
       'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
       'internal' => TRUE,
@@ -570,7 +570,7 @@ 
   }
   if (version_compare($editor['installed version'], '3', '>')) {
     $plugins['bbcode'] = array(
-      'path' => $editor['library path'] . '/plugins/bbcode',
+      'path' => $editor['library path'].'/plugins/bbcode',
       'extensions' => array('bbcode' => t('BBCode')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
       'internal' => TRUE,
@@ -578,7 +578,7 @@ 
     );
     if (version_compare($editor['installed version'], '3.3', '<')) {
       $plugins['safari'] = array(
-        'path' => $editor['library path'] . '/plugins/safari',
+        'path' => $editor['library path'].'/plugins/safari',
         'extensions' => array('safari' => t('Safari compatibility')),
         'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
         'internal' => TRUE,
@@ -588,7 +588,7 @@ 
   }
   if (version_compare($editor['installed version'], '3.2.5', '>=')) {
     $plugins['autoresize'] = array(
-      'path' => $editor['library path'] . '/plugins/autoresize',
+      'path' => $editor['library path'].'/plugins/autoresize',
       'extensions' => array('autoresize' => t('Auto resize')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
       'internal' => TRUE,
@@ -597,7 +597,7 @@ 
   }
   if (version_compare($editor['installed version'], '3.3', '>=')) {
     $plugins['advlist'] = array(
-      'path' => $editor['library path'] . '/plugins/advlist',
+      'path' => $editor['library path'].'/plugins/advlist',
       'extensions' => array('advlist' => t('Advanced list')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
       'internal' => TRUE,
@@ -606,7 +606,7 @@ 
   }
   if (version_compare($editor['installed version'], '3.2.6', '>=')) {
     $plugins['wordcount'] = array(
-      'path' => $editor['library path'] . '/plugins/wordcount',
+      'path' => $editor['library path'].'/plugins/wordcount',
       'extensions' => array('wordcount' => t('Word count')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
       'internal' => TRUE,

Braces +2 added lines, -4 removed lines

@@ -188,8 +188,7 @@ 
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $settings['content_css'] = implode(',', wysiwyg_get_css());
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }
@@ -367,8 +366,7 @@ 
       return '-' . $name;
     }
     return $name;
-  }
-  else if ($op == 'remove') {
+  } else if ($op == 'remove') {
     if (strpos($name, '-') === 0) {
       return substr($name, 1);
     }

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

@@ -33,8 +33,8 @@ 
     'plugin settings callback' => 'wysiwyg_tinymce_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
-        'proxy' => TRUE,
+        'load' => true,
+        'proxy' => true,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_tinymce_proxy_plugin_settings',
@@ -52,7 +52,7 @@ 
           '' => array(
             'title' => 'Minified',
             'files' => array(
-              'tiny_mce.js' => array('preprocess' => FALSE),
+              'tiny_mce.js' => array('preprocess' => false),
             ),
           ),
           'jquery' => array(
@@ -141,7 +141,7 @@ 
  */
 function wysiwyg_tinymce_settings($editor, $config, $theme) {
   $settings = array(
-    'button_tile_map' => TRUE, // @todo Add a setting for this.
+    'button_tile_map' => true, // @todo Add a setting for this.
     'document_base_url' => base_path(),
     'mode' => 'none',
     'plugins' => array(),
@@ -149,10 +149,10 @@ 
     'width' => '100%',
     // Strict loading mode must be enabled; otherwise TinyMCE would use
     // document.write() in IE and Chrome.
-    'strict_loading_mode' => TRUE,
+    'strict_loading_mode' => true,
     // TinyMCE's URL conversion magic breaks Drupal modules that use a special
     // syntax for paths. This makes 'relative_urls' obsolete.
-    'convert_urls' => FALSE,
+    'convert_urls' => false,
     // The default entity_encoding ('named') converts too many characters in
     // languages (like Greek). Since Drupal supports Unicode, we only convert
     // HTML control characters and invisible characters. TinyMCE always converts
@@ -263,8 +263,8 @@ 
   switch ($theme) {
     case 'advanced':
       $settings += array(
-        'theme_advanced_resize_horizontal' => FALSE,
-        'theme_advanced_resizing_use_cookie' => FALSE,
+        'theme_advanced_resize_horizontal' => false,
+        'theme_advanced_resizing_use_cookie' => false,
         'theme_advanced_path_location' => isset($config['path_loc']) ? $config['path_loc'] : 'bottom',
         'theme_advanced_resizing' => isset($config['resizing']) ? $config['resizing'] : 1,
         'theme_advanced_toolbar_location' => isset($config['toolbar_loc']) ? $config['toolbar_loc'] : 'top',
@@ -403,73 +403,73 @@ 
         'charmap' => t('Character map'),
         'help' => t('Help'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
     'advhr' => array(
       'path' => $editor['library path'] . '/plugins/advhr',
       'buttons' => array('advhr' => t('Advanced horizontal rule')),
       'extended_valid_elements' => array('hr[class|width|size|noshade]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'advimage' => array(
       'path' => $editor['library path'] . '/plugins/advimage',
       'extensions' => array('advimage' => t('Advanced image')),
       'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'advlink' => array(
       'path' => $editor['library path'] . '/plugins/advlink',
       'extensions' => array('advlink' => t('Advanced link')),
       'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'autosave' => array(
       'path' => $editor['library path'] . '/plugins/autosave',
       'extensions' => array('autosave' => t('Auto save')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'contextmenu' => array(
       'path' => $editor['library path'] . '/plugins/contextmenu',
       'extensions' => array('contextmenu' => t('Context menu')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'directionality' => array(
       'path' => $editor['library path'] . '/plugins/directionality',
       'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'emotions' => array(
       'path' => $editor['library path'] . '/plugins/emotions',
       'buttons' => array('emotions' => t('Emotions')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'font' => array(
       'path' => $editor['library path'] . '/plugins/font',
       'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')),
       'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font',
-      'internal' => TRUE,
+      'internal' => true,
     ),
     'fullscreen' => array(
       'path' => $editor['library path'] . '/plugins/fullscreen',
       'buttons' => array('fullscreen' => t('Fullscreen')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'inlinepopups' => array(
       'path' => $editor['library path'] . '/plugins/inlinepopups',
@@ -478,8 +478,8 @@ 
         'dialog_type' => array('modal'),
       ),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'insertdatetime' => array(
       'path' => $editor['library path'] . '/plugins/insertdatetime',
@@ -489,57 +489,57 @@ 
         'plugin_insertdate_timeFormat' => '%H:%M:%S',
       ),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'layer' => array(
       'path' => $editor['library path'] . '/plugins/layer',
       'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'paste' => array(
       'path' => $editor['library path'] . '/plugins/paste',
       'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'preview' => array(
       'path' => $editor['library path'] . '/plugins/preview',
       'buttons' => array('preview' => t('Preview')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'print' => array(
       'path' => $editor['library path'] . '/plugins/print',
       'buttons' => array('print' => t('Print')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'searchreplace' => array(
       'path' => $editor['library path'] . '/plugins/searchreplace',
       'buttons' => array('search' => t('Search'), 'replace' => t('Replace')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'style' => array(
       'path' => $editor['library path'] . '/plugins/style',
       'buttons' => array('styleprops' => t('Style properties')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'table' => array(
       'path' => $editor['library path'] . '/plugins/table',
       'buttons' => array('tablecontrols' => t('Table')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
   );
   if (version_compare($editor['installed version'], '3', '<')) {
@@ -548,8 +548,8 @@ 
       'buttons' => array('flash' => t('Flash')),
       'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
   }
   if (version_compare($editor['installed version'], '2.0.6', '>')) {
@@ -557,15 +557,15 @@ 
       'path' => $editor['library path'] . '/plugins/media',
       'buttons' => array('media' => t('Media')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
     $plugins['xhtmlxtras'] = array(
       'path' => $editor['library path'] . '/plugins/xhtmlxtras',
       'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
   }
   if (version_compare($editor['installed version'], '3', '>')) {
@@ -573,16 +573,16 @@ 
       'path' => $editor['library path'] . '/plugins/bbcode',
       'extensions' => array('bbcode' => t('BBCode')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
     if (version_compare($editor['installed version'], '3.3', '<')) {
       $plugins['safari'] = array(
         'path' => $editor['library path'] . '/plugins/safari',
         'extensions' => array('safari' => t('Safari compatibility')),
         'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
-        'internal' => TRUE,
-        'load' => TRUE,
+        'internal' => true,
+        'load' => true,
       );
     }
   }
@@ -591,8 +591,8 @@ 
       'path' => $editor['library path'] . '/plugins/autoresize',
       'extensions' => array('autoresize' => t('Auto resize')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
   }
   if (version_compare($editor['installed version'], '3.3', '>=')) {
@@ -600,8 +600,8 @@ 
       'path' => $editor['library path'] . '/plugins/advlist',
       'extensions' => array('advlist' => t('Advanced list')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
   }
   if (version_compare($editor['installed version'], '3.2.6', '>=')) {
@@ -609,8 +609,8 @@ 
       'path' => $editor['library path'] . '/plugins/wordcount',
       'extensions' => array('wordcount' => t('Word count')),
       'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     );
   }
   return $plugins;

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

Indentation +416 added lines, -416 removed lines

@@ -9,19 +9,19 @@ 
  * Implementation of hook_menu().
  */
 function wysiwyg_menu() {
-  $items['admin/settings/wysiwyg'] = array(
+    $items['admin/settings/wysiwyg'] = array(
     'title' => 'Wysiwyg profiles',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_overview'),
     'description' => 'Configure client-side editors.',
     'access arguments' => array('administer filters'),
     'file' => 'wysiwyg.admin.inc',
-  );
-  $items['admin/settings/wysiwyg/profile'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile'] = array(
     'title' => 'List',
     'type' => MENU_DEFAULT_LOCAL_TASK,
-  );
-  $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array(
     'title' => 'Edit',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_form', 4),
@@ -30,8 +30,8 @@ 
     'tab_root' => 'admin/settings/wysiwyg/profile',
     'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile',
     'type' => MENU_LOCAL_TASK,
-  );
-  $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array(
+    );
+    $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array(
     'title' => 'Remove',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('wysiwyg_profile_delete_confirm', 4),
@@ -41,15 +41,15 @@ 
     'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile',
     'type' => MENU_LOCAL_TASK,
     'weight' => 10,
-  );
-  $items['wysiwyg/%'] = array(
+    );
+    $items['wysiwyg/%'] = array(
     'page callback' => 'wysiwyg_dialog',
     'page arguments' => array(1),
     'access arguments' => array('access content'),
     'type' => MENU_CALLBACK,
     'file' => 'wysiwyg.dialog.inc',
-  );
-  return $items;
+    );
+    return $items;
 }
 
 /**
@@ -59,37 +59,37 @@ 
  * @see template_preprocess_page(), theme.inc
  */
 function wysiwyg_theme() {
-  return array(
+    return array(
     'wysiwyg_profile_overview' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
     'wysiwyg_admin_button_table' => array(
-      'arguments' => array('form' => NULL),
+        'arguments' => array('form' => NULL),
     ),
     'wysiwyg_dialog_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
-      'file' => 'wysiwyg.dialog.inc',
-      'template' => 'wysiwyg-dialog-page',
+        'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+        'file' => 'wysiwyg.dialog.inc',
+        'template' => 'wysiwyg-dialog-page',
     ),
-  );
+    );
 }
 
 /**
  * Implementation of hook_help().
  */
 function wysiwyg_help($path, $arg) {
-  switch ($path) {
+    switch ($path) {
     case 'admin/settings/wysiwyg':
       $output = '<p>' . t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.') . '</p>';
-      return $output;
-  }
+        return $output;
+    }
 }
 
 /**
  * Clear wysiwyg cache on admin/build/modules form.
  */
 function wysiwyg_form_system_modules_alter(&$form, $form_state) {
-  wysiwyg_profile_load_all(TRUE);
+    wysiwyg_profile_load_all(TRUE);
 }
 
 /**
@@ -104,11 +104,11 @@ 
  * @see wysiwyg_process_form()
  */
 function wysiwyg_form_alter(&$form, &$form_state) {
-  $form['#after_build'][] = 'wysiwyg_process_form';
-  // Teaser splitter is unconditionally removed and NOT supported.
-  if (isset($form['body_field'])) {
+    $form['#after_build'][] = 'wysiwyg_process_form';
+    // Teaser splitter is unconditionally removed and NOT supported.
+    if (isset($form['body_field'])) {
     unset($form['body_field']['teaser_js']);
-  }
+    }
 }
 
 /**
@@ -123,53 +123,53 @@ 
  * @see wysiwyg_elements(), filter_form()
  */
 function wysiwyg_process_form(&$form) {
-  // Iterate over element children; resetting array keys to access last index.
-  if ($children = array_values(element_children($form))) {
+    // Iterate over element children; resetting array keys to access last index.
+    if ($children = array_values(element_children($form))) {
     foreach ($children as $index => $item) {
-      $element = &$form[$item];
+        $element = &$form[$item];
 
-      // filter_form() always uses the key 'format'. We need a type-agnostic
-      // match to prevent false positives. Also, there must have been at least
-      // one element on this level.
-      if (($item === 'format' || $item === 'signature_format') && $index > 0) {
+        // filter_form() always uses the key 'format'. We need a type-agnostic
+        // match to prevent false positives. Also, there must have been at least
+        // one element on this level.
+        if (($item === 'format' || $item === 'signature_format') && $index > 0) {
         // Make sure we either match a input format selector or input format
         // guidelines (displayed if user has access to one input format only).
         if ((isset($element['#type']) && $element['#type'] == 'fieldset') || isset($element['format']['guidelines'])) {
-          // The element before this element is the target form field.
-          $field = &$form[$children[$index - 1]];
+            // The element before this element is the target form field.
+            $field = &$form[$children[$index - 1]];
 
-          // Allow modules to programmatically enforce no client-side editor by
-          // setting the #wysiwyg property to FALSE.
-          if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) {
+            // Allow modules to programmatically enforce no client-side editor by
+            // setting the #wysiwyg property to FALSE.
+            if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) {
             // A 'format' element should not have any child elements that may
             // need processing, so it should be safe to skip the recursion that
             // happens at the end of this function, and move on to the next
             // element on the same level.
             continue;
-          }
-
-          // If this textarea is #resizable and we will load at least one
-          // editor, then only load the behavior and let the 'none' editor
-          // attach/detach it to avoid hi-jacking the UI. Due to our CSS class
-          // parsing, we can add arbitrary parameters for each input format.
-          // The #resizable property will be removed below, if at least one
-          // profile has been loaded.
-          $extra_class = '';
-          if (!empty($field['#resizable'])) {
+            }
+
+            // If this textarea is #resizable and we will load at least one
+            // editor, then only load the behavior and let the 'none' editor
+            // attach/detach it to avoid hi-jacking the UI. Due to our CSS class
+            // parsing, we can add arbitrary parameters for each input format.
+            // The #resizable property will be removed below, if at least one
+            // profile has been loaded.
+            $extra_class = '';
+            if (!empty($field['#resizable'])) {
             $extra_class = ' wysiwyg-resizable-1';
             drupal_add_js('misc/textarea.js');
-          }
-
-          // Determine the available input formats. The last child element is a
-          // link to "More information about formatting options". When only one
-          // input format is displayed, we also have to remove formatting
-          // guidelines, stored in the child 'format'.
-          $formats = element_children($element);
-          array_pop($formats);
-          if (($key = array_search('format', $formats)) !== FALSE) {
+            }
+
+            // Determine the available input formats. The last child element is a
+            // link to "More information about formatting options". When only one
+            // input format is displayed, we also have to remove formatting
+            // guidelines, stored in the child 'format'.
+            $formats = element_children($element);
+            array_pop($formats);
+            if (($key = array_search('format', $formats)) !== FALSE) {
             unset($formats[$key]);
-          }
-          foreach ($formats as $format) {
+            }
+            foreach ($formats as $format) {
             // Default to 'none' editor (Drupal's default behaviors).
             $editor = 'none';
             $status = 1;
@@ -177,51 +177,51 @@ 
             // Fetch the profile associated to this input format.
             $profile = wysiwyg_get_profile($format);
             if ($profile) {
-              $loaded = TRUE;
-              $editor = $profile->editor;
-              $status = (int) wysiwyg_user_get_status($profile);
-              if (isset($profile->settings['show_toggle'])) {
+                $loaded = TRUE;
+                $editor = $profile->editor;
+                $status = (int) wysiwyg_user_get_status($profile);
+                if (isset($profile->settings['show_toggle'])) {
                 $toggle = (int) $profile->settings['show_toggle'];
-              }
-              // Check editor theme (and reset it if not/no longer available).
-              $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : ''));
-
-              // Add plugin settings (first) for this input format.
-              wysiwyg_add_plugin_settings($profile);
-              // Add profile settings for this input format.
-              wysiwyg_add_editor_settings($profile, $theme);
+                }
+                // Check editor theme (and reset it if not/no longer available).
+                $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : ''));
+
+                // Add plugin settings (first) for this input format.
+                wysiwyg_add_plugin_settings($profile);
+                // Add profile settings for this input format.
+                wysiwyg_add_editor_settings($profile, $theme);
             }
 
             // Use a prefix/suffix for a single input format, or attach to input
             // format selector radio buttons.
             if (isset($element['format']['guidelines'])) {
-              $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class . '">';
-              $element['format']['guidelines']['#suffix'] = '</div>';
-              // Edge-case: Default format contains no input filters.
-              if (empty($element['format']['guidelines']['#value'])) {
+                $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class . '">';
+                $element['format']['guidelines']['#suffix'] = '</div>';
+                // Edge-case: Default format contains no input filters.
+                if (empty($element['format']['guidelines']['#value'])) {
                 $element['format']['guidelines']['#value'] = ' ';
-              }
+                }
             }
             else {
-              $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
-              $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
+                $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
+                $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
+            }
             }
-          }
 
-          // If we loaded at least one editor, then the 'none' editor will
-          // handle resizable textareas instead of core.
-          if (isset($loaded) && !empty($field['#resizable'])) {
+            // If we loaded at least one editor, then the 'none' editor will
+            // handle resizable textareas instead of core.
+            if (isset($loaded) && !empty($field['#resizable'])) {
             $field['#resizable'] = FALSE;
-          }
+            }
         }
         // If this element is 'format', do not recurse further.
         continue;
-      }
-      // Recurse into children.
-      wysiwyg_process_form($element);
+        }
+        // Recurse into children.
+        wysiwyg_process_form($element);
+    }
     }
-  }
-  return $form;
+    return $form;
 }
 
 /**
@@ -239,12 +239,12 @@ 
  * @see wysiwyg_load_editor(), wysiwyg_get_editor()
  */
 function wysiwyg_get_profile($format) {
-  if ($profile = wysiwyg_profile_load($format)) {
+    if ($profile = wysiwyg_profile_load($format)) {
     if (wysiwyg_load_editor($profile)) {
-      return $profile;
+        return $profile;
+    }
     }
-  }
-  return FALSE;
+    return FALSE;
 }
 
 /**
@@ -259,82 +259,82 @@ 
  * @see wysiwyg_get_profile()
  */
 function wysiwyg_load_editor($profile) {
-  static $settings_added;
-  static $loaded = array();
+    static $settings_added;
+    static $loaded = array();
 
-  $name = $profile->editor;
-  // Library files must be loaded only once.
-  if (!isset($loaded[$name])) {
+    $name = $profile->editor;
+    // Library files must be loaded only once.
+    if (!isset($loaded[$name])) {
     // Load editor.
     $editor = wysiwyg_get_editor($name);
     if ($editor) {
-      // Determine library files to load.
-      // @todo Allow to configure the library/execMode to use.
-      if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) {
+        // Determine library files to load.
+        // @todo Allow to configure the library/execMode to use.
+        if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) {
         $library = $profile->settings['library'];
         $files = $editor['libraries'][$library]['files'];
-      }
-      else {
+        }
+        else {
         // Fallback to the first defined library by default (external libraries can change).
         $library = key($editor['libraries']);
         $files = array_shift($editor['libraries']);
         $files = $files['files'];
-      }
-      foreach ($files as $file => $options) {
+        }
+        foreach ($files as $file => $options) {
         if (is_array($options)) {
-          $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
-          drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
+            $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
+            drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
         }
         else {
-          drupal_add_js($editor['library path'] . '/' . $options);
+            drupal_add_js($editor['library path'] . '/' . $options);
         }
-      }
-      // If editor defines an additional load callback, invoke it.
-      // @todo Isn't the settings callback sufficient?
-      if (isset($editor['load callback']) && function_exists($editor['load callback'])) {
+        }
+        // If editor defines an additional load callback, invoke it.
+        // @todo Isn't the settings callback sufficient?
+        if (isset($editor['load callback']) && function_exists($editor['load callback'])) {
         $editor['load callback']($editor, $library);
-      }
-      // Load JavaScript integration files for this editor.
-      $files = array();
-      if (isset($editor['js files'])) {
+        }
+        // Load JavaScript integration files for this editor.
+        $files = array();
+        if (isset($editor['js files'])) {
         $files = $editor['js files'];
-      }
-      foreach ($files as $file) {
+        }
+        foreach ($files as $file) {
         drupal_add_js($editor['js path'] . '/' . $file);
-      }
-      // Load CSS stylesheets for this editor.
-      $files = array();
-      if (isset($editor['css files'])) {
+        }
+        // Load CSS stylesheets for this editor.
+        $files = array();
+        if (isset($editor['css files'])) {
         $files = $editor['css files'];
-      }
-      foreach ($files as $file) {
+        }
+        foreach ($files as $file) {
         drupal_add_css($editor['css path'] . '/' . $file);
-      }
+        }
 
-      drupal_add_js(array('wysiwyg' => array(
+        drupal_add_js(array('wysiwyg' => array(
         'configs' => array($editor['name'] => array('global' => array(
-          // @todo Move into (global) editor settings.
-          // If JS compression is enabled, at least TinyMCE is unable to determine
-          // its own base path and exec mode since it can't find the script name.
-          'editorBasePath' => base_path() . $editor['library path'],
-          'execMode' => $library,
+            // @todo Move into (global) editor settings.
+            // If JS compression is enabled, at least TinyMCE is unable to determine
+            // its own base path and exec mode since it can't find the script name.
+            'editorBasePath' => base_path() . $editor['library path'],
+            'execMode' => $library,
         ))),
-      )), 'setting');
+        )), 'setting');
 
-      $loaded[$name] = TRUE;
+        $loaded[$name] = TRUE;
     }
     else {
-      $loaded[$name] = FALSE;
+        $loaded[$name] = FALSE;
+    }
     }
-  }
 
-  // Add basic Wysiwyg settings if any editor has been added.
-  if (!isset($settings_added) && $loaded[$name]) {
+    // Add basic Wysiwyg settings if any editor has been added.
+    if (!isset($settings_added) && $loaded[$name]) {
     drupal_add_js(array('wysiwyg' => array(
-      'configs' => array(),
-      'plugins' => array(),
-      'disable' => t('Disable rich-text'),
-      'enable' => t('Enable rich-text'),
+        'configs' => array(),
+        'plugins' => array(),
+        'disable' => t('Disable rich-text'),
+        'enable' => t('Enable rich-text'),
     )), 'setting');
 
     $path = drupal_get_path('module', 'wysiwyg');
@@ -355,26 +355,26 @@ 
     drupal_add_js($path . '/wysiwyg.js', 'module', 'footer');
 
     $settings_added = TRUE;
-  }
+    }
 
-  return $loaded[$name];
+    return $loaded[$name];
 }
 
 /**
  * Add editor settings for a given input format.
  */
 function wysiwyg_add_editor_settings($profile, $theme) {
-  static $formats = array();
+    static $formats = array();
 
-  if (!isset($formats[$profile->format])) {
+    if (!isset($formats[$profile->format])) {
     $config = wysiwyg_get_editor_config($profile, $theme);
     // drupal_to_js() does not properly convert numeric array keys, so we need
     // to use a string instead of the format id.
     if ($config) {
-      drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
     }
     $formats[$profile->format] = TRUE;
-  }
+    }
 }
 
 /**
@@ -402,86 +402,86 @@ 
  *   and simplify this entire function.
  */
 function wysiwyg_add_plugin_settings($profile) {
-  static $plugins = array();
-  static $processed_plugins = array();
-  static $processed_formats = array();
+    static $plugins = array();
+    static $processed_plugins = array();
+    static $processed_formats = array();
 
-  // Each input format must only processed once.
-  // @todo ...as long as we do not have multiple profiles per format.
-  if (isset($processed_formats[$profile->format])) {
+    // Each input format must only processed once.
+    // @todo ...as long as we do not have multiple profiles per format.
+    if (isset($processed_formats[$profile->format])) {
     return;
-  }
-  $processed_formats[$profile->format] = TRUE;
+    }
+    $processed_formats[$profile->format] = TRUE;
 
-  $editor = wysiwyg_get_editor($profile->editor);
+    $editor = wysiwyg_get_editor($profile->editor);
 
-  // Collect native plugins for this editor provided via hook_wysiwyg_plugin()
-  // and Drupal plugins provided via hook_wysiwyg_include_directory().
-  if (!array_key_exists($editor['name'], $plugins)) {
+    // Collect native plugins for this editor provided via hook_wysiwyg_plugin()
+    // and Drupal plugins provided via hook_wysiwyg_include_directory().
+    if (!array_key_exists($editor['name'], $plugins)) {
     $plugins[$editor['name']] = wysiwyg_get_plugins($editor['name']);
-  }
+    }
 
-  // Nothing to do, if there are no plugins.
-  if (empty($plugins[$editor['name']])) {
+    // Nothing to do, if there are no plugins.
+    if (empty($plugins[$editor['name']])) {
     return;
-  }
+    }
 
-  // Determine name of proxy plugin for Drupal plugins.
-  $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : '');
+    // Determine name of proxy plugin for Drupal plugins.
+    $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : '');
 
-  // Process native editor plugins.
-  if (isset($editor['plugin settings callback'])) {
+    // Process native editor plugins.
+    if (isset($editor['plugin settings callback'])) {
     // @todo Require PHP 5.1 in 3.x and use array_intersect_key().
     $profile_plugins_native = array();
     foreach ($plugins[$editor['name']] as $plugin => $meta) {
-      // Skip Drupal plugins (handled below).
-      if ($plugin === $proxy) {
+        // Skip Drupal plugins (handled below).
+        if ($plugin === $proxy) {
         continue;
-      }
-      // Only keep native plugins that are enabled in this profile.
-      if (isset($profile->settings['buttons'][$plugin])) {
+        }
+        // Only keep native plugins that are enabled in this profile.
+        if (isset($profile->settings['buttons'][$plugin])) {
         $profile_plugins_native[$plugin] = $meta;
-      }
+        }
     }
     // Invoke the editor's plugin settings callback, so it can populate the
     // settings for native external plugins with required values.
     $settings_native = call_user_func($editor['plugin settings callback'], $editor, $profile, $profile_plugins_native);
 
     if ($settings_native) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting');
+    }
     }
-  }
 
-  // Process Drupal plugins.
-  if ($proxy && isset($editor['proxy plugin settings callback'])) {
+    // Process Drupal plugins.
+    if ($proxy && isset($editor['proxy plugin settings callback'])) {
     $profile_plugins_drupal = array();
     foreach (wysiwyg_get_all_plugins() as $plugin => $meta) {
-      if (isset($profile->settings['buttons'][$proxy][$plugin])) {
+        if (isset($profile->settings['buttons'][$proxy][$plugin])) {
         // JavaScript and plugin-specific settings for Drupal plugins must be
         // loaded and processed only once. Plugin information is cached
         // statically to pass it to the editor's proxy plugin settings callback.
         if (!isset($processed_plugins[$proxy][$plugin])) {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
-          // Load the Drupal plugin's JavaScript.
-          drupal_add_js($meta['js path'] . '/' . $meta['js file']);
-          // Add plugin-specific settings.
-          if (isset($meta['settings'])) {
+            $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
+            // Load the Drupal plugin's JavaScript.
+            drupal_add_js($meta['js path'] . '/' . $meta['js file']);
+            // Add plugin-specific settings.
+            if (isset($meta['settings'])) {
             drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting');
-          }
+            }
         }
         else {
-          $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
+            $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
+        }
         }
-      }
     }
     // Invoke the editor's proxy plugin settings callback, so it can populate
     // the settings for Drupal plugins with custom, required values.
     $settings_drupal = call_user_func($editor['proxy plugin settings callback'], $editor, $profile, $profile_plugins_drupal);
 
     if ($settings_drupal) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting');
+        drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting');
+    }
     }
-  }
 }
 
 /**
@@ -499,28 +499,28 @@ 
  *   was given.
  */
 function wysiwyg_get_editor_themes(&$profile, $selected_theme = NULL) {
-  static $themes = array();
+    static $themes = array();
 
-  if (!isset($themes[$profile->editor])) {
+    if (!isset($themes[$profile->editor])) {
     $editor = wysiwyg_get_editor($profile->editor);
     if (isset($editor['themes callback']) && function_exists($editor['themes callback'])) {
-      $themes[$editor['name']] = $editor['themes callback']($editor, $profile);
+        $themes[$editor['name']] = $editor['themes callback']($editor, $profile);
     }
     // Fallback to 'default' otherwise.
     else {
-      $themes[$editor['name']] = array('default');
+        $themes[$editor['name']] = array('default');
+    }
     }
-  }
 
-  // Check optional $selected_theme argument, if given.
-  if (isset($selected_theme)) {
+    // Check optional $selected_theme argument, if given.
+    if (isset($selected_theme)) {
     // If the passed theme name does not exist, use the first available.
     if (!in_array($selected_theme, $themes[$profile->editor])) {
-      $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0];
+        $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0];
+    }
     }
-  }
 
-  return isset($selected_theme) ? $selected_theme : $themes[$profile->editor];
+    return isset($selected_theme) ? $selected_theme : $themes[$profile->editor];
 }
 
 /**
@@ -533,42 +533,42 @@ 
  *   An array for each plugin.
  */
 function wysiwyg_get_plugins($editor_name) {
-  $plugins = array();
-  if (!empty($editor_name)) {
+    $plugins = array();
+    if (!empty($editor_name)) {
     $editor = wysiwyg_get_editor($editor_name);
     // Add internal editor plugins.
     if (isset($editor['plugin callback']) && function_exists($editor['plugin callback'])) {
-      $plugins = $editor['plugin callback']($editor);
+        $plugins = $editor['plugin callback']($editor);
     }
     // Add editor plugins provided via hook_wysiwyg_plugin().
     $plugins = array_merge($plugins, module_invoke_all('wysiwyg_plugin', $editor['name'], $editor['installed version']));
     // Add API plugins provided by Drupal modules.
     // @todo We need to pass the filepath to the plugin icon for Drupal plugins.
     if (isset($editor['proxy plugin'])) {
-      $plugins += $editor['proxy plugin'];
-      $proxy = key($editor['proxy plugin']);
-      foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) {
+        $plugins += $editor['proxy plugin'];
+        $proxy = key($editor['proxy plugin']);
+        foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) {
         $plugins[$proxy]['buttons'][$plugin_name] = $info['title'];
-      }
+        }
+    }
     }
-  }
-  return $plugins;
+    return $plugins;
 }
 
 /**
  * Return an array of initial editor settings for a Wysiwyg profile.
  */
 function wysiwyg_get_editor_config($profile, $theme) {
-  $editor = wysiwyg_get_editor($profile->editor);
-  $settings = array();
-  if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) {
+    $editor = wysiwyg_get_editor($profile->editor);
+    $settings = array();
+    if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) {
     $settings = $editor['settings callback']($editor, $profile->settings, $theme);
 
     // Allow other modules to alter the editor settings for this format.
     $context = array('editor' => $editor, 'profile' => $profile, 'theme' => $theme);
     drupal_alter('wysiwyg_editor_settings', $settings, $context);
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
@@ -581,106 +581,106 @@ 
  *   An array containing CSS files, including proper base path.
  */
 function wysiwyg_get_css() {
-  static $files;
+    static $files;
 
-  if (isset($files)) {
+    if (isset($files)) {
     return $files;
-  }
-  // In node form previews, the theme has not been initialized yet.
-  if (!empty($_POST)) {
+    }
+    // In node form previews, the theme has not been initialized yet.
+    if (!empty($_POST)) {
     init_theme();
-  }
+    }
 
-  $files = array();
-  foreach (drupal_add_css() as $media => $css) {
+    $files = array();
+    foreach (drupal_add_css() as $media => $css) {
     if ($media != 'print') {
-      foreach ($css['theme'] as $filepath => $preprocess) {
+        foreach ($css['theme'] as $filepath => $preprocess) {
         if (file_exists($filepath)) {
-          $files[] = base_path() . $filepath;
+            $files[] = base_path() . $filepath;
+        }
         }
-      }
     }
-  }
-  return $files;
+    }
+    return $files;
 }
 
 /**
  * Load profile for a given input format.
  */
 function wysiwyg_profile_load($format) {
-  static $profiles;
+    static $profiles;
 
-  if (!isset($profiles) || !array_key_exists($format, $profiles)) {
+    if (!isset($profiles) || !array_key_exists($format, $profiles)) {
     $profiles = wysiwyg_profile_load_all();
-  }
+    }
 
-  return (isset($profiles[$format]) ? $profiles[$format] : FALSE);
+    return (isset($profiles[$format]) ? $profiles[$format] : FALSE);
 }
 
 /**
  * Load all profiles.
  */
 function wysiwyg_profile_load_all($reset = FALSE) {
-  static $profiles;
+    static $profiles;
 
-  if ($reset || !isset($profiles)) {
+    if ($reset || !isset($profiles)) {
     $profiles = array();
     if (!$reset && ($cache = cache_get('wysiwyg:profiles', 'cache')) && is_array($cache->data)) {
-      $profiles = $cache->data;
-      return $profiles;
+        $profiles = $cache->data;
+        return $profiles;
     }
     // If Exportables and CTools are installed, use their API to load both
     // wysiwyg profiles from code and from the database
     if (module_exists('ctools') && module_exists('exportables')) {
-      if (exportables_api_version('2.0') && ctools_api_version('1.7')) {
+        if (exportables_api_version('2.0') && ctools_api_version('1.7')) {
         $input_formats = exportables_load_all('input_formats');
         ctools_include('export');
         $ctools_profiles = ctools_export_load_object('wysiwyg');
         // Wysiwyg module still use numeric ids as keys
         foreach ($ctools_profiles as $machine_name => $profile) {
-          $profile->format = $input_formats[$machine_name];
-          $profiles[$profile->format] = $profile;
+            $profile->format = $input_formats[$machine_name];
+            $profiles[$profile->format] = $profile;
+        }
         }
-      }
     }
 
     // DB profiles will always override Features profiles from flat files.
     $result = db_query('SELECT format, editor, settings FROM {wysiwyg}');
     while ($profile = db_fetch_object($result)) {
-      if (!isset($profiles[$profile->format])) {
+        if (!isset($profiles[$profile->format])) {
         $profile->settings = unserialize($profile->settings);
         $profiles[$profile->format] = $profile;
-      }
+        }
     }
 
     drupal_alter('wysiwyg_load_profiles', $profiles);
     cache_set('wysiwyg:profiles', $profiles);
-  }
+    }
 
-  return $profiles;
+    return $profiles;
 }
- /**
- * Wysiwyg profiles list callback.
- */
+    /**
+     * Wysiwyg profiles list callback.
+     */
 function wysiwyg_profile_list() {
-  $profiles = wysiwyg_profile_load_all(TRUE);
-  $filter_formats = filter_formats();
-  $list = array();
-  foreach ($profiles as $profile) {
+    $profiles = wysiwyg_profile_load_all(TRUE);
+    $filter_formats = filter_formats();
+    $list = array();
+    foreach ($profiles as $profile) {
     $list[$profile->machine] = t('@format (@editor)', array('@editor' => $profile->editor, '@format' => $filter_formats[$profile->format]->name));
-  }
-  return $list;
+    }
+    return $list;
 }
 
 /**
  * Remove a profile from the database.
  */
 function wysiwyg_profile_delete($wysiwyg) {
-  if (!isset($wysiwyg->format)) {
+    if (!isset($wysiwyg->format)) {
     $input_formats = exportables_load_all('input_formats');
     $wysiwyg->format = $input_formats[$wysiwyg->machine];
-  }
-  db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format);
+    }
+    db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format);
 }
 
 
@@ -689,68 +689,68 @@ 
  * Implementation of hook_user().
  */
 function wysiwyg_user($op, &$edit, $account, $category = NULL) {
-  if ($op == 'form' && $category == 'account') {
+    if ($op == 'form' && $category == 'account') {
     $user_formats = filter_formats();
     $options = array();
     $options_default = array();
     foreach (wysiwyg_profile_load_all() as $format => $profile) {
-      // Only show profiles that have user_choose enabled.
-      if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) {
+        // Only show profiles that have user_choose enabled.
+        if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) {
         $options[$format] = check_plain($user_formats[$format]->name);
         if (wysiwyg_user_get_status($profile, $account)) {
-          $options_default[] = $format;
+            $options_default[] = $format;
+        }
         }
-      }
     }
     if (!empty($options)) {
-      $form['wysiwyg']['wysiwyg_status'] = array(
+        $form['wysiwyg']['wysiwyg_status'] = array(
         '#type' => 'checkboxes',
         '#title' => t('Text formats enabled for rich-text editing'),
         '#options' => $options,
         '#default_value' => $options_default,
-      );
-      return $form;
+        );
+        return $form;
     }
-  }
-  elseif ($op == 'insert' || $op == 'update') {
+    }
+    elseif ($op == 'insert' || $op == 'update') {
     if (isset($edit['wysiwyg_status'])) {
-      db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
-      foreach ($edit['wysiwyg_status'] as $format => $status) {
+        db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
+        foreach ($edit['wysiwyg_status'] as $format => $status) {
         db_query("INSERT INTO {wysiwyg_user} (uid, format, status) VALUES (%d, %d, %d)", array(
-          $account->uid,
-          $format,
-          (int) (bool) $status,
+            $account->uid,
+            $format,
+            (int) (bool) $status,
         ));
-      }
+        }
+    }
     }
-  }
 }
 
 function wysiwyg_user_get_status($profile, $account = NULL) {
-  global $user;
+    global $user;
 
-  if (!isset($account)) {
+    if (!isset($account)) {
     $account = $user;
-  }
+    }
 
-  // Default wysiwyg editor status information is only required on forms, so we
-  // do not pre-emptively load and attach this information on every user_load().
-  if (!isset($account->wysiwyg_status)) {
+    // Default wysiwyg editor status information is only required on forms, so we
+    // do not pre-emptively load and attach this information on every user_load().
+    if (!isset($account->wysiwyg_status)) {
     $account->wysiwyg_status = array();
     $result = db_query("SELECT format, status FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
     while ($row = db_fetch_object($result)) {
-      $account->wysiwyg_status[$row->format] = $row->status;
+        $account->wysiwyg_status[$row->format] = $row->status;
+    }
     }
-  }
 
-  if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) {
+    if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) {
     $status = $account->wysiwyg_status[$profile->format];
-  }
-  else {
+    }
+    else {
     $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE;
-  }
+    }
 
-  return (bool) $status;
+    return (bool) $status;
 }
 
 /**
@@ -772,110 +772,110 @@ 
  *   installed properly.
  */
 function wysiwyg_get_editor($name) {
-  $editors = wysiwyg_get_all_editors();
-  return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE;
+    $editors = wysiwyg_get_all_editors();
+    return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE;
 }
 
 /**
  * Compile a list holding all supported editors including installed editor version information.
  */
 function wysiwyg_get_all_editors() {
-  static $editors;
+    static $editors;
 
-  if (isset($editors)) {
+    if (isset($editors)) {
     return $editors;
-  }
+    }
 
-  $editors = wysiwyg_load_includes('editors', 'editor');
-  foreach ($editors as $editor => $properties) {
+    $editors = wysiwyg_load_includes('editors', 'editor');
+    foreach ($editors as $editor => $properties) {
     // Fill in required properties.
     $editors[$editor] += array(
-      'title' => '',
-      'vendor url' => '',
-      'download url' => '',
-      'editor path' => wysiwyg_get_path($editors[$editor]['name']),
-      'library path' => wysiwyg_get_path($editors[$editor]['name']),
-      'libraries' => array(),
-      'version callback' => NULL,
-      'themes callback' => NULL,
-      'settings callback' => NULL,
-      'plugin callback' => NULL,
-      'plugin settings callback' => NULL,
-      'versions' => array(),
-      'js path' => $editors[$editor]['path'] . '/js',
-      'css path' => $editors[$editor]['path'] . '/css',
+        'title' => '',
+        'vendor url' => '',
+        'download url' => '',
+        'editor path' => wysiwyg_get_path($editors[$editor]['name']),
+        'library path' => wysiwyg_get_path($editors[$editor]['name']),
+        'libraries' => array(),
+        'version callback' => NULL,
+        'themes callback' => NULL,
+        'settings callback' => NULL,
+        'plugin callback' => NULL,
+        'plugin settings callback' => NULL,
+        'versions' => array(),
+        'js path' => $editors[$editor]['path'] . '/js',
+        'css path' => $editors[$editor]['path'] . '/css',
     );
     // Check whether library is present.
     if (!($editors[$editor]['installed'] = file_exists($editors[$editor]['library path']))) {
-      continue;
+        continue;
     }
     // Detect library version.
     if (function_exists($editors[$editor]['version callback'])) {
-      $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]);
+        $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]);
     }
     if (empty($editors[$editor]['installed version'])) {
-      $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title']));
-      $editors[$editor]['installed'] = FALSE;
-      continue;
+        $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title']));
+        $editors[$editor]['installed'] = FALSE;
+        continue;
     }
     // Determine to which supported version the installed version maps.
     ksort($editors[$editor]['versions']);
     $version = 0;
     foreach ($editors[$editor]['versions'] as $supported_version => $version_properties) {
-      if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) {
+        if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) {
         $version = $supported_version;
-      }
+        }
     }
     if (!$version) {
-      $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title']));
-      $editors[$editor]['installed'] = FALSE;
-      continue;
+        $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title']));
+        $editors[$editor]['installed'] = FALSE;
+        continue;
     }
     // Apply library version specific definitions and overrides.
     $editors[$editor] = array_merge($editors[$editor], $editors[$editor]['versions'][$version]);
     unset($editors[$editor]['versions']);
-  }
-  return $editors;
+    }
+    return $editors;
 }
 
 /**
  * Invoke hook_wysiwyg_plugin() in all modules.
  */
 function wysiwyg_get_all_plugins() {
-  static $plugins;
+    static $plugins;
 
-  if (isset($plugins)) {
+    if (isset($plugins)) {
     return $plugins;
-  }
+    }
 
-  $plugins = wysiwyg_load_includes('plugins', 'plugin');
-  foreach ($plugins as $name => $properties) {
+    $plugins = wysiwyg_load_includes('plugins', 'plugin');
+    foreach ($plugins as $name => $properties) {
     $plugin = &$plugins[$name];
     // Fill in required/default properties.
     $plugin += array(
-      'title' => $plugin['name'],
-      'vendor url' => '',
-      'js path' => $plugin['path'] . '/' . $plugin['name'],
-      'js file' => $plugin['name'] . '.js',
-      'css path' => $plugin['path'] . '/' . $plugin['name'],
-      'css file' => $plugin['name'] . '.css',
-      'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images',
-      'icon file' => $plugin['name'] . '.png',
-      'dialog path' => $plugin['name'],
-      'dialog settings' => array(),
-      'settings callback' => NULL,
-      'settings form callback' => NULL,
+        'title' => $plugin['name'],
+        'vendor url' => '',
+        'js path' => $plugin['path'] . '/' . $plugin['name'],
+        'js file' => $plugin['name'] . '.js',
+        'css path' => $plugin['path'] . '/' . $plugin['name'],
+        'css file' => $plugin['name'] . '.css',
+        'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images',
+        'icon file' => $plugin['name'] . '.png',
+        'dialog path' => $plugin['name'],
+        'dialog settings' => array(),
+        'settings callback' => NULL,
+        'settings form callback' => NULL,
     );
     // Fill in default settings.
     $plugin['settings'] += array(
-      'path' => base_path() . $plugin['path'] . '/' . $plugin['name'],
+        'path' => base_path() . $plugin['path'] . '/' . $plugin['name'],
     );
     // Check whether library is present.
     if (!($plugin['installed'] = file_exists($plugin['js path'] . '/' . $plugin['js file']))) {
-      continue;
+        continue;
+    }
     }
-  }
-  return $plugins;
+    return $plugins;
 }
 
 /**
@@ -891,26 +891,26 @@ 
  * @see wysiwyg_get_directories(), _wysiwyg_process_include()
  */
 function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) {
-  // Determine implementations.
-  $directories = wysiwyg_get_directories($type);
-  $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
-  $file_list = array();
-  foreach ($directories as $module => $path) {
+    // Determine implementations.
+    $directories = wysiwyg_get_directories($type);
+    $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
+    $file_list = array();
+    foreach ($directories as $module => $path) {
     $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0);
-  }
+    }
 
-  // Load implementations.
-  $info = array();
-  foreach (array_filter($file_list) as $module => $files) {
+    // Load implementations.
+    $info = array();
+    foreach (array_filter($file_list) as $module => $files) {
     foreach ($files as $file) {
-      include_once './' . $file->filename;
-      $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook);
-      if (is_array($result)) {
+        include_once './' . $file->filename;
+        $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook);
+        if (is_array($result)) {
         $info = array_merge($info, $result);
-      }
+        }
     }
-  }
-  return $info;
+    }
+    return $info;
 }
 
 /**
@@ -927,20 +927,20 @@ 
  * @ingroup libraries
  */
 function wysiwyg_get_path($library, $base_path = FALSE) {
-  static $libraries;
+    static $libraries;
 
-  if (!isset($libraries)) {
+    if (!isset($libraries)) {
     $libraries = wysiwyg_get_libraries();
-  }
-  if (!isset($libraries[$library])) {
+    }
+    if (!isset($libraries[$library])) {
     // Most often, external libraries can be shared across multiple sites.
     return 'sites/all/libraries/' . $library;
-  }
+    }
 
-  $path = ($base_path ? base_path() : '');
-  $path .= $libraries[$library];
+    $path = ($base_path ? base_path() : '');
+    $path .= $libraries[$library];
 
-  return $path;
+    return $path;
 }
 
 /**
@@ -960,55 +960,55 @@ 
  * @ingroup libraries
  */
 function wysiwyg_get_libraries() {
-  global $profile;
-
-  // When this function is called during Drupal's initial installation process,
-  // the name of the profile that is about to be installed is stored in the
-  // global $profile variable. At all other times, the regular system variable
-  // contains the name of the current profile, and we can call variable_get()
-  // to determine the profile.
-  if (!isset($profile)) {
+    global $profile;
+
+    // When this function is called during Drupal's initial installation process,
+    // the name of the profile that is about to be installed is stored in the
+    // global $profile variable. At all other times, the regular system variable
+    // contains the name of the current profile, and we can call variable_get()
+    // to determine the profile.
+    if (!isset($profile)) {
     $profile = variable_get('install_profile', 'default');
-  }
+    }
 
-  $directory = 'libraries';
-  $searchdir = array();
-  $config = conf_path();
+    $directory = 'libraries';
+    $searchdir = array();
+    $config = conf_path();
 
-  // The 'profiles' directory contains pristine collections of modules and
-  // themes as organized by a distribution.  It is pristine in the same way
-  // that /modules is pristine for core; users should avoid changing anything
-  // there in favor of sites/all or sites/<domain> directories.
-  if (file_exists("profiles/$profile/$directory")) {
+    // The 'profiles' directory contains pristine collections of modules and
+    // themes as organized by a distribution.  It is pristine in the same way
+    // that /modules is pristine for core; users should avoid changing anything
+    // there in favor of sites/all or sites/<domain> directories.
+    if (file_exists("profiles/$profile/$directory")) {
     $searchdir[] = "profiles/$profile/$directory";
-  }
+    }
 
-  // Always search sites/all/*.
-  $searchdir[] = 'sites/all/' . $directory;
+    // Always search sites/all/*.
+    $searchdir[] = 'sites/all/' . $directory;
 
-  // Also search sites/<domain>/*.
-  if (file_exists("$config/$directory")) {
+    // Also search sites/<domain>/*.
+    if (file_exists("$config/$directory")) {
     $searchdir[] = "$config/$directory";
-  }
+    }
 
-  // Retrieve list of directories.
-  // @todo Core: Allow to scan for directories.
-  $directories = array();
-  $nomask = array('CVS');
-  foreach ($searchdir as $dir) {
+    // Retrieve list of directories.
+    // @todo Core: Allow to scan for directories.
+    $directories = array();
+    $nomask = array('CVS');
+    foreach ($searchdir as $dir) {
     if (is_dir($dir) && $handle = opendir($dir)) {
-      while (FALSE !== ($file = readdir($handle))) {
+        while (FALSE !== ($file = readdir($handle))) {
         if (!in_array($file, $nomask) && $file[0] != '.') {
-          if (is_dir("$dir/$file")) {
+            if (is_dir("$dir/$file")) {
             $directories[$file] = "$dir/$file";
-          }
+            }
+        }
         }
-      }
-      closedir($handle);
+        closedir($handle);
+    }
     }
-  }
 
-  return $directories;
+    return $directories;
 }
 
 /**
@@ -1024,14 +1024,14 @@ 
  * @see wysiwyg_load_includes(), _wysiwyg_process_include()
  */
 function wysiwyg_get_directories($plugintype) {
-  $directories = array();
-  foreach (module_implements('wysiwyg_include_directory') as $module) {
+    $directories = array();
+    foreach (module_implements('wysiwyg_include_directory') as $module) {
     $result = module_invoke($module, 'wysiwyg_include_directory', $plugintype);
     if (isset($result) && is_string($result)) {
-      $directories[$module] = drupal_get_path('module', $module) . '/' . $result;
+        $directories[$module] = drupal_get_path('module', $module) . '/' . $result;
     }
-  }
-  return $directories;
+    }
+    return $directories;
 }
 
 /**
@@ -1045,22 +1045,22 @@ 
  *   The name of the hook being invoked.
  */
 function _wysiwyg_process_include($module, $identifier, $path, $hook) {
-  $function = $identifier . '_' . $hook;
-  if (!function_exists($function)) {
+    $function = $identifier . '_' . $hook;
+    if (!function_exists($function)) {
     return NULL;
-  }
-  $result = $function();
-  if (!isset($result) || !is_array($result)) {
+    }
+    $result = $function();
+    if (!isset($result) || !is_array($result)) {
     return NULL;
-  }
+    }
 
-  // Fill in defaults.
-  foreach ($result as $editor => $properties) {
+    // Fill in defaults.
+    foreach ($result as $editor => $properties) {
     $result[$editor]['module'] = $module;
     $result[$editor]['name'] = $editor;
     $result[$editor]['path'] = $path;
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -1079,12 +1079,12 @@ 
  * installed.
  */
 function wysiwyg_features_api() {
-  $return = array();
-  if (module_exists('exportables') && module_exists('ctools')) {
+    $return = array();
+    if (module_exists('exportables') && module_exists('ctools')) {
     module_load_include('inc', 'features', 'includes/features.ctools');
     $return = ctools_component_features_api('wysiwyg');
-  }
-  return $return;
+    }
+    return $return;
 }
 
 /**
@@ -1094,10 +1094,10 @@ 
  */
 function wysiwyg_features_export($data, &$export, $module_name = '') {
 
-  $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name);
-  $export['dependencies']['exportables'] = 'exportables';
+    $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name);
+    $export['dependencies']['exportables'] = 'exportables';
 
-  return $return;
+    return $return;
 }
 
 /**

Switch Indentation +3 added lines, -3 removed lines

@@ -79,9 +79,9 @@
  */
 function wysiwyg_help($path, $arg) {
   switch ($path) {
-    case 'admin/settings/wysiwyg':
-      $output = '<p>' . t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.') . '</p>';
-      return $output;
+  case 'admin/settings/wysiwyg':
+    $output = '<p>' . t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.') . '</p>';
+    return $output;
   }
 }
 

Spacing +39 added lines, -39 removed lines

@@ -80,7 +80,7 @@ 
 function wysiwyg_help($path, $arg) {
   switch ($path) {
     case 'admin/settings/wysiwyg':
-      $output = '<p>' . t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.') . '</p>';
+      $output = '<p>'.t('A Wysiwyg profile is associated with an input format. A Wysiwyg profile defines which client-side editor is loaded with a particular input format, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor-specific functions.').'</p>';
       return $output;
   }
 }
@@ -179,9 +179,9 @@ 
             if ($profile) {
               $loaded = TRUE;
               $editor = $profile->editor;
-              $status = (int) wysiwyg_user_get_status($profile);
+              $status = (int)wysiwyg_user_get_status($profile);
               if (isset($profile->settings['show_toggle'])) {
-                $toggle = (int) $profile->settings['show_toggle'];
+                $toggle = (int)$profile->settings['show_toggle'];
               }
               // Check editor theme (and reset it if not/no longer available).
               $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : ''));
@@ -195,7 +195,7 @@ 
             // Use a prefix/suffix for a single input format, or attach to input
             // format selector radio buttons.
             if (isset($element['format']['guidelines'])) {
-              $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class . '">';
+              $element['format']['guidelines']['#prefix'] = '<div class="wysiwyg wysiwyg-format-'.$format.' wysiwyg-editor-'.$editor.' wysiwyg-field-'.$field['#id'].' wysiwyg-status-'.$status.' wysiwyg-toggle-'.$toggle.$extra_class.'">';
               $element['format']['guidelines']['#suffix'] = '</div>';
               // Edge-case: Default format contains no input filters.
               if (empty($element['format']['guidelines']['#value'])) {
@@ -203,8 +203,8 @@ 
               }
             }
             else {
-              $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
-              $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
+              $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'].' ' : '');
+              $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-'.$format.' wysiwyg-editor-'.$editor.' wysiwyg-field-'.$field['#id'].' wysiwyg-status-'.$status.' wysiwyg-toggle-'.$toggle.$extra_class;
             }
           }
 
@@ -283,10 +283,10 @@ 
       foreach ($files as $file => $options) {
         if (is_array($options)) {
           $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
-          drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
+          drupal_add_js($editor['library path'].'/'.$file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
         }
         else {
-          drupal_add_js($editor['library path'] . '/' . $options);
+          drupal_add_js($editor['library path'].'/'.$options);
         }
       }
       // If editor defines an additional load callback, invoke it.
@@ -300,7 +300,7 @@ 
         $files = $editor['js files'];
       }
       foreach ($files as $file) {
-        drupal_add_js($editor['js path'] . '/' . $file);
+        drupal_add_js($editor['js path'].'/'.$file);
       }
       // Load CSS stylesheets for this editor.
       $files = array();
@@ -308,7 +308,7 @@ 
         $files = $editor['css files'];
       }
       foreach ($files as $file) {
-        drupal_add_css($editor['css path'] . '/' . $file);
+        drupal_add_css($editor['css path'].'/'.$file);
       }
 
       drupal_add_js(array('wysiwyg' => array(
@@ -316,7 +316,7 @@ 
           // @todo Move into (global) editor settings.
           // If JS compression is enabled, at least TinyMCE is unable to determine
           // its own base path and exec mode since it can't find the script name.
-          'editorBasePath' => base_path() . $editor['library path'],
+          'editorBasePath' => base_path().$editor['library path'],
           'execMode' => $library,
         ))),
       )), 'setting');
@@ -340,11 +340,11 @@ 
     $path = drupal_get_path('module', 'wysiwyg');
     // Initialize our namespaces in the *header* to do not force editor
     // integration scripts to check and define Drupal.wysiwyg on its own.
-    drupal_add_js($path . '/wysiwyg.init.js', 'core');
+    drupal_add_js($path.'/wysiwyg.init.js', 'core');
 
     // The 'none' editor is a special editor implementation, allowing us to
     // attach and detach regular Drupal behaviors just like any other editor.
-    drupal_add_js($path . '/editors/js/none.js');
+    drupal_add_js($path.'/editors/js/none.js');
 
     // Add wysiwyg.js to the footer to ensure it's executed after the
     // Drupal.settings array has been rendered and populated. Also, since editor
@@ -352,7 +352,7 @@ 
     // and Drupal.wysiwygInit() must be executed AFTER editors registered
     // their callbacks and BEFORE Drupal.behaviors are applied, this must come
     // last.
-    drupal_add_js($path . '/wysiwyg.js', 'module', 'footer');
+    drupal_add_js($path.'/wysiwyg.js', 'module', 'footer');
 
     $settings_added = TRUE;
   }
@@ -371,7 +371,7 @@ 
     // drupal_to_js() does not properly convert numeric array keys, so we need
     // to use a string instead of the format id.
     if ($config) {
-      drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
+      drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format'.$profile->format => $config)))), 'setting');
     }
     $formats[$profile->format] = TRUE;
   }
@@ -448,7 +448,7 @@ 
     $settings_native = call_user_func($editor['plugin settings callback'], $editor, $profile, $profile_plugins_native);
 
     if ($settings_native) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting');
+      drupal_add_js(array('wysiwyg' => array('plugins' => array('format'.$profile->format => array('native' => $settings_native)))), 'setting');
     }
   }
 
@@ -463,7 +463,7 @@ 
         if (!isset($processed_plugins[$proxy][$plugin])) {
           $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta;
           // Load the Drupal plugin's JavaScript.
-          drupal_add_js($meta['js path'] . '/' . $meta['js file']);
+          drupal_add_js($meta['js path'].'/'.$meta['js file']);
           // Add plugin-specific settings.
           if (isset($meta['settings'])) {
             drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting');
@@ -479,7 +479,7 @@ 
     $settings_drupal = call_user_func($editor['proxy plugin settings callback'], $editor, $profile, $profile_plugins_drupal);
 
     if ($settings_drupal) {
-      drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting');
+      drupal_add_js(array('wysiwyg' => array('plugins' => array('format'.$profile->format => array('drupal' => $settings_drupal)))), 'setting');
     }
   }
 }
@@ -596,7 +596,7 @@ 
     if ($media != 'print') {
       foreach ($css['theme'] as $filepath => $preprocess) {
         if (file_exists($filepath)) {
-          $files[] = base_path() . $filepath;
+          $files[] = base_path().$filepath;
         }
       }
     }
@@ -719,7 +719,7 @@ 
         db_query("INSERT INTO {wysiwyg_user} (uid, format, status) VALUES (%d, %d, %d)", array(
           $account->uid,
           $format,
-          (int) (bool) $status,
+          (int)(bool)$status,
         ));
       }
     }
@@ -750,7 +750,7 @@ 
     $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE;
   }
 
-  return (bool) $status;
+  return (bool)$status;
 }
 
 /**
@@ -802,8 +802,8 @@ 
       'plugin callback' => NULL,
       'plugin settings callback' => NULL,
       'versions' => array(),
-      'js path' => $editors[$editor]['path'] . '/js',
-      'css path' => $editors[$editor]['path'] . '/css',
+      'js path' => $editors[$editor]['path'].'/js',
+      'css path' => $editors[$editor]['path'].'/css',
     );
     // Check whether library is present.
     if (!($editors[$editor]['installed'] = file_exists($editors[$editor]['library path']))) {
@@ -855,12 +855,12 @@ 
     $plugin += array(
       'title' => $plugin['name'],
       'vendor url' => '',
-      'js path' => $plugin['path'] . '/' . $plugin['name'],
-      'js file' => $plugin['name'] . '.js',
-      'css path' => $plugin['path'] . '/' . $plugin['name'],
-      'css file' => $plugin['name'] . '.css',
-      'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images',
-      'icon file' => $plugin['name'] . '.png',
+      'js path' => $plugin['path'].'/'.$plugin['name'],
+      'js file' => $plugin['name'].'.js',
+      'css path' => $plugin['path'].'/'.$plugin['name'],
+      'css file' => $plugin['name'].'.css',
+      'icon path' => $plugin['path'].'/'.$plugin['name'].'/images',
+      'icon file' => $plugin['name'].'.png',
       'dialog path' => $plugin['name'],
       'dialog settings' => array(),
       'settings callback' => NULL,
@@ -868,10 +868,10 @@ 
     );
     // Fill in default settings.
     $plugin['settings'] += array(
-      'path' => base_path() . $plugin['path'] . '/' . $plugin['name'],
+      'path' => base_path().$plugin['path'].'/'.$plugin['name'],
     );
     // Check whether library is present.
-    if (!($plugin['installed'] = file_exists($plugin['js path'] . '/' . $plugin['js file']))) {
+    if (!($plugin['installed'] = file_exists($plugin['js path'].'/'.$plugin['js file']))) {
       continue;
     }
   }
@@ -893,18 +893,18 @@ 
 function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) {
   // Determine implementations.
   $directories = wysiwyg_get_directories($type);
-  $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
+  $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg').'/'.$type;
   $file_list = array();
   foreach ($directories as $module => $path) {
-    $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0);
+    $file_list[$module] = drupal_system_listing("$file".'.inc$', $path, 'name', 0);
   }
 
   // Load implementations.
   $info = array();
   foreach (array_filter($file_list) as $module => $files) {
     foreach ($files as $file) {
-      include_once './' . $file->filename;
-      $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook);
+      include_once './'.$file->filename;
+      $result = _wysiwyg_process_include($module, $module.'_'.$file->name, dirname($file->filename), $hook);
       if (is_array($result)) {
         $info = array_merge($info, $result);
       }
@@ -934,7 +934,7 @@ 
   }
   if (!isset($libraries[$library])) {
     // Most often, external libraries can be shared across multiple sites.
-    return 'sites/all/libraries/' . $library;
+    return 'sites/all/libraries/'.$library;
   }
 
   $path = ($base_path ? base_path() : '');
@@ -984,7 +984,7 @@ 
   }
 
   // Always search sites/all/*.
-  $searchdir[] = 'sites/all/' . $directory;
+  $searchdir[] = 'sites/all/'.$directory;
 
   // Also search sites/<domain>/*.
   if (file_exists("$config/$directory")) {
@@ -1028,7 +1028,7 @@ 
   foreach (module_implements('wysiwyg_include_directory') as $module) {
     $result = module_invoke($module, 'wysiwyg_include_directory', $plugintype);
     if (isset($result) && is_string($result)) {
-      $directories[$module] = drupal_get_path('module', $module) . '/' . $result;
+      $directories[$module] = drupal_get_path('module', $module).'/'.$result;
     }
   }
   return $directories;
@@ -1045,7 +1045,7 @@ 
  *   The name of the hook being invoked.
  */
 function _wysiwyg_process_include($module, $identifier, $path, $hook) {
-  $function = $identifier . '_' . $hook;
+  $function = $identifier.'_'.$hook;
   if (!function_exists($function)) {
     return NULL;
   }

Braces +7 added lines, -14 removed lines

@@ -201,8 +201,7 @@ 
               if (empty($element['format']['guidelines']['#value'])) {
                 $element['format']['guidelines']['#value'] = ' ';
               }
-            }
-            else {
+            } else {
               $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : '');
               $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class;
             }
@@ -273,8 +272,7 @@ 
       if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) {
         $library = $profile->settings['library'];
         $files = $editor['libraries'][$library]['files'];
-      }
-      else {
+      } else {
         // Fallback to the first defined library by default (external libraries can change).
         $library = key($editor['libraries']);
         $files = array_shift($editor['libraries']);
@@ -284,8 +282,7 @@ 
         if (is_array($options)) {
           $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
           drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
-        }
-        else {
+        } else {
           drupal_add_js($editor['library path'] . '/' . $options);
         }
       }
@@ -322,8 +319,7 @@ 
       )), 'setting');
 
       $loaded[$name] = TRUE;
-    }
-    else {
+    } else {
       $loaded[$name] = FALSE;
     }
   }
@@ -468,8 +464,7 @@ 
           if (isset($meta['settings'])) {
             drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting');
           }
-        }
-        else {
+        } else {
           $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin];
         }
       }
@@ -711,8 +706,7 @@ 
       );
       return $form;
     }
-  }
-  elseif ($op == 'insert' || $op == 'update') {
+  } elseif ($op == 'insert' || $op == 'update') {
     if (isset($edit['wysiwyg_status'])) {
       db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid);
       foreach ($edit['wysiwyg_status'] as $format => $status) {
@@ -745,8 +739,7 @@ 
 
   if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) {
     $status = $account->wysiwyg_status[$profile->format];
-  }
-  else {
+  } else {
     $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE;
   }
 

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

@@ -61,13 +61,13 @@ 
 function wysiwyg_theme() {
   return array(
     'wysiwyg_profile_overview' => array(
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
     'wysiwyg_admin_button_table' => array(
-      'arguments' => array('form' => NULL),
+      'arguments' => array('form' => null),
     ),
     'wysiwyg_dialog_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+      'arguments' => array('content' => null, 'show_messages' => true),
       'file' => 'wysiwyg.dialog.inc',
       'template' => 'wysiwyg-dialog-page',
     ),
@@ -89,7 +89,7 @@ 
  * Clear wysiwyg cache on admin/build/modules form.
  */
 function wysiwyg_form_system_modules_alter(&$form, $form_state) {
-  wysiwyg_profile_load_all(TRUE);
+  wysiwyg_profile_load_all(true);
 }
 
 /**
@@ -166,7 +166,7 @@ 
           // guidelines, stored in the child 'format'.
           $formats = element_children($element);
           array_pop($formats);
-          if (($key = array_search('format', $formats)) !== FALSE) {
+          if (($key = array_search('format', $formats)) !== false) {
             unset($formats[$key]);
           }
           foreach ($formats as $format) {
@@ -177,7 +177,7 @@ 
             // Fetch the profile associated to this input format.
             $profile = wysiwyg_get_profile($format);
             if ($profile) {
-              $loaded = TRUE;
+              $loaded = true;
               $editor = $profile->editor;
               $status = (int) wysiwyg_user_get_status($profile);
               if (isset($profile->settings['show_toggle'])) {
@@ -211,7 +211,7 @@ 
           // If we loaded at least one editor, then the 'none' editor will
           // handle resizable textareas instead of core.
           if (isset($loaded) && !empty($field['#resizable'])) {
-            $field['#resizable'] = FALSE;
+            $field['#resizable'] = false;
           }
         }
         // If this element is 'format', do not recurse further.
@@ -244,7 +244,7 @@ 
       return $profile;
     }
   }
-  return FALSE;
+  return false;
 }
 
 /**
@@ -282,7 +282,7 @@ 
       }
       foreach ($files as $file => $options) {
         if (is_array($options)) {
-          $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE);
+          $options += array('type' => 'module', 'scope' => 'header', 'defer' => false, 'cache' => true, 'preprocess' => true);
           drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']);
         }
         else {
@@ -321,10 +321,10 @@ 
         ))),
       )), 'setting');
 
-      $loaded[$name] = TRUE;
+      $loaded[$name] = true;
     }
     else {
-      $loaded[$name] = FALSE;
+      $loaded[$name] = false;
     }
   }
 
@@ -354,7 +354,7 @@ 
     // last.
     drupal_add_js($path . '/wysiwyg.js', 'module', 'footer');
 
-    $settings_added = TRUE;
+    $settings_added = true;
   }
 
   return $loaded[$name];
@@ -373,7 +373,7 @@ 
     if ($config) {
       drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting');
     }
-    $formats[$profile->format] = TRUE;
+    $formats[$profile->format] = true;
   }
 }
 
@@ -411,7 +411,7 @@ 
   if (isset($processed_formats[$profile->format])) {
     return;
   }
-  $processed_formats[$profile->format] = TRUE;
+  $processed_formats[$profile->format] = true;
 
   $editor = wysiwyg_get_editor($profile->editor);
 
@@ -498,7 +498,7 @@ 
  *   An array of theme names, or a single, checked theme name if $selected_theme
  *   was given.
  */
-function wysiwyg_get_editor_themes(&$profile, $selected_theme = NULL) {
+function wysiwyg_get_editor_themes(&$profile, $selected_theme = null) {
   static $themes = array();
 
   if (!isset($themes[$profile->editor])) {
@@ -614,13 +614,13 @@ 
     $profiles = wysiwyg_profile_load_all();
   }
 
-  return (isset($profiles[$format]) ? $profiles[$format] : FALSE);
+  return (isset($profiles[$format]) ? $profiles[$format] : false);
 }
 
 /**
  * Load all profiles.
  */
-function wysiwyg_profile_load_all($reset = FALSE) {
+function wysiwyg_profile_load_all($reset = false) {
   static $profiles;
 
   if ($reset || !isset($profiles)) {
@@ -663,7 +663,7 @@ 
  * Wysiwyg profiles list callback.
  */
 function wysiwyg_profile_list() {
-  $profiles = wysiwyg_profile_load_all(TRUE);
+  $profiles = wysiwyg_profile_load_all(true);
   $filter_formats = filter_formats();
   $list = array();
   foreach ($profiles as $profile) {
@@ -688,7 +688,7 @@ 
 /**
  * Implementation of hook_user().
  */
-function wysiwyg_user($op, &$edit, $account, $category = NULL) {
+function wysiwyg_user($op, &$edit, $account, $category = null) {
   if ($op == 'form' && $category == 'account') {
     $user_formats = filter_formats();
     $options = array();
@@ -726,7 +726,7 @@ 
   }
 }
 
-function wysiwyg_user_get_status($profile, $account = NULL) {
+function wysiwyg_user_get_status($profile, $account = null) {
   global $user;
 
   if (!isset($account)) {
@@ -747,7 +747,7 @@ 
     $status = $account->wysiwyg_status[$profile->format];
   }
   else {
-    $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE;
+    $status = isset($profile->settings['default']) ? $profile->settings['default'] : true;
   }
 
   return (bool) $status;
@@ -773,7 +773,7 @@ 
  */
 function wysiwyg_get_editor($name) {
   $editors = wysiwyg_get_all_editors();
-  return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE;
+  return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : false;
 }
 
 /**
@@ -796,11 +796,11 @@ 
       'editor path' => wysiwyg_get_path($editors[$editor]['name']),
       'library path' => wysiwyg_get_path($editors[$editor]['name']),
       'libraries' => array(),
-      'version callback' => NULL,
-      'themes callback' => NULL,
-      'settings callback' => NULL,
-      'plugin callback' => NULL,
-      'plugin settings callback' => NULL,
+      'version callback' => null,
+      'themes callback' => null,
+      'settings callback' => null,
+      'plugin callback' => null,
+      'plugin settings callback' => null,
       'versions' => array(),
       'js path' => $editors[$editor]['path'] . '/js',
       'css path' => $editors[$editor]['path'] . '/css',
@@ -815,7 +815,7 @@ 
     }
     if (empty($editors[$editor]['installed version'])) {
       $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title']));
-      $editors[$editor]['installed'] = FALSE;
+      $editors[$editor]['installed'] = false;
       continue;
     }
     // Determine to which supported version the installed version maps.
@@ -828,7 +828,7 @@ 
     }
     if (!$version) {
       $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title']));
-      $editors[$editor]['installed'] = FALSE;
+      $editors[$editor]['installed'] = false;
       continue;
     }
     // Apply library version specific definitions and overrides.
@@ -863,8 +863,8 @@ 
       'icon file' => $plugin['name'] . '.png',
       'dialog path' => $plugin['name'],
       'dialog settings' => array(),
-      'settings callback' => NULL,
-      'settings form callback' => NULL,
+      'settings callback' => null,
+      'settings form callback' => null,
     );
     // Fill in default settings.
     $plugin['settings'] += array(
@@ -890,7 +890,7 @@ 
  *
  * @see wysiwyg_get_directories(), _wysiwyg_process_include()
  */
-function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) {
+function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = null) {
   // Determine implementations.
   $directories = wysiwyg_get_directories($type);
   $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type;
@@ -926,7 +926,7 @@ 
  *
  * @ingroup libraries
  */
-function wysiwyg_get_path($library, $base_path = FALSE) {
+function wysiwyg_get_path($library, $base_path = false) {
   static $libraries;
 
   if (!isset($libraries)) {
@@ -997,7 +997,7 @@ 
   $nomask = array('CVS');
   foreach ($searchdir as $dir) {
     if (is_dir($dir) && $handle = opendir($dir)) {
-      while (FALSE !== ($file = readdir($handle))) {
+      while (false !== ($file = readdir($handle))) {
         if (!in_array($file, $nomask) && $file[0] != '.') {
           if (is_dir("$dir/$file")) {
             $directories[$file] = "$dir/$file";
@@ -1047,11 +1047,11 @@ 
 function _wysiwyg_process_include($module, $identifier, $path, $hook) {
   $function = $identifier . '_' . $hook;
   if (!function_exists($function)) {
-    return NULL;
+    return null;
   }
   $result = $function();
   if (!isset($result) || !is_array($result)) {
-    return NULL;
+    return null;
   }
 
   // Fill in defaults.

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));
     }
   }
 }

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

Indentation +63 added lines, -63 removed lines

@@ -2,38 +2,38 @@ 
 // $Id: bbcode.module,v 1.50 2008/02/07 14:05:30 naudefj Exp $
 
 function bbcode_help($section) {
-  if ($section == 'admin/modules#description')
+    if ($section == 'admin/modules#description')
     return t('Allow the use of BBCode in your posts.');
 }
 
 function bbcode_filter_tips($delta, $format, $long = false) {
-  if ($long) {
+    if ($long) {
     include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
     return _bbcode_filter_tip();
-  }
-  else {
+    }
+    else {
     # D5: $output = t('You can use !BBCode tags in the text.', array('!BBCode' =>  l(t('BBCode'), "filter/tips/$format", NULL, NULL, 'filter-bbcode-' . $delta)));
     $output = t('You can use !BBCode (opens in new window) tags in the text.',
-      array(
+        array(
         '!BBCode' =>  l(t('BBCode'), "filter/tips/$format",
         array(
-          'fragment' => 'filter-bbcode-' . $delta,
-	  'attributes' =>
-	    array(
-	      'target'=>'_blank',
-	      'rel'=>'noopener noreferrer',
-	    ),
+            'fragment' => 'filter-bbcode-' . $delta,
+        'attributes' =>
+        array(
+            'target'=>'_blank',
+            'rel'=>'noopener noreferrer',
+        ),
         ))
-      ));
+        ));
     if (variable_get("bbcode_make_links_$format", FALSE)) {
-      $output .= ' '. t('URLs will automatically be converted to links.');
+        $output .= ' '. t('URLs will automatically be converted to links.');
     }
     return $output;
-  }
+    }
 }
 
 function bbcode_filter($op, $delta = 0, $format = -1, $text = '') {
-  switch ($op) {
+    switch ($op) {
     case 'list':
       return array(0 => t('BBCode'));
 
@@ -42,7 +42,7 @@ 
 
     case 'process':
       include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
-      if (variable_get("bbcode_debug_$format", 0)) {
+        if (variable_get("bbcode_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _bbcode_filter_process($text, $format);
         $timing_stop = explode(' ', microtime());
@@ -50,99 +50,99 @@ 
         $elapsed += $timing_stop[0] - $timing_start[0];
         $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
-      }
-      else 
+        }
+        else 
         return _bbcode_filter_process($text, $format);
 
     case 'settings':
       $form = array();
-      $form['bbcode_filter'] = array(
+        $form['bbcode_filter'] = array(
         '#type' => 'fieldset', 
         '#title' => t('BBCode filter'), 
         '#collapsible' => TRUE, 
         '#collapsed' => FALSE);
-      $form['bbcode_filter']["bbcode_make_links_$format"] = array(
+        $form['bbcode_filter']["bbcode_make_links_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Convert addresses to links'), 
         '#default_value' => variable_get("bbcode_make_links_$format", 1), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Turn web and e-mail addresses into clickable links. This is useful if content authors do not explicitly mark addresses as links with [url] and [email] tags.'));
-      $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
+        $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Spam link deterrent'),
         '#default_value' => variable_get("bbcode_filter_nofollow_$format", 0),
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('If enabled, BBCode will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'));
-      $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
+        $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Email address encoding'), 
         '#default_value' => variable_get("bbcode_encode_mailto_$format", 1), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Whether to encode email addresses with javascript. With this method you will have clickable mailto links, but it will be a bit harder for spam robots to collect them.'));
-      $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
+        $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
         '#type' => 'select',
         '#title' => t('Smart paragraph and line breaks'),
         '#default_value' => variable_get("bbcode_paragraph_breaks_$format", 2),
         '#options' => array(t('Disabled'), t('Line breaks only'), t('Line and paragraph breaks')),
         '#description' => t('Add line and paragraph breaks to text, excluding text in preformatted code blocks. If you disable this option, you need to enable Drupal\'s "Line break converter". Don\'t use both together!'));
-      $form['bbcode_filter']["bbcode_debug_$format"] = array(
+        $form['bbcode_filter']["bbcode_debug_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Print debugging info'), 
         '#default_value' => variable_get("bbcode_debug_$format", 0), 
         '#options' => array(t('Disabled'), t('Enabled')), 
         '#description' => t('Print BBCode parse date and execution time. This option should be disabled on production sites. You may need to clear the cache after changing this option.'));
-      return $form;
+        return $form;
 
     default:
       return $text;
-  }
+    }
 }
 
 /* hook_quicktags_alter
  * Alter icons if the quicktags module is enabled
  */
 function bbcode_quicktags_alter($items) {
-  $path = base_path() . drupal_get_path('module','quicktags') .'/';
-  $items['ed_italic'] = array(
-      'name' => 'italic',
-      'prefix' => '[i]',
-      'suffix' => '[/i]',
-      'accesskey' => 'i',
-      'weight' => 10,
-      'icon' => $path .'ed_italic.png',
+    $path = base_path() . drupal_get_path('module','quicktags') .'/';
+    $items['ed_italic'] = array(
+        'name' => 'italic',
+        'prefix' => '[i]',
+        'suffix' => '[/i]',
+        'accesskey' => 'i',
+        'weight' => 10,
+        'icon' => $path .'ed_italic.png',
     );
-  $items['ed_bold'] = array(
-      'name' => 'bold',
-      'prefix' => '[b]',
-      'suffix' => '[/b]',
-      'accesskey' => 'b',
-      'weight' => 20,
-      'icon' => $path .'ed_bold.png',
+    $items['ed_bold'] = array(
+        'name' => 'bold',
+        'prefix' => '[b]',
+        'suffix' => '[/b]',
+        'accesskey' => 'b',
+        'weight' => 20,
+        'icon' => $path .'ed_bold.png',
     );
-  $items['ed_code'] = array(
-      'name' => 'code',
-      'prefix' =>'[code]',
-      'suffix' => '[/code]',
-      'accesskey' => 'c',
-      'weight' => 30,
-      'icon' => $path .'ed_code.png',
+    $items['ed_code'] = array(
+        'name' => 'code',
+        'prefix' =>'[code]',
+        'suffix' => '[/code]',
+        'accesskey' => 'c',
+        'weight' => 30,
+        'icon' => $path .'ed_code.png',
     );
-  $items['ed_block'] = array(
-      'name' => 'quote',
-      'prefix' =>'[quote]',
-      'suffix' => '[/quote]',
-      'accesskey' => 'q',
-      'weight' => 40,
-      'icon' => $path .'ed_block.png',
+    $items['ed_block'] = array(
+        'name' => 'quote',
+        'prefix' =>'[quote]',
+        'suffix' => '[/quote]',
+        'accesskey' => 'q',
+        'weight' => 40,
+        'icon' => $path .'ed_block.png',
     );
-  $items['ed_link'] = array(
-      'name' => 'link',
-      'prefix' =>'[url=http://]',
-      'suffix' => '[/url]',
-      'accesskey' => 'l',
-      'weight' => 50,
-      'icon' => $path .'ed_link.png',
+    $items['ed_link'] = array(
+        'name' => 'link',
+        'prefix' =>'[url=http://]',
+        'suffix' => '[/url]',
+        'accesskey' => 'l',
+        'weight' => 50,
+        'icon' => $path .'ed_link.png',
     );
-  return $items;
+    return $items;
 }
 

Switch Indentation +57 added lines, -57 removed lines

@@ -34,67 +34,67 @@
 
 function bbcode_filter($op, $delta = 0, $format = -1, $text = '') {
   switch ($op) {
-    case 'list':
-      return array(0 => t('BBCode'));
+  case 'list':
+    return array(0 => t('BBCode'));
 
-    case 'description':
-      return t('Converts BBCode to HTML.');
+  case 'description':
+    return t('Converts BBCode to HTML.');
 
-    case 'process':
-      include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
-      if (variable_get("bbcode_debug_$format", 0)) {
-        $timing_start = explode(' ', microtime());
-        $ret = _bbcode_filter_process($text, $format);
-        $timing_stop = explode(' ', microtime());
-        $elapsed = $timing_stop[1] - $timing_start[1];
-        $elapsed += $timing_stop[0] - $timing_start[0];
-        $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
-        return $ret;
-      }
-      else 
-        return _bbcode_filter_process($text, $format);
+  case 'process':
+    include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
+    if (variable_get("bbcode_debug_$format", 0)) {
+      $timing_start = explode(' ', microtime());
+      $ret = _bbcode_filter_process($text, $format);
+      $timing_stop = explode(' ', microtime());
+      $elapsed = $timing_stop[1] - $timing_start[1];
+      $elapsed += $timing_stop[0] - $timing_start[0];
+      $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
+      return $ret;
+    }
+    else 
+      return _bbcode_filter_process($text, $format);
 
-    case 'settings':
-      $form = array();
-      $form['bbcode_filter'] = array(
-        '#type' => 'fieldset', 
-        '#title' => t('BBCode filter'), 
-        '#collapsible' => TRUE, 
-        '#collapsed' => FALSE);
-      $form['bbcode_filter']["bbcode_make_links_$format"] = array(
-        '#type' => 'select', 
-        '#title' => t('Convert addresses to links'), 
-        '#default_value' => variable_get("bbcode_make_links_$format", 1), 
-        '#options' => array(t('Disabled'), t('Enabled')), 
-        '#description' => t('Turn web and e-mail addresses into clickable links. This is useful if content authors do not explicitly mark addresses as links with [url] and [email] tags.'));
-      $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
-        '#type' => 'select', 
-        '#title' => t('Spam link deterrent'),
-        '#default_value' => variable_get("bbcode_filter_nofollow_$format", 0),
-        '#options' => array(t('Disabled'), t('Enabled')), 
-        '#description' => t('If enabled, BBCode will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'));
-      $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
-        '#type' => 'select', 
-        '#title' => t('Email address encoding'), 
-        '#default_value' => variable_get("bbcode_encode_mailto_$format", 1), 
-        '#options' => array(t('Disabled'), t('Enabled')), 
-        '#description' => t('Whether to encode email addresses with javascript. With this method you will have clickable mailto links, but it will be a bit harder for spam robots to collect them.'));
-      $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
-        '#type' => 'select',
-        '#title' => t('Smart paragraph and line breaks'),
-        '#default_value' => variable_get("bbcode_paragraph_breaks_$format", 2),
-        '#options' => array(t('Disabled'), t('Line breaks only'), t('Line and paragraph breaks')),
-        '#description' => t('Add line and paragraph breaks to text, excluding text in preformatted code blocks. If you disable this option, you need to enable Drupal\'s "Line break converter". Don\'t use both together!'));
-      $form['bbcode_filter']["bbcode_debug_$format"] = array(
-        '#type' => 'select', 
-        '#title' => t('Print debugging info'), 
-        '#default_value' => variable_get("bbcode_debug_$format", 0), 
-        '#options' => array(t('Disabled'), t('Enabled')), 
-        '#description' => t('Print BBCode parse date and execution time. This option should be disabled on production sites. You may need to clear the cache after changing this option.'));
-      return $form;
+  case 'settings':
+    $form = array();
+    $form['bbcode_filter'] = array(
+      '#type' => 'fieldset', 
+      '#title' => t('BBCode filter'), 
+      '#collapsible' => TRUE, 
+      '#collapsed' => FALSE);
+    $form['bbcode_filter']["bbcode_make_links_$format"] = array(
+      '#type' => 'select', 
+      '#title' => t('Convert addresses to links'), 
+      '#default_value' => variable_get("bbcode_make_links_$format", 1), 
+      '#options' => array(t('Disabled'), t('Enabled')), 
+      '#description' => t('Turn web and e-mail addresses into clickable links. This is useful if content authors do not explicitly mark addresses as links with [url] and [email] tags.'));
+    $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array(
+      '#type' => 'select', 
+      '#title' => t('Spam link deterrent'),
+      '#default_value' => variable_get("bbcode_filter_nofollow_$format", 0),
+      '#options' => array(t('Disabled'), t('Enabled')), 
+      '#description' => t('If enabled, BBCode will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.'));
+    $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array(
+      '#type' => 'select', 
+      '#title' => t('Email address encoding'), 
+      '#default_value' => variable_get("bbcode_encode_mailto_$format", 1), 
+      '#options' => array(t('Disabled'), t('Enabled')), 
+      '#description' => t('Whether to encode email addresses with javascript. With this method you will have clickable mailto links, but it will be a bit harder for spam robots to collect them.'));
+    $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array(
+      '#type' => 'select',
+      '#title' => t('Smart paragraph and line breaks'),
+      '#default_value' => variable_get("bbcode_paragraph_breaks_$format", 2),
+      '#options' => array(t('Disabled'), t('Line breaks only'), t('Line and paragraph breaks')),
+      '#description' => t('Add line and paragraph breaks to text, excluding text in preformatted code blocks. If you disable this option, you need to enable Drupal\'s "Line break converter". Don\'t use both together!'));
+    $form['bbcode_filter']["bbcode_debug_$format"] = array(
+      '#type' => 'select', 
+      '#title' => t('Print debugging info'), 
+      '#default_value' => variable_get("bbcode_debug_$format", 0), 
+      '#options' => array(t('Disabled'), t('Enabled')), 
+      '#description' => t('Print BBCode parse date and execution time. This option should be disabled on production sites. You may need to clear the cache after changing this option.'));
+    return $form;
 
-    default:
-      return $text;
+  default:
+    return $text;
   }
 }
 

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 
 function bbcode_filter_tips($delta, $format, $long = false) {
   if ($long) {
-    include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
+    include_once(drupal_get_path('module', 'bbcode').'/bbcode-help.inc');
     return _bbcode_filter_tip();
   }
   else {
@@ -17,7 +17,7 @@ 
       array(
         '!BBCode' =>  l(t('BBCode'), "filter/tips/$format",
         array(
-          'fragment' => 'filter-bbcode-' . $delta,
+          'fragment' => 'filter-bbcode-'.$delta,
 	  'attributes' =>
 	    array(
 	      'target'=>'_blank',
@@ -26,7 +26,7 @@ 
         ))
       ));
     if (variable_get("bbcode_make_links_$format", FALSE)) {
-      $output .= ' '. t('URLs will automatically be converted to links.');
+      $output .= ' '.t('URLs will automatically be converted to links.');
     }
     return $output;
   }
@@ -41,14 +41,14 @@ 
       return t('Converts BBCode to HTML.');
 
     case 'process':
-      include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc');
+      include_once(drupal_get_path('module', 'bbcode').'/bbcode-filter.inc');
       if (variable_get("bbcode_debug_$format", 0)) {
         $timing_start = explode(' ', microtime());
         $ret = _bbcode_filter_process($text, $format);
         $timing_stop = explode(' ', microtime());
         $elapsed = $timing_stop[1] - $timing_start[1];
         $elapsed += $timing_stop[0] - $timing_start[0];
-        $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
+        $ret .= '<hr />'.l('BBCode', "filter/tips/$format").' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
       }
       else 
@@ -102,14 +102,14 @@ 
  * Alter icons if the quicktags module is enabled
  */
 function bbcode_quicktags_alter($items) {
-  $path = base_path() . drupal_get_path('module','quicktags') .'/';
+  $path = base_path().drupal_get_path('module', 'quicktags').'/';
   $items['ed_italic'] = array(
       'name' => 'italic',
       'prefix' => '[i]',
       'suffix' => '[/i]',
       'accesskey' => 'i',
       'weight' => 10,
-      'icon' => $path .'ed_italic.png',
+      'icon' => $path.'ed_italic.png',
     );
   $items['ed_bold'] = array(
       'name' => 'bold',
@@ -117,7 +117,7 @@ 
       'suffix' => '[/b]',
       'accesskey' => 'b',
       'weight' => 20,
-      'icon' => $path .'ed_bold.png',
+      'icon' => $path.'ed_bold.png',
     );
   $items['ed_code'] = array(
       'name' => 'code',
@@ -125,7 +125,7 @@ 
       'suffix' => '[/code]',
       'accesskey' => 'c',
       'weight' => 30,
-      'icon' => $path .'ed_code.png',
+      'icon' => $path.'ed_code.png',
     );
   $items['ed_block'] = array(
       'name' => 'quote',
@@ -133,7 +133,7 @@ 
       'suffix' => '[/quote]',
       'accesskey' => 'q',
       'weight' => 40,
-      'icon' => $path .'ed_block.png',
+      'icon' => $path.'ed_block.png',
     );
   $items['ed_link'] = array(
       'name' => 'link',
@@ -141,7 +141,7 @@ 
       'suffix' => '[/url]',
       'accesskey' => 'l',
       'weight' => 50,
-      'icon' => $path .'ed_link.png',
+      'icon' => $path.'ed_link.png',
     );
   return $items;
 }

Braces +2 added lines, -4 removed lines

@@ -10,8 +10,7 @@ 
   if ($long) {
     include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc');
     return _bbcode_filter_tip();
-  }
-  else {
+  } else {
     # D5: $output = t('You can use !BBCode tags in the text.', array('!BBCode' =>  l(t('BBCode'), "filter/tips/$format", NULL, NULL, 'filter-bbcode-' . $delta)));
     $output = t('You can use !BBCode (opens in new window) tags in the text.',
       array(
@@ -50,8 +49,7 @@ 
         $elapsed += $timing_stop[0] - $timing_start[0];
         $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />';
         return $ret;
-      }
-      else 
+      } else 
         return _bbcode_filter_process($text, $format);
 
     case 'settings':

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

@@ -25,7 +25,7 @@ 
 	    ),
         ))
       ));
-    if (variable_get("bbcode_make_links_$format", FALSE)) {
+    if (variable_get("bbcode_make_links_$format", false)) {
       $output .= ' '. t('URLs will automatically be converted to links.');
     }
     return $output;
@@ -59,8 +59,8 @@ 
       $form['bbcode_filter'] = array(
         '#type' => 'fieldset', 
         '#title' => t('BBCode filter'), 
-        '#collapsible' => TRUE, 
-        '#collapsed' => FALSE);
+        '#collapsible' => true, 
+        '#collapsed' => false);
       $form['bbcode_filter']["bbcode_make_links_$format"] = array(
         '#type' => 'select', 
         '#title' => t('Convert addresses to links'), 

drupal/sites/default/boinc/modules/contrib/bbcode/bbcode-help.inc

Indentation +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 // $Id: bbcode-help.inc,v 1.8 2007/01/28 21:18:45 naudefj Exp $
 
 function _bbcode_filter_tip() {
-  return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2>
+    return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2>
 
 <p>
  BBCode allows you to specify formatting rules for your text,