BOINC / boinc

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

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'])) {

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

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,

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

Spacing +39 added lines, -39 removed lines

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

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +3 added lines, -3 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

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

Spacing +28 added lines, -28 removed lines

@@ -17,14 +17,14 @@ 
     foreach ($code_tags as $code_tag) {
       $code_tag[1] = str_replace(array('<', '>'), array('&lt;', '&gt;'), $code_tag[1]);
       if (strpos($code_tag[1], "\n") === FALSE)
-        $body = str_replace($code_tag[0], '<code class="bb-code">'. $code_tag[1] .'</code>', $body);
+        $body = str_replace($code_tag[0], '<code class="bb-code">'.$code_tag[1].'</code>', $body);
       elseif ($mode) {
         // Strip preformatted code blocks from text during line break processing, replaced below
         $body = str_replace($code_tag[0], "***pRe_sTrInG$i***", $body);
-        $pre[$i++] = '<pre class="bb-code-block">'. $code_tag[1] .'</pre>';
+        $pre[$i++] = '<pre class="bb-code-block">'.$code_tag[1].'</pre>';
       }
       else
-        $body = str_replace($code_tag[0], '<pre class="bb-code-block">'. $code_tag[1] .'</pre>', $body);
+        $body = str_replace($code_tag[0], '<pre class="bb-code-block">'.$code_tag[1].'</pre>', $body);
     }
   }
 
@@ -38,14 +38,14 @@ 
       $body  = preg_replace("/(\r\n|\n|\r)/", "\n", $body);
       $body  = preg_replace("/\n\n+/", "\n\n", $body);
       $parts = explode("\n\n", $body);
-      for ($i=0; $i<sizeof($parts); $i++) {
+      for ($i = 0; $i < sizeof($parts); $i++) {
          // No linebreaks if paragraph starts with an HTML tag
-         if ( !preg_match('/^<.*>/', $parts[$i]) ) 
+         if (!preg_match('/^<.*>/', $parts[$i])) 
            $parts[$i] = nl2br($parts[$i]);
 
          // Some tags should not be in paragraph blocks
-         if ( !preg_match('/^(?:<|\[)(?:table|list|ol|ul|pre|select|form|blockquote|hr)/i', $parts[$i]) ) 
-           $parts[$i] = '<p>'. $parts[$i] .'</p>';
+         if (!preg_match('/^(?:<|\[)(?:table|list|ol|ul|pre|select|form|blockquote|hr)/i', $parts[$i])) 
+           $parts[$i] = '<p>'.$parts[$i].'</p>';
       }
       $body = implode("\n\n", $parts);
     }
@@ -69,7 +69,7 @@ 
   }
   // Also add opening tags, if needed
   for ($i = $unclosed; $i < 0; $i++) {
-    $body = '[quote]' . $body;
+    $body = '[quote]'.$body;
   }
   preg_match_all('/\[list/i', $body, $matches);
   $opentags = count($matches['0']);
@@ -79,7 +79,7 @@ 
     $body .= '[/list]';
   }
   for ($i = $unclosed; $i < 0; $i++) {
-    $body = '[list]' . $body;
+    $body = '[list]'.$body;
   }
 
   // begin processing for [size] 
@@ -238,7 +238,7 @@ 
   }
   else {
     $body = preg_replace(
-      array('#\[email(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si','#\[email=(.*?)(?::\w+)?\]([\w\s]+)\[/email(?::\w+)?\]#si'),
+      array('#\[email(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si', '#\[email=(.*?)(?::\w+)?\]([\w\s]+)\[/email(?::\w+)?\]#si'),
       array('<a href="mailto:\\1" class="bb-email">\\1</a>', '<a href="mailto:\\1" class="bb-email">\\2</a>'),
       $body);
   }
@@ -247,7 +247,7 @@ 
   if (variable_get("bbcode_make_links_$format", 1)) {
 
     // pad with a space so we can match things at the start of the 1st line
-    $ret = ' ' . $body;
+    $ret = ' '.$body;
     // padding to already filtered links
     $ret = preg_replace('#(<a.+>)(.+</a>)#i', "$1\x07$2", $ret);
 
@@ -283,41 +283,41 @@ 
 
 function _bbcode_generate_heading($level, $text) {
   $anchor = preg_replace('/([\s]+)/', '_', $text);
-  $anchor = preg_replace('/([\W]+)/', '',  $anchor);
-  return '<h'. $level .'><a name="'. $anchor .'">'. $text .'</a></h'. $level .'>';
+  $anchor = preg_replace('/([\W]+)/', '', $anchor);
+  return '<h'.$level.'><a name="'.$anchor.'">'.$text.'</a></h'.$level.'>';
 }
 
 function _bbcode_generate_index($body, $tag = 'ol') {
   $level = 0;
-  $index = '<'. $tag .">\n";
+  $index = '<'.$tag.">\n";
   $close_tags = 0;
 
   if (preg_match_all('#\[h([1-6]).*?\](.*?)\[/h([1-6]).*?\]#si', $body, $head_tags, PREG_SET_ORDER)) {
     foreach ($head_tags as $head_tag) {
       if ($level == 0) $level = $head_tag[1];
       $anchor = preg_replace('/([\s]+)/', '_', $head_tag[2]);
-      $anchor = preg_replace('/([\W]+)/', '',  $anchor);
+      $anchor = preg_replace('/([\W]+)/', '', $anchor);
 
       if ($head_tag[1] > $level) {
-        $index .= '<'. $tag .">\n";
-        $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n";
+        $index .= '<'.$tag.">\n";
+        $index .= '<li><a href="#'.$anchor.'">'.$head_tag[2]."</a>\n";
         $close_tags++;
         $level = $head_tag[1];
       } else if ($head_tag[1] < $level) {
         while ($close_tags > 0) {
-           $index .= '</'. $tag .">\n";
+           $index .= '</'.$tag.">\n";
            $close_tags--;
         }
-        $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n";
+        $index .= '<li><a href="#'.$anchor.'">'.$head_tag[2]."</a>\n";
         $level = $head_tag[1];
       } else {
-        $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n";
+        $index .= '<li><a href="#'.$anchor.'">'.$head_tag[2]."</a>\n";
         $level = $head_tag[1];
       }
     }
   }
   while ($close_tags >= 0) {
-    $index .= '</'. $tag .">\n";
+    $index .= '</'.$tag.">\n";
     $close_tags--;
   }
   return $index;
@@ -325,27 +325,27 @@ 
 
 function _bbcode_encode_mailto($matches) {
   if (isset($matches[3])) 
-    $link = 'document.write(\'<a href="mailto:' . $matches[2].'@'.$matches[3] . '">' . $matches[2].'@'.$matches[3] . '</a>\');';
+    $link = 'document.write(\'<a href="mailto:'.$matches[2].'@'.$matches[3].'">'.$matches[2].'@'.$matches[3].'</a>\');';
   else 
-    $link = 'document.write(\'<a href="mailto:' . $matches[1] . '" class="bb-email">' . (isset($matches[2]) ? $matches[2] : $matches[1]) . '</a>\');';
+    $link = 'document.write(\'<a href="mailto:'.$matches[1].'" class="bb-email">'.(isset($matches[2]) ? $matches[2] : $matches[1]).'</a>\');';
 
   $js_encode = '';
   for ($x = 0; $x < strlen($link); $x++) 
-    $js_encode .= '%' . bin2hex($link{$x});
+    $js_encode .= '%'.bin2hex($link{$x});
 
   $link = '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>';
   if (isset($matches[3]))
-    $link = $matches[1] . $link;
+    $link = $matches[1].$link;
 
   return $link;
 }
 
 function _bbcode_notag_tag($text = NULL) {
-  return str_replace( array('[', ']', '@'), array('&#91;', '&#93;', '&#64;'), stripslashes($text));
+  return str_replace(array('[', ']', '@'), array('&#91;', '&#93;', '&#64;'), stripslashes($text));
 }
 
 function _bbcode_php_tag($text = NULL) {
-  return '<pre>'. highlight_string( str_replace('<br />', '', stripslashes($text)), true) .'</pre>';
+  return '<pre>'.highlight_string(str_replace('<br />', '', stripslashes($text)), true).'</pre>';
 }
 
 function _bbcode_round_size_val($size) {
@@ -358,7 +358,7 @@ 
 }
 
 function _bbcode_replace_nest_tag($arr = NULL) {
-  $text = preg_replace('#(\[[/]*)'. $arr['tag'] .'(.*?\])#si', "$1\x07$2", $arr['text']);
+  $text = preg_replace('#(\[[/]*)'.$arr['tag'].'(.*?\])#si', "$1\x07$2", $arr['text']);
   // It will be better to use &count and do-while, if php 5 or higher.
   while (preg_match($arr['pattern'], $text)) {
     $text = preg_replace($arr['pattern'], $arr['replacement'], $text);

drupal/sites/default/boinc/modules/contrib/cck/includes/content.crud.inc

Spacing +23 added lines, -23 removed lines

@@ -42,7 +42,7 @@ 
     $field['active'] = 1;
   }
 
-  $field['columns'] = (array) module_invoke($module, 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($module, 'field_settings', 'database columns', $field);
   // Ensure columns always default to NULL values.
   foreach ($field['columns'] as $column_name => $column) {
     $field['columns'][$column_name]['not null'] = FALSE;
@@ -53,7 +53,7 @@ 
   $field['db_storage'] = CONTENT_DB_STORAGE_PER_CONTENT_TYPE;
 
   // Make sure field settings all have an index in the array.
-  $setting_names = (array) module_invoke($module, 'field_settings', 'save', $field);
+  $setting_names = (array)module_invoke($module, 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
   foreach ($setting_names as $setting) {
     $field[$setting] = NULL;
@@ -92,7 +92,7 @@ 
   }
 
   // Make sure widget settings all have an index in the array.
-  $settings_names = (array) module_invoke($module, 'widget_settings', 'save', $widget);
+  $settings_names = (array)module_invoke($module, 'widget_settings', 'save', $widget);
   drupal_alter('widget_settings', $settings_names, 'save', $widget);
   $widget['widget_settings'] = array();
   foreach ($settings_names as $name) {
@@ -133,7 +133,7 @@ 
   // initialize $widget_settings with default values,
   if (isset($field['default_value']) && isset($field['default_value_php']) &&
       content_callback('widget', 'default value', $field) == CONTENT_CALLBACK_DEFAULT) {
-    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value']  : NULL;
+    $field['widget']['default_value'] = !empty($field['default_value']) ? $field['default_value'] : NULL;
     $field['widget']['default_value_php'] = !empty($field['default_value_php']) ? $field['default_value_php'] : NULL;
     unset($field['default_value']);
     unset($field['default_value_php']);
@@ -208,7 +208,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_create($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   $form_values = $field;
   $field = content_field_instance_expand($field);
@@ -255,7 +255,7 @@ 
   $field['db_storage'] = content_storage_type($field);
 
   // Get a fresh copy of the column information whenever a field is created.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
   if (empty($prev_field['widget']) || $prior_instances < 1) {
     // If this is the first instance, create the field.
@@ -319,7 +319,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_update($field, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   // Ensure the field description is in the 'expanded' form.
   $field = content_field_instance_expand($field);
@@ -345,7 +345,7 @@ 
 
   // Changes in field values may affect columns, or column
   // information may have changed, get a fresh copy.
-  $field['columns'] = (array) module_invoke($field['module'], 'field_settings', 'database columns', $field);
+  $field['columns'] = (array)module_invoke($field['module'], 'field_settings', 'database columns', $field);
 
   // If the database storage has changed, update the field and previous instances.
   $prior_instances = content_field_instance_read(array('field_name' => $field['field_name']));
@@ -399,7 +399,7 @@ 
 function _content_field_write($field, $op = 'update') {
   // Rearrange the data to create the global_settings array.
   $field['global_settings'] = array();
-  $setting_names = (array) module_invoke($field['module'], 'field_settings', 'save', $field);
+  $setting_names = (array)module_invoke($field['module'], 'field_settings', 'save', $field);
   drupal_alter('field_settings', $setting_names, 'save', $field);
 
   foreach ($setting_names as $setting) {
@@ -435,7 +435,7 @@ 
   $field = content_field_instance_collapse($field);
 
   // Rearrange the data to create the widget_settings array.
-  $setting_names = (array) module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
+  $setting_names = (array)module_invoke($field['widget_module'], 'widget_settings', 'save', $field);
   drupal_alter('widget_settings', $setting_names, 'save', $field);
   foreach ($setting_names as $setting) {
     // In some cases (when the updated $field was originally read from
@@ -478,7 +478,7 @@ 
   if (is_array($param)) {
     // Turn the conditions into a query.
     foreach ($param as $key => $value) {
-      $cond[] = 'nfi.'. db_escape_string($key) ." = '%s'";
+      $cond[] = 'nfi.'.db_escape_string($key)." = '%s'";
       $args[] = $value;
     }
   }
@@ -486,17 +486,17 @@ 
     $cond[] = 'nf.active = 1';
     $cond[] = 'nfi.widget_active = 1';
   }
-  $where = $cond ? ' WHERE '. implode(' AND ', $cond) : '';
+  $where = $cond ? ' WHERE '.implode(' AND ', $cond) : '';
 
-  $db_result = db_query("SELECT * FROM {". content_instance_tablename() ."} nfi ".
-    " JOIN {". content_field_tablename() ."} nf ON nfi.field_name = nf.field_name ".
+  $db_result = db_query("SELECT * FROM {".content_instance_tablename()."} nfi ".
+    " JOIN {".content_field_tablename()."} nf ON nfi.field_name = nf.field_name ".
     "$where ORDER BY nfi.weight ASC, nfi.label ASC", $args);
 
   $fields = array();
   while ($instance = db_fetch_array($db_result)) {
     // Unserialize arrays.
     foreach (array('widget_settings', 'display_settings', 'global_settings', 'db_columns') as $key) {
-      $instance[$key] = (!empty($instance[$key])) ? (array) unserialize($instance[$key]) : array();
+      $instance[$key] = (!empty($instance[$key])) ? (array)unserialize($instance[$key]) : array();
     }
     // 'columns' is a reserved word in MySQL4, so our column is named 'db_columns'.
     $instance['columns'] = $instance['db_columns'];
@@ -544,7 +544,7 @@ 
  * @see menu_rebuild()
  */
 function content_field_instance_delete($field_name, $type_name, $rebuild = TRUE) {
-  include_once('./'. drupal_get_path('module', 'content') .'/includes/content.admin.inc');
+  include_once('./'.drupal_get_path('module', 'content').'/includes/content.admin.inc');
 
   // Get the previous field value.
   $field = array_pop(content_field_instance_read(array('field_name' => $field_name, 'type_name' => $type_name)));
@@ -552,13 +552,13 @@ 
   // Invoke hook_content_fieldapi().
   module_invoke_all('content_fieldapi', 'delete instance', $field);
 
-  db_query("DELETE FROM {". content_instance_tablename() .
+  db_query("DELETE FROM {".content_instance_tablename().
     "} WHERE field_name = '%s' AND type_name = '%s'", $field['field_name'], $field['type_name']);
 
   // If no instances remain, delete the field entirely.
   $instances = content_field_instance_read(array('field_name' => $field_name));
   if (sizeof($instances) < 1) {
-    db_query("DELETE FROM {". content_field_tablename() ."} WHERE field_name = '%s'", $field['field_name']);
+    db_query("DELETE FROM {".content_field_tablename()."} WHERE field_name = '%s'", $field['field_name']);
     content_alter_schema($field, array());
   }
   // If only one instance remains, we may need to change the database
@@ -600,7 +600,7 @@ 
   // If content module has been uninstalled first, all tables
   // have already been dropped, and running that code will raise errors.
   if (db_table_exists(content_instance_tablename())) {
-    $results = db_query("SELECT field_name, type_name FROM {". content_instance_tablename() ."} WHERE widget_module = '%s'", $module);
+    $results = db_query("SELECT field_name, type_name FROM {".content_instance_tablename()."} WHERE widget_module = '%s'", $module);
     while ($field = db_fetch_array($results)) {
       content_field_instance_delete($field['field_name'], $field['type_name'], FALSE);
     }
@@ -634,7 +634,7 @@ 
 function content_type_update($info) {
   if (!empty($info->old_type) && $info->old_type != $info->type) {
     // Rename the content type in all fields that use changed content type.
-    db_query("UPDATE {". content_instance_tablename() ."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
+    db_query("UPDATE {".content_instance_tablename()."} SET type_name='%s' WHERE type_name='%s'", array($info->type, $info->old_type));
 
     // Rename the content fields table to match new content type name.
     $old_type = content_types($info->old_type);
@@ -648,9 +648,9 @@ 
     }
 
     // Rename the variable storing weights for non-CCK fields.
-    if ($extra = variable_get('content_extra_weights_'. $info->old_type, array())) {
-      variable_set('content_extra_weights_'. $info->type, $extra);
-      variable_del('content_extra_weights_'. $info->old_type);
+    if ($extra = variable_get('content_extra_weights_'.$info->old_type, array())) {
+      variable_set('content_extra_weights_'.$info->type, $extra);
+      variable_del('content_extra_weights_'.$info->old_type);
     }
   }