BOINC / boinc

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

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
   $library = $editor['library path'] . '/ckeditor.js';

Indentation +122 added lines, -122 removed lines

@@ -9,23 +9,23 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_ckeditor_editor() {
-  $editor['ckeditor'] = array(
+    $editor['ckeditor'] = array(
     'title' => 'CKEditor',
     'vendor url' => 'http://ckeditor.com',
     'download url' => 'http://ckeditor.com/download',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Default',
         'files' => array(
-          'ckeditor.js' => array('preprocess' => FALSE),
+            'ckeditor.js' => array('preprocess' => FALSE),
         ),
-      ),
-      'src' => array(
+        ),
+        'src' => array(
         'title' => 'Source',
         'files' => array(
-          'ckeditor_source.js' => array('preprocess' => FALSE),
+            'ckeditor_source.js' => array('preprocess' => FALSE),
+        ),
         ),
-      ),
     ),
     'version callback' => 'wysiwyg_ckeditor_version',
     'themes callback' => 'wysiwyg_ckeditor_themes',
@@ -33,19 +33,19 @@ 
     'plugin callback' => 'wysiwyg_ckeditor_plugins',
     'plugin settings callback' => 'wysiwyg_ckeditor_plugin_settings',
     'proxy plugin' => array(
-      'drupal' => array(
+        'drupal' => array(
         'load' => TRUE,
         'proxy' => TRUE,
-      ),
+        ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_ckeditor_proxy_plugin_settings',
     'versions' => array(
-      '3.0.0.3665' => array(
+        '3.0.0.3665' => array(
         'js files' => array('ckeditor-3.0.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -58,25 +58,25 @@ 
  *   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
-  $library = $editor['library path'] . '/ckeditor.js';
-  if (!file_exists($library)) {
+    $library = $editor['library path'] . '/ckeditor.js';
+    if (!file_exists($library)) {
     return;
-  }
-  $library = fopen($library, 'r');
-  $max_lines = 8;
-  while ($max_lines && $line = fgets($library, 500)) {
+    }
+    $library = fopen($library, 'r');
+    $max_lines = 8;
+    while ($max_lines && $line = fgets($library, 500)) {
     // version:'CKEditor 3.0 SVN',revision:'3665'
     // version:'3.0 RC',revision:'3753'
     // version:'3.0.1',revision:'4391'
     if (preg_match('@version:\'(?:CKEditor )?([\d\.]+)(?:.+revision:\'([\d]+))?@', $line, $version)) {
-      fclose($library);
-      // Version numbers need to have three parts since 3.0.1.
-      $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
-      return $version[1] . '.' . $version[2];
+        fclose($library);
+        // Version numbers need to have three parts since 3.0.1.
+        $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
+        return $version[1] . '.' . $version[2];
     }
     $max_lines--;
-  }
-  fclose($library);
+    }
+    fclose($library);
 }
 
 /**
@@ -92,23 +92,23 @@ 
  *   theme name.
  */
 function wysiwyg_ckeditor_themes($editor, $profile) {
-  // @todo Skins are not themes but this will do for now.
-  $path = $editor['library path'] . '/skins/';
-  if (file_exists($path) && ($dir_handle = opendir($path))) {
+    // @todo Skins are not themes but this will do for now.
+    $path = $editor['library path'] . '/skins/';
+    if (file_exists($path) && ($dir_handle = opendir($path))) {
     $themes = array();
     while ($file = readdir($dir_handle)) {
-      if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
+        if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
         $themes[] = $file;
-      }
+        }
     }
     closedir($dir_handle);
     natcasesort($themes);
     $themes = array_values($themes);
     return !empty($themes) ? $themes : array('default');
-  }
-  else {
+    }
+    else {
     return array('default');
-  }
+    }
 }
 
 /**
@@ -126,7 +126,7 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_ckeditor_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'baseHref' => $GLOBALS['base_url'] . '/',
     'width' => '100%',
     // For better compatibility with smaller textareas.
@@ -142,155 +142,155 @@ 
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
     'entities_latin' => FALSE,
     'entities_greek' => FALSE,
-  );
+    );
 
-  // Add HTML block format settings; common block formats are already predefined
-  // by CKEditor.
-  if (isset($config['block_formats'])) {
+    // Add HTML block format settings; common block formats are already predefined
+    // by CKEditor.
+    if (isset($config['block_formats'])) {
     $block_formats = explode(',', drupal_strtolower($config['block_formats']));
     $predefined_formats = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'pre', 'address', 'div');
     foreach (array_diff($block_formats, $predefined_formats) as $tag) {
-      $tag = trim($tag);
-      $settings["format_$tag"] = array('element' => $tag);
+        $tag = trim($tag);
+        $settings["format_$tag"] = array('element' => $tag);
     }
     $settings['format_tags'] = implode(';', $block_formats);
-  }
+    }
 
-  if (isset($config['apply_source_formatting'])) {
+    if (isset($config['apply_source_formatting'])) {
     $settings['apply_source_formatting'] = $config['apply_source_formatting'];
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     // Versions below 3.0.1 could only handle one stylesheet.
     if (version_compare($editor['installed version'], '3.0.1.4391', '<')) {
-      if ($config['css_setting'] == 'theme') {
+        if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = reset(wysiwyg_get_css());
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+        }
+        elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
-      }
+        }
     }
     else {
-      if ($config['css_setting'] == 'theme') {
+        if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = wysiwyg_get_css();
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+        }
+        elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme())));
-      }
+        }
+    }
     }
-  }
 
-  if (isset($config['language'])) {
+    if (isset($config['language'])) {
     $settings['language'] = $config['language'];
-  }
-  if (isset($config['resizing'])) {
+    }
+    if (isset($config['resizing'])) {
     // CKEditor tests "!== false", so ensure it is a Boolean.
     $settings['resize_enabled'] = (bool) $config['resizing'];
-  }
-  if (isset($config['toolbar_loc'])) {
+    }
+    if (isset($config['toolbar_loc'])) {
     $settings['toolbarLocation'] = $config['toolbar_loc'];
-  }
+    }
 
-  $settings['toolbar'] = array();
-  if (!empty($config['buttons'])) {
+    $settings['toolbar'] = array();
+    if (!empty($config['buttons'])) {
     $extra_plugins = array();
     $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['toolbar'][] = $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'])) {
             $extra_plugins[] = $button;
-          }
-          // Add external plugins to the list of extensions.
-          elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
+            }
+            // Add external plugins to the list of extensions.
+            elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
             $extra_plugins[] = $plugin;
-          }
-          // Add internal buttons that also need to be loaded as extension.
-          elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add internal buttons that also need to be loaded as extension.
+            elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
             $extra_plugins[] = $plugin;
-          }
-          // Add plain extensions.
-          elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
+            }
+            // Add plain extensions.
+            elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
             $extra_plugins[] = $plugin;
-          }
-          // 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']);
-          }
+            }
+        }
         }
-      }
     }
     if (!empty($extra_plugins)) {
-      $settings['extraPlugins'] = implode(',', $extra_plugins);
+        $settings['extraPlugins'] = implode(',', $extra_plugins);
     }
-  }
-  // For now, all buttons are placed into one row.
-  $settings['toolbar'] = array($settings['toolbar']);
+    }
+    // For now, all buttons are placed into one row.
+    $settings['toolbar'] = array($settings['toolbar']);
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array of native external plugins that need to be loaded separately.
  */
 function wysiwyg_ckeditor_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Register all plugins that need to be loaded.
     if (!empty($plugin['load'])) {
-      $settings[$name] = array();
-      // Add path for native external plugins.
-      if (empty($plugin['internal']) && isset($plugin['path'])) {
+        $settings[$name] = array();
+        // Add path for native external plugins.
+        if (empty($plugin['internal']) && isset($plugin['path'])) {
         $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
-      }
-      // Force native internal plugins to use the standard path.
-      else {
+        }
+        // Force native internal plugins to use the standard path.
+        else {
         $settings[$name]['path'] = base_path() . $editor['library path'] . '/plugins/' . $name . '/';
-      }
-      // CKEditor defaults to 'plugin.js' on its own when filename is not set.
-      if (!empty($plugin['filename'])) {
+        }
+        // CKEditor defaults to 'plugin.js' on its own when filename is not set.
+        if (!empty($plugin['filename'])) {
         $settings[$name]['fileName'] = $plugin['filename'];
-      }
+        }
     }
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Build a JS settings array for Drupal plugins loaded via the proxy plugin.
  */
 function wysiwyg_ckeditor_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'],
-      // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+        'title' => $plugin['title'],
+        'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+        'iconTitle' => $plugin['icon title'],
+        // @todo These should only be set if the plugin defined them.
+        'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
     );
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_ckeditor_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'), 'Underline' => t('Underline'),
         'Strike' => t('Strike-through'),
         'JustifyLeft' => t('Align left'), 'JustifyCenter' => t('Align center'), 'JustifyRight' => t('Align right'), 'JustifyBlock' => t('Justify'),
@@ -317,17 +317,17 @@ 
         'Maximize' => t('Maximize'),
         'SpellChecker' => t('Check spelling'), 'Scayt' => t('Check spelling as you type'),
         'About' => t('About'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
+    );
 
-  if (version_compare($editor['installed version'], '3.1.0.4885', '<')) {
+    if (version_compare($editor['installed version'], '3.1.0.4885', '<')) {
     unset($plugins['default']['buttons']['CreateDiv']);
-  }
-  if (version_compare($editor['installed version'], '3.5.0.6260', '<')) {
+    }
+    if (version_compare($editor['installed version'], '3.5.0.6260', '<')) {
     unset($plugins['default']['buttons']['Iframe']);
-  }
-  return $plugins;
+    }
+    return $plugins;
 }
 

Spacing +10 added lines, -10 removed lines

@@ -58,7 +58,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_ckeditor_version($editor) {
-  $library = $editor['library path'] . '/ckeditor.js';
+  $library = $editor['library path'].'/ckeditor.js';
   if (!file_exists($library)) {
     return;
   }
@@ -72,7 +72,7 @@ 
       fclose($library);
       // Version numbers need to have three parts since 3.0.1.
       $version[1] = preg_replace('/^(\d+)\.(\d+)$/', '${1}.${2}.0', $version[1]);
-      return $version[1] . '.' . $version[2];
+      return $version[1].'.'.$version[2];
     }
     $max_lines--;
   }
@@ -93,11 +93,11 @@ 
  */
 function wysiwyg_ckeditor_themes($editor, $profile) {
   // @todo Skins are not themes but this will do for now.
-  $path = $editor['library path'] . '/skins/';
+  $path = $editor['library path'].'/skins/';
   if (file_exists($path) && ($dir_handle = opendir($path))) {
     $themes = array();
     while ($file = readdir($dir_handle)) {
-      if (is_dir($path . $file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
+      if (is_dir($path.$file) && substr($file, 0, 1) != '.' && $file != 'CVS') {
         $themes[] = $file;
       }
     }
@@ -127,7 +127,7 @@ 
  */
 function wysiwyg_ckeditor_settings($editor, $config, $theme) {
   $settings = array(
-    'baseHref' => $GLOBALS['base_url'] . '/',
+    'baseHref' => $GLOBALS['base_url'].'/',
     'width' => '100%',
     // For better compatibility with smaller textareas.
     'resize_minWidth' => 450,
@@ -185,7 +185,7 @@ 
   }
   if (isset($config['resizing'])) {
     // CKEditor tests "!== false", so ensure it is a Boolean.
-    $settings['resize_enabled'] = (bool) $config['resizing'];
+    $settings['resize_enabled'] = (bool)$config['resizing'];
   }
   if (isset($config['toolbar_loc'])) {
     $settings['toolbarLocation'] = $config['toolbar_loc'];
@@ -251,11 +251,11 @@ 
       $settings[$name] = array();
       // Add path for native external plugins.
       if (empty($plugin['internal']) && isset($plugin['path'])) {
-        $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
+        $settings[$name]['path'] = base_path().$plugin['path'].'/';
       }
       // Force native internal plugins to use the standard path.
       else {
-        $settings[$name]['path'] = base_path() . $editor['library path'] . '/plugins/' . $name . '/';
+        $settings[$name]['path'] = base_path().$editor['library path'].'/plugins/'.$name.'/';
       }
       // CKEditor defaults to 'plugin.js' on its own when filename is not set.
       if (!empty($plugin['filename'])) {
@@ -275,10 +275,10 @@ 
     // Populate required plugin settings.
     $settings[$name] = $plugin['dialog settings'] + array(
       'title' => $plugin['title'],
-      'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+      'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'],
       'iconTitle' => $plugin['icon title'],
       // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+      'css' => base_path().$plugin['css path'].'/'.$plugin['css file'],
     );
   }
   return $settings;

Braces +4 added lines, -8 removed lines

@@ -105,8 +105,7 @@ 
     natcasesort($themes);
     $themes = array_values($themes);
     return !empty($themes) ? $themes : array('default');
-  }
-  else {
+  } else {
     return array('default');
   }
 }
@@ -165,16 +164,13 @@ 
     if (version_compare($editor['installed version'], '3.0.1.4391', '<')) {
       if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = reset(wysiwyg_get_css());
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+      } elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
       }
-    }
-    else {
+    } else {
       if ($config['css_setting'] == 'theme') {
         $settings['contentsCss'] = wysiwyg_get_css();
-      }
-      elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+      } elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
         $settings['contentsCss'] = explode(',', strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme())));
       }
     }

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

@@ -17,13 +17,13 @@ 
       '' => array(
         'title' => 'Default',
         'files' => array(
-          'ckeditor.js' => array('preprocess' => FALSE),
+          'ckeditor.js' => array('preprocess' => false),
         ),
       ),
       'src' => array(
         'title' => 'Source',
         'files' => array(
-          'ckeditor_source.js' => array('preprocess' => FALSE),
+          'ckeditor_source.js' => array('preprocess' => false),
         ),
       ),
     ),
@@ -34,8 +34,8 @@ 
     'plugin settings callback' => 'wysiwyg_ckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
-        'proxy' => TRUE,
+        'load' => true,
+        'proxy' => true,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_ckeditor_proxy_plugin_settings',
@@ -140,8 +140,8 @@ 
     // disable at least the additional character sets. CKEditor always converts
     // XML default characters '&', '<', '>'.
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
-    'entities_latin' => FALSE,
-    'entities_greek' => FALSE,
+    'entities_latin' => false,
+    'entities_greek' => false,
   );
 
   // Add HTML block format settings; common block formats are already predefined
@@ -318,7 +318,7 @@ 
         'SpellChecker' => t('Check spelling'), 'Scayt' => t('Check spelling as you type'),
         'About' => t('About'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
 

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

Doc Comments +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
   $library = $editor['library path'] . '/fckeditor.js';
@@ -75,7 +75,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_fckeditor_themes($editor, $profile) {

Indentation +99 added lines, -99 removed lines

@@ -9,15 +9,15 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_fckeditor_editor() {
-  $editor['fckeditor'] = array(
+    $editor['fckeditor'] = array(
     'title' => 'FCKeditor',
     'vendor url' => 'http://www.fckeditor.net',
     'download url' => 'http://www.fckeditor.net/download',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Default',
         'files' => array('fckeditor.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_fckeditor_version',
     'themes callback' => 'wysiwyg_fckeditor_themes',
@@ -25,19 +25,19 @@ 
     'plugin callback' => 'wysiwyg_fckeditor_plugins',
     'plugin settings callback' => 'wysiwyg_fckeditor_plugin_settings',
     'proxy plugin' => array(
-      'drupal' => array(
+        'drupal' => array(
         'load' => TRUE,
         'proxy' => TRUE,
-      ),
+        ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_fckeditor_proxy_plugin_settings',
     'versions' => array(
-      '2.6' => array(
+        '2.6' => array(
         'js files' => array('fckeditor-2.6.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -50,20 +50,20 @@ 
  *   The installed editor version.
  */
 function wysiwyg_fckeditor_version($editor) {
-  $library = $editor['library path'] . '/fckeditor.js';
-  if (!file_exists($library)) {
+    $library = $editor['library path'] . '/fckeditor.js';
+    if (!file_exists($library)) {
     return;
-  }
-  $library = fopen($library, 'r');
-  $max_lines = 100;
-  while ($max_lines && $line = fgets($library, 60)) {
+    }
+    $library = fopen($library, 'r');
+    $max_lines = 100;
+    while ($max_lines && $line = fgets($library, 60)) {
     if (preg_match('@^FCKeditor.prototype.Version\s*= \'([\d\.]+)@', $line, $version)) {
-      fclose($library);
-      return $version[1];
+        fclose($library);
+        return $version[1];
     }
     $max_lines--;
-  }
-  fclose($library);
+    }
+    fclose($library);
 }
 
 /**
@@ -79,7 +79,7 @@ 
  *   theme name.
  */
 function wysiwyg_fckeditor_themes($editor, $profile) {
-  return array('default', 'office2003', 'silver');
+    return array('default', 'office2003', 'silver');
 }
 
 /**
@@ -97,7 +97,7 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_fckeditor_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'EditorPath' => base_path() . $editor['library path'] . '/',
     'SkinPath' => base_path() . $editor['library path'] . '/editor/skins/' . $theme . '/',
     'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
@@ -116,105 +116,105 @@ 
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
     'IncludeLatinEntities' => FALSE,
     'IncludeGreekEntities' => FALSE,
-  );
-  if (isset($config['block_formats'])) {
+    );
+    if (isset($config['block_formats'])) {
     $settings['FontFormats'] = strtr($config['block_formats'], array(',' => ';'));
-  }
-  if (isset($config['apply_source_formatting'])) {
+    }
+    if (isset($config['apply_source_formatting'])) {
     $settings['FormatOutput'] = $settings['FormatSource'] = $config['apply_source_formatting'];
-  }
-  if (isset($config['paste_auto_cleanup_on_paste'])) {
+    }
+    if (isset($config['paste_auto_cleanup_on_paste'])) {
     $settings['AutoDetectPasteFromWord'] = $config['paste_auto_cleanup_on_paste'];
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
+        $settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+    }
     }
-  }
 
-  // Use our custom toolbar set.
-  $settings['ToolbarSet'] = 'Wysiwyg';
-  // Populate our custom toolbar set for fckeditor.config.js.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons'])) {
+    // Use our custom toolbar set.
+    $settings['ToolbarSet'] = 'Wysiwyg';
+    // Populate our custom toolbar set for fckeditor.config.js.
+    $settings['buttons'] = array();
+    if (!empty($config['buttons'])) {
     $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;
-          }
-          // 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']);
-          }
+            }
         }
-      }
+        }
+    }
     }
-  }
-  // For now, all buttons are placed into one row.
-  $settings['buttons'] = array($settings['buttons']);
+    // For now, all buttons are placed into one row.
+    $settings['buttons'] = array($settings['buttons']);
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array of native external plugins that need to be loaded separately.
  */
 function wysiwyg_fckeditor_plugin_settings($editor, $profile, $plugins) {
-  $settings = array();
-  foreach ($plugins as $name => $plugin) {
+    $settings = array();
+    foreach ($plugins as $name => $plugin) {
     // Register all plugins that need to be loaded.
     if (!empty($plugin['load'])) {
-      $settings[$name] = array();
-      // Add path for native external plugins; internal ones do not need a path.
-      if (empty($plugin['internal']) && isset($plugin['path'])) {
+        $settings[$name] = array();
+        // Add path for native external plugins; internal ones do not need a path.
+        if (empty($plugin['internal']) && isset($plugin['path'])) {
         // All native FCKeditor plugins use the filename fckplugin.js.
         $settings[$name]['path'] = base_path() . $plugin['path'] . '/';
-      }
-      if (!empty($plugin['languages'])) {
+        }
+        if (!empty($plugin['languages'])) {
         $settings[$name]['languages'] = $plugin['languages'];
-      }
+        }
+    }
     }
-  }
-  return $settings;
+    return $settings;
 }
 
 /**
  * Build a JS settings array for Drupal plugins loaded via the proxy plugin.
  */
 function wysiwyg_fckeditor_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'],
-      // @todo These should only be set if the plugin defined them.
-      'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
+        'title' => $plugin['title'],
+        'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'],
+        'iconTitle' => $plugin['icon title'],
+        // @todo These should only be set if the plugin defined them.
+        'css' => base_path() . $plugin['css path'] . '/' . $plugin['css file'],
     );
-  }
-  return $settings;
+    }
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_fckeditor_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        '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'),
@@ -240,39 +240,39 @@ 
         'Flash' => t('Flash'), 'Smiley' => t('Smiley'),
         'FitWindow' => t('FitWindow'),
         'SpellCheck' => t('Check spelling'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
     'autogrow' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'autogrow' => t('Autogrow'),
-      ),
-      'options' => array(
+        ),
+        'options' => array(
         'AutoGrowMax' => 800,
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'bbcode' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'bbcode' => t('BBCode'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'dragresizetable' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'extensions' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
     'tablecommands' => array(
-      'path' => $editor['library path'] . '/editor/plugins',
-      'buttons' => array(
+        'path' => $editor['library path'] . '/editor/plugins',
+        'buttons' => array(
         'TableCellProp' => t('Table: Cell properties'),
         'TableInsertRowAfter' => t('Table: Insert row after'),
         'TableInsertColumnAfter' => t('Table: Insert column after'),
@@ -282,11 +282,11 @@ 
         'TableDeleteCells' => t('Table: Delete cells'),
         'TableMergeCells' => t('Table: Merge cells'),
         'TableHorizontalSplitCell' => t('Table: Horizontal split cell'),
-      ),
-      'internal' => TRUE,
-      'load' => TRUE,
+        ),
+        'internal' => TRUE,
+        'load' => TRUE,
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 

Spacing +11 added lines, -11 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -130,8 +130,7 @@
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $settings['EditorAreaCSS'] = 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['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }

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

@@ -26,8 +26,8 @@ 
     'plugin settings callback' => 'wysiwyg_fckeditor_plugin_settings',
     'proxy plugin' => array(
       'drupal' => array(
-        'load' => TRUE,
-        'proxy' => TRUE,
+        'load' => true,
+        'proxy' => true,
       ),
     ),
     'proxy plugin settings callback' => 'wysiwyg_fckeditor_proxy_plugin_settings',
@@ -103,19 +103,19 @@ 
     'CustomConfigurationsPath' => base_path() . drupal_get_path('module', 'wysiwyg') . '/editors/js/fckeditor.config.js',
     'Width' => '100%',
     'Height' => 420,
-    'LinkBrowser' => FALSE,
-    'LinkUpload' => FALSE,
-    'ImageBrowser' => FALSE,
-    'ImageUpload' => FALSE,
-    'FlashBrowser' => FALSE,
-    'FlashUpload' => FALSE,
+    'LinkBrowser' => false,
+    'LinkUpload' => false,
+    'ImageBrowser' => false,
+    'ImageUpload' => false,
+    'FlashBrowser' => false,
+    'FlashUpload' => false,
     // By default, FCKeditor converts most characters into HTML entities. Since
     // it does not support a custom definition, but Drupal supports Unicode, we
     // disable at least the additional character sets. FCKeditor always converts
     // XML default characters '&', '<', '>'.
     // @todo Check whether completely disabling ProcessHTMLEntities is an option.
-    'IncludeLatinEntities' => FALSE,
-    'IncludeGreekEntities' => FALSE,
+    'IncludeLatinEntities' => false,
+    'IncludeGreekEntities' => false,
   );
   if (isset($config['block_formats'])) {
     $settings['FontFormats'] = strtr($config['block_formats'], array(',' => ';'));
@@ -241,7 +241,7 @@ 
         'FitWindow' => t('FitWindow'),
         'SpellCheck' => t('Check spelling'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
     'autogrow' => array(
       'path' => $editor['library path'] . '/editor/plugins',
@@ -251,24 +251,24 @@ 
       'options' => array(
         'AutoGrowMax' => 800,
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'bbcode' => array(
       'path' => $editor['library path'] . '/editor/plugins',
       'extensions' => array(
         'bbcode' => t('BBCode'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'dragresizetable' => array(
       'path' => $editor['library path'] . '/editor/plugins',
       'extensions' => array(
         'dragresizetable' => t('Table drag/resize'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
     'tablecommands' => array(
       'path' => $editor['library path'] . '/editor/plugins',
@@ -283,8 +283,8 @@ 
         'TableMergeCells' => t('Table: Merge cells'),
         'TableHorizontalSplitCell' => t('Table: Horizontal split cell'),
       ),
-      'internal' => TRUE,
-      'load' => TRUE,
+      'internal' => true,
+      'load' => true,
     ),
   );
   return $plugins;

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

Doc Comments +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_jwysiwyg_version($editor) {
   $script = $editor['library path'] . '/jquery.wysiwyg.js';

Indentation +18 added lines, -18 removed lines

@@ -9,31 +9,31 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_jwysiwyg_editor() {
-  $editor['jwysiwyg'] = array(
+    $editor['jwysiwyg'] = array(
     'title' => 'jWYSIWYG',
     'vendor url' => 'http://code.google.com/p/jwysiwyg/',
     'download url' => 'http://code.google.com/p/jwysiwyg/downloads/list',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Source',
         'files' => array('jquery.wysiwyg.js'),
-      ),
-      'pack' => array(
+        ),
+        'pack' => array(
         'title' => 'Packed',
         'files' => array('jquery.wysiwyg.pack.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_jwysiwyg_version',
     // @todo Wrong property; add separate properties for editor requisites.
     'css path' => wysiwyg_get_path('jwysiwyg'),
     'versions' => array(
-      '0.5' => array(
+        '0.5' => array(
         'js files' => array('jwysiwyg.js'),
         'css files' => array('jquery.wysiwyg.css'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -46,17 +46,17 @@ 
  *   The installed editor version.
  */
 function wysiwyg_jwysiwyg_version($editor) {
-  $script = $editor['library path'] . '/jquery.wysiwyg.js';
-  if (!file_exists($script)) {
+    $script = $editor['library path'] . '/jquery.wysiwyg.js';
+    if (!file_exists($script)) {
     return;
-  }
-  $script = fopen($script, 'r');
-  fgets($script);
-  $line = fgets($script);
-  if (preg_match('@([0-9\.]+)$@', $line, $version)) {
+    }
+    $script = fopen($script, 'r');
+    fgets($script);
+    $line = fgets($script);
+    if (preg_match('@([0-9\.]+)$@', $line, $version)) {
     fclose($script);
     return $version[1];
-  }
-  fclose($script);
+    }
+    fclose($script);
 }
 

Spacing +1 added lines, -1 removed lines

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

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

Doc Comments +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_markitup_version($editor) {
   // Changelog was in markitup/markitup/readme.txt <= 1.1.5.
@@ -74,7 +74,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_markitup_themes($editor, $profile) {

Indentation +68 added lines, -68 removed lines

@@ -9,32 +9,32 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_markitup_editor() {
-  $editor['markitup'] = array(
+    $editor['markitup'] = array(
     'title' => 'markItUp',
     'vendor url' => 'http://markitup.jaysalvat.com',
     'download url' => 'http://markitup.jaysalvat.com/downloads',
     'library path' => wysiwyg_get_path('markitup'),
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Source',
         'files' => array('markitup/jquery.markitup.js'),
-      ),
-      'pack' => array(
+        ),
+        'pack' => array(
         'title' => 'Packed',
         'files' => array('markitup/jquery.markitup.pack.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_markitup_version',
     'themes callback' => 'wysiwyg_markitup_themes',
     'settings callback' => 'wysiwyg_markitup_settings',
     'plugin callback' => 'wysiwyg_markitup_plugins',
     'versions' => array(
-      '1.1.5' => array(
+        '1.1.5' => array(
         'js files' => array('markitup.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -47,22 +47,22 @@ 
  *   The installed editor version.
  */
 function wysiwyg_markitup_version($editor) {
-  // Changelog was in markitup/markitup/readme.txt <= 1.1.5.
-  $changelog = $editor['library path'] . '/markitup/readme.txt';
-  if (!file_exists($changelog)) {
+    // Changelog was in markitup/markitup/readme.txt <= 1.1.5.
+    $changelog = $editor['library path'] . '/markitup/readme.txt';
+    if (!file_exists($changelog)) {
     // Changelog was moved up to markitup/CHANGELOG.md after 1.1.5.
     $changelog = $editor['library path'] . '/CHANGELOG.md';
     if (!file_exists($changelog)) {
-      return;
+        return;
+    }
     }
-  }
-  $changelog = fopen($changelog, 'r');
-  $line = fgets($changelog);
-  if (preg_match('@([0-9\.]+)@', $line, $version)) {
+    $changelog = fopen($changelog, 'r');
+    $line = fgets($changelog);
+    if (preg_match('@([0-9\.]+)@', $line, $version)) {
     fclose($changelog);
     return $version[1];
-  }
-  fclose($changelog);
+    }
+    fclose($changelog);
 }
 
 /**
@@ -78,7 +78,7 @@ 
  *   theme name.
  */
 function wysiwyg_markitup_themes($editor, $profile) {
-  return array('simple', 'markitup');
+    return array('simple', 'markitup');
 }
 
 /**
@@ -96,91 +96,91 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_markitup_settings($editor, $config, $theme) {
-  // Whoever is guilty for adding this horrible CSS-file-without-filepath
-  // override "feature" to Drupal core... stand in the corner!
-  drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme');
+    // Whoever is guilty for adding this horrible CSS-file-without-filepath
+    // override "feature" to Drupal core... stand in the corner!
+    drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme');
 
-  $settings = array(
+    $settings = array(
     'root' => base_path() . $editor['library path'] . '/markitup/',
     'nameSpace' => $theme,
     'markupSet' => array(),
-  );
+    );
 
-  // Add configured buttons or all available.
-  $default_buttons = array(
+    // Add configured buttons or all available.
+    $default_buttons = array(
     'bold' => array(
-      'name' => t('Bold'),
-      'className' => 'markitup-bold',
-      'key' => 'B',
-      'openWith' => '(!(<strong>|!|<b>)!)',
-      'closeWith' => '(!(</strong>|!|</b>)!)',
+        'name' => t('Bold'),
+        'className' => 'markitup-bold',
+        'key' => 'B',
+        'openWith' => '(!(<strong>|!|<b>)!)',
+        'closeWith' => '(!(</strong>|!|</b>)!)',
     ),
     'italic' => array(
-      'name' => t('Italic'),
-      'className' => 'markitup-italic',
-      'key' => 'I',
-      'openWith' => '(!(<em>|!|<i>)!)',
-      'closeWith' => '(!(</em>|!|</i>)!)',
+        'name' => t('Italic'),
+        'className' => 'markitup-italic',
+        'key' => 'I',
+        'openWith' => '(!(<em>|!|<i>)!)',
+        'closeWith' => '(!(</em>|!|</i>)!)',
     ),
     'stroke' => array(
-      'name' => t('Strike-through'),
-      'className' => 'markitup-stroke',
-      'key' => 'S',
-      'openWith' => '<del>',
-      'closeWith' => '</del>',
+        'name' => t('Strike-through'),
+        'className' => 'markitup-stroke',
+        'key' => 'S',
+        'openWith' => '<del>',
+        'closeWith' => '</del>',
     ),
     'image' => array(
-      'name' => t('Image'),
-      'className' => 'markitup-image',
-      'key' => 'P',
-      'replaceWith' => '<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />',
+        'name' => t('Image'),
+        'className' => 'markitup-image',
+        'key' => 'P',
+        'replaceWith' => '<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />',
     ),
     'link' => array(
-      'name' => t('Link'),
-      'className' => 'markitup-link',
-      'key' => 'K',
-      'openWith' => '<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>',
-      'closeWith' => '</a>',
-      'placeHolder' => 'Your text to link...',
+        'name' => t('Link'),
+        'className' => 'markitup-link',
+        'key' => 'K',
+        'openWith' => '<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>',
+        'closeWith' => '</a>',
+        'placeHolder' => 'Your text to link...',
     ),
     // @todo
     // 'cleanup' => array('name' => t('Clean-up'), 'className' => 'markitup-cleanup', 'replaceWith' => 'function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") }'),
     'preview' => array(
-      'name' => t('Preview'),
-      'className' => 'markitup-preview',
-      'call' => 'preview',
+        'name' => t('Preview'),
+        'className' => 'markitup-preview',
+        'call' => 'preview',
     ),
-  );
-  $settings['markupSet'] = array();
-  if (!empty($config['buttons'])) {
+    );
+    $settings['markupSet'] = array();
+    if (!empty($config['buttons'])) {
     foreach ($config['buttons'] as $plugin) {
-      foreach ($plugin as $button => $enabled) {
+        foreach ($plugin as $button => $enabled) {
         if (isset($default_buttons[$button])) {
-          $settings['markupSet'][$button] = $default_buttons[$button];
+            $settings['markupSet'][$button] = $default_buttons[$button];
+        }
         }
-      }
     }
-  }
+    }
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_markitup_plugins($editor) {
-  return array(
+    return array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'bold' => t('Bold'), 'italic' => t('Italic'),
         'stroke' => t('Strike-through'),
         'link' => t('Link'),
         'image' => t('Image'),
         // 'cleanup' => t('Clean-up'),
         'preview' => t('Preview'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
+    );
 }
 

Spacing +4 added lines, -4 removed lines

@@ -48,10 +48,10 @@ 
  */
 function wysiwyg_markitup_version($editor) {
   // Changelog was in markitup/markitup/readme.txt <= 1.1.5.
-  $changelog = $editor['library path'] . '/markitup/readme.txt';
+  $changelog = $editor['library path'].'/markitup/readme.txt';
   if (!file_exists($changelog)) {
     // Changelog was moved up to markitup/CHANGELOG.md after 1.1.5.
-    $changelog = $editor['library path'] . '/CHANGELOG.md';
+    $changelog = $editor['library path'].'/CHANGELOG.md';
     if (!file_exists($changelog)) {
       return;
     }
@@ -98,10 +98,10 @@ 
 function wysiwyg_markitup_settings($editor, $config, $theme) {
   // Whoever is guilty for adding this horrible CSS-file-without-filepath
   // override "feature" to Drupal core... stand in the corner!
-  drupal_add_css($editor['library path'] . '/markitup/skins/' . $theme . '/style.css', 'theme');
+  drupal_add_css($editor['library path'].'/markitup/skins/'.$theme.'/style.css', 'theme');
 
   $settings = array(
-    'root' => base_path() . $editor['library path'] . '/markitup/',
+    'root' => base_path().$editor['library path'].'/markitup/',
     'nameSpace' => $theme,
     'markupSet' => array(),
   );

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

@@ -179,7 +179,7 @@
         // 'cleanup' => t('Clean-up'),
         'preview' => t('Preview'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
 }

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

Doc Comments +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ string   The installed editor version.
  */
 function wysiwyg_nicedit_version($editor) {
   // @see http://nicedit.com/forums/viewtopic.php?t=425

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/openwysiwyg.inc

Doc Comments +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_openwysiwyg_version($editor) {
   // 'library path' has '/scripts' appended already.
@@ -67,7 +67,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_openwysiwyg_themes($editor, $profile) {

Indentation +44 added lines, -44 removed lines

@@ -9,29 +9,29 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_openwysiwyg_editor() {
-  $editor['openwysiwyg'] = array(
+    $editor['openwysiwyg'] = array(
     'title' => 'openWYSIWYG',
     'vendor url' => 'http://www.openwebware.com',
     'download url' => 'http://www.openwebware.com/download.shtml',
     'library path' => wysiwyg_get_path('openwysiwyg') . '/scripts',
     'libraries' => array(
-      'src' => array(
+        'src' => array(
         'title' => 'Source',
         'files' => array('wysiwyg.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_openwysiwyg_version',
     'themes callback' => 'wysiwyg_openwysiwyg_themes',
     'settings callback' => 'wysiwyg_openwysiwyg_settings',
     'plugin callback' => 'wysiwyg_openwysiwyg_plugins',
     'versions' => array(
-      '1.4.7' => array(
+        '1.4.7' => array(
         'js files' => array('openwysiwyg.js'),
         'css files' => array('openwysiwyg.css'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -44,18 +44,18 @@ 
  *   The installed editor version.
  */
 function wysiwyg_openwysiwyg_version($editor) {
-  // 'library path' has '/scripts' appended already.
-  $changelog = $editor['editor path'] . '/changelog';
-  if (!file_exists($changelog)) {
+    // 'library path' has '/scripts' appended already.
+    $changelog = $editor['editor path'] . '/changelog';
+    if (!file_exists($changelog)) {
     return;
-  }
-  $changelog = fopen($changelog, 'r');
-  $line = fgets($changelog, 20);
-  if (preg_match('@v([\d\.]+)@', $line, $version)) {
+    }
+    $changelog = fopen($changelog, 'r');
+    $line = fgets($changelog, 20);
+    if (preg_match('@v([\d\.]+)@', $line, $version)) {
     fclose($changelog);
     return $version[1];
-  }
-  fclose($changelog);
+    }
+    fclose($changelog);
 }
 
 /**
@@ -71,7 +71,7 @@ 
  *   theme name.
  */
 function wysiwyg_openwysiwyg_themes($editor, $profile) {
-  return array('default');
+    return array('default');
 }
 
 /**
@@ -89,58 +89,58 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
-  $settings = array(
+    $settings = array(
     'path' => base_path() . $editor['editor path'] . '/',
     'Width' => '100%',
-  );
+    );
 
-  if (isset($config['path_loc']) && $config['path_loc'] == 'none') {
+    if (isset($config['path_loc']) && $config['path_loc'] == 'none') {
     $settings['StatusBarEnabled'] = FALSE;
-  }
+    }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      $settings['CSSFile'] = reset(wysiwyg_get_css());
+        $settings['CSSFile'] = reset(wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+    }
     }
-  }
 
-  $settings['Toolbar'] = array();
-  if (!empty($config['buttons'])) {
+    $settings['Toolbar'] = array();
+    if (!empty($config['buttons'])) {
     $plugins = wysiwyg_get_plugins($editor['name']);
     foreach ($config['buttons'] as $plugin => $buttons) {
-      foreach ($buttons as $button => $enabled) {
+        foreach ($buttons as $button => $enabled) {
         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['Toolbar'][0][] = $button;
-          }
+            }
+        }
         }
-      }
     }
-  }
+    }
 
-  // @todo 
+    // @todo 
 //  if (isset($config['block_formats'])) {
 //    $settings['DropDowns']['headings']['elements'] = explode(',', $config['block_formats']);
 //  }
 
-  return $settings;
+    return $settings;
 }
 
 /**
  * Return internal plugins for this editor; semi-implementation of hook_wysiwyg_plugin().
  */
 function wysiwyg_openwysiwyg_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        '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'),
@@ -164,10 +164,10 @@ 
         'print' => t('Print'),
         'inserttable' => t('Table'),
         'help' => t('Help'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 

Spacing +3 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
     'title' => 'openWYSIWYG',
     'vendor url' => 'http://www.openwebware.com',
     'download url' => 'http://www.openwebware.com/download.shtml',
-    'library path' => wysiwyg_get_path('openwysiwyg') . '/scripts',
+    'library path' => wysiwyg_get_path('openwysiwyg').'/scripts',
     'libraries' => array(
       'src' => array(
         'title' => 'Source',
@@ -45,7 +45,7 @@ 
  */
 function wysiwyg_openwysiwyg_version($editor) {
   // 'library path' has '/scripts' appended already.
-  $changelog = $editor['editor path'] . '/changelog';
+  $changelog = $editor['editor path'].'/changelog';
   if (!file_exists($changelog)) {
     return;
   }
@@ -90,7 +90,7 @@ 
  */
 function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
   $settings = array(
-    'path' => base_path() . $editor['editor path'] . '/',
+    'path' => base_path().$editor['editor path'].'/',
     'Width' => '100%',
   );
 

Braces +1 added lines, -2 removed lines

@@ -101,8 +101,7 @@
   if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
       $settings['CSSFile'] = reset(wysiwyg_get_css());
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }

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

@@ -95,7 +95,7 @@ 
   );
 
   if (isset($config['path_loc']) && $config['path_loc'] == 'none') {
-    $settings['StatusBarEnabled'] = FALSE;
+    $settings['StatusBarEnabled'] = false;
   }
 
   if (isset($config['css_setting'])) {
@@ -165,7 +165,7 @@ 
         'inserttable' => t('Table'),
         'help' => t('Help'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
   return $plugins;

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

Doc Comments +2 added lines, -2 removed lines

@@ -77,7 +77,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_tinymce_version($editor) {
   $script = $editor['library path'] . '/tiny_mce.js';
@@ -104,7 +104,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_tinymce_themes($editor, $profile) {

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/editors/whizzywig.inc

Doc Comments +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_whizzywig_version($editor) {
   $script = $editor['library path'] . '/whizzywig.js';

Indentation +48 added lines, -48 removed lines

@@ -9,32 +9,32 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_whizzywig_editor() {
-  $editor['whizzywig'] = array(
+    $editor['whizzywig'] = array(
     'title' => 'Whizzywig',
     'vendor url' => 'http://www.unverse.net',
     'download url' => 'http://www.unverse.net/whizzywig-download.html',
     'libraries' => array(
-      '' => array(
+        '' => array(
         'title' => 'Default',
         'files' => array('whizzywig.js', 'xhtml.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_whizzywig_version',
     'settings callback' => 'wysiwyg_whizzywig_settings',
     'plugin callback' => 'wysiwyg_whizzywig_plugins',
     'versions' => array(
-      '55' => array(
+        '55' => array(
         'js files' => array('whizzywig.js'),
-      ),
-      '56' => array(
+        ),
+        '56' => array(
         'js files' => array('whizzywig-56.js'),
-      ),
-      '60' => array(
+        ),
+        '60' => array(
         'js files' => array('whizzywig-60.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -47,19 +47,19 @@ 
  *   The installed editor version.
  */
 function wysiwyg_whizzywig_version($editor) {
-  $script = $editor['library path'] . '/whizzywig.js';
-  if (!file_exists($script)) {
+    $script = $editor['library path'] . '/whizzywig.js';
+    if (!file_exists($script)) {
     return;
-  }
-  $script = fopen($script, 'r');
-  $line = fgets($script, 43);
-  // 55: Whizzywig v55i
-  // 60: Whizzywig 60
-  if (preg_match('@Whizzywig v?([0-9]+)@', $line, $version)) {
+    }
+    $script = fopen($script, 'r');
+    $line = fgets($script, 43);
+    // 55: Whizzywig v55i
+    // 60: Whizzywig 60
+    if (preg_match('@Whizzywig v?([0-9]+)@', $line, $version)) {
     fclose($script);
     return $version[1];
-  }
-  fclose($script);
+    }
+    fclose($script);
 }
 
 /**
@@ -77,53 +77,53 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_whizzywig_settings($editor, $config, $theme) {
-  $settings = array();
+    $settings = array();
 
-  // Add path to button images, if available.
-  if (is_dir($editor['library path'] . '/btn')) {
+    // Add path to button images, if available.
+    if (is_dir($editor['library path'] . '/btn')) {
     $settings['buttonPath'] = base_path() . $editor['library path'] . '/btn/';
-  }
-  if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) {
+    }
+    if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) {
     $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/WhizzywigToolbar.png';
-  }
-  // Filename changed in version 60.
-  elseif (file_exists($editor['library path'] . '/icons.png')) {
+    }
+    // Filename changed in version 60.
+    elseif (file_exists($editor['library path'] . '/icons.png')) {
     $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/icons.png';
-  }
+    }
 
-  // Add configured buttons or all available.
-  $settings['buttons'] = array();
-  if (!empty($config['buttons'])) {
+    // Add configured buttons or all available.
+    $settings['buttons'] = array();
+    if (!empty($config['buttons'])) {
     $buttons = array();
     foreach ($config['buttons'] as $plugin) {
-      $buttons = array_merge($buttons, $plugin);
+        $buttons = array_merge($buttons, $plugin);
     }
     $settings['buttons'] = implode(' ', 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_whizzywig_plugins($editor) {
-  return array(
+    return array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'formatblock' => t('HTML block format'), 'fontname' => t('Font'), 'fontsize' => t('Font size'),
         'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'),
         'left' => t('Align left'), 'center' => t('Align center'), 'right' => t('Align right'),
@@ -139,9 +139,9 @@ 
         'clean' => t('Clean-up'),
         'html' => t('Source code'),
         'spellcheck' => t('Spell check'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
+    );
 }
 

Spacing +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
  *   The installed editor version.
  */
 function wysiwyg_whizzywig_version($editor) {
-  $script = $editor['library path'] . '/whizzywig.js';
+  $script = $editor['library path'].'/whizzywig.js';
   if (!file_exists($script)) {
     return;
   }
@@ -80,15 +80,15 @@ 
   $settings = array();
 
   // Add path to button images, if available.
-  if (is_dir($editor['library path'] . '/btn')) {
-    $settings['buttonPath'] = base_path() . $editor['library path'] . '/btn/';
+  if (is_dir($editor['library path'].'/btn')) {
+    $settings['buttonPath'] = base_path().$editor['library path'].'/btn/';
   }
-  if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) {
-    $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/WhizzywigToolbar.png';
+  if (file_exists($editor['library path'].'/WhizzywigToolbar.png')) {
+    $settings['toolbarImagePath'] = base_path().$editor['library path'].'/WhizzywigToolbar.png';
   }
   // Filename changed in version 60.
-  elseif (file_exists($editor['library path'] . '/icons.png')) {
-    $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/icons.png';
+  elseif (file_exists($editor['library path'].'/icons.png')) {
+    $settings['toolbarImagePath'] = base_path().$editor['library path'].'/icons.png';
   }
 
   // Add configured buttons or all available.
@@ -104,9 +104,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

@@ -140,7 +140,7 @@
         'html' => t('Source code'),
         'spellcheck' => t('Spell check'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
  *   An array containing editor properties as returned from hook_editor().
  *
  * @return
- *   The installed editor version.
+ null|string   The installed editor version.
  */
 function wysiwyg_wymeditor_version($editor) {
   $script = $editor['library path'] . '/jquery.wymeditor.js';
@@ -74,7 +74,7 @@ 
  *   A wysiwyg editor profile.
  *
  * @return
- *   An array of theme names. The first returned name should be the default
+ string[]   An array of theme names. The first returned name should be the default
  *   theme name.
  */
 function wysiwyg_wymeditor_themes($editor, $profile) {

Indentation +74 added lines, -74 removed lines

@@ -9,36 +9,36 @@ 
  * Plugin implementation of hook_editor().
  */
 function wysiwyg_wymeditor_editor() {
-  $editor['wymeditor'] = array(
+    $editor['wymeditor'] = array(
     'title' => 'WYMeditor',
     'vendor url' => 'http://www.wymeditor.org/',
     'download url' => 'http://www.wymeditor.org/download/',
     'library path' => wysiwyg_get_path('wymeditor') . '/wymeditor',
     'libraries' => array(
-      'min' => array(
+        'min' => array(
         'title' => 'Minified',
         'files' => array('jquery.wymeditor.min.js'),
-      ),
-      'pack' => array(
+        ),
+        'pack' => array(
         'title' => 'Packed',
         'files' => array('jquery.wymeditor.pack.js'),
-      ),
-      'src' => array(
+        ),
+        'src' => array(
         'title' => 'Source',
         'files' => array('jquery.wymeditor.js'),
-      ),
+        ),
     ),
     'version callback' => 'wysiwyg_wymeditor_version',
     'themes callback' => 'wysiwyg_wymeditor_themes',
     'settings callback' => 'wysiwyg_wymeditor_settings',
     'plugin callback' => 'wysiwyg_wymeditor_plugins',
     'versions' => array(
-      '0.5-rc1' => array(
+        '0.5-rc1' => array(
         'js files' => array('wymeditor.js'),
-      ),
+        ),
     ),
-  );
-  return $editor;
+    );
+    return $editor;
 }
 
 /**
@@ -51,18 +51,18 @@ 
  *   The installed editor version.
  */
 function wysiwyg_wymeditor_version($editor) {
-  $script = $editor['library path'] . '/jquery.wymeditor.js';
-  if (!file_exists($script)) {
+    $script = $editor['library path'] . '/jquery.wymeditor.js';
+    if (!file_exists($script)) {
     return;
-  }
-  $script = fopen($script, 'r');
-  fgets($script);
-  $line = fgets($script);
-  if (preg_match('@version\s+([0-9a-z\.-]+)@', $line, $version)) {
+    }
+    $script = fopen($script, 'r');
+    fgets($script);
+    $line = fgets($script);
+    if (preg_match('@version\s+([0-9a-z\.-]+)@', $line, $version)) {
     fclose($script);
     return $version[1];
-  }
-  fclose($script);
+    }
+    fclose($script);
 }
 
 /**
@@ -78,7 +78,7 @@ 
  *   theme name.
  */
 function wysiwyg_wymeditor_themes($editor, $profile) {
-  return array('compact', 'default', 'minimal', 'silver', 'twopanels');
+    return array('compact', 'default', 'minimal', 'silver', 'twopanels');
 }
 
 /**
@@ -96,99 +96,99 @@ 
  *   Drupal.settings.wysiwyg.configs.{editor}
  */
 function wysiwyg_wymeditor_settings($editor, $config, $theme) {
-  // @todo Setup $library in wysiwyg_load_editor() already.
-  $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
-  $settings = array(
+    // @todo Setup $library in wysiwyg_load_editor() already.
+    $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
+    $settings = array(
     'basePath' => base_path() . $editor['library path'] . '/',
     'wymPath' => $editor['libraries'][$library]['files'][0],
     // @todo Does not work in Drupal; jQuery can live anywhere.
     'jQueryPath' => base_path() . 'misc/jquery.js',
     'updateSelector' => '.form-submit',
     'skin' => $theme,
-  );
+    );
 
-  if (isset($config['language'])) {
+    if (isset($config['language'])) {
     $settings['lang'] = $config['language'];
-  }
+    }
 
-  // Add configured buttons.
-  $settings['toolsItems'] = array();
-  if (!empty($config['buttons'])) {
+    // Add configured buttons.
+    $settings['toolsItems'] = array();
+    if (!empty($config['buttons'])) {
     $buttoninfo = _wysiwyg_wymeditor_button_info();
     $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') {
             // Merge meta-data for internal default buttons.
             if (isset($buttoninfo[$button])) {
-              $buttoninfo[$button] += array('name' => $button);
-              $settings['toolsItems'][] = $buttoninfo[$button];
+                $buttoninfo[$button] += array('name' => $button);
+                $settings['toolsItems'][] = $buttoninfo[$button];
             }
             // For custom buttons, try to provide a valid button definition.
             else {
-              $settings['toolsItems'][] = array(
+                $settings['toolsItems'][] = array(
                 'name' => $button,
                 'title' => $plugins[$plugin][$type][$button],
                 'css' => 'wym_tools_' . $button,
-              );
+                );
+            }
             }
-          }
         }
-      }
+        }
+    }
     }
-  }
 
-  if (!empty($config['block_formats'])) {
+    if (!empty($config['block_formats'])) {
     $containers = array(
-      'p' => 'Paragraph',
-      'h1' => 'Heading_1',
-      'h2' => 'Heading_2',
-      'h3' => 'Heading_3',
-      'h4' => 'Heading_4',
-      'h5' => 'Heading_5',
-      'h6' => 'Heading_6',
-      'pre' => 'Preformatted',
-      'blockquote' => 'Blockquote',
-      'th' => 'Table_Header',
+        'p' => 'Paragraph',
+        'h1' => 'Heading_1',
+        'h2' => 'Heading_2',
+        'h3' => 'Heading_3',
+        'h4' => 'Heading_4',
+        'h5' => 'Heading_5',
+        'h6' => 'Heading_6',
+        'pre' => 'Preformatted',
+        'blockquote' => 'Blockquote',
+        'th' => 'Table_Header',
     );
     foreach (explode(',', $config['block_formats']) as $tag) {
-      if (isset($containers[$tag])) {
+        if (isset($containers[$tag])) {
         $settings['containersItems'][] = array(
-          'name' => strtoupper($tag),
-          'title' => $containers[$tag],
-          'css' => 'wym_containers_' . $tag,
+            'name' => strtoupper($tag),
+            'title' => $containers[$tag],
+            'css' => 'wym_containers_' . $tag,
         );
-      }
+        }
+    }
     }
-  }
 
-  if (isset($config['css_setting'])) {
+    if (isset($config['css_setting'])) {
     if ($config['css_setting'] == 'theme') {
-      // WYMeditor only supports one CSS file currently.
-      $settings['stylesheet'] = reset(wysiwyg_get_css());
+        // WYMeditor only supports one CSS file currently.
+        $settings['stylesheet'] = reset(wysiwyg_get_css());
     }
     else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
-      $settings['stylesheet'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
+        $settings['stylesheet'] = 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_wymeditor_plugins($editor) {
-  $plugins = array(
+    $plugins = array(
     'default' => array(
-      'buttons' => array(
+        'buttons' => array(
         'Bold' => t('Bold'), 'Italic' => t('Italic'),
         'InsertOrderedList' => t('Bullet list'), 'InsertUnorderedList' => t('Numbered list'),
         'Outdent' => t('Outdent'), 'Indent' => t('Indent'),
@@ -200,18 +200,18 @@ 
         'Paste' => t('Paste'),
         'InsertTable' => t('Table'),
         'Preview' => t('Preview'),
-      ),
-      'internal' => TRUE,
+        ),
+        'internal' => TRUE,
     ),
-  );
-  return $plugins;
+    );
+    return $plugins;
 }
 
 /**
  * Helper function to provide additional meta-data for internal default buttons.
  */
 function _wysiwyg_wymeditor_button_info() {
-  return array(
+    return array(
     'Bold' => array('title'=> 'Strong', 'css'=> 'wym_tools_strong'),
     'Italic' => array('title'=> 'Emphasis', 'css'=> 'wym_tools_emphasis'),
     'Superscript' => array('title'=> 'Superscript', 'css'=> 'wym_tools_superscript'),
@@ -229,5 +229,5 @@ 
     'Paste' => array('title'=> 'Paste_From_Word', 'css'=> 'wym_tools_paste'),
     'ToggleHtml' => array('title'=> 'HTML', 'css'=> 'wym_tools_html'),
     'Preview' => array('title'=> 'Preview', 'css'=> 'wym_tools_preview'),
-  );
+    );
 }

Spacing +6 added lines, -6 removed lines

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

Braces +1 added lines, -2 removed lines

@@ -173,8 +173,7 @@
     if ($config['css_setting'] == 'theme') {
       // WYMeditor only supports one CSS file currently.
       $settings['stylesheet'] = reset(wysiwyg_get_css());
-    }
-    else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+    } else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
       $settings['stylesheet'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
     }
   }

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

@@ -201,7 +201,7 @@
         'InsertTable' => t('Table'),
         'Preview' => t('Preview'),
       ),
-      'internal' => TRUE,
+      'internal' => true,
     ),
   );
   return $plugins;