BOINC / boinc

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

Doc Comments +6 added lines, -4 removed lines

@@ -674,6 +674,7 @@ 
 
 /**
  * Remove a profile from the database.
+ * @param stdClass $wysiwyg
  */
 function wysiwyg_profile_delete($wysiwyg) {
   if (!isset($wysiwyg->format)) {
@@ -922,7 +923,7 @@ 
  *   Whether to prefix the resulting path with base_path().
  *
  * @return
- *   The path to the specified library.
+ string   The path to the specified library.
  *
  * @ingroup libraries
  */
@@ -1014,7 +1015,7 @@ 
 /**
  * Return a list of directories by modules implementing wysiwyg_include_directory().
  *
- * @param $plugintype
+ * @param string $plugintype
  *   The type of a plugin; can be 'editors'.
  *
  * @return
@@ -1039,10 +1040,11 @@ 
  *
  * @param $module
  *   The module that owns the hook.
- * @param $identifier
+ * @param string $identifier
  *   Either the module or 'wysiwyg_' . $file->name
- * @param $hook
+ * @param string $hook
  *   The name of the hook being invoked.
+ * @param string $path
  */
 function _wysiwyg_process_include($module, $identifier, $path, $hook) {
   $function = $identifier . '_' . $hook;

Indentation +416 added lines, -416 removed lines

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

Switch Indentation +3 added lines, -3 removed lines

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

Spacing +39 added lines, -39 removed lines

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

Braces +7 added lines, -14 removed lines

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

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

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

html/inc/account.inc

Doc Comments +7 added lines

@@ -18,6 +18,10 @@ 
 
 // forms for account creation and login
 
+/**
+ * @param integer $teamid
+ * @param string $next_url
+ */
 function create_account_form($teamid, $next_url) {
     global $recaptcha_public_key;
     echo "
@@ -92,6 +96,9 @@ 
     echo "</form>\n";
 }
 
+/**
+ * @param string $next_url
+ */
 function login_form($next_url) {
     echo "
         <form name=\"f\" method=\"post\" action=\"".secure_url_base()."/login_action.php\">

Indentation +4 added lines, -4 removed lines

@@ -35,10 +35,10 @@
     // Using invitation codes to restrict access?
     //
     if (defined('INVITE_CODES')) {
-         row2(
-             tra("Invitation Code")."<br><small>".tra("A valid invitation code is required to create an account.")."</small>",
-             '<input class="form-control" type="text" name="invite_code" size="30" >'
-         );
+            row2(
+                tra("Invitation Code")."<br><small>".tra("A valid invitation code is required to create an account.")."</small>",
+                '<input class="form-control" type="text" name="invite_code" size="30" >'
+            );
     }
 
     row2(

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
         $x .= '<br><small><a href="get_passwd.php">'.tra("forgot email address?")."</a></small>";
     }
     row2($x, '<input class="form-control" name=email_addr type="text" size=40 tabindex=1>');
-    row2(tra("Password:") . '<br><small><a href="get_passwd.php">' . tra("forgot password?") . "</a></small>",
+    row2(tra("Password:").'<br><small><a href="get_passwd.php">'.tra("forgot password?")."</a></small>",
         '<input class="form-control" type="password" name="passwd" size="40" tabindex="2">'
     );
     row2(tra("Stay logged in"),

html/inc/akismet.inc

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
     }
 }
 
+/**
+ * @param string $path
+ */
 function akismet_request($request, $host, $path, $port = 80) {
     $http_request  = "POST $path HTTP/1.0\r\n";
     $http_request .= "Host: $host\r\n";

Spacing +4 added lines, -4 removed lines

@@ -26,7 +26,7 @@ 
 
     $master_url_enc = urlencode($master_url);
     $response = akismet_request("key=$key&blog=$master_url_enc", "rest.akismet.com", "/1.1/verify-key");
-    if ("valid" == $response[1] ) {
+    if ("valid" == $response[1]) {
         $post = urlencode($post);
         $ip = urlencode($_SERVER['REMOTE_ADDR']);
         $referrer = urlencode($_SERVER['HTTP_REFERER']);
@@ -56,15 +56,15 @@ 
     $http_request  = "POST $path HTTP/1.0\r\n";
     $http_request .= "Host: $host\r\n";
     $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n";
-    $http_request .= "Content-Length: " . strlen($request) . "\r\n";
+    $http_request .= "Content-Length: ".strlen($request)."\r\n";
     $http_request .= "User-Agent: BOINC | Akismet 1.1\r\n";
     $http_request .= "\r\n";
     $http_request .= $request;
 
     $response = '';
-    if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) {
+    if (false !== ($fs = @fsockopen($host, $port, $errno, $errstr, 3))) {
         fwrite($fs, $http_request);
-        while ( !feof($fs) )
+        while (!feof($fs))
             $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);

Braces +6 added lines, -3 removed lines

@@ -42,7 +42,8 @@ 
 
         $response = akismet_request($request, "$key.rest.akismet.com", "/1.1/comment-check");
 
-        if ("true" == $response[1]) { // Akismet says it's spam
+        if ("true" == $response[1]) {
+// Akismet says it's spam
             return false;
         } else {
             return true;
@@ -64,8 +65,10 @@ 
     $response = '';
     if( false !== ( $fs = @fsockopen($host, $port, $errno, $errstr, 3) ) ) {
         fwrite($fs, $http_request);
-        while ( !feof($fs) )
-            $response .= fgets($fs, 1160); // One TCP-IP packet
+        while ( !feof($fs) ) {
+                    $response .= fgets($fs, 1160);
+        }
+        // One TCP-IP packet
         fclose($fs);
         $response = explode("\r\n\r\n", $response, 2);
     }

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

@@ -53,7 +53,7 @@
 }
 
 function akismet_request($request, $host, $path, $port = 80) {
-    $http_request  = "POST $path HTTP/1.0\r\n";
+    $http_request  = "post $path HTTP/1.0\r\n";
     $http_request .= "Host: $host\r\n";
     $http_request .= "Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n";
     $http_request .= "Content-Length: " . strlen($request) . "\r\n";

html/inc/boinc_db.inc

Doc Comments +107 added lines

@@ -40,6 +40,10 @@ 
     // 2: only use replica_db_user, only try replica_db_host
     // can be set projectwide using <replica_fallback_mode>
     //
+
+    /**
+     * @param boolean $readonly
+     */
     static function get_aux($readonly, $fallback_mode = 0) {
         $config = get_config();
         $user = parse_config($config, '<db_user>');
@@ -204,6 +208,10 @@ 
         $db = BoincDb::get();
         return $db->count('user', $clause);
     }
+
+    /**
+     * @param string $field
+     */
     static function max($field) {
         $db = BoincDb::get();
         return $db->max('user', $field);
@@ -216,6 +224,10 @@ 
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
+
+    /**
+     * @param string $fields
+     */
     static function enum_fields($fields, $where_clause, $order_clause=null) {
         $db = BoincDb::get();
         return $db->enum_fields(
@@ -233,10 +245,19 @@ 
         $db->delete_aux('profile', "userid=$this->id");
         return $db->delete($this, 'user');
     }
+
+    /**
+     * @param string $field
+     */
     static function sum($field) {
         $db = BoincDb::get();
         return $db->sum('user', $field);
     }
+
+    /**
+     * @param string $field
+     * @param string $clause
+     */
     static function percentile($field, $clause, $pct) {
         $db = BoincDb::get();
         return $db->percentile('user', $field, $clause, $pct);
@@ -245,6 +266,10 @@ 
 
 class BoincTeam {
     static $cache;
+
+    /**
+     * @param string $clause
+     */
     static function insert($clause) {
         $db = BoincDb::get();
         $ret = $db->insert('team', $clause);
@@ -282,14 +307,27 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'team');
     }
+
+    /**
+     * @param string $field
+     * @param string $clause
+     */
     static function percentile($field, $clause, $pct) {
         $db = BoincDb::get();
         return $db->percentile('team', $field, $clause, $pct);
     }
+
+    /**
+     * @param string $field
+     */
     static function max($field) {
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
+
+    /**
+     * @param string $fields
+     */
     static function enum_fields($fields, $where_clause, $order_clause=null) {
         $db = BoincDb::get();
         return $db->enum_fields(
@@ -326,6 +364,12 @@ 
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
+
+    /**
+     * @param string $fields
+     * @param string $where_clause
+     * @param string $order_clause
+     */
     static function enum_fields($fields, $where_clause, $order_clause=null) {
         $db = BoincDb::get();
         return $db->enum_fields(
@@ -358,6 +402,10 @@ 
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause);
     }
+
+	/**
+	 * @param string $fields
+	 */
 	static function enum_fields($fields, $where_clause, $order_clause) {
         $db = BoincDb::get();
 		return $db->enum_fields('result', 'BoincResult', $fields, $where_clause, $order_clause);
@@ -412,6 +460,10 @@ 
         $db = BoincDb::get();
         return $db->update_aux('workunit', $clause);
     }
+
+    /**
+     * @param string $clause
+     */
     static function count($clause) {
         $db = BoincDb::get();
         return $db->count('workunit', $clause);
@@ -427,6 +479,10 @@ 
         $db = BoincDb::get();
         return $db->lookup('app', 'BoincApp', $clause);
     }
+
+    /**
+     * @param string $where_clause
+     */
     static function enum($where_clause) {
         $db = BoincDb::get();
         return $db->enum('app', 'BoincApp', $where_clause);
@@ -441,6 +497,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
+
+    /**
+     * @param string $field
+     * @param string $clause
+     */
     static function sum($field, $clause=null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
@@ -473,6 +534,10 @@ 
 }
 
 class BoincProfile {
+
+    /**
+     * @param string $fields
+     */
     static function lookup_fields($fields, $clause) {
         $db = BoincDb::get();
         return $db->lookup_fields('profile', 'BoincProfile', $fields, $clause);
@@ -489,18 +554,37 @@ 
         $db = BoincDb::get();
         return $db->update_aux('profile', $clause.' where userid='.$this->userid);
     }
+
+    /**
+     * @param string $clause
+     */
     static function update_aux($clause) {
         $db = BoincDb::get();
         return $db->update_aux('profile', $clause);
     }
+
+    /**
+     * @param string $clause
+     */
     static function insert($clause) {
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
+
+    /**
+     * @param string $where_clause
+     * @param string $order_clause
+     */
     static function enum($where_clause=null, $order_clause=null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
+
+    /**
+     * @param string $fields
+     * @param string $where_clause
+     * @param string $order_clause
+     */
     static function enum_fields($fields, $where_clause=null, $order_clause=null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
@@ -568,6 +652,10 @@ 
 }
 
 class BoincPlatform {
+
+    /**
+     * @param string $where_clause
+     */
     static function enum($where_clause) {
         $db = BoincDb::get();
         return $db->enum('platform', 'BoincPlatform', $where_clause);
@@ -648,6 +736,10 @@ 
 }
 
 class BoincBadge {
+
+    /**
+     * @param string $where_clause
+     */
     static function enum($where_clause) {
         $db = BoincDb::get();
         return $db->enum('badge', 'BoincBadge', $where_clause);
@@ -743,6 +835,11 @@ 
         $db = BoincDb::get();
         return $db->enum('credit_user', 'BoincCreditUser', $where_clause);
     }
+
+    /**
+     * @param string $field
+     * @param string $clause
+     */
     static function sum($field, $clause) {
         $db = BoincDb::get();
         return $db->sum('credit_user', $field, $clause);
@@ -766,6 +863,11 @@ 
         $db = BoincDb::get();
         return $db->enum('credit_team', 'BoincCreditTeam', $where_clause);
     }
+
+    /**
+     * @param string $field
+     * @param string $clause
+     */
     static function sum($field, $clause) {
         $db = BoincDb::get();
         return $db->sum('credit_team', $field, $clause);
@@ -780,6 +882,11 @@ 
 // 
 // apply this to any user-supplied strings used in queries
 // 
+/**
+ * @param string $x
+ *
+ * @return string
+ */
 function boinc_real_escape_string($x) {
     if (version_compare(phpversion(),"4.3.0")>=0) {
         return BoincDb::escape_string($x);

Indentation +3 added lines, -3 removed lines

@@ -358,10 +358,10 @@
         $db = BoincDb::get();
         return $db->enum('result', 'BoincResult', $where_clause);
     }
-	static function enum_fields($fields, $where_clause, $order_clause) {
+    static function enum_fields($fields, $where_clause, $order_clause) {
         $db = BoincDb::get();
-		return $db->enum_fields('result', 'BoincResult', $fields, $where_clause, $order_clause);
-	}
+        return $db->enum_fields('result', 'BoincResult', $fields, $where_clause, $order_clause);
+    }
     function update($clause) {
         $db = BoincDb::get();
         return $db->update($this, 'result', $clause);

Spacing +10 added lines, -10 removed lines

@@ -212,11 +212,11 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'user', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('user', 'BoincUser', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'user', 'BoincUser', $fields, $where_clause, $order_clause
@@ -265,7 +265,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'team', $clause);
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('team', 'BoincTeam', $where_clause, $order_clause);
     }
@@ -290,7 +290,7 @@ 
         $db = BoincDb::get();
         return $db->max('team', $field);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'team', 'BoincTeam', $fields, $where_clause, $order_clause
@@ -322,11 +322,11 @@ 
         $db = BoincDb::get();
         return $db->delete($this, 'host');
     }
-    static function enum($where_clause, $order_clause=null) {
+    static function enum($where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('host', 'BoincHost', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause, $order_clause=null) {
+    static function enum_fields($fields, $where_clause, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields(
             'host', 'BoincHost', $fields, $where_clause, $order_clause
@@ -441,7 +441,7 @@ 
         $db = BoincDb::get();
         return $db->update($this, 'app', $clause);
     }
-    static function sum($field, $clause=null) {
+    static function sum($field, $clause = null) {
         $db = BoincDb::get();
         return $db->sum('app', $field, $clause);
     }
@@ -497,11 +497,11 @@ 
         $db = BoincDb::get();
         return $db->insert('profile', $clause);
     }
-    static function enum($where_clause=null, $order_clause=null) {
+    static function enum($where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum('profile', 'BoincProfile', $where_clause, $order_clause);
     }
-    static function enum_fields($fields, $where_clause=null, $order_clause=null) {
+    static function enum_fields($fields, $where_clause = null, $order_clause = null) {
         $db = BoincDb::get();
         return $db->enum_fields('profile', 'BoincProfile', $fields, $where_clause, $order_clause);
     }
@@ -781,7 +781,7 @@ 
 // apply this to any user-supplied strings used in queries
 // 
 function boinc_real_escape_string($x) {
-    if (version_compare(phpversion(),"4.3.0")>=0) {
+    if (version_compare(phpversion(), "4.3.0") >= 0) {
         return BoincDb::escape_string($x);
     } else {
         $x = str_replace("'", "\'", $x);

html/inc/bolt.inc

Doc Comments +9 added lines

@@ -246,6 +246,9 @@ 
 
 }
 
+/**
+ * @param string $n
+ */
 function name($n) {
     return array('name', $n);
 }
@@ -254,10 +257,16 @@ 
     return array('title', $n);
 }
 
+/**
+ * @param integer $n
+ */
 function number($n) {
     return array('number', $n);
 }
 
+/**
+ * @param string $n
+ */
 function filename($n) {
     return array('filename', $n);
 }

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
     public $title;
         // Optional; used when showing course history outline.
     public $is_item;
-    public $attrs;        // course-defined
+    public $attrs; // course-defined
 
     abstract function walk(&$iter, $incr, &$frac_done);
         // multi-purpose function for traversing a course.
@@ -55,7 +55,7 @@ 
             $this->query_string = null;
         } else {
             $this->filename = substr($filename, 0, $p);
-            $this->query_string = substr($filename, $p+1);
+            $this->query_string = substr($filename, $p + 1);
         }
         $this->name = $filename;
         $this->title = $title;
@@ -162,7 +162,7 @@ 
             // look up unit by name
             //
             $child = null;
-            for ($i=0; $i<$n; $i++) {
+            for ($i = 0; $i < $n; $i++) {
                 $c = $this->units[$i];
                 if ($c->name == $child_name) {
                     $child = $c;
@@ -177,7 +177,7 @@ 
                 if ($i >= $n) {
                     // and if index is too big, use last unit
                     //
-                    $i = $n-1;
+                    $i = $n - 1;
                 }
                 $child = $this->units[$i];
             }
@@ -197,7 +197,7 @@ 
                         $this->finished($iter);
                         return true;
                     } else {
-                        $i = ($i+1)%$n;
+                        $i = ($i + 1)%$n;
                     }
                 }
             }
@@ -235,7 +235,7 @@ 
         if (array_key_exists($this->name, $state)) {
             $state_rec = $state[$this->name];
             $child_name = $state_rec['child_name'];
-            foreach($this->units as $c) {
+            foreach ($this->units as $c) {
                 if ($c->name == $child_name) {
                     return $c;
                 }

html/inc/bolt_ex.inc

Doc Comments +8 added lines

@@ -240,6 +240,10 @@ 
 
 class BoltFitbField {
     public $textarea, $nrows, $ncols;
+
+    /**
+     * @param boolean $textarea
+     */
     function __construct($textarea, $nrows, $ncols) {
         $this->textarea = $textarea;
         $this->nrows = $nrows;
@@ -258,6 +262,10 @@ 
 class BoltFitbAnswer {
     public $type;   // 0=constant, 1=regexp, 2=func
     public $ans;
+
+    /**
+     * @param integer $type
+     */
     function __construct($type, $ans) {
         $this->type = $type;
         $this->ans = $ans;

Spacing +14 added lines, -14 removed lines

@@ -21,11 +21,11 @@ 
 // The following is a global var accessed by exercise functions.
 //
 $bolt_ex = null;
-$bolt_ex->mode = 0;     // input: SHOW/SCORE/ANSWER
-$bolt_ex->index = 0;    // input: sequence of this exercise in file
-$bolt_ex->score = 0;    // input/output: cumulative score (if mode = SCORE)
-$bolt_ex->weight = 0;   // input/output: cumulative weight
-$bolt_ex->query_string = "";    // user's response (if SCORE or ANSWER)
+$bolt_ex->mode = 0; // input: SHOW/SCORE/ANSWER
+$bolt_ex->index = 0; // input: sequence of this exercise in file
+$bolt_ex->score = 0; // input/output: cumulative score (if mode = SCORE)
+$bolt_ex->weight = 0; // input/output: cumulative weight
+$bolt_ex->query_string = ""; // user's response (if SCORE or ANSWER)
 
 function weight($w) {
     return array('weight', $w);
@@ -170,9 +170,9 @@ 
             $response = isset($$key);
             $r = $choice[1];
             $correct = ($r && $response) || (!$r && !$response);
-            $color = $correct?"#88ff88":"#ff8888";
-            table_row($c, $r?"yes":"no",
-                array($response?"yes":"no", "bgcolor=$color")
+            $color = $correct ? "#88ff88" : "#ff8888";
+            table_row($c, $r ? "yes" : "no",
+                array($response ? "yes" : "no", "bgcolor=$color")
             );
             $i++;
         }
@@ -215,11 +215,11 @@ 
         if ($y > $rect[3]) $right = false;
         $cx = $rect[0];
         $cy = $rect[2];
-        $sizex = $rect[1]-$rect[0];
-        $sizey = $rect[3]-$rect[2];
-        $ax = $x-4;
-        $ay = $y-4;
-        $color = $right?"green":"red";
+        $sizex = $rect[1] - $rect[0];
+        $sizey = $rect[3] - $rect[2];
+        $ax = $x - 4;
+        $ay = $y - 4;
+        $color = $right ? "green" : "red";
         if ($right) {
             echo "The point you selected (shown in green) is correct.";
         } else {
@@ -256,7 +256,7 @@ 
 }
 
 class BoltFitbAnswer {
-    public $type;   // 0=constant, 1=regexp, 2=func
+    public $type; // 0=constant, 1=regexp, 2=func
     public $ans;
     function __construct($type, $ans) {
         $this->type = $type;

html/inc/bolt_select.inc

Doc Comments +3 added lines

@@ -52,6 +52,9 @@
     }
 }
 
+/**
+ * @param string $n
+ */
 function valuator($n) {
     return array('valuator', $n);
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 
 function select_cmp($a, $b) {
     if ($a->value == $b->value) return 0;
-    return ($a->value < $b->value)?1:-1;
+    return ($a->value < $b->value) ? 1 : -1;
 }
 
 class BoltSelect extends BoltSet {

html/inc/bolt_snap.inc

Doc Comments +6 added lines

@@ -45,6 +45,9 @@ 
     return "../bolt_snap/compare_snapshot_$x";
 }
 
+/**
+ * @param null|integer $dur
+ */
 function write_compare_snapshot($course_id, $select_name, $xset_name, $dur) {
     $now = time();
     $start = $now - $dur*86400;
@@ -127,6 +130,9 @@ 
     return "../bolt_snap/map_snapshot_".$course_id;
 }
 
+/**
+ * @param null|integer $dur
+ */
 function write_map_snapshot($course_id, $dur) {
     $now = time();
     $start = $now - $dur*86400;

html/inc/bolt_util_ops.inc

Doc Comments +21 added lines

@@ -23,6 +23,9 @@ 
 
 // get names of units of a given type
 
+/**
+ * @param string $type
+ */
 function units_of_type($unit, $type) {
     $names = array();
     if (get_class($unit) == $type) {
@@ -118,6 +121,10 @@ 
 
 //////////// graph drawing
 
+/**
+ * @param integer $n
+ * @param integer $width
+ */
 function compare_bar($title, $n, $width, $lo, $hi) {
     $x1 = $width*$lo;
     $x2 = $width*($hi-$lo);
@@ -137,6 +144,9 @@ 
     ";
 }
 
+/**
+ * @param integer $width
+ */
 function compare_bar_insuff($title, $width) {
     return "
         <tr>
@@ -150,6 +160,10 @@ 
     ";
 }
 
+/**
+ * @param integer[] $x
+ * @param integer $width
+ */
 function outcome_graph($x, $width) {
     $n = $x[0]+$x[1]+$x[2];
     if (!$n) return empty_cell();
@@ -182,6 +196,9 @@ 
     return $s;
 }
 
+/**
+ * @param integer $w
+ */
 function time_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = (log10($t)+2)*$w/4;
@@ -193,6 +210,10 @@ 
     </td>";
 }
 
+/**
+ * @param integer $t
+ * @param integer $w
+ */
 function score_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = $t*$w;

Spacing +9 added lines, -9 removed lines

@@ -89,10 +89,10 @@ 
         $n++;
         $delta = $x - $m;
         $m += $delta/$n;
-        $m2 += $delta*($x-$m);
+        $m2 += $delta*($x - $m);
     }
     $mean = $m;
-    $stdev = sqrt($m2/($n-1));
+    $stdev = sqrt($m2/($n - 1));
 }
 
 // approximate the 90% confidence interval for the mean of an array
@@ -103,13 +103,13 @@ 
 
     // I'm too lazy to compute the t distribution
     $t_90 = 1.7;
-    $d = $t_90 * $stdev / sqrt($n);
+    $d = $t_90*$stdev/sqrt($n);
     $lo = $mean - $d;
     $hi = $mean + $d;
 }
 
 function test_stats() {
-    $a = array(1,1,1,1,0,1,1,1,3, 1, 1, 1, 1);
+    $a = array(1, 1, 1, 1, 0, 1, 1, 1, 3, 1, 1, 1, 1);
     mean_stdev($a, $mean, $stdev);
     echo "mean: $mean stdev: $stdev\n";
     conf_int_90($a, $lo, $hi);
@@ -120,7 +120,7 @@ 
 
 function compare_bar($title, $n, $width, $lo, $hi) {
     $x1 = $width*$lo;
-    $x2 = $width*($hi-$lo);
+    $x2 = $width*($hi - $lo);
     $a1 = number_format($lo*100);
     $a2 = number_format($hi*100);
     return "
@@ -151,12 +151,12 @@ 
 }
 
 function outcome_graph($x, $width) {
-    $n = $x[0]+$x[1]+$x[2];
+    $n = $x[0] + $x[1] + $x[2];
     if (!$n) return empty_cell();
     $x0 = $width*$x[1]/$n;
     $x1 = $width*$x[0]/$n;
     $x2 = $width*$x[2]/$n;
-    if ($x[1]/$n>0.05) {
+    if ($x[1]/$n > 0.05) {
         $t0 = number_format(100*$x[1]/$n)."%";
     } else {
         $t0 = "";
@@ -184,7 +184,7 @@ 
 
 function time_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
-    $x = (log10($t)+2)*$w/4;
+    $x = (log10($t) + 2)*$w/4;
     $t = number_format($t, 1);
     return "<td>
         <table class=bolt_bar><tr>
@@ -196,7 +196,7 @@ 
 function score_graph($t, $w) {
     if ($t == 0) return "<td>---</td>";
     $x = $t*$w;
-    $y = (1-$t)*$w;
+    $y = (1 - $t)*$w;
     $t = number_format($t*100);
     $s = "<td>
         <table class=bolt_bar><tr>