@@ -9,19 +9,19 @@ discard block |
||
| 9 | 9 | * Implementation of hook_menu(). |
| 10 | 10 | */ |
| 11 | 11 | function wysiwyg_menu() { |
| 12 | - $items['admin/settings/wysiwyg'] = array( |
|
| 12 | + $items['admin/settings/wysiwyg'] = array( |
|
| 13 | 13 | 'title' => 'Wysiwyg profiles', |
| 14 | 14 | 'page callback' => 'drupal_get_form', |
| 15 | 15 | 'page arguments' => array('wysiwyg_profile_overview'), |
| 16 | 16 | 'description' => 'Configure client-side editors.', |
| 17 | 17 | 'access arguments' => array('administer filters'), |
| 18 | 18 | 'file' => 'wysiwyg.admin.inc', |
| 19 | - ); |
|
| 20 | - $items['admin/settings/wysiwyg/profile'] = array( |
|
| 19 | + ); |
|
| 20 | + $items['admin/settings/wysiwyg/profile'] = array( |
|
| 21 | 21 | 'title' => 'List', |
| 22 | 22 | 'type' => MENU_DEFAULT_LOCAL_TASK, |
| 23 | - ); |
|
| 24 | - $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array( |
|
| 23 | + ); |
|
| 24 | + $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/edit'] = array( |
|
| 25 | 25 | 'title' => 'Edit', |
| 26 | 26 | 'page callback' => 'drupal_get_form', |
| 27 | 27 | 'page arguments' => array('wysiwyg_profile_form', 4), |
@@ -30,8 +30,8 @@ discard block |
||
| 30 | 30 | 'tab_root' => 'admin/settings/wysiwyg/profile', |
| 31 | 31 | 'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile', |
| 32 | 32 | 'type' => MENU_LOCAL_TASK, |
| 33 | - ); |
|
| 34 | - $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array( |
|
| 33 | + ); |
|
| 34 | + $items['admin/settings/wysiwyg/profile/%wysiwyg_profile/delete'] = array( |
|
| 35 | 35 | 'title' => 'Remove', |
| 36 | 36 | 'page callback' => 'drupal_get_form', |
| 37 | 37 | 'page arguments' => array('wysiwyg_profile_delete_confirm', 4), |
@@ -41,15 +41,15 @@ discard block |
||
| 41 | 41 | 'tab_parent' => 'admin/settings/wysiwyg/profile/%wysiwyg_profile', |
| 42 | 42 | 'type' => MENU_LOCAL_TASK, |
| 43 | 43 | 'weight' => 10, |
| 44 | - ); |
|
| 45 | - $items['wysiwyg/%'] = array( |
|
| 44 | + ); |
|
| 45 | + $items['wysiwyg/%'] = array( |
|
| 46 | 46 | 'page callback' => 'wysiwyg_dialog', |
| 47 | 47 | 'page arguments' => array(1), |
| 48 | 48 | 'access arguments' => array('access content'), |
| 49 | 49 | 'type' => MENU_CALLBACK, |
| 50 | 50 | 'file' => 'wysiwyg.dialog.inc', |
| 51 | - ); |
|
| 52 | - return $items; |
|
| 51 | + ); |
|
| 52 | + return $items; |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -59,37 +59,37 @@ discard block |
||
| 59 | 59 | * @see template_preprocess_page(), theme.inc |
| 60 | 60 | */ |
| 61 | 61 | function wysiwyg_theme() { |
| 62 | - return array( |
|
| 62 | + return array( |
|
| 63 | 63 | 'wysiwyg_profile_overview' => array( |
| 64 | - 'arguments' => array('form' => NULL), |
|
| 64 | + 'arguments' => array('form' => NULL), |
|
| 65 | 65 | ), |
| 66 | 66 | 'wysiwyg_admin_button_table' => array( |
| 67 | - 'arguments' => array('form' => NULL), |
|
| 67 | + 'arguments' => array('form' => NULL), |
|
| 68 | 68 | ), |
| 69 | 69 | 'wysiwyg_dialog_page' => array( |
| 70 | - 'arguments' => array('content' => NULL, 'show_messages' => TRUE), |
|
| 71 | - 'file' => 'wysiwyg.dialog.inc', |
|
| 72 | - 'template' => 'wysiwyg-dialog-page', |
|
| 70 | + 'arguments' => array('content' => NULL, 'show_messages' => TRUE), |
|
| 71 | + 'file' => 'wysiwyg.dialog.inc', |
|
| 72 | + 'template' => 'wysiwyg-dialog-page', |
|
| 73 | 73 | ), |
| 74 | - ); |
|
| 74 | + ); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | /** |
| 78 | 78 | * Implementation of hook_help(). |
| 79 | 79 | */ |
| 80 | 80 | function wysiwyg_help($path, $arg) { |
| 81 | - switch ($path) { |
|
| 81 | + switch ($path) { |
|
| 82 | 82 | case 'admin/settings/wysiwyg': |
| 83 | 83 | $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>'; |
| 84 | - return $output; |
|
| 85 | - } |
|
| 84 | + return $output; |
|
| 85 | + } |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * Clear wysiwyg cache on admin/build/modules form. |
| 90 | 90 | */ |
| 91 | 91 | function wysiwyg_form_system_modules_alter(&$form, $form_state) { |
| 92 | - wysiwyg_profile_load_all(TRUE); |
|
| 92 | + wysiwyg_profile_load_all(TRUE); |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | /** |
@@ -104,11 +104,11 @@ discard block |
||
| 104 | 104 | * @see wysiwyg_process_form() |
| 105 | 105 | */ |
| 106 | 106 | function wysiwyg_form_alter(&$form, &$form_state) { |
| 107 | - $form['#after_build'][] = 'wysiwyg_process_form'; |
|
| 108 | - // Teaser splitter is unconditionally removed and NOT supported. |
|
| 109 | - if (isset($form['body_field'])) { |
|
| 107 | + $form['#after_build'][] = 'wysiwyg_process_form'; |
|
| 108 | + // Teaser splitter is unconditionally removed and NOT supported. |
|
| 109 | + if (isset($form['body_field'])) { |
|
| 110 | 110 | unset($form['body_field']['teaser_js']); |
| 111 | - } |
|
| 111 | + } |
|
| 112 | 112 | } |
| 113 | 113 | |
| 114 | 114 | /** |
@@ -123,53 +123,53 @@ discard block |
||
| 123 | 123 | * @see wysiwyg_elements(), filter_form() |
| 124 | 124 | */ |
| 125 | 125 | function wysiwyg_process_form(&$form) { |
| 126 | - // Iterate over element children; resetting array keys to access last index. |
|
| 127 | - if ($children = array_values(element_children($form))) { |
|
| 126 | + // Iterate over element children; resetting array keys to access last index. |
|
| 127 | + if ($children = array_values(element_children($form))) { |
|
| 128 | 128 | foreach ($children as $index => $item) { |
| 129 | - $element = &$form[$item]; |
|
| 129 | + $element = &$form[$item]; |
|
| 130 | 130 | |
| 131 | - // filter_form() always uses the key 'format'. We need a type-agnostic |
|
| 132 | - // match to prevent false positives. Also, there must have been at least |
|
| 133 | - // one element on this level. |
|
| 134 | - if (($item === 'format' || $item === 'signature_format') && $index > 0) { |
|
| 131 | + // filter_form() always uses the key 'format'. We need a type-agnostic |
|
| 132 | + // match to prevent false positives. Also, there must have been at least |
|
| 133 | + // one element on this level. |
|
| 134 | + if (($item === 'format' || $item === 'signature_format') && $index > 0) { |
|
| 135 | 135 | // Make sure we either match a input format selector or input format |
| 136 | 136 | // guidelines (displayed if user has access to one input format only). |
| 137 | 137 | if ((isset($element['#type']) && $element['#type'] == 'fieldset') || isset($element['format']['guidelines'])) { |
| 138 | - // The element before this element is the target form field. |
|
| 139 | - $field = &$form[$children[$index - 1]]; |
|
| 138 | + // The element before this element is the target form field. |
|
| 139 | + $field = &$form[$children[$index - 1]]; |
|
| 140 | 140 | |
| 141 | - // Allow modules to programmatically enforce no client-side editor by |
|
| 142 | - // setting the #wysiwyg property to FALSE. |
|
| 143 | - if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) { |
|
| 141 | + // Allow modules to programmatically enforce no client-side editor by |
|
| 142 | + // setting the #wysiwyg property to FALSE. |
|
| 143 | + if (isset($field['#wysiwyg']) && !$field['#wysiwyg']) { |
|
| 144 | 144 | // A 'format' element should not have any child elements that may |
| 145 | 145 | // need processing, so it should be safe to skip the recursion that |
| 146 | 146 | // happens at the end of this function, and move on to the next |
| 147 | 147 | // element on the same level. |
| 148 | 148 | continue; |
| 149 | - } |
|
| 150 | - |
|
| 151 | - // If this textarea is #resizable and we will load at least one |
|
| 152 | - // editor, then only load the behavior and let the 'none' editor |
|
| 153 | - // attach/detach it to avoid hi-jacking the UI. Due to our CSS class |
|
| 154 | - // parsing, we can add arbitrary parameters for each input format. |
|
| 155 | - // The #resizable property will be removed below, if at least one |
|
| 156 | - // profile has been loaded. |
|
| 157 | - $extra_class = ''; |
|
| 158 | - if (!empty($field['#resizable'])) { |
|
| 149 | + } |
|
| 150 | + |
|
| 151 | + // If this textarea is #resizable and we will load at least one |
|
| 152 | + // editor, then only load the behavior and let the 'none' editor |
|
| 153 | + // attach/detach it to avoid hi-jacking the UI. Due to our CSS class |
|
| 154 | + // parsing, we can add arbitrary parameters for each input format. |
|
| 155 | + // The #resizable property will be removed below, if at least one |
|
| 156 | + // profile has been loaded. |
|
| 157 | + $extra_class = ''; |
|
| 158 | + if (!empty($field['#resizable'])) { |
|
| 159 | 159 | $extra_class = ' wysiwyg-resizable-1'; |
| 160 | 160 | drupal_add_js('misc/textarea.js'); |
| 161 | - } |
|
| 162 | - |
|
| 163 | - // Determine the available input formats. The last child element is a |
|
| 164 | - // link to "More information about formatting options". When only one |
|
| 165 | - // input format is displayed, we also have to remove formatting |
|
| 166 | - // guidelines, stored in the child 'format'. |
|
| 167 | - $formats = element_children($element); |
|
| 168 | - array_pop($formats); |
|
| 169 | - if (($key = array_search('format', $formats)) !== FALSE) { |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + // Determine the available input formats. The last child element is a |
|
| 164 | + // link to "More information about formatting options". When only one |
|
| 165 | + // input format is displayed, we also have to remove formatting |
|
| 166 | + // guidelines, stored in the child 'format'. |
|
| 167 | + $formats = element_children($element); |
|
| 168 | + array_pop($formats); |
|
| 169 | + if (($key = array_search('format', $formats)) !== FALSE) { |
|
| 170 | 170 | unset($formats[$key]); |
| 171 | - } |
|
| 172 | - foreach ($formats as $format) { |
|
| 171 | + } |
|
| 172 | + foreach ($formats as $format) { |
|
| 173 | 173 | // Default to 'none' editor (Drupal's default behaviors). |
| 174 | 174 | $editor = 'none'; |
| 175 | 175 | $status = 1; |
@@ -177,51 +177,51 @@ discard block |
||
| 177 | 177 | // Fetch the profile associated to this input format. |
| 178 | 178 | $profile = wysiwyg_get_profile($format); |
| 179 | 179 | if ($profile) { |
| 180 | - $loaded = TRUE; |
|
| 181 | - $editor = $profile->editor; |
|
| 182 | - $status = (int) wysiwyg_user_get_status($profile); |
|
| 183 | - if (isset($profile->settings['show_toggle'])) { |
|
| 180 | + $loaded = TRUE; |
|
| 181 | + $editor = $profile->editor; |
|
| 182 | + $status = (int) wysiwyg_user_get_status($profile); |
|
| 183 | + if (isset($profile->settings['show_toggle'])) { |
|
| 184 | 184 | $toggle = (int) $profile->settings['show_toggle']; |
| 185 | - } |
|
| 186 | - // Check editor theme (and reset it if not/no longer available). |
|
| 187 | - $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : '')); |
|
| 188 | - |
|
| 189 | - // Add plugin settings (first) for this input format. |
|
| 190 | - wysiwyg_add_plugin_settings($profile); |
|
| 191 | - // Add profile settings for this input format. |
|
| 192 | - wysiwyg_add_editor_settings($profile, $theme); |
|
| 185 | + } |
|
| 186 | + // Check editor theme (and reset it if not/no longer available). |
|
| 187 | + $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : '')); |
|
| 188 | + |
|
| 189 | + // Add plugin settings (first) for this input format. |
|
| 190 | + wysiwyg_add_plugin_settings($profile); |
|
| 191 | + // Add profile settings for this input format. |
|
| 192 | + wysiwyg_add_editor_settings($profile, $theme); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | // Use a prefix/suffix for a single input format, or attach to input |
| 196 | 196 | // format selector radio buttons. |
| 197 | 197 | if (isset($element['format']['guidelines'])) { |
| 198 | - $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 . '">'; |
|
| 199 | - $element['format']['guidelines']['#suffix'] = '</div>'; |
|
| 200 | - // Edge-case: Default format contains no input filters. |
|
| 201 | - if (empty($element['format']['guidelines']['#value'])) { |
|
| 198 | + $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 . '">'; |
|
| 199 | + $element['format']['guidelines']['#suffix'] = '</div>'; |
|
| 200 | + // Edge-case: Default format contains no input filters. |
|
| 201 | + if (empty($element['format']['guidelines']['#value'])) { |
|
| 202 | 202 | $element['format']['guidelines']['#value'] = ' '; |
| 203 | - } |
|
| 203 | + } |
|
| 204 | 204 | } |
| 205 | 205 | else { |
| 206 | - $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : ''); |
|
| 207 | - $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class; |
|
| 206 | + $element[$format]['#attributes']['class'] = (isset($element[$format]['#attributes']['class']) ? $element[$format]['#attributes']['class'] . ' ' : ''); |
|
| 207 | + $element[$format]['#attributes']['class'] .= 'wysiwyg wysiwyg-format-' . $format . ' wysiwyg-editor-' . $editor . ' wysiwyg-field-' . $field['#id'] . ' wysiwyg-status-' . $status . ' wysiwyg-toggle-' . $toggle . $extra_class; |
|
| 208 | + } |
|
| 208 | 209 | } |
| 209 | - } |
|
| 210 | 210 | |
| 211 | - // If we loaded at least one editor, then the 'none' editor will |
|
| 212 | - // handle resizable textareas instead of core. |
|
| 213 | - if (isset($loaded) && !empty($field['#resizable'])) { |
|
| 211 | + // If we loaded at least one editor, then the 'none' editor will |
|
| 212 | + // handle resizable textareas instead of core. |
|
| 213 | + if (isset($loaded) && !empty($field['#resizable'])) { |
|
| 214 | 214 | $field['#resizable'] = FALSE; |
| 215 | - } |
|
| 215 | + } |
|
| 216 | 216 | } |
| 217 | 217 | // If this element is 'format', do not recurse further. |
| 218 | 218 | continue; |
| 219 | - } |
|
| 220 | - // Recurse into children. |
|
| 221 | - wysiwyg_process_form($element); |
|
| 219 | + } |
|
| 220 | + // Recurse into children. |
|
| 221 | + wysiwyg_process_form($element); |
|
| 222 | + } |
|
| 222 | 223 | } |
| 223 | - } |
|
| 224 | - return $form; |
|
| 224 | + return $form; |
|
| 225 | 225 | } |
| 226 | 226 | |
| 227 | 227 | /** |
@@ -239,12 +239,12 @@ discard block |
||
| 239 | 239 | * @see wysiwyg_load_editor(), wysiwyg_get_editor() |
| 240 | 240 | */ |
| 241 | 241 | function wysiwyg_get_profile($format) { |
| 242 | - if ($profile = wysiwyg_profile_load($format)) { |
|
| 242 | + if ($profile = wysiwyg_profile_load($format)) { |
|
| 243 | 243 | if (wysiwyg_load_editor($profile)) { |
| 244 | - return $profile; |
|
| 244 | + return $profile; |
|
| 245 | + } |
|
| 245 | 246 | } |
| 246 | - } |
|
| 247 | - return FALSE; |
|
| 247 | + return FALSE; |
|
| 248 | 248 | } |
| 249 | 249 | |
| 250 | 250 | /** |
@@ -259,82 +259,82 @@ discard block |
||
| 259 | 259 | * @see wysiwyg_get_profile() |
| 260 | 260 | */ |
| 261 | 261 | function wysiwyg_load_editor($profile) { |
| 262 | - static $settings_added; |
|
| 263 | - static $loaded = array(); |
|
| 262 | + static $settings_added; |
|
| 263 | + static $loaded = array(); |
|
| 264 | 264 | |
| 265 | - $name = $profile->editor; |
|
| 266 | - // Library files must be loaded only once. |
|
| 267 | - if (!isset($loaded[$name])) { |
|
| 265 | + $name = $profile->editor; |
|
| 266 | + // Library files must be loaded only once. |
|
| 267 | + if (!isset($loaded[$name])) { |
|
| 268 | 268 | // Load editor. |
| 269 | 269 | $editor = wysiwyg_get_editor($name); |
| 270 | 270 | if ($editor) { |
| 271 | - // Determine library files to load. |
|
| 272 | - // @todo Allow to configure the library/execMode to use. |
|
| 273 | - if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) { |
|
| 271 | + // Determine library files to load. |
|
| 272 | + // @todo Allow to configure the library/execMode to use. |
|
| 273 | + if (isset($profile->settings['library']) && isset($editor['libraries'][$profile->settings['library']])) { |
|
| 274 | 274 | $library = $profile->settings['library']; |
| 275 | 275 | $files = $editor['libraries'][$library]['files']; |
| 276 | - } |
|
| 277 | - else { |
|
| 276 | + } |
|
| 277 | + else { |
|
| 278 | 278 | // Fallback to the first defined library by default (external libraries can change). |
| 279 | 279 | $library = key($editor['libraries']); |
| 280 | 280 | $files = array_shift($editor['libraries']); |
| 281 | 281 | $files = $files['files']; |
| 282 | - } |
|
| 283 | - foreach ($files as $file => $options) { |
|
| 282 | + } |
|
| 283 | + foreach ($files as $file => $options) { |
|
| 284 | 284 | if (is_array($options)) { |
| 285 | - $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE); |
|
| 286 | - drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']); |
|
| 285 | + $options += array('type' => 'module', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE); |
|
| 286 | + drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']); |
|
| 287 | 287 | } |
| 288 | 288 | else { |
| 289 | - drupal_add_js($editor['library path'] . '/' . $options); |
|
| 289 | + drupal_add_js($editor['library path'] . '/' . $options); |
|
| 290 | 290 | } |
| 291 | - } |
|
| 292 | - // If editor defines an additional load callback, invoke it. |
|
| 293 | - // @todo Isn't the settings callback sufficient? |
|
| 294 | - if (isset($editor['load callback']) && function_exists($editor['load callback'])) { |
|
| 291 | + } |
|
| 292 | + // If editor defines an additional load callback, invoke it. |
|
| 293 | + // @todo Isn't the settings callback sufficient? |
|
| 294 | + if (isset($editor['load callback']) && function_exists($editor['load callback'])) { |
|
| 295 | 295 | $editor['load callback']($editor, $library); |
| 296 | - } |
|
| 297 | - // Load JavaScript integration files for this editor. |
|
| 298 | - $files = array(); |
|
| 299 | - if (isset($editor['js files'])) { |
|
| 296 | + } |
|
| 297 | + // Load JavaScript integration files for this editor. |
|
| 298 | + $files = array(); |
|
| 299 | + if (isset($editor['js files'])) { |
|
| 300 | 300 | $files = $editor['js files']; |
| 301 | - } |
|
| 302 | - foreach ($files as $file) { |
|
| 301 | + } |
|
| 302 | + foreach ($files as $file) { |
|
| 303 | 303 | drupal_add_js($editor['js path'] . '/' . $file); |
| 304 | - } |
|
| 305 | - // Load CSS stylesheets for this editor. |
|
| 306 | - $files = array(); |
|
| 307 | - if (isset($editor['css files'])) { |
|
| 304 | + } |
|
| 305 | + // Load CSS stylesheets for this editor. |
|
| 306 | + $files = array(); |
|
| 307 | + if (isset($editor['css files'])) { |
|
| 308 | 308 | $files = $editor['css files']; |
| 309 | - } |
|
| 310 | - foreach ($files as $file) { |
|
| 309 | + } |
|
| 310 | + foreach ($files as $file) { |
|
| 311 | 311 | drupal_add_css($editor['css path'] . '/' . $file); |
| 312 | - } |
|
| 312 | + } |
|
| 313 | 313 | |
| 314 | - drupal_add_js(array('wysiwyg' => array( |
|
| 314 | + drupal_add_js(array('wysiwyg' => array( |
|
| 315 | 315 | 'configs' => array($editor['name'] => array('global' => array( |
| 316 | - // @todo Move into (global) editor settings. |
|
| 317 | - // If JS compression is enabled, at least TinyMCE is unable to determine |
|
| 318 | - // its own base path and exec mode since it can't find the script name. |
|
| 319 | - 'editorBasePath' => base_path() . $editor['library path'], |
|
| 320 | - 'execMode' => $library, |
|
| 316 | + // @todo Move into (global) editor settings. |
|
| 317 | + // If JS compression is enabled, at least TinyMCE is unable to determine |
|
| 318 | + // its own base path and exec mode since it can't find the script name. |
|
| 319 | + 'editorBasePath' => base_path() . $editor['library path'], |
|
| 320 | + 'execMode' => $library, |
|
| 321 | 321 | ))), |
| 322 | - )), 'setting'); |
|
| 322 | + )), 'setting'); |
|
| 323 | 323 | |
| 324 | - $loaded[$name] = TRUE; |
|
| 324 | + $loaded[$name] = TRUE; |
|
| 325 | 325 | } |
| 326 | 326 | else { |
| 327 | - $loaded[$name] = FALSE; |
|
| 327 | + $loaded[$name] = FALSE; |
|
| 328 | + } |
|
| 328 | 329 | } |
| 329 | - } |
|
| 330 | 330 | |
| 331 | - // Add basic Wysiwyg settings if any editor has been added. |
|
| 332 | - if (!isset($settings_added) && $loaded[$name]) { |
|
| 331 | + // Add basic Wysiwyg settings if any editor has been added. |
|
| 332 | + if (!isset($settings_added) && $loaded[$name]) { |
|
| 333 | 333 | drupal_add_js(array('wysiwyg' => array( |
| 334 | - 'configs' => array(), |
|
| 335 | - 'plugins' => array(), |
|
| 336 | - 'disable' => t('Disable rich-text'), |
|
| 337 | - 'enable' => t('Enable rich-text'), |
|
| 334 | + 'configs' => array(), |
|
| 335 | + 'plugins' => array(), |
|
| 336 | + 'disable' => t('Disable rich-text'), |
|
| 337 | + 'enable' => t('Enable rich-text'), |
|
| 338 | 338 | )), 'setting'); |
| 339 | 339 | |
| 340 | 340 | $path = drupal_get_path('module', 'wysiwyg'); |
@@ -355,26 +355,26 @@ discard block |
||
| 355 | 355 | drupal_add_js($path . '/wysiwyg.js', 'module', 'footer'); |
| 356 | 356 | |
| 357 | 357 | $settings_added = TRUE; |
| 358 | - } |
|
| 358 | + } |
|
| 359 | 359 | |
| 360 | - return $loaded[$name]; |
|
| 360 | + return $loaded[$name]; |
|
| 361 | 361 | } |
| 362 | 362 | |
| 363 | 363 | /** |
| 364 | 364 | * Add editor settings for a given input format. |
| 365 | 365 | */ |
| 366 | 366 | function wysiwyg_add_editor_settings($profile, $theme) { |
| 367 | - static $formats = array(); |
|
| 367 | + static $formats = array(); |
|
| 368 | 368 | |
| 369 | - if (!isset($formats[$profile->format])) { |
|
| 369 | + if (!isset($formats[$profile->format])) { |
|
| 370 | 370 | $config = wysiwyg_get_editor_config($profile, $theme); |
| 371 | 371 | // drupal_to_js() does not properly convert numeric array keys, so we need |
| 372 | 372 | // to use a string instead of the format id. |
| 373 | 373 | if ($config) { |
| 374 | - drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting'); |
|
| 374 | + drupal_add_js(array('wysiwyg' => array('configs' => array($profile->editor => array('format' . $profile->format => $config)))), 'setting'); |
|
| 375 | 375 | } |
| 376 | 376 | $formats[$profile->format] = TRUE; |
| 377 | - } |
|
| 377 | + } |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | /** |
@@ -402,86 +402,86 @@ discard block |
||
| 402 | 402 | * and simplify this entire function. |
| 403 | 403 | */ |
| 404 | 404 | function wysiwyg_add_plugin_settings($profile) { |
| 405 | - static $plugins = array(); |
|
| 406 | - static $processed_plugins = array(); |
|
| 407 | - static $processed_formats = array(); |
|
| 405 | + static $plugins = array(); |
|
| 406 | + static $processed_plugins = array(); |
|
| 407 | + static $processed_formats = array(); |
|
| 408 | 408 | |
| 409 | - // Each input format must only processed once. |
|
| 410 | - // @todo ...as long as we do not have multiple profiles per format. |
|
| 411 | - if (isset($processed_formats[$profile->format])) { |
|
| 409 | + // Each input format must only processed once. |
|
| 410 | + // @todo ...as long as we do not have multiple profiles per format. |
|
| 411 | + if (isset($processed_formats[$profile->format])) { |
|
| 412 | 412 | return; |
| 413 | - } |
|
| 414 | - $processed_formats[$profile->format] = TRUE; |
|
| 413 | + } |
|
| 414 | + $processed_formats[$profile->format] = TRUE; |
|
| 415 | 415 | |
| 416 | - $editor = wysiwyg_get_editor($profile->editor); |
|
| 416 | + $editor = wysiwyg_get_editor($profile->editor); |
|
| 417 | 417 | |
| 418 | - // Collect native plugins for this editor provided via hook_wysiwyg_plugin() |
|
| 419 | - // and Drupal plugins provided via hook_wysiwyg_include_directory(). |
|
| 420 | - if (!array_key_exists($editor['name'], $plugins)) { |
|
| 418 | + // Collect native plugins for this editor provided via hook_wysiwyg_plugin() |
|
| 419 | + // and Drupal plugins provided via hook_wysiwyg_include_directory(). |
|
| 420 | + if (!array_key_exists($editor['name'], $plugins)) { |
|
| 421 | 421 | $plugins[$editor['name']] = wysiwyg_get_plugins($editor['name']); |
| 422 | - } |
|
| 422 | + } |
|
| 423 | 423 | |
| 424 | - // Nothing to do, if there are no plugins. |
|
| 425 | - if (empty($plugins[$editor['name']])) { |
|
| 424 | + // Nothing to do, if there are no plugins. |
|
| 425 | + if (empty($plugins[$editor['name']])) { |
|
| 426 | 426 | return; |
| 427 | - } |
|
| 427 | + } |
|
| 428 | 428 | |
| 429 | - // Determine name of proxy plugin for Drupal plugins. |
|
| 430 | - $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : ''); |
|
| 429 | + // Determine name of proxy plugin for Drupal plugins. |
|
| 430 | + $proxy = (isset($editor['proxy plugin']) ? key($editor['proxy plugin']) : ''); |
|
| 431 | 431 | |
| 432 | - // Process native editor plugins. |
|
| 433 | - if (isset($editor['plugin settings callback'])) { |
|
| 432 | + // Process native editor plugins. |
|
| 433 | + if (isset($editor['plugin settings callback'])) { |
|
| 434 | 434 | // @todo Require PHP 5.1 in 3.x and use array_intersect_key(). |
| 435 | 435 | $profile_plugins_native = array(); |
| 436 | 436 | foreach ($plugins[$editor['name']] as $plugin => $meta) { |
| 437 | - // Skip Drupal plugins (handled below). |
|
| 438 | - if ($plugin === $proxy) { |
|
| 437 | + // Skip Drupal plugins (handled below). |
|
| 438 | + if ($plugin === $proxy) { |
|
| 439 | 439 | continue; |
| 440 | - } |
|
| 441 | - // Only keep native plugins that are enabled in this profile. |
|
| 442 | - if (isset($profile->settings['buttons'][$plugin])) { |
|
| 440 | + } |
|
| 441 | + // Only keep native plugins that are enabled in this profile. |
|
| 442 | + if (isset($profile->settings['buttons'][$plugin])) { |
|
| 443 | 443 | $profile_plugins_native[$plugin] = $meta; |
| 444 | - } |
|
| 444 | + } |
|
| 445 | 445 | } |
| 446 | 446 | // Invoke the editor's plugin settings callback, so it can populate the |
| 447 | 447 | // settings for native external plugins with required values. |
| 448 | 448 | $settings_native = call_user_func($editor['plugin settings callback'], $editor, $profile, $profile_plugins_native); |
| 449 | 449 | |
| 450 | 450 | if ($settings_native) { |
| 451 | - drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting'); |
|
| 451 | + drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('native' => $settings_native)))), 'setting'); |
|
| 452 | + } |
|
| 452 | 453 | } |
| 453 | - } |
|
| 454 | 454 | |
| 455 | - // Process Drupal plugins. |
|
| 456 | - if ($proxy && isset($editor['proxy plugin settings callback'])) { |
|
| 455 | + // Process Drupal plugins. |
|
| 456 | + if ($proxy && isset($editor['proxy plugin settings callback'])) { |
|
| 457 | 457 | $profile_plugins_drupal = array(); |
| 458 | 458 | foreach (wysiwyg_get_all_plugins() as $plugin => $meta) { |
| 459 | - if (isset($profile->settings['buttons'][$proxy][$plugin])) { |
|
| 459 | + if (isset($profile->settings['buttons'][$proxy][$plugin])) { |
|
| 460 | 460 | // JavaScript and plugin-specific settings for Drupal plugins must be |
| 461 | 461 | // loaded and processed only once. Plugin information is cached |
| 462 | 462 | // statically to pass it to the editor's proxy plugin settings callback. |
| 463 | 463 | if (!isset($processed_plugins[$proxy][$plugin])) { |
| 464 | - $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta; |
|
| 465 | - // Load the Drupal plugin's JavaScript. |
|
| 466 | - drupal_add_js($meta['js path'] . '/' . $meta['js file']); |
|
| 467 | - // Add plugin-specific settings. |
|
| 468 | - if (isset($meta['settings'])) { |
|
| 464 | + $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta; |
|
| 465 | + // Load the Drupal plugin's JavaScript. |
|
| 466 | + drupal_add_js($meta['js path'] . '/' . $meta['js file']); |
|
| 467 | + // Add plugin-specific settings. |
|
| 468 | + if (isset($meta['settings'])) { |
|
| 469 | 469 | drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting'); |
| 470 | - } |
|
| 470 | + } |
|
| 471 | 471 | } |
| 472 | 472 | else { |
| 473 | - $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin]; |
|
| 473 | + $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin]; |
|
| 474 | + } |
|
| 474 | 475 | } |
| 475 | - } |
|
| 476 | 476 | } |
| 477 | 477 | // Invoke the editor's proxy plugin settings callback, so it can populate |
| 478 | 478 | // the settings for Drupal plugins with custom, required values. |
| 479 | 479 | $settings_drupal = call_user_func($editor['proxy plugin settings callback'], $editor, $profile, $profile_plugins_drupal); |
| 480 | 480 | |
| 481 | 481 | if ($settings_drupal) { |
| 482 | - drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting'); |
|
| 482 | + drupal_add_js(array('wysiwyg' => array('plugins' => array('format' . $profile->format => array('drupal' => $settings_drupal)))), 'setting'); |
|
| 483 | + } |
|
| 483 | 484 | } |
| 484 | - } |
|
| 485 | 485 | } |
| 486 | 486 | |
| 487 | 487 | /** |
@@ -499,28 +499,28 @@ discard block |
||
| 499 | 499 | * was given. |
| 500 | 500 | */ |
| 501 | 501 | function wysiwyg_get_editor_themes(&$profile, $selected_theme = NULL) { |
| 502 | - static $themes = array(); |
|
| 502 | + static $themes = array(); |
|
| 503 | 503 | |
| 504 | - if (!isset($themes[$profile->editor])) { |
|
| 504 | + if (!isset($themes[$profile->editor])) { |
|
| 505 | 505 | $editor = wysiwyg_get_editor($profile->editor); |
| 506 | 506 | if (isset($editor['themes callback']) && function_exists($editor['themes callback'])) { |
| 507 | - $themes[$editor['name']] = $editor['themes callback']($editor, $profile); |
|
| 507 | + $themes[$editor['name']] = $editor['themes callback']($editor, $profile); |
|
| 508 | 508 | } |
| 509 | 509 | // Fallback to 'default' otherwise. |
| 510 | 510 | else { |
| 511 | - $themes[$editor['name']] = array('default'); |
|
| 511 | + $themes[$editor['name']] = array('default'); |
|
| 512 | + } |
|
| 512 | 513 | } |
| 513 | - } |
|
| 514 | 514 | |
| 515 | - // Check optional $selected_theme argument, if given. |
|
| 516 | - if (isset($selected_theme)) { |
|
| 515 | + // Check optional $selected_theme argument, if given. |
|
| 516 | + if (isset($selected_theme)) { |
|
| 517 | 517 | // If the passed theme name does not exist, use the first available. |
| 518 | 518 | if (!in_array($selected_theme, $themes[$profile->editor])) { |
| 519 | - $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0]; |
|
| 519 | + $selected_theme = $profile->settings['theme'] = $themes[$profile->editor][0]; |
|
| 520 | + } |
|
| 520 | 521 | } |
| 521 | - } |
|
| 522 | 522 | |
| 523 | - return isset($selected_theme) ? $selected_theme : $themes[$profile->editor]; |
|
| 523 | + return isset($selected_theme) ? $selected_theme : $themes[$profile->editor]; |
|
| 524 | 524 | } |
| 525 | 525 | |
| 526 | 526 | /** |
@@ -533,42 +533,42 @@ discard block |
||
| 533 | 533 | * An array for each plugin. |
| 534 | 534 | */ |
| 535 | 535 | function wysiwyg_get_plugins($editor_name) { |
| 536 | - $plugins = array(); |
|
| 537 | - if (!empty($editor_name)) { |
|
| 536 | + $plugins = array(); |
|
| 537 | + if (!empty($editor_name)) { |
|
| 538 | 538 | $editor = wysiwyg_get_editor($editor_name); |
| 539 | 539 | // Add internal editor plugins. |
| 540 | 540 | if (isset($editor['plugin callback']) && function_exists($editor['plugin callback'])) { |
| 541 | - $plugins = $editor['plugin callback']($editor); |
|
| 541 | + $plugins = $editor['plugin callback']($editor); |
|
| 542 | 542 | } |
| 543 | 543 | // Add editor plugins provided via hook_wysiwyg_plugin(). |
| 544 | 544 | $plugins = array_merge($plugins, module_invoke_all('wysiwyg_plugin', $editor['name'], $editor['installed version'])); |
| 545 | 545 | // Add API plugins provided by Drupal modules. |
| 546 | 546 | // @todo We need to pass the filepath to the plugin icon for Drupal plugins. |
| 547 | 547 | if (isset($editor['proxy plugin'])) { |
| 548 | - $plugins += $editor['proxy plugin']; |
|
| 549 | - $proxy = key($editor['proxy plugin']); |
|
| 550 | - foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) { |
|
| 548 | + $plugins += $editor['proxy plugin']; |
|
| 549 | + $proxy = key($editor['proxy plugin']); |
|
| 550 | + foreach (wysiwyg_get_all_plugins() as $plugin_name => $info) { |
|
| 551 | 551 | $plugins[$proxy]['buttons'][$plugin_name] = $info['title']; |
| 552 | - } |
|
| 552 | + } |
|
| 553 | + } |
|
| 553 | 554 | } |
| 554 | - } |
|
| 555 | - return $plugins; |
|
| 555 | + return $plugins; |
|
| 556 | 556 | } |
| 557 | 557 | |
| 558 | 558 | /** |
| 559 | 559 | * Return an array of initial editor settings for a Wysiwyg profile. |
| 560 | 560 | */ |
| 561 | 561 | function wysiwyg_get_editor_config($profile, $theme) { |
| 562 | - $editor = wysiwyg_get_editor($profile->editor); |
|
| 563 | - $settings = array(); |
|
| 564 | - if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) { |
|
| 562 | + $editor = wysiwyg_get_editor($profile->editor); |
|
| 563 | + $settings = array(); |
|
| 564 | + if (!empty($editor['settings callback']) && function_exists($editor['settings callback'])) { |
|
| 565 | 565 | $settings = $editor['settings callback']($editor, $profile->settings, $theme); |
| 566 | 566 | |
| 567 | 567 | // Allow other modules to alter the editor settings for this format. |
| 568 | 568 | $context = array('editor' => $editor, 'profile' => $profile, 'theme' => $theme); |
| 569 | 569 | drupal_alter('wysiwyg_editor_settings', $settings, $context); |
| 570 | - } |
|
| 571 | - return $settings; |
|
| 570 | + } |
|
| 571 | + return $settings; |
|
| 572 | 572 | } |
| 573 | 573 | |
| 574 | 574 | /** |
@@ -581,106 +581,106 @@ discard block |
||
| 581 | 581 | * An array containing CSS files, including proper base path. |
| 582 | 582 | */ |
| 583 | 583 | function wysiwyg_get_css() { |
| 584 | - static $files; |
|
| 584 | + static $files; |
|
| 585 | 585 | |
| 586 | - if (isset($files)) { |
|
| 586 | + if (isset($files)) { |
|
| 587 | 587 | return $files; |
| 588 | - } |
|
| 589 | - // In node form previews, the theme has not been initialized yet. |
|
| 590 | - if (!empty($_POST)) { |
|
| 588 | + } |
|
| 589 | + // In node form previews, the theme has not been initialized yet. |
|
| 590 | + if (!empty($_POST)) { |
|
| 591 | 591 | init_theme(); |
| 592 | - } |
|
| 592 | + } |
|
| 593 | 593 | |
| 594 | - $files = array(); |
|
| 595 | - foreach (drupal_add_css() as $media => $css) { |
|
| 594 | + $files = array(); |
|
| 595 | + foreach (drupal_add_css() as $media => $css) { |
|
| 596 | 596 | if ($media != 'print') { |
| 597 | - foreach ($css['theme'] as $filepath => $preprocess) { |
|
| 597 | + foreach ($css['theme'] as $filepath => $preprocess) { |
|
| 598 | 598 | if (file_exists($filepath)) { |
| 599 | - $files[] = base_path() . $filepath; |
|
| 599 | + $files[] = base_path() . $filepath; |
|
| 600 | + } |
|
| 600 | 601 | } |
| 601 | - } |
|
| 602 | 602 | } |
| 603 | - } |
|
| 604 | - return $files; |
|
| 603 | + } |
|
| 604 | + return $files; |
|
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | /** |
| 608 | 608 | * Load profile for a given input format. |
| 609 | 609 | */ |
| 610 | 610 | function wysiwyg_profile_load($format) { |
| 611 | - static $profiles; |
|
| 611 | + static $profiles; |
|
| 612 | 612 | |
| 613 | - if (!isset($profiles) || !array_key_exists($format, $profiles)) { |
|
| 613 | + if (!isset($profiles) || !array_key_exists($format, $profiles)) { |
|
| 614 | 614 | $profiles = wysiwyg_profile_load_all(); |
| 615 | - } |
|
| 615 | + } |
|
| 616 | 616 | |
| 617 | - return (isset($profiles[$format]) ? $profiles[$format] : FALSE); |
|
| 617 | + return (isset($profiles[$format]) ? $profiles[$format] : FALSE); |
|
| 618 | 618 | } |
| 619 | 619 | |
| 620 | 620 | /** |
| 621 | 621 | * Load all profiles. |
| 622 | 622 | */ |
| 623 | 623 | function wysiwyg_profile_load_all($reset = FALSE) { |
| 624 | - static $profiles; |
|
| 624 | + static $profiles; |
|
| 625 | 625 | |
| 626 | - if ($reset || !isset($profiles)) { |
|
| 626 | + if ($reset || !isset($profiles)) { |
|
| 627 | 627 | $profiles = array(); |
| 628 | 628 | if (!$reset && ($cache = cache_get('wysiwyg:profiles', 'cache')) && is_array($cache->data)) { |
| 629 | - $profiles = $cache->data; |
|
| 630 | - return $profiles; |
|
| 629 | + $profiles = $cache->data; |
|
| 630 | + return $profiles; |
|
| 631 | 631 | } |
| 632 | 632 | // If Exportables and CTools are installed, use their API to load both |
| 633 | 633 | // wysiwyg profiles from code and from the database |
| 634 | 634 | if (module_exists('ctools') && module_exists('exportables')) { |
| 635 | - if (exportables_api_version('2.0') && ctools_api_version('1.7')) { |
|
| 635 | + if (exportables_api_version('2.0') && ctools_api_version('1.7')) { |
|
| 636 | 636 | $input_formats = exportables_load_all('input_formats'); |
| 637 | 637 | ctools_include('export'); |
| 638 | 638 | $ctools_profiles = ctools_export_load_object('wysiwyg'); |
| 639 | 639 | // Wysiwyg module still use numeric ids as keys |
| 640 | 640 | foreach ($ctools_profiles as $machine_name => $profile) { |
| 641 | - $profile->format = $input_formats[$machine_name]; |
|
| 642 | - $profiles[$profile->format] = $profile; |
|
| 641 | + $profile->format = $input_formats[$machine_name]; |
|
| 642 | + $profiles[$profile->format] = $profile; |
|
| 643 | + } |
|
| 643 | 644 | } |
| 644 | - } |
|
| 645 | 645 | } |
| 646 | 646 | |
| 647 | 647 | // DB profiles will always override Features profiles from flat files. |
| 648 | 648 | $result = db_query('SELECT format, editor, settings FROM {wysiwyg}'); |
| 649 | 649 | while ($profile = db_fetch_object($result)) { |
| 650 | - if (!isset($profiles[$profile->format])) { |
|
| 650 | + if (!isset($profiles[$profile->format])) { |
|
| 651 | 651 | $profile->settings = unserialize($profile->settings); |
| 652 | 652 | $profiles[$profile->format] = $profile; |
| 653 | - } |
|
| 653 | + } |
|
| 654 | 654 | } |
| 655 | 655 | |
| 656 | 656 | drupal_alter('wysiwyg_load_profiles', $profiles); |
| 657 | 657 | cache_set('wysiwyg:profiles', $profiles); |
| 658 | - } |
|
| 658 | + } |
|
| 659 | 659 | |
| 660 | - return $profiles; |
|
| 660 | + return $profiles; |
|
| 661 | 661 | } |
| 662 | - /** |
|
| 663 | - * Wysiwyg profiles list callback. |
|
| 664 | - */ |
|
| 662 | + /** |
|
| 663 | + * Wysiwyg profiles list callback. |
|
| 664 | + */ |
|
| 665 | 665 | function wysiwyg_profile_list() { |
| 666 | - $profiles = wysiwyg_profile_load_all(TRUE); |
|
| 667 | - $filter_formats = filter_formats(); |
|
| 668 | - $list = array(); |
|
| 669 | - foreach ($profiles as $profile) { |
|
| 666 | + $profiles = wysiwyg_profile_load_all(TRUE); |
|
| 667 | + $filter_formats = filter_formats(); |
|
| 668 | + $list = array(); |
|
| 669 | + foreach ($profiles as $profile) { |
|
| 670 | 670 | $list[$profile->machine] = t('@format (@editor)', array('@editor' => $profile->editor, '@format' => $filter_formats[$profile->format]->name)); |
| 671 | - } |
|
| 672 | - return $list; |
|
| 671 | + } |
|
| 672 | + return $list; |
|
| 673 | 673 | } |
| 674 | 674 | |
| 675 | 675 | /** |
| 676 | 676 | * Remove a profile from the database. |
| 677 | 677 | */ |
| 678 | 678 | function wysiwyg_profile_delete($wysiwyg) { |
| 679 | - if (!isset($wysiwyg->format)) { |
|
| 679 | + if (!isset($wysiwyg->format)) { |
|
| 680 | 680 | $input_formats = exportables_load_all('input_formats'); |
| 681 | 681 | $wysiwyg->format = $input_formats[$wysiwyg->machine]; |
| 682 | - } |
|
| 683 | - db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format); |
|
| 682 | + } |
|
| 683 | + db_query("DELETE FROM {wysiwyg} WHERE format = %d", $wysiwyg->format); |
|
| 684 | 684 | } |
| 685 | 685 | |
| 686 | 686 | |
@@ -689,68 +689,68 @@ discard block |
||
| 689 | 689 | * Implementation of hook_user(). |
| 690 | 690 | */ |
| 691 | 691 | function wysiwyg_user($op, &$edit, $account, $category = NULL) { |
| 692 | - if ($op == 'form' && $category == 'account') { |
|
| 692 | + if ($op == 'form' && $category == 'account') { |
|
| 693 | 693 | $user_formats = filter_formats(); |
| 694 | 694 | $options = array(); |
| 695 | 695 | $options_default = array(); |
| 696 | 696 | foreach (wysiwyg_profile_load_all() as $format => $profile) { |
| 697 | - // Only show profiles that have user_choose enabled. |
|
| 698 | - if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) { |
|
| 697 | + // Only show profiles that have user_choose enabled. |
|
| 698 | + if (!empty($profile->settings['user_choose']) && isset($user_formats[$format])) { |
|
| 699 | 699 | $options[$format] = check_plain($user_formats[$format]->name); |
| 700 | 700 | if (wysiwyg_user_get_status($profile, $account)) { |
| 701 | - $options_default[] = $format; |
|
| 701 | + $options_default[] = $format; |
|
| 702 | + } |
|
| 702 | 703 | } |
| 703 | - } |
|
| 704 | 704 | } |
| 705 | 705 | if (!empty($options)) { |
| 706 | - $form['wysiwyg']['wysiwyg_status'] = array( |
|
| 706 | + $form['wysiwyg']['wysiwyg_status'] = array( |
|
| 707 | 707 | '#type' => 'checkboxes', |
| 708 | 708 | '#title' => t('Text formats enabled for rich-text editing'), |
| 709 | 709 | '#options' => $options, |
| 710 | 710 | '#default_value' => $options_default, |
| 711 | - ); |
|
| 712 | - return $form; |
|
| 711 | + ); |
|
| 712 | + return $form; |
|
| 713 | 713 | } |
| 714 | - } |
|
| 715 | - elseif ($op == 'insert' || $op == 'update') { |
|
| 714 | + } |
|
| 715 | + elseif ($op == 'insert' || $op == 'update') { |
|
| 716 | 716 | if (isset($edit['wysiwyg_status'])) { |
| 717 | - db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid); |
|
| 718 | - foreach ($edit['wysiwyg_status'] as $format => $status) { |
|
| 717 | + db_query("DELETE FROM {wysiwyg_user} WHERE uid = %d", $account->uid); |
|
| 718 | + foreach ($edit['wysiwyg_status'] as $format => $status) { |
|
| 719 | 719 | db_query("INSERT INTO {wysiwyg_user} (uid, format, status) VALUES (%d, %d, %d)", array( |
| 720 | - $account->uid, |
|
| 721 | - $format, |
|
| 722 | - (int) (bool) $status, |
|
| 720 | + $account->uid, |
|
| 721 | + $format, |
|
| 722 | + (int) (bool) $status, |
|
| 723 | 723 | )); |
| 724 | - } |
|
| 724 | + } |
|
| 725 | + } |
|
| 725 | 726 | } |
| 726 | - } |
|
| 727 | 727 | } |
| 728 | 728 | |
| 729 | 729 | function wysiwyg_user_get_status($profile, $account = NULL) { |
| 730 | - global $user; |
|
| 730 | + global $user; |
|
| 731 | 731 | |
| 732 | - if (!isset($account)) { |
|
| 732 | + if (!isset($account)) { |
|
| 733 | 733 | $account = $user; |
| 734 | - } |
|
| 734 | + } |
|
| 735 | 735 | |
| 736 | - // Default wysiwyg editor status information is only required on forms, so we |
|
| 737 | - // do not pre-emptively load and attach this information on every user_load(). |
|
| 738 | - if (!isset($account->wysiwyg_status)) { |
|
| 736 | + // Default wysiwyg editor status information is only required on forms, so we |
|
| 737 | + // do not pre-emptively load and attach this information on every user_load(). |
|
| 738 | + if (!isset($account->wysiwyg_status)) { |
|
| 739 | 739 | $account->wysiwyg_status = array(); |
| 740 | 740 | $result = db_query("SELECT format, status FROM {wysiwyg_user} WHERE uid = %d", $account->uid); |
| 741 | 741 | while ($row = db_fetch_object($result)) { |
| 742 | - $account->wysiwyg_status[$row->format] = $row->status; |
|
| 742 | + $account->wysiwyg_status[$row->format] = $row->status; |
|
| 743 | + } |
|
| 743 | 744 | } |
| 744 | - } |
|
| 745 | 745 | |
| 746 | - if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) { |
|
| 746 | + if (!empty($profile->settings['user_choose']) && isset($account->wysiwyg_status[$profile->format])) { |
|
| 747 | 747 | $status = $account->wysiwyg_status[$profile->format]; |
| 748 | - } |
|
| 749 | - else { |
|
| 748 | + } |
|
| 749 | + else { |
|
| 750 | 750 | $status = isset($profile->settings['default']) ? $profile->settings['default'] : TRUE; |
| 751 | - } |
|
| 751 | + } |
|
| 752 | 752 | |
| 753 | - return (bool) $status; |
|
| 753 | + return (bool) $status; |
|
| 754 | 754 | } |
| 755 | 755 | |
| 756 | 756 | /** |
@@ -772,110 +772,110 @@ discard block |
||
| 772 | 772 | * installed properly. |
| 773 | 773 | */ |
| 774 | 774 | function wysiwyg_get_editor($name) { |
| 775 | - $editors = wysiwyg_get_all_editors(); |
|
| 776 | - return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE; |
|
| 775 | + $editors = wysiwyg_get_all_editors(); |
|
| 776 | + return isset($editors[$name]) && $editors[$name]['installed'] ? $editors[$name] : FALSE; |
|
| 777 | 777 | } |
| 778 | 778 | |
| 779 | 779 | /** |
| 780 | 780 | * Compile a list holding all supported editors including installed editor version information. |
| 781 | 781 | */ |
| 782 | 782 | function wysiwyg_get_all_editors() { |
| 783 | - static $editors; |
|
| 783 | + static $editors; |
|
| 784 | 784 | |
| 785 | - if (isset($editors)) { |
|
| 785 | + if (isset($editors)) { |
|
| 786 | 786 | return $editors; |
| 787 | - } |
|
| 787 | + } |
|
| 788 | 788 | |
| 789 | - $editors = wysiwyg_load_includes('editors', 'editor'); |
|
| 790 | - foreach ($editors as $editor => $properties) { |
|
| 789 | + $editors = wysiwyg_load_includes('editors', 'editor'); |
|
| 790 | + foreach ($editors as $editor => $properties) { |
|
| 791 | 791 | // Fill in required properties. |
| 792 | 792 | $editors[$editor] += array( |
| 793 | - 'title' => '', |
|
| 794 | - 'vendor url' => '', |
|
| 795 | - 'download url' => '', |
|
| 796 | - 'editor path' => wysiwyg_get_path($editors[$editor]['name']), |
|
| 797 | - 'library path' => wysiwyg_get_path($editors[$editor]['name']), |
|
| 798 | - 'libraries' => array(), |
|
| 799 | - 'version callback' => NULL, |
|
| 800 | - 'themes callback' => NULL, |
|
| 801 | - 'settings callback' => NULL, |
|
| 802 | - 'plugin callback' => NULL, |
|
| 803 | - 'plugin settings callback' => NULL, |
|
| 804 | - 'versions' => array(), |
|
| 805 | - 'js path' => $editors[$editor]['path'] . '/js', |
|
| 806 | - 'css path' => $editors[$editor]['path'] . '/css', |
|
| 793 | + 'title' => '', |
|
| 794 | + 'vendor url' => '', |
|
| 795 | + 'download url' => '', |
|
| 796 | + 'editor path' => wysiwyg_get_path($editors[$editor]['name']), |
|
| 797 | + 'library path' => wysiwyg_get_path($editors[$editor]['name']), |
|
| 798 | + 'libraries' => array(), |
|
| 799 | + 'version callback' => NULL, |
|
| 800 | + 'themes callback' => NULL, |
|
| 801 | + 'settings callback' => NULL, |
|
| 802 | + 'plugin callback' => NULL, |
|
| 803 | + 'plugin settings callback' => NULL, |
|
| 804 | + 'versions' => array(), |
|
| 805 | + 'js path' => $editors[$editor]['path'] . '/js', |
|
| 806 | + 'css path' => $editors[$editor]['path'] . '/css', |
|
| 807 | 807 | ); |
| 808 | 808 | // Check whether library is present. |
| 809 | 809 | if (!($editors[$editor]['installed'] = file_exists($editors[$editor]['library path']))) { |
| 810 | - continue; |
|
| 810 | + continue; |
|
| 811 | 811 | } |
| 812 | 812 | // Detect library version. |
| 813 | 813 | if (function_exists($editors[$editor]['version callback'])) { |
| 814 | - $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]); |
|
| 814 | + $editors[$editor]['installed version'] = $editors[$editor]['version callback']($editors[$editor]); |
|
| 815 | 815 | } |
| 816 | 816 | if (empty($editors[$editor]['installed version'])) { |
| 817 | - $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title'])); |
|
| 818 | - $editors[$editor]['installed'] = FALSE; |
|
| 819 | - continue; |
|
| 817 | + $editors[$editor]['error'] = t('The version of %editor could not be detected.', array('%editor' => $properties['title'])); |
|
| 818 | + $editors[$editor]['installed'] = FALSE; |
|
| 819 | + continue; |
|
| 820 | 820 | } |
| 821 | 821 | // Determine to which supported version the installed version maps. |
| 822 | 822 | ksort($editors[$editor]['versions']); |
| 823 | 823 | $version = 0; |
| 824 | 824 | foreach ($editors[$editor]['versions'] as $supported_version => $version_properties) { |
| 825 | - if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) { |
|
| 825 | + if (version_compare($editors[$editor]['installed version'], $supported_version, '>=')) { |
|
| 826 | 826 | $version = $supported_version; |
| 827 | - } |
|
| 827 | + } |
|
| 828 | 828 | } |
| 829 | 829 | if (!$version) { |
| 830 | - $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title'])); |
|
| 831 | - $editors[$editor]['installed'] = FALSE; |
|
| 832 | - continue; |
|
| 830 | + $editors[$editor]['error'] = t('The installed version %version of %editor is not supported.', array('%version' => $editors[$editor]['installed version'], '%editor' => $editors[$editor]['title'])); |
|
| 831 | + $editors[$editor]['installed'] = FALSE; |
|
| 832 | + continue; |
|
| 833 | 833 | } |
| 834 | 834 | // Apply library version specific definitions and overrides. |
| 835 | 835 | $editors[$editor] = array_merge($editors[$editor], $editors[$editor]['versions'][$version]); |
| 836 | 836 | unset($editors[$editor]['versions']); |
| 837 | - } |
|
| 838 | - return $editors; |
|
| 837 | + } |
|
| 838 | + return $editors; |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | /** |
| 842 | 842 | * Invoke hook_wysiwyg_plugin() in all modules. |
| 843 | 843 | */ |
| 844 | 844 | function wysiwyg_get_all_plugins() { |
| 845 | - static $plugins; |
|
| 845 | + static $plugins; |
|
| 846 | 846 | |
| 847 | - if (isset($plugins)) { |
|
| 847 | + if (isset($plugins)) { |
|
| 848 | 848 | return $plugins; |
| 849 | - } |
|
| 849 | + } |
|
| 850 | 850 | |
| 851 | - $plugins = wysiwyg_load_includes('plugins', 'plugin'); |
|
| 852 | - foreach ($plugins as $name => $properties) { |
|
| 851 | + $plugins = wysiwyg_load_includes('plugins', 'plugin'); |
|
| 852 | + foreach ($plugins as $name => $properties) { |
|
| 853 | 853 | $plugin = &$plugins[$name]; |
| 854 | 854 | // Fill in required/default properties. |
| 855 | 855 | $plugin += array( |
| 856 | - 'title' => $plugin['name'], |
|
| 857 | - 'vendor url' => '', |
|
| 858 | - 'js path' => $plugin['path'] . '/' . $plugin['name'], |
|
| 859 | - 'js file' => $plugin['name'] . '.js', |
|
| 860 | - 'css path' => $plugin['path'] . '/' . $plugin['name'], |
|
| 861 | - 'css file' => $plugin['name'] . '.css', |
|
| 862 | - 'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images', |
|
| 863 | - 'icon file' => $plugin['name'] . '.png', |
|
| 864 | - 'dialog path' => $plugin['name'], |
|
| 865 | - 'dialog settings' => array(), |
|
| 866 | - 'settings callback' => NULL, |
|
| 867 | - 'settings form callback' => NULL, |
|
| 856 | + 'title' => $plugin['name'], |
|
| 857 | + 'vendor url' => '', |
|
| 858 | + 'js path' => $plugin['path'] . '/' . $plugin['name'], |
|
| 859 | + 'js file' => $plugin['name'] . '.js', |
|
| 860 | + 'css path' => $plugin['path'] . '/' . $plugin['name'], |
|
| 861 | + 'css file' => $plugin['name'] . '.css', |
|
| 862 | + 'icon path' => $plugin['path'] . '/' . $plugin['name'] . '/images', |
|
| 863 | + 'icon file' => $plugin['name'] . '.png', |
|
| 864 | + 'dialog path' => $plugin['name'], |
|
| 865 | + 'dialog settings' => array(), |
|
| 866 | + 'settings callback' => NULL, |
|
| 867 | + 'settings form callback' => NULL, |
|
| 868 | 868 | ); |
| 869 | 869 | // Fill in default settings. |
| 870 | 870 | $plugin['settings'] += array( |
| 871 | - 'path' => base_path() . $plugin['path'] . '/' . $plugin['name'], |
|
| 871 | + 'path' => base_path() . $plugin['path'] . '/' . $plugin['name'], |
|
| 872 | 872 | ); |
| 873 | 873 | // Check whether library is present. |
| 874 | 874 | if (!($plugin['installed'] = file_exists($plugin['js path'] . '/' . $plugin['js file']))) { |
| 875 | - continue; |
|
| 875 | + continue; |
|
| 876 | + } |
|
| 876 | 877 | } |
| 877 | - } |
|
| 878 | - return $plugins; |
|
| 878 | + return $plugins; |
|
| 879 | 879 | } |
| 880 | 880 | |
| 881 | 881 | /** |
@@ -891,26 +891,26 @@ discard block |
||
| 891 | 891 | * @see wysiwyg_get_directories(), _wysiwyg_process_include() |
| 892 | 892 | */ |
| 893 | 893 | function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) { |
| 894 | - // Determine implementations. |
|
| 895 | - $directories = wysiwyg_get_directories($type); |
|
| 896 | - $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type; |
|
| 897 | - $file_list = array(); |
|
| 898 | - foreach ($directories as $module => $path) { |
|
| 894 | + // Determine implementations. |
|
| 895 | + $directories = wysiwyg_get_directories($type); |
|
| 896 | + $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type; |
|
| 897 | + $file_list = array(); |
|
| 898 | + foreach ($directories as $module => $path) { |
|
| 899 | 899 | $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0); |
| 900 | - } |
|
| 900 | + } |
|
| 901 | 901 | |
| 902 | - // Load implementations. |
|
| 903 | - $info = array(); |
|
| 904 | - foreach (array_filter($file_list) as $module => $files) { |
|
| 902 | + // Load implementations. |
|
| 903 | + $info = array(); |
|
| 904 | + foreach (array_filter($file_list) as $module => $files) { |
|
| 905 | 905 | foreach ($files as $file) { |
| 906 | - include_once './' . $file->filename; |
|
| 907 | - $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook); |
|
| 908 | - if (is_array($result)) { |
|
| 906 | + include_once './' . $file->filename; |
|
| 907 | + $result = _wysiwyg_process_include($module, $module . '_' . $file->name, dirname($file->filename), $hook); |
|
| 908 | + if (is_array($result)) { |
|
| 909 | 909 | $info = array_merge($info, $result); |
| 910 | - } |
|
| 910 | + } |
|
| 911 | 911 | } |
| 912 | - } |
|
| 913 | - return $info; |
|
| 912 | + } |
|
| 913 | + return $info; |
|
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | /** |
@@ -927,20 +927,20 @@ discard block |
||
| 927 | 927 | * @ingroup libraries |
| 928 | 928 | */ |
| 929 | 929 | function wysiwyg_get_path($library, $base_path = FALSE) { |
| 930 | - static $libraries; |
|
| 930 | + static $libraries; |
|
| 931 | 931 | |
| 932 | - if (!isset($libraries)) { |
|
| 932 | + if (!isset($libraries)) { |
|
| 933 | 933 | $libraries = wysiwyg_get_libraries(); |
| 934 | - } |
|
| 935 | - if (!isset($libraries[$library])) { |
|
| 934 | + } |
|
| 935 | + if (!isset($libraries[$library])) { |
|
| 936 | 936 | // Most often, external libraries can be shared across multiple sites. |
| 937 | 937 | return 'sites/all/libraries/' . $library; |
| 938 | - } |
|
| 938 | + } |
|
| 939 | 939 | |
| 940 | - $path = ($base_path ? base_path() : ''); |
|
| 941 | - $path .= $libraries[$library]; |
|
| 940 | + $path = ($base_path ? base_path() : ''); |
|
| 941 | + $path .= $libraries[$library]; |
|
| 942 | 942 | |
| 943 | - return $path; |
|
| 943 | + return $path; |
|
| 944 | 944 | } |
| 945 | 945 | |
| 946 | 946 | /** |
@@ -960,55 +960,55 @@ discard block |
||
| 960 | 960 | * @ingroup libraries |
| 961 | 961 | */ |
| 962 | 962 | function wysiwyg_get_libraries() { |
| 963 | - global $profile; |
|
| 964 | - |
|
| 965 | - // When this function is called during Drupal's initial installation process, |
|
| 966 | - // the name of the profile that is about to be installed is stored in the |
|
| 967 | - // global $profile variable. At all other times, the regular system variable |
|
| 968 | - // contains the name of the current profile, and we can call variable_get() |
|
| 969 | - // to determine the profile. |
|
| 970 | - if (!isset($profile)) { |
|
| 963 | + global $profile; |
|
| 964 | + |
|
| 965 | + // When this function is called during Drupal's initial installation process, |
|
| 966 | + // the name of the profile that is about to be installed is stored in the |
|
| 967 | + // global $profile variable. At all other times, the regular system variable |
|
| 968 | + // contains the name of the current profile, and we can call variable_get() |
|
| 969 | + // to determine the profile. |
|
| 970 | + if (!isset($profile)) { |
|
| 971 | 971 | $profile = variable_get('install_profile', 'default'); |
| 972 | - } |
|
| 972 | + } |
|
| 973 | 973 | |
| 974 | - $directory = 'libraries'; |
|
| 975 | - $searchdir = array(); |
|
| 976 | - $config = conf_path(); |
|
| 974 | + $directory = 'libraries'; |
|
| 975 | + $searchdir = array(); |
|
| 976 | + $config = conf_path(); |
|
| 977 | 977 | |
| 978 | - // The 'profiles' directory contains pristine collections of modules and |
|
| 979 | - // themes as organized by a distribution. It is pristine in the same way |
|
| 980 | - // that /modules is pristine for core; users should avoid changing anything |
|
| 981 | - // there in favor of sites/all or sites/<domain> directories. |
|
| 982 | - if (file_exists("profiles/$profile/$directory")) { |
|
| 978 | + // The 'profiles' directory contains pristine collections of modules and |
|
| 979 | + // themes as organized by a distribution. It is pristine in the same way |
|
| 980 | + // that /modules is pristine for core; users should avoid changing anything |
|
| 981 | + // there in favor of sites/all or sites/<domain> directories. |
|
| 982 | + if (file_exists("profiles/$profile/$directory")) { |
|
| 983 | 983 | $searchdir[] = "profiles/$profile/$directory"; |
| 984 | - } |
|
| 984 | + } |
|
| 985 | 985 | |
| 986 | - // Always search sites/all/*. |
|
| 987 | - $searchdir[] = 'sites/all/' . $directory; |
|
| 986 | + // Always search sites/all/*. |
|
| 987 | + $searchdir[] = 'sites/all/' . $directory; |
|
| 988 | 988 | |
| 989 | - // Also search sites/<domain>/*. |
|
| 990 | - if (file_exists("$config/$directory")) { |
|
| 989 | + // Also search sites/<domain>/*. |
|
| 990 | + if (file_exists("$config/$directory")) { |
|
| 991 | 991 | $searchdir[] = "$config/$directory"; |
| 992 | - } |
|
| 992 | + } |
|
| 993 | 993 | |
| 994 | - // Retrieve list of directories. |
|
| 995 | - // @todo Core: Allow to scan for directories. |
|
| 996 | - $directories = array(); |
|
| 997 | - $nomask = array('CVS'); |
|
| 998 | - foreach ($searchdir as $dir) { |
|
| 994 | + // Retrieve list of directories. |
|
| 995 | + // @todo Core: Allow to scan for directories. |
|
| 996 | + $directories = array(); |
|
| 997 | + $nomask = array('CVS'); |
|
| 998 | + foreach ($searchdir as $dir) { |
|
| 999 | 999 | if (is_dir($dir) && $handle = opendir($dir)) { |
| 1000 | - while (FALSE !== ($file = readdir($handle))) { |
|
| 1000 | + while (FALSE !== ($file = readdir($handle))) { |
|
| 1001 | 1001 | if (!in_array($file, $nomask) && $file[0] != '.') { |
| 1002 | - if (is_dir("$dir/$file")) { |
|
| 1002 | + if (is_dir("$dir/$file")) { |
|
| 1003 | 1003 | $directories[$file] = "$dir/$file"; |
| 1004 | - } |
|
| 1004 | + } |
|
| 1005 | + } |
|
| 1005 | 1006 | } |
| 1006 | - } |
|
| 1007 | - closedir($handle); |
|
| 1007 | + closedir($handle); |
|
| 1008 | + } |
|
| 1008 | 1009 | } |
| 1009 | - } |
|
| 1010 | 1010 | |
| 1011 | - return $directories; |
|
| 1011 | + return $directories; |
|
| 1012 | 1012 | } |
| 1013 | 1013 | |
| 1014 | 1014 | /** |
@@ -1024,14 +1024,14 @@ discard block |
||
| 1024 | 1024 | * @see wysiwyg_load_includes(), _wysiwyg_process_include() |
| 1025 | 1025 | */ |
| 1026 | 1026 | function wysiwyg_get_directories($plugintype) { |
| 1027 | - $directories = array(); |
|
| 1028 | - foreach (module_implements('wysiwyg_include_directory') as $module) { |
|
| 1027 | + $directories = array(); |
|
| 1028 | + foreach (module_implements('wysiwyg_include_directory') as $module) { |
|
| 1029 | 1029 | $result = module_invoke($module, 'wysiwyg_include_directory', $plugintype); |
| 1030 | 1030 | if (isset($result) && is_string($result)) { |
| 1031 | - $directories[$module] = drupal_get_path('module', $module) . '/' . $result; |
|
| 1031 | + $directories[$module] = drupal_get_path('module', $module) . '/' . $result; |
|
| 1032 | 1032 | } |
| 1033 | - } |
|
| 1034 | - return $directories; |
|
| 1033 | + } |
|
| 1034 | + return $directories; |
|
| 1035 | 1035 | } |
| 1036 | 1036 | |
| 1037 | 1037 | /** |
@@ -1045,22 +1045,22 @@ discard block |
||
| 1045 | 1045 | * The name of the hook being invoked. |
| 1046 | 1046 | */ |
| 1047 | 1047 | function _wysiwyg_process_include($module, $identifier, $path, $hook) { |
| 1048 | - $function = $identifier . '_' . $hook; |
|
| 1049 | - if (!function_exists($function)) { |
|
| 1048 | + $function = $identifier . '_' . $hook; |
|
| 1049 | + if (!function_exists($function)) { |
|
| 1050 | 1050 | return NULL; |
| 1051 | - } |
|
| 1052 | - $result = $function(); |
|
| 1053 | - if (!isset($result) || !is_array($result)) { |
|
| 1051 | + } |
|
| 1052 | + $result = $function(); |
|
| 1053 | + if (!isset($result) || !is_array($result)) { |
|
| 1054 | 1054 | return NULL; |
| 1055 | - } |
|
| 1055 | + } |
|
| 1056 | 1056 | |
| 1057 | - // Fill in defaults. |
|
| 1058 | - foreach ($result as $editor => $properties) { |
|
| 1057 | + // Fill in defaults. |
|
| 1058 | + foreach ($result as $editor => $properties) { |
|
| 1059 | 1059 | $result[$editor]['module'] = $module; |
| 1060 | 1060 | $result[$editor]['name'] = $editor; |
| 1061 | 1061 | $result[$editor]['path'] = $path; |
| 1062 | - } |
|
| 1063 | - return $result; |
|
| 1062 | + } |
|
| 1063 | + return $result; |
|
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | 1066 | /** |
@@ -1079,12 +1079,12 @@ discard block |
||
| 1079 | 1079 | * installed. |
| 1080 | 1080 | */ |
| 1081 | 1081 | function wysiwyg_features_api() { |
| 1082 | - $return = array(); |
|
| 1083 | - if (module_exists('exportables') && module_exists('ctools')) { |
|
| 1082 | + $return = array(); |
|
| 1083 | + if (module_exists('exportables') && module_exists('ctools')) { |
|
| 1084 | 1084 | module_load_include('inc', 'features', 'includes/features.ctools'); |
| 1085 | 1085 | $return = ctools_component_features_api('wysiwyg'); |
| 1086 | - } |
|
| 1087 | - return $return; |
|
| 1086 | + } |
|
| 1087 | + return $return; |
|
| 1088 | 1088 | } |
| 1089 | 1089 | |
| 1090 | 1090 | /** |
@@ -1094,10 +1094,10 @@ discard block |
||
| 1094 | 1094 | */ |
| 1095 | 1095 | function wysiwyg_features_export($data, &$export, $module_name = '') { |
| 1096 | 1096 | |
| 1097 | - $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name); |
|
| 1098 | - $export['dependencies']['exportables'] = 'exportables'; |
|
| 1097 | + $return = ctools_component_features_export('wysiwyg', $data, $export, $module_name); |
|
| 1098 | + $export['dependencies']['exportables'] = 'exportables'; |
|
| 1099 | 1099 | |
| 1100 | - return $return; |
|
| 1100 | + return $return; |
|
| 1101 | 1101 | } |
| 1102 | 1102 | |
| 1103 | 1103 | /** |
@@ -9,25 +9,25 @@ discard block |
||
| 9 | 9 | * Menu callback; Output a wysiwyg plugin dialog page. |
| 10 | 10 | */ |
| 11 | 11 | function wysiwyg_dialog($plugin, $instance) { |
| 12 | - $plugins = wysiwyg_get_all_plugins(); |
|
| 13 | - if (!isset($plugins[$plugin])) { |
|
| 12 | + $plugins = wysiwyg_get_all_plugins(); |
|
| 13 | + if (!isset($plugins[$plugin])) { |
|
| 14 | 14 | return drupal_access_denied(); |
| 15 | - } |
|
| 16 | - $callback = $plugin . '_wysiwyg_dialog'; |
|
| 17 | - if (!function_exists($callback)) { |
|
| 15 | + } |
|
| 16 | + $callback = $plugin . '_wysiwyg_dialog'; |
|
| 17 | + if (!function_exists($callback)) { |
|
| 18 | 18 | return drupal_not_found(); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - // Suppress admin menu. |
|
| 22 | - module_invoke('admin_menu', 'suppress'); |
|
| 23 | - // Add editor instance id to Drupal.settings. |
|
| 24 | - $settings = array( |
|
| 21 | + // Suppress admin menu. |
|
| 22 | + module_invoke('admin_menu', 'suppress'); |
|
| 23 | + // Add editor instance id to Drupal.settings. |
|
| 24 | + $settings = array( |
|
| 25 | 25 | 'plugin' => $plugin, |
| 26 | 26 | 'instance' => $instance, |
| 27 | - ); |
|
| 28 | - drupal_add_js(array('wysiwyg' => $settings), 'setting'); |
|
| 27 | + ); |
|
| 28 | + drupal_add_js(array('wysiwyg' => $settings), 'setting'); |
|
| 29 | 29 | |
| 30 | - echo theme('wysiwyg_dialog_page', $callback($instance)); |
|
| 30 | + echo theme('wysiwyg_dialog_page', $callback($instance)); |
|
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
@@ -38,26 +38,26 @@ discard block |
||
| 38 | 38 | * @see template_preprocess() |
| 39 | 39 | */ |
| 40 | 40 | function template_preprocess_wysiwyg_dialog_page(&$variables) { |
| 41 | - // Construct page title |
|
| 42 | - $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); |
|
| 41 | + // Construct page title |
|
| 42 | + $head_title = array(strip_tags(drupal_get_title()), variable_get('site_name', 'Drupal')); |
|
| 43 | 43 | |
| 44 | - $variables['head_title'] = implode(' | ', $head_title); |
|
| 45 | - $variables['base_path'] = base_path(); |
|
| 46 | - $variables['front_page'] = url(); |
|
| 47 | - // @todo Would a breadcrumb make sense / possible at all? |
|
| 48 | - // $variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb()); |
|
| 49 | - $variables['head'] = drupal_get_html_head(); |
|
| 50 | - $variables['help'] = theme('help'); |
|
| 51 | - $variables['language'] = $GLOBALS['language']; |
|
| 52 | - $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; |
|
| 53 | - $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; |
|
| 54 | - $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); |
|
| 55 | - $variables['css'] = drupal_add_css(); |
|
| 56 | - $variables['styles'] = drupal_get_css(); |
|
| 57 | - $variables['scripts'] = drupal_get_js(); |
|
| 58 | - $variables['tabs'] = theme('menu_local_tasks'); |
|
| 59 | - $variables['title'] = drupal_get_title(); |
|
| 60 | - // Closure should be filled last. |
|
| 61 | - $variables['closure'] = theme('closure'); |
|
| 44 | + $variables['head_title'] = implode(' | ', $head_title); |
|
| 45 | + $variables['base_path'] = base_path(); |
|
| 46 | + $variables['front_page'] = url(); |
|
| 47 | + // @todo Would a breadcrumb make sense / possible at all? |
|
| 48 | + // $variables['breadcrumb'] = theme('breadcrumb', drupal_get_breadcrumb()); |
|
| 49 | + $variables['head'] = drupal_get_html_head(); |
|
| 50 | + $variables['help'] = theme('help'); |
|
| 51 | + $variables['language'] = $GLOBALS['language']; |
|
| 52 | + $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; |
|
| 53 | + $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; |
|
| 54 | + $variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : ''); |
|
| 55 | + $variables['css'] = drupal_add_css(); |
|
| 56 | + $variables['styles'] = drupal_get_css(); |
|
| 57 | + $variables['scripts'] = drupal_get_js(); |
|
| 58 | + $variables['tabs'] = theme('menu_local_tasks'); |
|
| 59 | + $variables['title'] = drupal_get_title(); |
|
| 60 | + // Closure should be filled last. |
|
| 61 | + $variables['closure'] = theme('closure'); |
|
| 62 | 62 | } |
| 63 | 63 | |
@@ -36,11 +36,11 @@ discard block |
||
| 36 | 36 | * plugin meta-information as values. |
| 37 | 37 | */ |
| 38 | 38 | function hook_wysiwyg_plugin($editor, $version) { |
| 39 | - switch ($editor) { |
|
| 39 | + switch ($editor) { |
|
| 40 | 40 | case 'tinymce': |
| 41 | 41 | if ($version > 3) { |
| 42 | 42 | return array( |
| 43 | - 'myplugin' => array( |
|
| 43 | + 'myplugin' => array( |
|
| 44 | 44 | // A URL to the plugin's homepage. |
| 45 | 45 | 'url' => 'http://drupal.org/project/img_assist', |
| 46 | 46 | // The full path to the native editor plugin, no trailing slash. |
@@ -54,19 +54,19 @@ discard block |
||
| 54 | 54 | // match the corresponding JavaScript implementation. The value is |
| 55 | 55 | // is displayed on the editor configuration form only. |
| 56 | 56 | 'buttons' => array( |
| 57 | - 'img_assist' => t('Image Assist'), |
|
| 57 | + 'img_assist' => t('Image Assist'), |
|
| 58 | 58 | ), |
| 59 | 59 | // A list of editor extensions provided by this native plugin. |
| 60 | 60 | // Extensions are not displayed as buttons and touch the editor's |
| 61 | 61 | // internals, so you should know what you are doing. |
| 62 | 62 | 'extensions' => array( |
| 63 | - 'imce' => t('IMCE'), |
|
| 63 | + 'imce' => t('IMCE'), |
|
| 64 | 64 | ), |
| 65 | 65 | // A list of global, native editor configuration settings to |
| 66 | 66 | // override. To be used rarely and only when required. |
| 67 | 67 | 'options' => array( |
| 68 | - 'file_browser_callback' => 'imceImageBrowser', |
|
| 69 | - 'inline_styles' => TRUE, |
|
| 68 | + 'file_browser_callback' => 'imceImageBrowser', |
|
| 69 | + 'inline_styles' => TRUE, |
|
| 70 | 70 | ), |
| 71 | 71 | // Boolean whether the editor needs to load this plugin. When TRUE, |
| 72 | 72 | // the editor will automatically load the plugin based on the 'path' |
@@ -81,13 +81,13 @@ discard block |
||
| 81 | 81 | 'internal' => TRUE, |
| 82 | 82 | // TinyMCE-specific: Additional HTML elements to allow in the markup. |
| 83 | 83 | 'extended_valid_elements' => array( |
| 84 | - 'img[class|src|border=0|alt|title|width|height|align|name|style]', |
|
| 84 | + 'img[class|src|border=0|alt|title|width|height|align|name|style]', |
|
| 85 | + ), |
|
| 85 | 86 | ), |
| 86 | - ), |
|
| 87 | 87 | ); |
| 88 | - } |
|
| 89 | - break; |
|
| 90 | - } |
|
| 88 | + } |
|
| 89 | + break; |
|
| 90 | + } |
|
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | /** |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | * Wysiwyg module. |
| 102 | 102 | */ |
| 103 | 103 | function hook_wysiwyg_include_directory($type) { |
| 104 | - switch ($type) { |
|
| 104 | + switch ($type) { |
|
| 105 | 105 | case 'plugins': |
| 106 | 106 | // You can just return $type, if you place your Wysiwyg plugins into a |
| 107 | 107 | // sub-directory named 'plugins'. |
| 108 | 108 | return $type; |
| 109 | - } |
|
| 109 | + } |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | /** |
@@ -136,7 +136,7 @@ discard block |
||
| 136 | 136 | * Meta information about the buttons provided by this plugin. |
| 137 | 137 | */ |
| 138 | 138 | function hook_INCLUDE_plugin() { |
| 139 | - $plugins['awesome'] = array( |
|
| 139 | + $plugins['awesome'] = array( |
|
| 140 | 140 | // The plugin's title; defaulting to its internal name ('awesome'). |
| 141 | 141 | 'title' => t('Awesome plugin'), |
| 142 | 142 | // The (vendor) homepage of this plugin; defaults to ''. |
@@ -165,11 +165,11 @@ discard block |
||
| 165 | 165 | ), |
| 166 | 166 | // TinyMCE-specific: Additional HTML elements to allow in the markup. |
| 167 | 167 | 'extended_valid_elements' => array( |
| 168 | - 'tag1[attribute1|attribute2]', |
|
| 169 | - 'tag2[attribute3|attribute4]', |
|
| 168 | + 'tag1[attribute1|attribute2]', |
|
| 169 | + 'tag2[attribute3|attribute4]', |
|
| 170 | 170 | ), |
| 171 | - ); |
|
| 172 | - return $plugins; |
|
| 171 | + ); |
|
| 172 | + return $plugins; |
|
| 173 | 173 | } |
| 174 | 174 | |
| 175 | 175 | /** |
@@ -196,11 +196,11 @@ discard block |
||
| 196 | 196 | * - theme: The name of the editor theme/skin. |
| 197 | 197 | */ |
| 198 | 198 | function hook_wysiwyg_editor_settings_alter(&$settings, $context) { |
| 199 | - // Each editor has its own collection of native settings that may be extended |
|
| 200 | - // or overridden. Please consult the respective official vendor documentation |
|
| 201 | - // for details. |
|
| 202 | - if ($context['profile']->editor == 'tinymce') { |
|
| 199 | + // Each editor has its own collection of native settings that may be extended |
|
| 200 | + // or overridden. Please consult the respective official vendor documentation |
|
| 201 | + // for details. |
|
| 202 | + if ($context['profile']->editor == 'tinymce') { |
|
| 203 | 203 | // Supported values to JSON data types. |
| 204 | 204 | $settings['cleanup_on_startup'] = TRUE; |
| 205 | - } |
|
| 205 | + } |
|
| 206 | 206 | } |
@@ -17,14 +17,14 @@ |
||
| 17 | 17 | * Implementation of hook_menu(). |
| 18 | 18 | */ |
| 19 | 19 | function forum_tweaks_menu() { |
| 20 | - // Note that this comes straight out of the Advanced Forum module. As such, |
|
| 21 | - // it should be removed should said module be added at a future point in time |
|
| 22 | - $items['community/forum/%/read'] = array( |
|
| 20 | + // Note that this comes straight out of the Advanced Forum module. As such, |
|
| 21 | + // it should be removed should said module be added at a future point in time |
|
| 22 | + $items['community/forum/%/read'] = array( |
|
| 23 | 23 | 'access callback' => 'forum_tweaks_markasread_access', |
| 24 | 24 | 'page arguments' => array(2), |
| 25 | 25 | 'page callback' => 'forum_tweaks_markasread', |
| 26 | 26 | 'type' => MENU_CALLBACK, |
| 27 | 27 | 'file' => 'includes/mark-read.inc', |
| 28 | - ); |
|
| 29 | - return $items; |
|
| 28 | + ); |
|
| 29 | + return $items; |
|
| 30 | 30 | } |
@@ -13,31 +13,31 @@ discard block |
||
| 13 | 13 | * Either fill a $links array or return a string version of the link to mark read. |
| 14 | 14 | */ |
| 15 | 15 | function forum_tweaks_get_mark_read_link($tid = 0, &$links = array()) { |
| 16 | - if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) { |
|
| 16 | + if (forum_tweaks_markasread_access() && !in_array($tid, variable_get('forum_containers', array()))) { |
|
| 17 | 17 | if ($tid) { |
| 18 | - $links['mark-read']['title'] = t('Mark all topics read'); |
|
| 19 | - $links['mark-read']['href'] = "community/forum/{$tid}/read"; |
|
| 18 | + $links['mark-read']['title'] = t('Mark all topics read'); |
|
| 19 | + $links['mark-read']['href'] = "community/forum/{$tid}/read"; |
|
| 20 | 20 | |
| 21 | - return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE)); |
|
| 21 | + return l(t('Mark all topics read') . '<span class="image-replace"></span>', "forum/markasread/$tid", array('html' => TRUE)); |
|
| 22 | 22 | } |
| 23 | 23 | else { |
| 24 | - $links['mark-read']['title'] = t('Mark all forums read'); |
|
| 25 | - $links['mark-read']['href'] = "community/forum/0/read"; |
|
| 24 | + $links['mark-read']['title'] = t('Mark all forums read'); |
|
| 25 | + $links['mark-read']['href'] = "community/forum/0/read"; |
|
| 26 | 26 | |
| 27 | - return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE)); |
|
| 27 | + return l(t('Mark all forums read') . '<span class="image-replace"></span>', "forum/markasread", array('html' => TRUE)); |
|
| 28 | + } |
|
| 28 | 29 | } |
| 29 | - } |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
| 33 | 33 | * Marks all posts in forums or in a given forum as read by the current user. |
| 34 | 34 | */ |
| 35 | 35 | function forum_tweaks_markasread($current_forum_id = 0) { |
| 36 | - global $user; |
|
| 36 | + global $user; |
|
| 37 | 37 | |
| 38 | - // See if we're on a forum or on the forum overview |
|
| 39 | - // Path will be /forum/markasread or /forum/markasread/tid |
|
| 40 | - if ($current_forum_id) { |
|
| 38 | + // See if we're on a forum or on the forum overview |
|
| 39 | + // Path will be /forum/markasread or /forum/markasread/tid |
|
| 40 | + if ($current_forum_id) { |
|
| 41 | 41 | // Delete the current history entries so already visited nodes get updated. |
| 42 | 42 | $sql = "DELETE h |
| 43 | 43 | FROM {history} AS h |
@@ -58,26 +58,26 @@ discard block |
||
| 58 | 58 | |
| 59 | 59 | // Readpath integration |
| 60 | 60 | if (module_exists('readpath')) { |
| 61 | - readpath_clear_readpath(); |
|
| 61 | + readpath_clear_readpath(); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | drupal_set_message(t('All content in this forum has been marked as read')); |
| 65 | 65 | drupal_goto('community/forum/' . $current_forum_id); |
| 66 | - } |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - // We are on the forum overview, requesting all forums be marked read |
|
| 69 | - $forum_vocabulary_id = variable_get('forum_nav_vocabulary', ''); |
|
| 68 | + // We are on the forum overview, requesting all forums be marked read |
|
| 69 | + $forum_vocabulary_id = variable_get('forum_nav_vocabulary', ''); |
|
| 70 | 70 | |
| 71 | - // Delete the current history entries so already visited nodes get updated. |
|
| 72 | - $sql = "DELETE h |
|
| 71 | + // Delete the current history entries so already visited nodes get updated. |
|
| 72 | + $sql = "DELETE h |
|
| 73 | 73 | FROM {history} AS h |
| 74 | 74 | INNER JOIN {term_node} AS tn ON (h.nid = tn.nid) |
| 75 | 75 | INNER JOIN {term_data} AS td ON (td.tid = tn.tid) |
| 76 | 76 | WHERE h.uid = %d AND td.vid = %d"; |
| 77 | - db_query($sql, $user->uid, $forum_vocabulary_id); |
|
| 77 | + db_query($sql, $user->uid, $forum_vocabulary_id); |
|
| 78 | 78 | |
| 79 | - // Update the history table with all forum nodes newer than the cutoff. |
|
| 80 | - $sql = "INSERT INTO {history} (uid, nid, timestamp) |
|
| 79 | + // Update the history table with all forum nodes newer than the cutoff. |
|
| 80 | + $sql = "INSERT INTO {history} (uid, nid, timestamp) |
|
| 81 | 81 | SELECT DISTINCT %d, n.nid, %d |
| 82 | 82 | FROM {node} AS n |
| 83 | 83 | INNER JOIN {term_node} AS tn ON n.nid=tn.nid |
@@ -85,12 +85,12 @@ discard block |
||
| 85 | 85 | INNER JOIN {term_data} AS td ON tn.tid = td.tid |
| 86 | 86 | WHERE (n.changed > %d OR ncs.last_comment_timestamp > %d) AND td.vid = %d"; |
| 87 | 87 | |
| 88 | - $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id); |
|
| 88 | + $args = array($user->uid, time(), NODE_NEW_LIMIT, NODE_NEW_LIMIT, $forum_vocabulary_id); |
|
| 89 | 89 | |
| 90 | - db_query($sql, $args); |
|
| 90 | + db_query($sql, $args); |
|
| 91 | 91 | |
| 92 | - drupal_set_message(t('All forum content has been marked as read')); |
|
| 93 | - drupal_goto('community/forum'); |
|
| 92 | + drupal_set_message(t('All forum content has been marked as read')); |
|
| 93 | + drupal_goto('community/forum'); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | /** |
@@ -101,6 +101,6 @@ discard block |
||
| 101 | 101 | * cached and re-used for other users. |
| 102 | 102 | */ |
| 103 | 103 | function forum_tweaks_markasread_access() { |
| 104 | - global $user; |
|
| 105 | - return user_access('access content') && $user->uid; |
|
| 104 | + global $user; |
|
| 105 | + return user_access('access content') && $user->uid; |
|
| 106 | 106 | } |
@@ -2,38 +2,38 @@ discard block |
||
| 2 | 2 | // $Id: bbcode.module,v 1.50 2008/02/07 14:05:30 naudefj Exp $ |
| 3 | 3 | |
| 4 | 4 | function bbcode_help($section) { |
| 5 | - if ($section == 'admin/modules#description') |
|
| 5 | + if ($section == 'admin/modules#description') |
|
| 6 | 6 | return t('Allow the use of BBCode in your posts.'); |
| 7 | 7 | } |
| 8 | 8 | |
| 9 | 9 | function bbcode_filter_tips($delta, $format, $long = false) { |
| 10 | - if ($long) { |
|
| 10 | + if ($long) { |
|
| 11 | 11 | include_once(drupal_get_path('module', 'bbcode') .'/bbcode-help.inc'); |
| 12 | 12 | return _bbcode_filter_tip(); |
| 13 | - } |
|
| 14 | - else { |
|
| 13 | + } |
|
| 14 | + else { |
|
| 15 | 15 | # D5: $output = t('You can use !BBCode tags in the text.', array('!BBCode' => l(t('BBCode'), "filter/tips/$format", NULL, NULL, 'filter-bbcode-' . $delta))); |
| 16 | 16 | $output = t('You can use !BBCode (opens in new window) tags in the text.', |
| 17 | - array( |
|
| 17 | + array( |
|
| 18 | 18 | '!BBCode' => l(t('BBCode'), "filter/tips/$format", |
| 19 | 19 | array( |
| 20 | - 'fragment' => 'filter-bbcode-' . $delta, |
|
| 21 | - 'attributes' => |
|
| 22 | - array( |
|
| 23 | - 'target'=>'_blank', |
|
| 24 | - 'rel'=>'noopener noreferrer', |
|
| 25 | - ), |
|
| 20 | + 'fragment' => 'filter-bbcode-' . $delta, |
|
| 21 | + 'attributes' => |
|
| 22 | + array( |
|
| 23 | + 'target'=>'_blank', |
|
| 24 | + 'rel'=>'noopener noreferrer', |
|
| 25 | + ), |
|
| 26 | 26 | )) |
| 27 | - )); |
|
| 27 | + )); |
|
| 28 | 28 | if (variable_get("bbcode_make_links_$format", FALSE)) { |
| 29 | - $output .= ' '. t('URLs will automatically be converted to links.'); |
|
| 29 | + $output .= ' '. t('URLs will automatically be converted to links.'); |
|
| 30 | 30 | } |
| 31 | 31 | return $output; |
| 32 | - } |
|
| 32 | + } |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | function bbcode_filter($op, $delta = 0, $format = -1, $text = '') { |
| 36 | - switch ($op) { |
|
| 36 | + switch ($op) { |
|
| 37 | 37 | case 'list': |
| 38 | 38 | return array(0 => t('BBCode')); |
| 39 | 39 | |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | |
| 43 | 43 | case 'process': |
| 44 | 44 | include_once(drupal_get_path('module', 'bbcode') .'/bbcode-filter.inc'); |
| 45 | - if (variable_get("bbcode_debug_$format", 0)) { |
|
| 45 | + if (variable_get("bbcode_debug_$format", 0)) { |
|
| 46 | 46 | $timing_start = explode(' ', microtime()); |
| 47 | 47 | $ret = _bbcode_filter_process($text, $format); |
| 48 | 48 | $timing_stop = explode(' ', microtime()); |
@@ -50,99 +50,99 @@ discard block |
||
| 50 | 50 | $elapsed += $timing_stop[0] - $timing_start[0]; |
| 51 | 51 | $ret .= '<hr />'. l('BBCode', "filter/tips/$format") .' parsed on '.date('r').'<br />Execution time: '.$elapsed.' seconds.<hr />'; |
| 52 | 52 | return $ret; |
| 53 | - } |
|
| 54 | - else |
|
| 53 | + } |
|
| 54 | + else |
|
| 55 | 55 | return _bbcode_filter_process($text, $format); |
| 56 | 56 | |
| 57 | 57 | case 'settings': |
| 58 | 58 | $form = array(); |
| 59 | - $form['bbcode_filter'] = array( |
|
| 59 | + $form['bbcode_filter'] = array( |
|
| 60 | 60 | '#type' => 'fieldset', |
| 61 | 61 | '#title' => t('BBCode filter'), |
| 62 | 62 | '#collapsible' => TRUE, |
| 63 | 63 | '#collapsed' => FALSE); |
| 64 | - $form['bbcode_filter']["bbcode_make_links_$format"] = array( |
|
| 64 | + $form['bbcode_filter']["bbcode_make_links_$format"] = array( |
|
| 65 | 65 | '#type' => 'select', |
| 66 | 66 | '#title' => t('Convert addresses to links'), |
| 67 | 67 | '#default_value' => variable_get("bbcode_make_links_$format", 1), |
| 68 | 68 | '#options' => array(t('Disabled'), t('Enabled')), |
| 69 | 69 | '#description' => t('Turn web and e-mail addresses into clickable links. This is useful if content authors do not explicitly mark addresses as links with [url] and [email] tags.')); |
| 70 | - $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array( |
|
| 70 | + $form['bbcode_filter']["bbcode_filter_nofollow_$format"] = array( |
|
| 71 | 71 | '#type' => 'select', |
| 72 | 72 | '#title' => t('Spam link deterrent'), |
| 73 | 73 | '#default_value' => variable_get("bbcode_filter_nofollow_$format", 0), |
| 74 | 74 | '#options' => array(t('Disabled'), t('Enabled')), |
| 75 | 75 | '#description' => t('If enabled, BBCode will add rel="nofollow" to all links, as a measure to reduce the effectiveness of spam links. Note: this will also prevent valid links from being followed by search engines, therefore it is likely most effective when enabled for anonymous users.')); |
| 76 | - $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array( |
|
| 76 | + $form['bbcode_filter']["bbcode_encode_mailto_$format"] = array( |
|
| 77 | 77 | '#type' => 'select', |
| 78 | 78 | '#title' => t('Email address encoding'), |
| 79 | 79 | '#default_value' => variable_get("bbcode_encode_mailto_$format", 1), |
| 80 | 80 | '#options' => array(t('Disabled'), t('Enabled')), |
| 81 | 81 | '#description' => t('Whether to encode email addresses with javascript. With this method you will have clickable mailto links, but it will be a bit harder for spam robots to collect them.')); |
| 82 | - $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array( |
|
| 82 | + $form['bbcode_filter']["bbcode_paragraph_breaks_$format"] = array( |
|
| 83 | 83 | '#type' => 'select', |
| 84 | 84 | '#title' => t('Smart paragraph and line breaks'), |
| 85 | 85 | '#default_value' => variable_get("bbcode_paragraph_breaks_$format", 2), |
| 86 | 86 | '#options' => array(t('Disabled'), t('Line breaks only'), t('Line and paragraph breaks')), |
| 87 | 87 | '#description' => t('Add line and paragraph breaks to text, excluding text in preformatted code blocks. If you disable this option, you need to enable Drupal\'s "Line break converter". Don\'t use both together!')); |
| 88 | - $form['bbcode_filter']["bbcode_debug_$format"] = array( |
|
| 88 | + $form['bbcode_filter']["bbcode_debug_$format"] = array( |
|
| 89 | 89 | '#type' => 'select', |
| 90 | 90 | '#title' => t('Print debugging info'), |
| 91 | 91 | '#default_value' => variable_get("bbcode_debug_$format", 0), |
| 92 | 92 | '#options' => array(t('Disabled'), t('Enabled')), |
| 93 | 93 | '#description' => t('Print BBCode parse date and execution time. This option should be disabled on production sites. You may need to clear the cache after changing this option.')); |
| 94 | - return $form; |
|
| 94 | + return $form; |
|
| 95 | 95 | |
| 96 | 96 | default: |
| 97 | 97 | return $text; |
| 98 | - } |
|
| 98 | + } |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | /* hook_quicktags_alter |
| 102 | 102 | * Alter icons if the quicktags module is enabled |
| 103 | 103 | */ |
| 104 | 104 | function bbcode_quicktags_alter($items) { |
| 105 | - $path = base_path() . drupal_get_path('module','quicktags') .'/'; |
|
| 106 | - $items['ed_italic'] = array( |
|
| 107 | - 'name' => 'italic', |
|
| 108 | - 'prefix' => '[i]', |
|
| 109 | - 'suffix' => '[/i]', |
|
| 110 | - 'accesskey' => 'i', |
|
| 111 | - 'weight' => 10, |
|
| 112 | - 'icon' => $path .'ed_italic.png', |
|
| 105 | + $path = base_path() . drupal_get_path('module','quicktags') .'/'; |
|
| 106 | + $items['ed_italic'] = array( |
|
| 107 | + 'name' => 'italic', |
|
| 108 | + 'prefix' => '[i]', |
|
| 109 | + 'suffix' => '[/i]', |
|
| 110 | + 'accesskey' => 'i', |
|
| 111 | + 'weight' => 10, |
|
| 112 | + 'icon' => $path .'ed_italic.png', |
|
| 113 | 113 | ); |
| 114 | - $items['ed_bold'] = array( |
|
| 115 | - 'name' => 'bold', |
|
| 116 | - 'prefix' => '[b]', |
|
| 117 | - 'suffix' => '[/b]', |
|
| 118 | - 'accesskey' => 'b', |
|
| 119 | - 'weight' => 20, |
|
| 120 | - 'icon' => $path .'ed_bold.png', |
|
| 114 | + $items['ed_bold'] = array( |
|
| 115 | + 'name' => 'bold', |
|
| 116 | + 'prefix' => '[b]', |
|
| 117 | + 'suffix' => '[/b]', |
|
| 118 | + 'accesskey' => 'b', |
|
| 119 | + 'weight' => 20, |
|
| 120 | + 'icon' => $path .'ed_bold.png', |
|
| 121 | 121 | ); |
| 122 | - $items['ed_code'] = array( |
|
| 123 | - 'name' => 'code', |
|
| 124 | - 'prefix' =>'[code]', |
|
| 125 | - 'suffix' => '[/code]', |
|
| 126 | - 'accesskey' => 'c', |
|
| 127 | - 'weight' => 30, |
|
| 128 | - 'icon' => $path .'ed_code.png', |
|
| 122 | + $items['ed_code'] = array( |
|
| 123 | + 'name' => 'code', |
|
| 124 | + 'prefix' =>'[code]', |
|
| 125 | + 'suffix' => '[/code]', |
|
| 126 | + 'accesskey' => 'c', |
|
| 127 | + 'weight' => 30, |
|
| 128 | + 'icon' => $path .'ed_code.png', |
|
| 129 | 129 | ); |
| 130 | - $items['ed_block'] = array( |
|
| 131 | - 'name' => 'quote', |
|
| 132 | - 'prefix' =>'[quote]', |
|
| 133 | - 'suffix' => '[/quote]', |
|
| 134 | - 'accesskey' => 'q', |
|
| 135 | - 'weight' => 40, |
|
| 136 | - 'icon' => $path .'ed_block.png', |
|
| 130 | + $items['ed_block'] = array( |
|
| 131 | + 'name' => 'quote', |
|
| 132 | + 'prefix' =>'[quote]', |
|
| 133 | + 'suffix' => '[/quote]', |
|
| 134 | + 'accesskey' => 'q', |
|
| 135 | + 'weight' => 40, |
|
| 136 | + 'icon' => $path .'ed_block.png', |
|
| 137 | 137 | ); |
| 138 | - $items['ed_link'] = array( |
|
| 139 | - 'name' => 'link', |
|
| 140 | - 'prefix' =>'[url=http://]', |
|
| 141 | - 'suffix' => '[/url]', |
|
| 142 | - 'accesskey' => 'l', |
|
| 143 | - 'weight' => 50, |
|
| 144 | - 'icon' => $path .'ed_link.png', |
|
| 138 | + $items['ed_link'] = array( |
|
| 139 | + 'name' => 'link', |
|
| 140 | + 'prefix' =>'[url=http://]', |
|
| 141 | + 'suffix' => '[/url]', |
|
| 142 | + 'accesskey' => 'l', |
|
| 143 | + 'weight' => 50, |
|
| 144 | + 'icon' => $path .'ed_link.png', |
|
| 145 | 145 | ); |
| 146 | - return $items; |
|
| 146 | + return $items; |
|
| 147 | 147 | } |
| 148 | 148 | |
@@ -2,7 +2,7 @@ |
||
| 2 | 2 | // $Id: bbcode-help.inc,v 1.8 2007/01/28 21:18:45 naudefj Exp $ |
| 3 | 3 | |
| 4 | 4 | function _bbcode_filter_tip() { |
| 5 | - return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2> |
|
| 5 | + return t("<a id=\"filter-bbcode\"></a><h2>BBCode Guide</h2> |
|
| 6 | 6 | |
| 7 | 7 | <p> |
| 8 | 8 | BBCode allows you to specify formatting rules for your text, |
@@ -3,128 +3,128 @@ discard block |
||
| 3 | 3 | |
| 4 | 4 | function _bbcode_filter_process(&$body, $format = -1) { |
| 5 | 5 | |
| 6 | - $quote_text = t('Quote:'); |
|
| 7 | - $quote_user = t('\\1 wrote:'); |
|
| 6 | + $quote_text = t('Quote:'); |
|
| 7 | + $quote_user = t('\\1 wrote:'); |
|
| 8 | 8 | |
| 9 | - // Encode all script tags to prevent XSS html injection attacks |
|
| 10 | - $body = preg_replace(array('#<script([^>]*)>#i', '#</script([^>]*)>#i'), array('<script\\1>', '</script\\1>'), $body); |
|
| 9 | + // Encode all script tags to prevent XSS html injection attacks |
|
| 10 | + $body = preg_replace(array('#<script([^>]*)>#i', '#</script([^>]*)>#i'), array('<script\\1>', '</script\\1>'), $body); |
|
| 11 | 11 | |
| 12 | - // Find all [code] tags and check if they contain a newline. If we find a newline, |
|
| 13 | - // that [code] should be rendered as a block, otherwise it will still be inline |
|
| 14 | - $mode = variable_get("bbcode_paragraph_breaks_$format", 2); |
|
| 15 | - $pre = array(); $i = 0; |
|
| 16 | - if (preg_match_all('#\[code(?::\w+)?\](.*?)\[/code(?::\w+)?\]#si', $body, $code_tags, PREG_SET_ORDER)) { |
|
| 12 | + // Find all [code] tags and check if they contain a newline. If we find a newline, |
|
| 13 | + // that [code] should be rendered as a block, otherwise it will still be inline |
|
| 14 | + $mode = variable_get("bbcode_paragraph_breaks_$format", 2); |
|
| 15 | + $pre = array(); $i = 0; |
|
| 16 | + if (preg_match_all('#\[code(?::\w+)?\](.*?)\[/code(?::\w+)?\]#si', $body, $code_tags, PREG_SET_ORDER)) { |
|
| 17 | 17 | foreach ($code_tags as $code_tag) { |
| 18 | - $code_tag[1] = str_replace(array('<', '>'), array('<', '>'), $code_tag[1]); |
|
| 19 | - if (strpos($code_tag[1], "\n") === FALSE) |
|
| 18 | + $code_tag[1] = str_replace(array('<', '>'), array('<', '>'), $code_tag[1]); |
|
| 19 | + if (strpos($code_tag[1], "\n") === FALSE) |
|
| 20 | 20 | $body = str_replace($code_tag[0], '<code class="bb-code">'. $code_tag[1] .'</code>', $body); |
| 21 | - elseif ($mode) { |
|
| 21 | + elseif ($mode) { |
|
| 22 | 22 | // Strip preformatted code blocks from text during line break processing, replaced below |
| 23 | 23 | $body = str_replace($code_tag[0], "***pRe_sTrInG$i***", $body); |
| 24 | 24 | $pre[$i++] = '<pre class="bb-code-block">'. $code_tag[1] .'</pre>'; |
| 25 | - } |
|
| 26 | - else |
|
| 25 | + } |
|
| 26 | + else |
|
| 27 | 27 | $body = str_replace($code_tag[0], '<pre class="bb-code-block">'. $code_tag[1] .'</pre>', $body); |
| 28 | 28 | } |
| 29 | - } |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - // Apply line and paragraph breaks (skipping preformatted code) |
|
| 32 | - if ($mode) { |
|
| 31 | + // Apply line and paragraph breaks (skipping preformatted code) |
|
| 32 | + if ($mode) { |
|
| 33 | 33 | |
| 34 | 34 | if ($mode == 1) // Line breaks only (starting with PHP 4.0.5, nl2br() is XHTML compliant) |
| 35 | - $body = nl2br($body); |
|
| 35 | + $body = nl2br($body); |
|
| 36 | 36 | |
| 37 | 37 | if ($mode == 2) { // Line and paragraph breaks (may not always be XHTML compliant) |
| 38 | - $body = preg_replace("/(\r\n|\n|\r)/", "\n", $body); |
|
| 39 | - $body = preg_replace("/\n\n+/", "\n\n", $body); |
|
| 40 | - $parts = explode("\n\n", $body); |
|
| 41 | - for ($i=0; $i<sizeof($parts); $i++) { |
|
| 42 | - // No linebreaks if paragraph starts with an HTML tag |
|
| 43 | - if ( !preg_match('/^<.*>/', $parts[$i]) ) |
|
| 44 | - $parts[$i] = nl2br($parts[$i]); |
|
| 45 | - |
|
| 46 | - // Some tags should not be in paragraph blocks |
|
| 47 | - if ( !preg_match('/^(?:<|\[)(?:table|list|ol|ul|pre|select|form|blockquote|hr)/i', $parts[$i]) ) |
|
| 48 | - $parts[$i] = '<p>'. $parts[$i] .'</p>'; |
|
| 49 | - } |
|
| 50 | - $body = implode("\n\n", $parts); |
|
| 38 | + $body = preg_replace("/(\r\n|\n|\r)/", "\n", $body); |
|
| 39 | + $body = preg_replace("/\n\n+/", "\n\n", $body); |
|
| 40 | + $parts = explode("\n\n", $body); |
|
| 41 | + for ($i=0; $i<sizeof($parts); $i++) { |
|
| 42 | + // No linebreaks if paragraph starts with an HTML tag |
|
| 43 | + if ( !preg_match('/^<.*>/', $parts[$i]) ) |
|
| 44 | + $parts[$i] = nl2br($parts[$i]); |
|
| 45 | + |
|
| 46 | + // Some tags should not be in paragraph blocks |
|
| 47 | + if ( !preg_match('/^(?:<|\[)(?:table|list|ol|ul|pre|select|form|blockquote|hr)/i', $parts[$i]) ) |
|
| 48 | + $parts[$i] = '<p>'. $parts[$i] .'</p>'; |
|
| 49 | + } |
|
| 50 | + $body = implode("\n\n", $parts); |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | // Reinsert preformatted code blocks |
| 54 | 54 | foreach ($pre as $i => $code_tag) |
| 55 | - $body = str_replace("***pRe_sTrInG$i***", $code_tag, $body); |
|
| 56 | - } |
|
| 55 | + $body = str_replace("***pRe_sTrInG$i***", $code_tag, $body); |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - // Replace any improper quote tags with proper quote tags |
|
| 59 | - $body = str_replace('[quote/]', '[/quote]', $body); |
|
| 58 | + // Replace any improper quote tags with proper quote tags |
|
| 59 | + $body = str_replace('[quote/]', '[/quote]', $body); |
|
| 60 | 60 | |
| 61 | - // Add closing tags to prevent users from disruping your site's HTML |
|
| 62 | - // (required for nestable tags only: [list] and [quote]) |
|
| 63 | - preg_match_all('/\[quote/i', $body, $matches); |
|
| 64 | - $opentags = count($matches['0']); |
|
| 65 | - preg_match_all('/\[\/quote\]/i', $body, $matches); |
|
| 66 | - $unclosed = $opentags - count($matches['0']); |
|
| 67 | - for ($i = 0; $i < $unclosed; $i++) { |
|
| 61 | + // Add closing tags to prevent users from disruping your site's HTML |
|
| 62 | + // (required for nestable tags only: [list] and [quote]) |
|
| 63 | + preg_match_all('/\[quote/i', $body, $matches); |
|
| 64 | + $opentags = count($matches['0']); |
|
| 65 | + preg_match_all('/\[\/quote\]/i', $body, $matches); |
|
| 66 | + $unclosed = $opentags - count($matches['0']); |
|
| 67 | + for ($i = 0; $i < $unclosed; $i++) { |
|
| 68 | 68 | $body .= '[/quote]'; |
| 69 | - } |
|
| 70 | - // Also add opening tags, if needed |
|
| 71 | - for ($i = $unclosed; $i < 0; $i++) { |
|
| 69 | + } |
|
| 70 | + // Also add opening tags, if needed |
|
| 71 | + for ($i = $unclosed; $i < 0; $i++) { |
|
| 72 | 72 | $body = '[quote]' . $body; |
| 73 | - } |
|
| 74 | - preg_match_all('/\[list/i', $body, $matches); |
|
| 75 | - $opentags = count($matches['0']); |
|
| 76 | - preg_match_all('/\[\/list\]/i', $body, $matches); |
|
| 77 | - $unclosed = $opentags - count($matches['0']); |
|
| 78 | - for ($i = 0; $i < $unclosed; $i++) { |
|
| 73 | + } |
|
| 74 | + preg_match_all('/\[list/i', $body, $matches); |
|
| 75 | + $opentags = count($matches['0']); |
|
| 76 | + preg_match_all('/\[\/list\]/i', $body, $matches); |
|
| 77 | + $unclosed = $opentags - count($matches['0']); |
|
| 78 | + for ($i = 0; $i < $unclosed; $i++) { |
|
| 79 | 79 | $body .= '[/list]'; |
| 80 | - } |
|
| 81 | - for ($i = $unclosed; $i < 0; $i++) { |
|
| 80 | + } |
|
| 81 | + for ($i = $unclosed; $i < 0; $i++) { |
|
| 82 | 82 | $body = '[list]' . $body; |
| 83 | - } |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - // begin processing for [size] |
|
| 86 | - if (stristr($body, '[size=') !== FALSE) { // prevent useless processing |
|
| 85 | + // begin processing for [size] |
|
| 86 | + if (stristr($body, '[size=') !== FALSE) { // prevent useless processing |
|
| 87 | 87 | $arr = array( |
| 88 | - 'tag' => 'size', |
|
| 89 | - 'pattern' => '#\[\x07=([\d]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#esi', |
|
| 90 | - 'replacement' => '"<span style=\"font-size:". _bbcode_round_size_val(\'$1\') ."px\">". str_replace(\'\"\', \'"\', \'$2\') ."</span>"', |
|
| 91 | - 'text' => $body); |
|
| 88 | + 'tag' => 'size', |
|
| 89 | + 'pattern' => '#\[\x07=([\d]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#esi', |
|
| 90 | + 'replacement' => '"<span style=\"font-size:". _bbcode_round_size_val(\'$1\') ."px\">". str_replace(\'\"\', \'"\', \'$2\') ."</span>"', |
|
| 91 | + 'text' => $body); |
|
| 92 | 92 | $body = _bbcode_replace_nest_tag($arr); |
| 93 | - } // end processing for [size] |
|
| 93 | + } // end processing for [size] |
|
| 94 | 94 | |
| 95 | - // begin processing for [color] |
|
| 96 | - if (stristr($body, '[color=') !== FALSE) { // prevent useless processing |
|
| 95 | + // begin processing for [color] |
|
| 96 | + if (stristr($body, '[color=') !== FALSE) { // prevent useless processing |
|
| 97 | 97 | $arr = array( |
| 98 | - 'tag' => 'color', |
|
| 99 | - 'pattern' => '#\[\x07=([\#\w]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si', |
|
| 100 | - 'replacement' => '<span style="color:$1">$2</span>', |
|
| 101 | - 'text' => $body); |
|
| 98 | + 'tag' => 'color', |
|
| 99 | + 'pattern' => '#\[\x07=([\#\w]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si', |
|
| 100 | + 'replacement' => '<span style="color:$1">$2</span>', |
|
| 101 | + 'text' => $body); |
|
| 102 | 102 | $body = _bbcode_replace_nest_tag($arr); |
| 103 | - } // end processing for [color] |
|
| 103 | + } // end processing for [color] |
|
| 104 | 104 | |
| 105 | - // begin processing for [font] |
|
| 106 | - if (stristr($body, '[font=') !== FALSE) { // prevent useless processing |
|
| 105 | + // begin processing for [font] |
|
| 106 | + if (stristr($body, '[font=') !== FALSE) { // prevent useless processing |
|
| 107 | 107 | $arr = array( |
| 108 | - 'tag' => 'font', |
|
| 109 | - 'pattern' => '#\[\x07=([\w\s]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si', |
|
| 110 | - 'replacement' => '<span style="font-family:$1">$2</span>', |
|
| 111 | - 'text' => $body); |
|
| 108 | + 'tag' => 'font', |
|
| 109 | + 'pattern' => '#\[\x07=([\w\s]+)(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si', |
|
| 110 | + 'replacement' => '<span style="font-family:$1">$2</span>', |
|
| 111 | + 'text' => $body); |
|
| 112 | 112 | $body = _bbcode_replace_nest_tag($arr); |
| 113 | - } // end processing for [font] |
|
| 113 | + } // end processing for [font] |
|
| 114 | 114 | |
| 115 | - // begin processing for [list] and [*] |
|
| 116 | - if (stristr($body, '[list') !== FALSE) { // prevent useless processing |
|
| 115 | + // begin processing for [list] and [*] |
|
| 116 | + if (stristr($body, '[list') !== FALSE) { // prevent useless processing |
|
| 117 | 117 | $l_type = array( |
| 118 | - NULL => array('style' => 'circle', 'tag' => 'ul'), |
|
| 119 | - 'c' => array('style' => 'circle', 'tag' => 'ul'), |
|
| 120 | - 'd' => array('style' => 'disc', 'tag' => 'ul'), |
|
| 121 | - 's' => array('style' => 'square', 'tag' => 'ul'), |
|
| 122 | - '1' => array('style' => 'decimal', 'tag' => 'ol'), |
|
| 123 | - 'a' => array('style' => 'lower-alpha', 'tag' => 'ol'), |
|
| 124 | - 'A' => array('style' => 'upper-alpha', 'tag' => 'ol'), |
|
| 125 | - 'i' => array('style' => 'lower-roman', 'tag' => 'ol'), |
|
| 126 | - 'I' => array('style' => 'upper-roman', 'tag' => 'ol') |
|
| 127 | - ); |
|
| 118 | + NULL => array('style' => 'circle', 'tag' => 'ul'), |
|
| 119 | + 'c' => array('style' => 'circle', 'tag' => 'ul'), |
|
| 120 | + 'd' => array('style' => 'disc', 'tag' => 'ul'), |
|
| 121 | + 's' => array('style' => 'square', 'tag' => 'ul'), |
|
| 122 | + '1' => array('style' => 'decimal', 'tag' => 'ol'), |
|
| 123 | + 'a' => array('style' => 'lower-alpha', 'tag' => 'ol'), |
|
| 124 | + 'A' => array('style' => 'upper-alpha', 'tag' => 'ol'), |
|
| 125 | + 'i' => array('style' => 'lower-roman', 'tag' => 'ol'), |
|
| 126 | + 'I' => array('style' => 'upper-roman', 'tag' => 'ol') |
|
| 127 | + ); |
|
| 128 | 128 | $body = preg_replace('#(\[[/]*)list(.*?\])#si', "$1\x07$2", $body); |
| 129 | 129 | |
| 130 | 130 | // replace to <li> tags - [*]..[*]|[*]..[/list] |
@@ -139,15 +139,15 @@ discard block |
||
| 139 | 139 | // replace to <ol>/<ul> and </ol>/</ul> tags |
| 140 | 140 | // It will be better to use &count and do-while, if php 5 or higher. |
| 141 | 141 | while (preg_match("#\[\x07[=]*((?-i)[cds1aAiI])*(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#si", $body)) { |
| 142 | - $body = preg_replace("#\[\x07[=]*((?-i)[cds1aAiI])*(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#esi", '"<". $l_type[\'$1\']["tag"] ." class=\"bb-list\" style=\"list-style-type:". $l_type[\'$1\']["style"] .";\">". str_replace(\'\"\', \'"\', \'$2\') ."</". $l_type[\'$1\']["tag"] .">"', $body); |
|
| 142 | + $body = preg_replace("#\[\x07[=]*((?-i)[cds1aAiI])*(?::\w+)?\]([^\x07]*)\[/\x07(?::\w+)?\]#esi", '"<". $l_type[\'$1\']["tag"] ." class=\"bb-list\" style=\"list-style-type:". $l_type[\'$1\']["style"] .";\">". str_replace(\'\"\', \'"\', \'$2\') ."</". $l_type[\'$1\']["tag"] .">"', $body); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | // remove <br /> tags |
| 146 | 146 | $body = preg_replace('#(<[/]*([uo]l|li).*>.*)<br />#i', '$1', $body); |
| 147 | - } // end processing for [list] and [*] |
|
| 147 | + } // end processing for [list] and [*] |
|
| 148 | 148 | |
| 149 | - // Define BBCode tags |
|
| 150 | - $preg = array( |
|
| 149 | + // Define BBCode tags |
|
| 150 | + $preg = array( |
|
| 151 | 151 | // Implement [notag] |
| 152 | 152 | '#\[notag(?::\w+)?\](.*?)\[/notag(?::\w+)?\]#sie' => '_bbcode_notag_tag(\'\\1\')', |
| 153 | 153 | |
@@ -215,36 +215,36 @@ discard block |
||
| 215 | 215 | // Cleanup table output (td, th and tr tags) |
| 216 | 216 | '#<([\/]?)t([dhr])><br />#si' => '<\\1t\\2>', |
| 217 | 217 | '#<table(.+?)><br />#si' => '<table\\1>', |
| 218 | - ); |
|
| 219 | - $body = preg_replace(array_keys($preg), array_values($preg), $body); |
|
| 218 | + ); |
|
| 219 | + $body = preg_replace(array_keys($preg), array_values($preg), $body); |
|
| 220 | 220 | |
| 221 | - // Simple replacements (str_replace is faster than preg_replace) |
|
| 222 | - $str = array( |
|
| 221 | + // Simple replacements (str_replace is faster than preg_replace) |
|
| 222 | + $str = array( |
|
| 223 | 223 | // Horizontal delimiter |
| 224 | 224 | '[hr]' => '<hr class="bb-hr" />', |
| 225 | 225 | // Force line break |
| 226 | 226 | '[br]' => '<br class="bb-br" />', |
| 227 | 227 | // Force space |
| 228 | 228 | '[sp]' => ' ', |
| 229 | - ); |
|
| 230 | - $body = str_replace(array_keys($str), array_values($str), $body); |
|
| 229 | + ); |
|
| 230 | + $body = str_replace(array_keys($str), array_values($str), $body); |
|
| 231 | 231 | |
| 232 | - // We cannot evaluate the variable in callback function because |
|
| 233 | - // there is no way to pass the $format variable |
|
| 234 | - if (variable_get("bbcode_encode_mailto_$format", 1)) { |
|
| 232 | + // We cannot evaluate the variable in callback function because |
|
| 233 | + // there is no way to pass the $format variable |
|
| 234 | + if (variable_get("bbcode_encode_mailto_$format", 1)) { |
|
| 235 | 235 | // Replacing email addresses with encoded html |
| 236 | 236 | $body = preg_replace_callback('#\[email(?::\w+)?\]([\w\.\-\+~@]+)\[/email(?::\w+)?\]#si', '_bbcode_encode_mailto', $body); |
| 237 | 237 | $body = preg_replace_callback('#\[email=(.*?)(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si', '_bbcode_encode_mailto', $body); |
| 238 | - } |
|
| 239 | - else { |
|
| 238 | + } |
|
| 239 | + else { |
|
| 240 | 240 | $body = preg_replace( |
| 241 | - array('#\[email(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si','#\[email=(.*?)(?::\w+)?\]([\w\s]+)\[/email(?::\w+)?\]#si'), |
|
| 242 | - array('<a href="mailto:\\1" class="bb-email">\\1</a>', '<a href="mailto:\\1" class="bb-email">\\2</a>'), |
|
| 243 | - $body); |
|
| 244 | - } |
|
| 241 | + array('#\[email(?::\w+)?\](.*?)\[/email(?::\w+)?\]#si','#\[email=(.*?)(?::\w+)?\]([\w\s]+)\[/email(?::\w+)?\]#si'), |
|
| 242 | + array('<a href="mailto:\\1" class="bb-email">\\1</a>', '<a href="mailto:\\1" class="bb-email">\\2</a>'), |
|
| 243 | + $body); |
|
| 244 | + } |
|
| 245 | 245 | |
| 246 | - // Turns web and e-mail addresses into clickable links |
|
| 247 | - if (variable_get("bbcode_make_links_$format", 1)) { |
|
| 246 | + // Turns web and e-mail addresses into clickable links |
|
| 247 | + if (variable_get("bbcode_make_links_$format", 1)) { |
|
| 248 | 248 | |
| 249 | 249 | // pad with a space so we can match things at the start of the 1st line |
| 250 | 250 | $ret = ' ' . $body; |
@@ -260,109 +260,109 @@ discard block |
||
| 260 | 260 | // Must contain at least 2 dots. xxxx contains either alphanum, or "-" |
| 261 | 261 | // zzzz is optional.. will contain everything up to the first space, newline, |
| 262 | 262 | // comma, double quote or <. |
| 263 | - $ret = preg_replace('#([\t\r\n >\(\[\|])(www|ftp)\.(([\w\-]+\.)*[\w]+(:[0-9]+)?(/[^ \"\'\(\n\r\t<\)\[\]\|]*)?)#i', '\1<a href="http://\2.\3">\2.\3</a>', $ret); |
|
| 263 | + $ret = preg_replace('#([\t\r\n >\(\[\|])(www|ftp)\.(([\w\-]+\.)*[\w]+(:[0-9]+)?(/[^ \"\'\(\n\r\t<\)\[\]\|]*)?)#i', '\1<a href="http://\2.\3">\2.\3</a>', $ret); |
|
| 264 | 264 | |
| 265 | 265 | // matches an email@domain type address at the start of a line, or after a space. |
| 266 | 266 | // Note: Only the followed chars are valid; alphanums, "-", "_" and or ".". |
| 267 | 267 | if (variable_get("bbcode_encode_mailto_$format", 1)) |
| 268 | - $ret = preg_replace_callback("#([\t\r\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", '_bbcode_encode_mailto', $ret); |
|
| 268 | + $ret = preg_replace_callback("#([\t\r\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", '_bbcode_encode_mailto', $ret); |
|
| 269 | 269 | else |
| 270 | - $ret = preg_replace('#([\t\r\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i', '\\1<a href="mailto:\\2@\\3">\\2@\\3</a>', $ret); |
|
| 270 | + $ret = preg_replace('#([\t\r\n ])([a-z0-9\-_.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i', '\\1<a href="mailto:\\2@\\3">\\2@\\3</a>', $ret); |
|
| 271 | 271 | |
| 272 | 272 | // Remove our padding |
| 273 | 273 | $ret = str_replace("\x07", '', $ret); |
| 274 | 274 | $body = substr($ret, 1); |
| 275 | - } |
|
| 275 | + } |
|
| 276 | 276 | |
| 277 | - if (variable_get("bbcode_filter_nofollow_$format", 0)) { |
|
| 277 | + if (variable_get("bbcode_filter_nofollow_$format", 0)) { |
|
| 278 | 278 | $body = preg_replace('#<a([^>]+)>#i', '<a\\1 rel="nofollow">', $body); |
| 279 | - } |
|
| 279 | + } |
|
| 280 | 280 | |
| 281 | - return $body; |
|
| 281 | + return $body; |
|
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | function _bbcode_generate_heading($level, $text) { |
| 285 | - $anchor = preg_replace('/([\s]+)/', '_', $text); |
|
| 286 | - $anchor = preg_replace('/([\W]+)/', '', $anchor); |
|
| 287 | - return '<h'. $level .'><a name="'. $anchor .'">'. $text .'</a></h'. $level .'>'; |
|
| 285 | + $anchor = preg_replace('/([\s]+)/', '_', $text); |
|
| 286 | + $anchor = preg_replace('/([\W]+)/', '', $anchor); |
|
| 287 | + return '<h'. $level .'><a name="'. $anchor .'">'. $text .'</a></h'. $level .'>'; |
|
| 288 | 288 | } |
| 289 | 289 | |
| 290 | 290 | function _bbcode_generate_index($body, $tag = 'ol') { |
| 291 | - $level = 0; |
|
| 292 | - $index = '<'. $tag .">\n"; |
|
| 293 | - $close_tags = 0; |
|
| 291 | + $level = 0; |
|
| 292 | + $index = '<'. $tag .">\n"; |
|
| 293 | + $close_tags = 0; |
|
| 294 | 294 | |
| 295 | - if (preg_match_all('#\[h([1-6]).*?\](.*?)\[/h([1-6]).*?\]#si', $body, $head_tags, PREG_SET_ORDER)) { |
|
| 295 | + if (preg_match_all('#\[h([1-6]).*?\](.*?)\[/h([1-6]).*?\]#si', $body, $head_tags, PREG_SET_ORDER)) { |
|
| 296 | 296 | foreach ($head_tags as $head_tag) { |
| 297 | - if ($level == 0) $level = $head_tag[1]; |
|
| 298 | - $anchor = preg_replace('/([\s]+)/', '_', $head_tag[2]); |
|
| 299 | - $anchor = preg_replace('/([\W]+)/', '', $anchor); |
|
| 297 | + if ($level == 0) $level = $head_tag[1]; |
|
| 298 | + $anchor = preg_replace('/([\s]+)/', '_', $head_tag[2]); |
|
| 299 | + $anchor = preg_replace('/([\W]+)/', '', $anchor); |
|
| 300 | 300 | |
| 301 | - if ($head_tag[1] > $level) { |
|
| 301 | + if ($head_tag[1] > $level) { |
|
| 302 | 302 | $index .= '<'. $tag .">\n"; |
| 303 | 303 | $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n"; |
| 304 | 304 | $close_tags++; |
| 305 | 305 | $level = $head_tag[1]; |
| 306 | - } else if ($head_tag[1] < $level) { |
|
| 306 | + } else if ($head_tag[1] < $level) { |
|
| 307 | 307 | while ($close_tags > 0) { |
| 308 | - $index .= '</'. $tag .">\n"; |
|
| 309 | - $close_tags--; |
|
| 308 | + $index .= '</'. $tag .">\n"; |
|
| 309 | + $close_tags--; |
|
| 310 | 310 | } |
| 311 | 311 | $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n"; |
| 312 | 312 | $level = $head_tag[1]; |
| 313 | - } else { |
|
| 313 | + } else { |
|
| 314 | 314 | $index .= '<li><a href="#'. $anchor .'">'. $head_tag[2] ."</a>\n"; |
| 315 | 315 | $level = $head_tag[1]; |
| 316 | - } |
|
| 316 | + } |
|
| 317 | + } |
|
| 317 | 318 | } |
| 318 | - } |
|
| 319 | - while ($close_tags >= 0) { |
|
| 319 | + while ($close_tags >= 0) { |
|
| 320 | 320 | $index .= '</'. $tag .">\n"; |
| 321 | 321 | $close_tags--; |
| 322 | - } |
|
| 323 | - return $index; |
|
| 322 | + } |
|
| 323 | + return $index; |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | function _bbcode_encode_mailto($matches) { |
| 327 | - if (isset($matches[3])) |
|
| 327 | + if (isset($matches[3])) |
|
| 328 | 328 | $link = 'document.write(\'<a href="mailto:' . $matches[2].'@'.$matches[3] . '">' . $matches[2].'@'.$matches[3] . '</a>\');'; |
| 329 | - else |
|
| 329 | + else |
|
| 330 | 330 | $link = 'document.write(\'<a href="mailto:' . $matches[1] . '" class="bb-email">' . (isset($matches[2]) ? $matches[2] : $matches[1]) . '</a>\');'; |
| 331 | 331 | |
| 332 | - $js_encode = ''; |
|
| 333 | - for ($x = 0; $x < strlen($link); $x++) |
|
| 332 | + $js_encode = ''; |
|
| 333 | + for ($x = 0; $x < strlen($link); $x++) |
|
| 334 | 334 | $js_encode .= '%' . bin2hex($link{$x}); |
| 335 | 335 | |
| 336 | - $link = '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>'; |
|
| 337 | - if (isset($matches[3])) |
|
| 336 | + $link = '<script type="text/javascript">eval(unescape(\''.$js_encode.'\'))</script>'; |
|
| 337 | + if (isset($matches[3])) |
|
| 338 | 338 | $link = $matches[1] . $link; |
| 339 | 339 | |
| 340 | - return $link; |
|
| 340 | + return $link; |
|
| 341 | 341 | } |
| 342 | 342 | |
| 343 | 343 | function _bbcode_notag_tag($text = NULL) { |
| 344 | - return str_replace( array('[', ']', '@'), array('[', ']', '@'), stripslashes($text)); |
|
| 344 | + return str_replace( array('[', ']', '@'), array('[', ']', '@'), stripslashes($text)); |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | function _bbcode_php_tag($text = NULL) { |
| 348 | - return '<pre>'. highlight_string( str_replace('<br />', '', stripslashes($text)), true) .'</pre>'; |
|
| 348 | + return '<pre>'. highlight_string( str_replace('<br />', '', stripslashes($text)), true) .'</pre>'; |
|
| 349 | 349 | } |
| 350 | 350 | |
| 351 | 351 | function _bbcode_round_size_val($size) { |
| 352 | - if ($size < 6) |
|
| 353 | - return 6; |
|
| 354 | - elseif ($size > 48) |
|
| 355 | - return 48; |
|
| 356 | - else |
|
| 357 | - return $size; |
|
| 352 | + if ($size < 6) |
|
| 353 | + return 6; |
|
| 354 | + elseif ($size > 48) |
|
| 355 | + return 48; |
|
| 356 | + else |
|
| 357 | + return $size; |
|
| 358 | 358 | } |
| 359 | 359 | |
| 360 | 360 | function _bbcode_replace_nest_tag($arr = NULL) { |
| 361 | - $text = preg_replace('#(\[[/]*)'. $arr['tag'] .'(.*?\])#si', "$1\x07$2", $arr['text']); |
|
| 362 | - // It will be better to use &count and do-while, if php 5 or higher. |
|
| 363 | - while (preg_match($arr['pattern'], $text)) { |
|
| 361 | + $text = preg_replace('#(\[[/]*)'. $arr['tag'] .'(.*?\])#si', "$1\x07$2", $arr['text']); |
|
| 362 | + // It will be better to use &count and do-while, if php 5 or higher. |
|
| 363 | + while (preg_match($arr['pattern'], $text)) { |
|
| 364 | 364 | $text = preg_replace($arr['pattern'], $arr['replacement'], $text); |
| 365 | - } |
|
| 366 | - return $text; |
|
| 365 | + } |
|
| 366 | + return $text; |
|
| 367 | 367 | } |
| 368 | 368 | |
@@ -9,10 +9,10 @@ |
||
| 9 | 9 | * Implementation of hook_wysiwyg_editor_settings_alter(). |
| 10 | 10 | */ |
| 11 | 11 | function wysiwyg_tweaks_wysiwyg_editor_settings_alter(&$settings, $context) { |
| 12 | - if ($context['profile']->editor == 'tinymce') { |
|
| 12 | + if ($context['profile']->editor == 'tinymce') { |
|
| 13 | 13 | $settings['browser_spellcheck'] = TRUE; |
| 14 | 14 | $settings['gecko_spellcheck'] = TRUE; |
| 15 | 15 | // Any init setting taking a string, boolean, number, or an array/object |
| 16 | 16 | // holding those types can be overridden/forced here. |
| 17 | - } |
|
| 17 | + } |
|
| 18 | 18 | } |