@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'title' => 'YUI editor', |
| 14 | 14 | 'vendor url' => 'http://developer.yahoo.com/yui/editor/', |
| 15 | 15 | 'download url' => 'http://developer.yahoo.com/yui/download/', |
| 16 | - 'library path' => wysiwyg_get_path('yui') . '/build', |
|
| 16 | + 'library path' => wysiwyg_get_path('yui').'/build', |
|
| 17 | 17 | 'libraries' => array( |
| 18 | 18 | 'min' => array( |
| 19 | 19 | 'title' => 'Minified', |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | * The installed editor version. |
| 65 | 65 | */ |
| 66 | 66 | function wysiwyg_yui_version($editor) { |
| 67 | - $library = $editor['library path'] . '/editor/editor.js'; |
|
| 67 | + $library = $editor['library path'].'/editor/editor.js'; |
|
| 68 | 68 | if (!file_exists($library)) { |
| 69 | 69 | return; |
| 70 | 70 | } |
@@ -105,11 +105,11 @@ discard block |
||
| 105 | 105 | * The internal library name (array key) to use. |
| 106 | 106 | */ |
| 107 | 107 | function wysiwyg_yui_load($editor, $library) { |
| 108 | - drupal_add_css($editor['library path'] . '/menu/assets/skins/sam/menu.css'); |
|
| 109 | - drupal_add_css($editor['library path'] . '/button/assets/skins/sam/button.css'); |
|
| 110 | - drupal_add_css($editor['library path'] . '/fonts/fonts-min.css'); |
|
| 111 | - drupal_add_css($editor['library path'] . '/container/assets/skins/sam/container.css'); |
|
| 112 | - drupal_add_css($editor['library path'] . '/editor/assets/skins/sam/editor.css'); |
|
| 108 | + drupal_add_css($editor['library path'].'/menu/assets/skins/sam/menu.css'); |
|
| 109 | + drupal_add_css($editor['library path'].'/button/assets/skins/sam/button.css'); |
|
| 110 | + drupal_add_css($editor['library path'].'/fonts/fonts-min.css'); |
|
| 111 | + drupal_add_css($editor['library path'].'/container/assets/skins/sam/container.css'); |
|
| 112 | + drupal_add_css($editor['library path'].'/editor/assets/skins/sam/editor.css'); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | // YUI only supports inline CSS, so we need to use @import directives. |
| 210 | 210 | // Syntax: '@import "/base/path/to/theme/style.css"; ' |
| 211 | 211 | if (!empty($settings['extracss'])) { |
| 212 | - $settings['extracss'] = '@import "' . implode('"; @import "', $settings['extracss']) . '";'; |
|
| 212 | + $settings['extracss'] = '@import "'.implode('"; @import "', $settings['extracss']).'";'; |
|
| 213 | 213 | } |
| 214 | 214 | } |
| 215 | 215 | |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | 'title' => 'openWYSIWYG', |
| 14 | 14 | 'vendor url' => 'http://www.openwebware.com', |
| 15 | 15 | 'download url' => 'http://www.openwebware.com/download.shtml', |
| 16 | - 'library path' => wysiwyg_get_path('openwysiwyg') . '/scripts', |
|
| 16 | + 'library path' => wysiwyg_get_path('openwysiwyg').'/scripts', |
|
| 17 | 17 | 'libraries' => array( |
| 18 | 18 | 'src' => array( |
| 19 | 19 | 'title' => 'Source', |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | */ |
| 46 | 46 | function wysiwyg_openwysiwyg_version($editor) { |
| 47 | 47 | // 'library path' has '/scripts' appended already. |
| 48 | - $changelog = $editor['editor path'] . '/changelog'; |
|
| 48 | + $changelog = $editor['editor path'].'/changelog'; |
|
| 49 | 49 | if (!file_exists($changelog)) { |
| 50 | 50 | return; |
| 51 | 51 | } |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | */ |
| 91 | 91 | function wysiwyg_openwysiwyg_settings($editor, $config, $theme) { |
| 92 | 92 | $settings = array( |
| 93 | - 'path' => base_path() . $editor['editor path'] . '/', |
|
| 93 | + 'path' => base_path().$editor['editor path'].'/', |
|
| 94 | 94 | 'Width' => '100%', |
| 95 | 95 | ); |
| 96 | 96 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * The installed editor version. |
| 48 | 48 | */ |
| 49 | 49 | function wysiwyg_whizzywig_version($editor) { |
| 50 | - $script = $editor['library path'] . '/whizzywig.js'; |
|
| 50 | + $script = $editor['library path'].'/whizzywig.js'; |
|
| 51 | 51 | if (!file_exists($script)) { |
| 52 | 52 | return; |
| 53 | 53 | } |
@@ -80,15 +80,15 @@ discard block |
||
| 80 | 80 | $settings = array(); |
| 81 | 81 | |
| 82 | 82 | // Add path to button images, if available. |
| 83 | - if (is_dir($editor['library path'] . '/btn')) { |
|
| 84 | - $settings['buttonPath'] = base_path() . $editor['library path'] . '/btn/'; |
|
| 83 | + if (is_dir($editor['library path'].'/btn')) { |
|
| 84 | + $settings['buttonPath'] = base_path().$editor['library path'].'/btn/'; |
|
| 85 | 85 | } |
| 86 | - if (file_exists($editor['library path'] . '/WhizzywigToolbar.png')) { |
|
| 87 | - $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/WhizzywigToolbar.png'; |
|
| 86 | + if (file_exists($editor['library path'].'/WhizzywigToolbar.png')) { |
|
| 87 | + $settings['toolbarImagePath'] = base_path().$editor['library path'].'/WhizzywigToolbar.png'; |
|
| 88 | 88 | } |
| 89 | 89 | // Filename changed in version 60. |
| 90 | - elseif (file_exists($editor['library path'] . '/icons.png')) { |
|
| 91 | - $settings['toolbarImagePath'] = base_path() . $editor['library path'] . '/icons.png'; |
|
| 90 | + elseif (file_exists($editor['library path'].'/icons.png')) { |
|
| 91 | + $settings['toolbarImagePath'] = base_path().$editor['library path'].'/icons.png'; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | // Add configured buttons or all available. |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | // Add editor content stylesheet. |
| 105 | 105 | if (isset($config['css_setting'])) { |
| 106 | 106 | if ($config['css_setting'] == 'theme') { |
| 107 | - $css = path_to_theme() . '/style.css'; |
|
| 107 | + $css = path_to_theme().'/style.css'; |
|
| 108 | 108 | if (file_exists($css)) { |
| 109 | - $settings['externalCSS'] = base_path() . $css; |
|
| 109 | + $settings['externalCSS'] = base_path().$css; |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | else if ($config['css_setting'] == 'self' && isset($config['css_path'])) { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | function wysiwyg_nicedit_settings($editor, $config, $theme) { |
| 63 | 63 | $settings = array( |
| 64 | - 'iconsPath' => base_path() . $editor['library path'] . '/nicEditorIcons.gif', |
|
| 64 | + 'iconsPath' => base_path().$editor['library path'].'/nicEditorIcons.gif', |
|
| 65 | 65 | ); |
| 66 | 66 | |
| 67 | 67 | // Add configured buttons or all available. |
@@ -77,9 +77,9 @@ discard block |
||
| 77 | 77 | // Add editor content stylesheet. |
| 78 | 78 | if (isset($config['css_setting'])) { |
| 79 | 79 | if ($config['css_setting'] == 'theme') { |
| 80 | - $css = path_to_theme() . '/style.css'; |
|
| 80 | + $css = path_to_theme().'/style.css'; |
|
| 81 | 81 | if (file_exists($css)) { |
| 82 | - $settings['externalCSS'] = base_path() . $css; |
|
| 82 | + $settings['externalCSS'] = base_path().$css; |
|
| 83 | 83 | } |
| 84 | 84 | } |
| 85 | 85 | else if ($config['css_setting'] == 'self' && isset($config['css_path'])) { |
@@ -15,7 +15,7 @@ discard block |
||
| 15 | 15 | 'title' => 'TinyMCE', |
| 16 | 16 | 'vendor url' => 'http://tinymce.moxiecode.com', |
| 17 | 17 | 'download url' => 'http://tinymce.moxiecode.com/download.php', |
| 18 | - 'library path' => wysiwyg_get_path('tinymce') . '/jscripts/tiny_mce', |
|
| 18 | + 'library path' => wysiwyg_get_path('tinymce').'/jscripts/tiny_mce', |
|
| 19 | 19 | 'libraries' => array( |
| 20 | 20 | '' => array( |
| 21 | 21 | 'title' => 'Minified', |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * The installed editor version. |
| 81 | 81 | */ |
| 82 | 82 | function wysiwyg_tinymce_version($editor) { |
| 83 | - $script = $editor['library path'] . '/tiny_mce.js'; |
|
| 83 | + $script = $editor['library path'].'/tiny_mce.js'; |
|
| 84 | 84 | if (!file_exists($script)) { |
| 85 | 85 | return; |
| 86 | 86 | } |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | // 2.x: this.majorVersion="2";this.minorVersion="1.3" |
| 92 | 92 | // 3.x: majorVersion:'3',minorVersion:'2.0.1' |
| 93 | 93 | if (preg_match('@majorVersion[=:]["\'](\d).+?minorVersion[=:]["\']([\d\.]+)@', $line, $version)) { |
| 94 | - return $version[1] . '.' . $version[2]; |
|
| 94 | + return $version[1].'.'.$version[2]; |
|
| 95 | 95 | } |
| 96 | 96 | } |
| 97 | 97 | |
@@ -178,7 +178,7 @@ discard block |
||
| 178 | 178 | $settings['remove_linebreaks'] = $config['remove_linebreaks']; |
| 179 | 179 | } |
| 180 | 180 | if (isset($config['verify_html'])) { |
| 181 | - $settings['verify_html'] = (bool) $config['verify_html']; |
|
| 181 | + $settings['verify_html'] = (bool)$config['verify_html']; |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | if (!empty($config['css_classes'])) { |
@@ -324,7 +324,7 @@ discard block |
||
| 324 | 324 | $plugin['filename'] = array_pop($parts); |
| 325 | 325 | $plugin['path'] = implode('/', $parts); |
| 326 | 326 | } |
| 327 | - $settings[$name] = base_path() . $plugin['path'] . '/' . $plugin['filename']; |
|
| 327 | + $settings[$name] = base_path().$plugin['path'].'/'.$plugin['filename']; |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | } |
@@ -340,11 +340,11 @@ discard block |
||
| 340 | 340 | // Populate required plugin settings. |
| 341 | 341 | $settings[$name] = $plugin['dialog settings'] + array( |
| 342 | 342 | 'title' => $plugin['title'], |
| 343 | - 'icon' => base_path() . $plugin['icon path'] . '/' . $plugin['icon file'], |
|
| 343 | + 'icon' => base_path().$plugin['icon path'].'/'.$plugin['icon file'], |
|
| 344 | 344 | 'iconTitle' => $plugin['icon title'], |
| 345 | 345 | ); |
| 346 | 346 | if (isset($plugin['css file'])) { |
| 347 | - $settings[$name]['css'] = base_path() . $plugin['css path'] . '/' . $plugin['css file']; |
|
| 347 | + $settings[$name]['css'] = base_path().$plugin['css path'].'/'.$plugin['css file']; |
|
| 348 | 348 | } |
| 349 | 349 | } |
| 350 | 350 | return $settings; |
@@ -364,7 +364,7 @@ discard block |
||
| 364 | 364 | function _wysiwyg_tinymce_plugin_name($op, $name) { |
| 365 | 365 | if ($op == 'add') { |
| 366 | 366 | if (strpos($name, '-') !== 0) { |
| 367 | - return '-' . $name; |
|
| 367 | + return '-'.$name; |
|
| 368 | 368 | } |
| 369 | 369 | return $name; |
| 370 | 370 | } |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | function wysiwyg_tinymce_plugins($editor) { |
| 383 | 383 | $plugins = array( |
| 384 | 384 | 'default' => array( |
| 385 | - 'path' => $editor['library path'] . '/themes/advanced', |
|
| 385 | + 'path' => $editor['library path'].'/themes/advanced', |
|
| 386 | 386 | 'buttons' => array( |
| 387 | 387 | 'bold' => t('Bold'), 'italic' => t('Italic'), 'underline' => t('Underline'), |
| 388 | 388 | 'strikethrough' => t('Strike-through'), |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | 'internal' => TRUE, |
| 407 | 407 | ), |
| 408 | 408 | 'advhr' => array( |
| 409 | - 'path' => $editor['library path'] . '/plugins/advhr', |
|
| 409 | + 'path' => $editor['library path'].'/plugins/advhr', |
|
| 410 | 410 | 'buttons' => array('advhr' => t('Advanced horizontal rule')), |
| 411 | 411 | 'extended_valid_elements' => array('hr[class|width|size|noshade]'), |
| 412 | 412 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr', |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | 'load' => TRUE, |
| 415 | 415 | ), |
| 416 | 416 | 'advimage' => array( |
| 417 | - 'path' => $editor['library path'] . '/plugins/advimage', |
|
| 417 | + 'path' => $editor['library path'].'/plugins/advimage', |
|
| 418 | 418 | 'extensions' => array('advimage' => t('Advanced image')), |
| 419 | 419 | 'extended_valid_elements' => array('img[src|alt|title|align|width|height|usemap|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'), |
| 420 | 420 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage', |
@@ -422,7 +422,7 @@ discard block |
||
| 422 | 422 | 'load' => TRUE, |
| 423 | 423 | ), |
| 424 | 424 | 'advlink' => array( |
| 425 | - 'path' => $editor['library path'] . '/plugins/advlink', |
|
| 425 | + 'path' => $editor['library path'].'/plugins/advlink', |
|
| 426 | 426 | 'extensions' => array('advlink' => t('Advanced link')), |
| 427 | 427 | 'extended_valid_elements' => array('a[name|href|target|title|class|onfocus|onblur|onclick|ondlbclick|onmousedown|onmouseup|onmouseover|onmouseout|onkeypress|onkeydown|onkeyup|id|style|rel]'), |
| 428 | 428 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink', |
@@ -430,49 +430,49 @@ discard block |
||
| 430 | 430 | 'load' => TRUE, |
| 431 | 431 | ), |
| 432 | 432 | 'autosave' => array( |
| 433 | - 'path' => $editor['library path'] . '/plugins/autosave', |
|
| 433 | + 'path' => $editor['library path'].'/plugins/autosave', |
|
| 434 | 434 | 'extensions' => array('autosave' => t('Auto save')), |
| 435 | 435 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave', |
| 436 | 436 | 'internal' => TRUE, |
| 437 | 437 | 'load' => TRUE, |
| 438 | 438 | ), |
| 439 | 439 | 'contextmenu' => array( |
| 440 | - 'path' => $editor['library path'] . '/plugins/contextmenu', |
|
| 440 | + 'path' => $editor['library path'].'/plugins/contextmenu', |
|
| 441 | 441 | 'extensions' => array('contextmenu' => t('Context menu')), |
| 442 | 442 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu', |
| 443 | 443 | 'internal' => TRUE, |
| 444 | 444 | 'load' => TRUE, |
| 445 | 445 | ), |
| 446 | 446 | 'directionality' => array( |
| 447 | - 'path' => $editor['library path'] . '/plugins/directionality', |
|
| 447 | + 'path' => $editor['library path'].'/plugins/directionality', |
|
| 448 | 448 | 'buttons' => array('ltr' => t('Left-to-right'), 'rtl' => t('Right-to-left')), |
| 449 | 449 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality', |
| 450 | 450 | 'internal' => TRUE, |
| 451 | 451 | 'load' => TRUE, |
| 452 | 452 | ), |
| 453 | 453 | 'emotions' => array( |
| 454 | - 'path' => $editor['library path'] . '/plugins/emotions', |
|
| 454 | + 'path' => $editor['library path'].'/plugins/emotions', |
|
| 455 | 455 | 'buttons' => array('emotions' => t('Emotions')), |
| 456 | 456 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions', |
| 457 | 457 | 'internal' => TRUE, |
| 458 | 458 | 'load' => TRUE, |
| 459 | 459 | ), |
| 460 | 460 | 'font' => array( |
| 461 | - 'path' => $editor['library path'] . '/plugins/font', |
|
| 461 | + 'path' => $editor['library path'].'/plugins/font', |
|
| 462 | 462 | 'buttons' => array('formatselect' => t('HTML block format'), 'fontselect' => t('Font'), 'fontsizeselect' => t('Font size'), 'styleselect' => t('Font style')), |
| 463 | 463 | 'extended_valid_elements' => array('font[face|size|color|style],span[class|align|style]'), |
| 464 | 464 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/font', |
| 465 | 465 | 'internal' => TRUE, |
| 466 | 466 | ), |
| 467 | 467 | 'fullscreen' => array( |
| 468 | - 'path' => $editor['library path'] . '/plugins/fullscreen', |
|
| 468 | + 'path' => $editor['library path'].'/plugins/fullscreen', |
|
| 469 | 469 | 'buttons' => array('fullscreen' => t('Fullscreen')), |
| 470 | 470 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen', |
| 471 | 471 | 'internal' => TRUE, |
| 472 | 472 | 'load' => TRUE, |
| 473 | 473 | ), |
| 474 | 474 | 'inlinepopups' => array( |
| 475 | - 'path' => $editor['library path'] . '/plugins/inlinepopups', |
|
| 475 | + 'path' => $editor['library path'].'/plugins/inlinepopups', |
|
| 476 | 476 | 'extensions' => array('inlinepopups' => t('Inline popups')), |
| 477 | 477 | 'options' => array( |
| 478 | 478 | 'dialog_type' => array('modal'), |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | 'load' => TRUE, |
| 483 | 483 | ), |
| 484 | 484 | 'insertdatetime' => array( |
| 485 | - 'path' => $editor['library path'] . '/plugins/insertdatetime', |
|
| 485 | + 'path' => $editor['library path'].'/plugins/insertdatetime', |
|
| 486 | 486 | 'buttons' => array('insertdate' => t('Insert date'), 'inserttime' => t('Insert time')), |
| 487 | 487 | 'options' => array( |
| 488 | 488 | 'plugin_insertdate_dateFormat' => '%Y-%m-%d', |
@@ -493,49 +493,49 @@ discard block |
||
| 493 | 493 | 'load' => TRUE, |
| 494 | 494 | ), |
| 495 | 495 | 'layer' => array( |
| 496 | - 'path' => $editor['library path'] . '/plugins/layer', |
|
| 496 | + 'path' => $editor['library path'].'/plugins/layer', |
|
| 497 | 497 | 'buttons' => array('insertlayer' => t('Insert layer'), 'moveforward' => t('Move forward'), 'movebackward' => t('Move backward'), 'absolute' => t('Absolute')), |
| 498 | 498 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer', |
| 499 | 499 | 'internal' => TRUE, |
| 500 | 500 | 'load' => TRUE, |
| 501 | 501 | ), |
| 502 | 502 | 'paste' => array( |
| 503 | - 'path' => $editor['library path'] . '/plugins/paste', |
|
| 503 | + 'path' => $editor['library path'].'/plugins/paste', |
|
| 504 | 504 | 'buttons' => array('pastetext' => t('Paste text'), 'pasteword' => t('Paste from Word'), 'selectall' => t('Select all')), |
| 505 | 505 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste', |
| 506 | 506 | 'internal' => TRUE, |
| 507 | 507 | 'load' => TRUE, |
| 508 | 508 | ), |
| 509 | 509 | 'preview' => array( |
| 510 | - 'path' => $editor['library path'] . '/plugins/preview', |
|
| 510 | + 'path' => $editor['library path'].'/plugins/preview', |
|
| 511 | 511 | 'buttons' => array('preview' => t('Preview')), |
| 512 | 512 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview', |
| 513 | 513 | 'internal' => TRUE, |
| 514 | 514 | 'load' => TRUE, |
| 515 | 515 | ), |
| 516 | 516 | 'print' => array( |
| 517 | - 'path' => $editor['library path'] . '/plugins/print', |
|
| 517 | + 'path' => $editor['library path'].'/plugins/print', |
|
| 518 | 518 | 'buttons' => array('print' => t('Print')), |
| 519 | 519 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print', |
| 520 | 520 | 'internal' => TRUE, |
| 521 | 521 | 'load' => TRUE, |
| 522 | 522 | ), |
| 523 | 523 | 'searchreplace' => array( |
| 524 | - 'path' => $editor['library path'] . '/plugins/searchreplace', |
|
| 524 | + 'path' => $editor['library path'].'/plugins/searchreplace', |
|
| 525 | 525 | 'buttons' => array('search' => t('Search'), 'replace' => t('Replace')), |
| 526 | 526 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace', |
| 527 | 527 | 'internal' => TRUE, |
| 528 | 528 | 'load' => TRUE, |
| 529 | 529 | ), |
| 530 | 530 | 'style' => array( |
| 531 | - 'path' => $editor['library path'] . '/plugins/style', |
|
| 531 | + 'path' => $editor['library path'].'/plugins/style', |
|
| 532 | 532 | 'buttons' => array('styleprops' => t('Style properties')), |
| 533 | 533 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style', |
| 534 | 534 | 'internal' => TRUE, |
| 535 | 535 | 'load' => TRUE, |
| 536 | 536 | ), |
| 537 | 537 | 'table' => array( |
| 538 | - 'path' => $editor['library path'] . '/plugins/table', |
|
| 538 | + 'path' => $editor['library path'].'/plugins/table', |
|
| 539 | 539 | 'buttons' => array('tablecontrols' => t('Table')), |
| 540 | 540 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table', |
| 541 | 541 | 'internal' => TRUE, |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | ); |
| 545 | 545 | if (version_compare($editor['installed version'], '3', '<')) { |
| 546 | 546 | $plugins['flash'] = array( |
| 547 | - 'path' => $editor['library path'] . '/plugins/flash', |
|
| 547 | + 'path' => $editor['library path'].'/plugins/flash', |
|
| 548 | 548 | 'buttons' => array('flash' => t('Flash')), |
| 549 | 549 | 'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]'), |
| 550 | 550 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/flash', |
@@ -554,14 +554,14 @@ discard block |
||
| 554 | 554 | } |
| 555 | 555 | if (version_compare($editor['installed version'], '2.0.6', '>')) { |
| 556 | 556 | $plugins['media'] = array( |
| 557 | - 'path' => $editor['library path'] . '/plugins/media', |
|
| 557 | + 'path' => $editor['library path'].'/plugins/media', |
|
| 558 | 558 | 'buttons' => array('media' => t('Media')), |
| 559 | 559 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media', |
| 560 | 560 | 'internal' => TRUE, |
| 561 | 561 | 'load' => TRUE, |
| 562 | 562 | ); |
| 563 | 563 | $plugins['xhtmlxtras'] = array( |
| 564 | - 'path' => $editor['library path'] . '/plugins/xhtmlxtras', |
|
| 564 | + 'path' => $editor['library path'].'/plugins/xhtmlxtras', |
|
| 565 | 565 | 'buttons' => array('cite' => t('Citation'), 'del' => t('Deleted'), 'abbr' => t('Abbreviation'), 'acronym' => t('Acronym'), 'ins' => t('Inserted'), 'attribs' => t('HTML attributes')), |
| 566 | 566 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras', |
| 567 | 567 | 'internal' => TRUE, |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | } |
| 571 | 571 | if (version_compare($editor['installed version'], '3', '>')) { |
| 572 | 572 | $plugins['bbcode'] = array( |
| 573 | - 'path' => $editor['library path'] . '/plugins/bbcode', |
|
| 573 | + 'path' => $editor['library path'].'/plugins/bbcode', |
|
| 574 | 574 | 'extensions' => array('bbcode' => t('BBCode')), |
| 575 | 575 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode', |
| 576 | 576 | 'internal' => TRUE, |
@@ -578,7 +578,7 @@ discard block |
||
| 578 | 578 | ); |
| 579 | 579 | if (version_compare($editor['installed version'], '3.3', '<')) { |
| 580 | 580 | $plugins['safari'] = array( |
| 581 | - 'path' => $editor['library path'] . '/plugins/safari', |
|
| 581 | + 'path' => $editor['library path'].'/plugins/safari', |
|
| 582 | 582 | 'extensions' => array('safari' => t('Safari compatibility')), |
| 583 | 583 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari', |
| 584 | 584 | 'internal' => TRUE, |
@@ -588,7 +588,7 @@ discard block |
||
| 588 | 588 | } |
| 589 | 589 | if (version_compare($editor['installed version'], '3.2.5', '>=')) { |
| 590 | 590 | $plugins['autoresize'] = array( |
| 591 | - 'path' => $editor['library path'] . '/plugins/autoresize', |
|
| 591 | + 'path' => $editor['library path'].'/plugins/autoresize', |
|
| 592 | 592 | 'extensions' => array('autoresize' => t('Auto resize')), |
| 593 | 593 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize', |
| 594 | 594 | 'internal' => TRUE, |
@@ -597,7 +597,7 @@ discard block |
||
| 597 | 597 | } |
| 598 | 598 | if (version_compare($editor['installed version'], '3.3', '>=')) { |
| 599 | 599 | $plugins['advlist'] = array( |
| 600 | - 'path' => $editor['library path'] . '/plugins/advlist', |
|
| 600 | + 'path' => $editor['library path'].'/plugins/advlist', |
|
| 601 | 601 | 'extensions' => array('advlist' => t('Advanced list')), |
| 602 | 602 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist', |
| 603 | 603 | 'internal' => TRUE, |
@@ -606,7 +606,7 @@ discard block |
||
| 606 | 606 | } |
| 607 | 607 | if (version_compare($editor['installed version'], '3.2.6', '>=')) { |
| 608 | 608 | $plugins['wordcount'] = array( |
| 609 | - 'path' => $editor['library path'] . '/plugins/wordcount', |
|
| 609 | + 'path' => $editor['library path'].'/plugins/wordcount', |
|
| 610 | 610 | 'extensions' => array('wordcount' => t('Word count')), |
| 611 | 611 | 'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount', |
| 612 | 612 | 'internal' => TRUE, |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | function wysiwyg_help($path, $arg) { |
| 81 | 81 | switch ($path) { |
| 82 | 82 | case 'admin/settings/wysiwyg': |
| 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>'; |
|
| 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 | 84 | return $output; |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -179,9 +179,9 @@ discard block |
||
| 179 | 179 | if ($profile) { |
| 180 | 180 | $loaded = TRUE; |
| 181 | 181 | $editor = $profile->editor; |
| 182 | - $status = (int) wysiwyg_user_get_status($profile); |
|
| 182 | + $status = (int)wysiwyg_user_get_status($profile); |
|
| 183 | 183 | if (isset($profile->settings['show_toggle'])) { |
| 184 | - $toggle = (int) $profile->settings['show_toggle']; |
|
| 184 | + $toggle = (int)$profile->settings['show_toggle']; |
|
| 185 | 185 | } |
| 186 | 186 | // Check editor theme (and reset it if not/no longer available). |
| 187 | 187 | $theme = wysiwyg_get_editor_themes($profile, (isset($profile->settings['theme']) ? $profile->settings['theme'] : '')); |
@@ -195,7 +195,7 @@ discard block |
||
| 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 . '">'; |
|
| 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 | 199 | $element['format']['guidelines']['#suffix'] = '</div>'; |
| 200 | 200 | // Edge-case: Default format contains no input filters. |
| 201 | 201 | if (empty($element['format']['guidelines']['#value'])) { |
@@ -203,8 +203,8 @@ discard block |
||
| 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 | |
@@ -283,10 +283,10 @@ discard block |
||
| 283 | 283 | foreach ($files as $file => $options) { |
| 284 | 284 | if (is_array($options)) { |
| 285 | 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']); |
|
| 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 | 291 | } |
| 292 | 292 | // If editor defines an additional load callback, invoke it. |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | $files = $editor['js files']; |
| 301 | 301 | } |
| 302 | 302 | foreach ($files as $file) { |
| 303 | - drupal_add_js($editor['js path'] . '/' . $file); |
|
| 303 | + drupal_add_js($editor['js path'].'/'.$file); |
|
| 304 | 304 | } |
| 305 | 305 | // Load CSS stylesheets for this editor. |
| 306 | 306 | $files = array(); |
@@ -308,7 +308,7 @@ discard block |
||
| 308 | 308 | $files = $editor['css files']; |
| 309 | 309 | } |
| 310 | 310 | foreach ($files as $file) { |
| 311 | - drupal_add_css($editor['css path'] . '/' . $file); |
|
| 311 | + drupal_add_css($editor['css path'].'/'.$file); |
|
| 312 | 312 | } |
| 313 | 313 | |
| 314 | 314 | drupal_add_js(array('wysiwyg' => array( |
@@ -316,7 +316,7 @@ discard block |
||
| 316 | 316 | // @todo Move into (global) editor settings. |
| 317 | 317 | // If JS compression is enabled, at least TinyMCE is unable to determine |
| 318 | 318 | // its own base path and exec mode since it can't find the script name. |
| 319 | - 'editorBasePath' => base_path() . $editor['library path'], |
|
| 319 | + 'editorBasePath' => base_path().$editor['library path'], |
|
| 320 | 320 | 'execMode' => $library, |
| 321 | 321 | ))), |
| 322 | 322 | )), 'setting'); |
@@ -340,11 +340,11 @@ discard block |
||
| 340 | 340 | $path = drupal_get_path('module', 'wysiwyg'); |
| 341 | 341 | // Initialize our namespaces in the *header* to do not force editor |
| 342 | 342 | // integration scripts to check and define Drupal.wysiwyg on its own. |
| 343 | - drupal_add_js($path . '/wysiwyg.init.js', 'core'); |
|
| 343 | + drupal_add_js($path.'/wysiwyg.init.js', 'core'); |
|
| 344 | 344 | |
| 345 | 345 | // The 'none' editor is a special editor implementation, allowing us to |
| 346 | 346 | // attach and detach regular Drupal behaviors just like any other editor. |
| 347 | - drupal_add_js($path . '/editors/js/none.js'); |
|
| 347 | + drupal_add_js($path.'/editors/js/none.js'); |
|
| 348 | 348 | |
| 349 | 349 | // Add wysiwyg.js to the footer to ensure it's executed after the |
| 350 | 350 | // Drupal.settings array has been rendered and populated. Also, since editor |
@@ -352,7 +352,7 @@ discard block |
||
| 352 | 352 | // and Drupal.wysiwygInit() must be executed AFTER editors registered |
| 353 | 353 | // their callbacks and BEFORE Drupal.behaviors are applied, this must come |
| 354 | 354 | // last. |
| 355 | - drupal_add_js($path . '/wysiwyg.js', 'module', 'footer'); |
|
| 355 | + drupal_add_js($path.'/wysiwyg.js', 'module', 'footer'); |
|
| 356 | 356 | |
| 357 | 357 | $settings_added = TRUE; |
| 358 | 358 | } |
@@ -371,7 +371,7 @@ discard block |
||
| 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 | } |
@@ -448,7 +448,7 @@ discard block |
||
| 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 | |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | if (!isset($processed_plugins[$proxy][$plugin])) { |
| 464 | 464 | $profile_plugins_drupal[$plugin] = $processed_plugins[$proxy][$plugin] = $meta; |
| 465 | 465 | // Load the Drupal plugin's JavaScript. |
| 466 | - drupal_add_js($meta['js path'] . '/' . $meta['js file']); |
|
| 466 | + drupal_add_js($meta['js path'].'/'.$meta['js file']); |
|
| 467 | 467 | // Add plugin-specific settings. |
| 468 | 468 | if (isset($meta['settings'])) { |
| 469 | 469 | drupal_add_js(array('wysiwyg' => array('plugins' => array('drupal' => array($plugin => $meta['settings'])))), 'setting'); |
@@ -479,7 +479,7 @@ discard block |
||
| 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 | } |
@@ -596,7 +596,7 @@ discard block |
||
| 596 | 596 | if ($media != 'print') { |
| 597 | 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 | } |
@@ -719,7 +719,7 @@ discard block |
||
| 719 | 719 | db_query("INSERT INTO {wysiwyg_user} (uid, format, status) VALUES (%d, %d, %d)", array( |
| 720 | 720 | $account->uid, |
| 721 | 721 | $format, |
| 722 | - (int) (bool) $status, |
|
| 722 | + (int)(bool)$status, |
|
| 723 | 723 | )); |
| 724 | 724 | } |
| 725 | 725 | } |
@@ -750,7 +750,7 @@ discard block |
||
| 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 | /** |
@@ -802,8 +802,8 @@ discard block |
||
| 802 | 802 | 'plugin callback' => NULL, |
| 803 | 803 | 'plugin settings callback' => NULL, |
| 804 | 804 | 'versions' => array(), |
| 805 | - 'js path' => $editors[$editor]['path'] . '/js', |
|
| 806 | - 'css path' => $editors[$editor]['path'] . '/css', |
|
| 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']))) { |
@@ -855,12 +855,12 @@ discard block |
||
| 855 | 855 | $plugin += array( |
| 856 | 856 | 'title' => $plugin['name'], |
| 857 | 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', |
|
| 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 | 864 | 'dialog path' => $plugin['name'], |
| 865 | 865 | 'dialog settings' => array(), |
| 866 | 866 | 'settings callback' => NULL, |
@@ -868,10 +868,10 @@ discard block |
||
| 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 | - if (!($plugin['installed'] = file_exists($plugin['js path'] . '/' . $plugin['js file']))) { |
|
| 874 | + if (!($plugin['installed'] = file_exists($plugin['js path'].'/'.$plugin['js file']))) { |
|
| 875 | 875 | continue; |
| 876 | 876 | } |
| 877 | 877 | } |
@@ -893,18 +893,18 @@ discard block |
||
| 893 | 893 | function wysiwyg_load_includes($type = 'editors', $hook = 'editor', $file = NULL) { |
| 894 | 894 | // Determine implementations. |
| 895 | 895 | $directories = wysiwyg_get_directories($type); |
| 896 | - $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg') . '/' . $type; |
|
| 896 | + $directories['wysiwyg'] = drupal_get_path('module', 'wysiwyg').'/'.$type; |
|
| 897 | 897 | $file_list = array(); |
| 898 | 898 | foreach ($directories as $module => $path) { |
| 899 | - $file_list[$module] = drupal_system_listing("$file" . '.inc$', $path, 'name', 0); |
|
| 899 | + $file_list[$module] = drupal_system_listing("$file".'.inc$', $path, 'name', 0); |
|
| 900 | 900 | } |
| 901 | 901 | |
| 902 | 902 | // Load implementations. |
| 903 | 903 | $info = array(); |
| 904 | 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); |
|
| 906 | + include_once './'.$file->filename; |
|
| 907 | + $result = _wysiwyg_process_include($module, $module.'_'.$file->name, dirname($file->filename), $hook); |
|
| 908 | 908 | if (is_array($result)) { |
| 909 | 909 | $info = array_merge($info, $result); |
| 910 | 910 | } |
@@ -934,7 +934,7 @@ discard block |
||
| 934 | 934 | } |
| 935 | 935 | if (!isset($libraries[$library])) { |
| 936 | 936 | // Most often, external libraries can be shared across multiple sites. |
| 937 | - return 'sites/all/libraries/' . $library; |
|
| 937 | + return 'sites/all/libraries/'.$library; |
|
| 938 | 938 | } |
| 939 | 939 | |
| 940 | 940 | $path = ($base_path ? base_path() : ''); |
@@ -984,7 +984,7 @@ discard block |
||
| 984 | 984 | } |
| 985 | 985 | |
| 986 | 986 | // Always search sites/all/*. |
| 987 | - $searchdir[] = 'sites/all/' . $directory; |
|
| 987 | + $searchdir[] = 'sites/all/'.$directory; |
|
| 988 | 988 | |
| 989 | 989 | // Also search sites/<domain>/*. |
| 990 | 990 | if (file_exists("$config/$directory")) { |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 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 | 1033 | } |
| 1034 | 1034 | return $directories; |
@@ -1045,7 +1045,7 @@ 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; |
|
| 1048 | + $function = $identifier.'_'.$hook; |
|
| 1049 | 1049 | if (!function_exists($function)) { |
| 1050 | 1050 | return NULL; |
| 1051 | 1051 | } |
@@ -13,7 +13,7 @@ |
||
| 13 | 13 | if (!isset($plugins[$plugin])) { |
| 14 | 14 | return drupal_access_denied(); |
| 15 | 15 | } |
| 16 | - $callback = $plugin . '_wysiwyg_dialog'; |
|
| 16 | + $callback = $plugin.'_wysiwyg_dialog'; |
|
| 17 | 17 | if (!function_exists($callback)) { |
| 18 | 18 | return drupal_not_found(); |
| 19 | 19 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | 'url' => 'http://drupal.org/project/img_assist', |
| 46 | 46 | // The full path to the native editor plugin, no trailing slash. |
| 47 | 47 | // Ignored when 'internal' is set to TRUE below. |
| 48 | - 'path' => drupal_get_path('module', 'img_assist') . '/drupalimage', |
|
| 48 | + 'path' => drupal_get_path('module', 'img_assist').'/drupalimage', |
|
| 49 | 49 | // The name of the plugin's main JavaScript file. |
| 50 | 50 | // Ignored when 'internal' is set to TRUE below. |
| 51 | 51 | // Default value depends on which editor the plugin is for. |
@@ -150,13 +150,13 @@ discard block |
||
| 150 | 150 | 'icon title' => t('Do something'), |
| 151 | 151 | // An alternative path to the integration JavaScript; defaults to |
| 152 | 152 | // '[path-to-module]/[plugins-directory]/[plugin-name]'. |
| 153 | - 'js path' => drupal_get_path('module', 'mymodule') . '/awesomeness', |
|
| 153 | + 'js path' => drupal_get_path('module', 'mymodule').'/awesomeness', |
|
| 154 | 154 | // An alternative filename of the integration JavaScript; defaults to |
| 155 | 155 | // '[plugin-name].js'. |
| 156 | 156 | 'js file' => 'awesome.js', |
| 157 | 157 | // An alternative path to the integration stylesheet; defaults to |
| 158 | 158 | // '[path-to-module]/[plugins-directory]/[plugin-name]'. |
| 159 | - 'css path' => drupal_get_path('module', 'mymodule') . '/awesomeness', |
|
| 159 | + 'css path' => drupal_get_path('module', 'mymodule').'/awesomeness', |
|
| 160 | 160 | // An alternative filename of the integration stylesheet; defaults to |
| 161 | 161 | // '[plugin-name].css'. |
| 162 | 162 | 'css file' => 'awesome.css', |
@@ -18,13 +18,13 @@ discard block |
||
| 18 | 18 | $links['mark-read']['title'] = t('Mark all topics read'); |
| 19 | 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 | 24 | $links['mark-read']['title'] = t('Mark all forums read'); |
| 25 | 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 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | drupal_set_message(t('All content in this forum has been marked as read')); |
| 65 | - drupal_goto('community/forum/' . $current_forum_id); |
|
| 65 | + drupal_goto('community/forum/'.$current_forum_id); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // We are on the forum overview, requesting all forums be marked read |