summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2011-06-23 01:37:10 (GMT)
committer sun2011-06-23 01:37:10 (GMT)
commit9d5e7fc0fbb6f568e904775371b8b3cb3378730a (patch)
tree5a1752f8bacbf9a1038ce70836ef69eee52b76f5
parent1da1947bc45bdba1f4fc5d3ff4353cb245e68ff5 (diff)
Issue #1078834 by sun: Fixed coding standards errors.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/fckeditor.inc2
-rw-r--r--editors/nicedit.inc2
-rw-r--r--editors/openwysiwyg.inc2
-rw-r--r--editors/tinymce.inc10
-rw-r--r--editors/whizzywig.inc2
-rw-r--r--editors/wymeditor.inc36
-rw-r--r--editors/yui.inc4
-rw-r--r--wysiwyg.admin.inc6
9 files changed, 33 insertions, 32 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a1a4989..2123950 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
Wysiwyg 7.x-2.x, xxxx-xx-xx
---------------------------
+#1078834 by sun: Fixed coding standards errors.
#1173476 by jim0203, sun: Fixed installation instructions in README.txt.
diff --git a/editors/fckeditor.inc b/editors/fckeditor.inc
index 70954da..fba81f6 100644
--- a/editors/fckeditor.inc
+++ b/editors/fckeditor.inc
@@ -131,7 +131,7 @@ function wysiwyg_fckeditor_settings($editor, $config, $theme) {
if ($config['css_setting'] == 'theme') {
$settings['EditorAreaCSS'] = implode(',', wysiwyg_get_css());
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['EditorAreaCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
diff --git a/editors/nicedit.inc b/editors/nicedit.inc
index 779660c..55404b8 100644
--- a/editors/nicedit.inc
+++ b/editors/nicedit.inc
@@ -82,7 +82,7 @@ function wysiwyg_nicedit_settings($editor, $config, $theme) {
$settings['externalCSS'] = base_path() . $css;
}
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
diff --git a/editors/openwysiwyg.inc b/editors/openwysiwyg.inc
index f521da5..3a4b66c 100644
--- a/editors/openwysiwyg.inc
+++ b/editors/openwysiwyg.inc
@@ -102,7 +102,7 @@ function wysiwyg_openwysiwyg_settings($editor, $config, $theme) {
if ($config['css_setting'] == 'theme') {
$settings['CSSFile'] = reset(wysiwyg_get_css());
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['CSSFile'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index a7250f3..1dba918 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -189,7 +189,7 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
if ($config['css_setting'] == 'theme') {
$settings['content_css'] = implode(',', wysiwyg_get_css());
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['content_css'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
@@ -229,15 +229,15 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
$settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $button)] = 1;
}
// Add external plugins to the list of extensions.
- else if ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
+ elseif ($type == 'buttons' && empty($plugins[$plugin]['internal'])) {
$settings['extensions'][_wysiwyg_tinymce_plugin_name('add', $plugin)] = 1;
}
// Add internal buttons that also need to be loaded as extension.
- else if ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
+ elseif ($type == 'buttons' && !empty($plugins[$plugin]['load'])) {
$settings['extensions'][$plugin] = 1;
}
// Add plain extensions.
- else if ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
+ elseif ($type == 'extensions' && !empty($plugins[$plugin]['load'])) {
$settings['extensions'][$plugin] = 1;
}
// Allow plugins to add valid HTML elements.
@@ -358,7 +358,7 @@ function _wysiwyg_tinymce_plugin_name($op, $name) {
}
return $name;
}
- else if ($op == 'remove') {
+ elseif ($op == 'remove') {
if (strpos($name, '-') === 0) {
return substr($name, 1);
}
diff --git a/editors/whizzywig.inc b/editors/whizzywig.inc
index d82cc0f..96c9ead 100644
--- a/editors/whizzywig.inc
+++ b/editors/whizzywig.inc
@@ -109,7 +109,7 @@ function wysiwyg_whizzywig_settings($editor, $config, $theme) {
$settings['externalCSS'] = base_path() . $css;
}
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['externalCSS'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
diff --git a/editors/wymeditor.inc b/editors/wymeditor.inc
index 3e8ffd2..042bc23 100644
--- a/editors/wymeditor.inc
+++ b/editors/wymeditor.inc
@@ -174,7 +174,7 @@ function wysiwyg_wymeditor_settings($editor, $config, $theme) {
// WYMeditor only supports one CSS file currently.
$settings['stylesheet'] = reset(wysiwyg_get_css());
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['stylesheet'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
}
}
@@ -212,22 +212,22 @@ function wysiwyg_wymeditor_plugins($editor) {
*/
function _wysiwyg_wymeditor_button_info() {
return array(
- 'Bold' => array('title'=> 'Strong', 'css'=> 'wym_tools_strong'),
- 'Italic' => array('title'=> 'Emphasis', 'css'=> 'wym_tools_emphasis'),
- 'Superscript' => array('title'=> 'Superscript', 'css'=> 'wym_tools_superscript'),
- 'Subscript' => array('title'=> 'Subscript', 'css'=> 'wym_tools_subscript'),
- 'InsertOrderedList' => array('title'=> 'Ordered_List', 'css'=> 'wym_tools_ordered_list'),
- 'InsertUnorderedList' => array('title'=> 'Unordered_List', 'css'=> 'wym_tools_unordered_list'),
- 'Indent' => array('title'=> 'Indent', 'css'=> 'wym_tools_indent'),
- 'Outdent' => array('title'=> 'Outdent', 'css'=> 'wym_tools_outdent'),
- 'Undo' => array('title'=> 'Undo', 'css'=> 'wym_tools_undo'),
- 'Redo' => array('title'=> 'Redo', 'css'=> 'wym_tools_redo'),
- 'CreateLink' => array('title'=> 'Link', 'css'=> 'wym_tools_link'),
- 'Unlink' => array('title'=> 'Unlink', 'css'=> 'wym_tools_unlink'),
- 'InsertImage' => array('title'=> 'Image', 'css'=> 'wym_tools_image'),
- 'InsertTable' => array('title'=> 'Table', 'css'=> 'wym_tools_table'),
- 'Paste' => array('title'=> 'Paste_From_Word', 'css'=> 'wym_tools_paste'),
- 'ToggleHtml' => array('title'=> 'HTML', 'css'=> 'wym_tools_html'),
- 'Preview' => array('title'=> 'Preview', 'css'=> 'wym_tools_preview'),
+ 'Bold' => array('title' => 'Strong', 'css' => 'wym_tools_strong'),
+ 'Italic' => array('title' => 'Emphasis', 'css' => 'wym_tools_emphasis'),
+ 'Superscript' => array('title' => 'Superscript', 'css' => 'wym_tools_superscript'),
+ 'Subscript' => array('title' => 'Subscript', 'css' => 'wym_tools_subscript'),
+ 'InsertOrderedList' => array('title' => 'Ordered_List', 'css' => 'wym_tools_ordered_list'),
+ 'InsertUnorderedList' => array('title' => 'Unordered_List', 'css' => 'wym_tools_unordered_list'),
+ 'Indent' => array('title' => 'Indent', 'css' => 'wym_tools_indent'),
+ 'Outdent' => array('title' => 'Outdent', 'css' => 'wym_tools_outdent'),
+ 'Undo' => array('title' => 'Undo', 'css' => 'wym_tools_undo'),
+ 'Redo' => array('title' => 'Redo', 'css' => 'wym_tools_redo'),
+ 'CreateLink' => array('title' => 'Link', 'css' => 'wym_tools_link'),
+ 'Unlink' => array('title' => 'Unlink', 'css' => 'wym_tools_unlink'),
+ 'InsertImage' => array('title' => 'Image', 'css' => 'wym_tools_image'),
+ 'InsertTable' => array('title' => 'Table', 'css' => 'wym_tools_table'),
+ 'Paste' => array('title' => 'Paste_From_Word', 'css' => 'wym_tools_paste'),
+ 'ToggleHtml' => array('title' => 'HTML', 'css' => 'wym_tools_html'),
+ 'Preview' => array('title' => 'Preview', 'css' => 'wym_tools_preview'),
);
}
diff --git a/editors/yui.inc b/editors/yui.inc
index 7e3c697..845a1af 100644
--- a/editors/yui.inc
+++ b/editors/yui.inc
@@ -177,7 +177,7 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
}
}
}
- else if ($button == 'fontname') {
+ elseif ($button == 'fontname') {
$extra = array('menu' => array(
array('text' => 'Arial', 'checked' => TRUE),
array('text' => 'Arial Black'),
@@ -202,7 +202,7 @@ function wysiwyg_yui_settings($editor, $config, $theme) {
if ($config['css_setting'] == 'theme') {
$settings['extracss'] = wysiwyg_get_css();
}
- else if ($config['css_setting'] == 'self' && isset($config['css_path'])) {
+ elseif ($config['css_setting'] == 'self' && isset($config['css_path'])) {
$settings['extracss'] = strtr($config['css_path'], array('%b' => base_path(), '%t' => path_to_theme()));
$settings['extracss'] = explode(',', $settings['extracss']);
}
diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index 510e1e3..d46d1ba 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -135,7 +135,7 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
}
$icon = file_exists($img_src) ? '<img src="' . base_path() . $img_src . '" title="' . $button . '" style="border: 1px solid grey; vertical-align: middle;" />' : '';
}
- $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title);
+ $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : check_plain($title));
$title = (!empty($icon) ? $icon . ' ' . $title : $title);
$form['buttons'][$name][$button] = array(
'#type' => 'checkbox',
@@ -144,11 +144,11 @@ function wysiwyg_profile_form($form, &$form_state, $profile) {
);
}
}
- else if (isset($meta['extensions']) && is_array($meta['extensions'])) {
+ elseif (isset($meta['extensions']) && is_array($meta['extensions'])) {
foreach ($meta['extensions'] as $extension => $title) {
$form['buttons'][$name][$extension] = array(
'#type' => 'checkbox',
- '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title,
+ '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : check_plain($title),
'#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : FALSE,
);
}