geekwright / XoopsCore

xoops_lib/Xoops/Core/Text/Sanitizer/Extensions/XoopsCode.php

Spacing +27 added lines, -27 removed lines

@@ -42,113 +42,113 @@
 
         $shortcodes->addShortcode(
             'siteurl',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
+            function($attributes, $content, $tagName) use ($shortcodes) {
                 $url = ltrim($attributes[0], '=');
                 $url = \Xoops::getInstance()->url($url);
-                $newcontent = '<a href="' .$url. '">' . $shortcodes->process($content) . '</a>';
+                $newcontent = '<a href="'.$url.'">'.$shortcodes->process($content).'</a>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'url',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
+            function($attributes, $content, $tagName) use ($shortcodes) {
                 $url = ltrim($attributes[0], '=');
                 $url = \Xoops::getInstance()->url($url);
-                $newcontent = '<a href="' .$url. '">' . $shortcodes->process($content) . '</a>';
+                $newcontent = '<a href="'.$url.'">'.$shortcodes->process($content).'</a>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'color',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
+            function($attributes, $content, $tagName) use ($shortcodes) {
                 $color = ltrim($attributes[0], '=');
-                $color = preg_match('/^[a-f0-9]{3}$|^[a-f0-9]{6}$/i', $color) ? '#' . $color : $color;
-                $newcontent = '<span style="color: ' .$color. '">' . $shortcodes->process($content) . '</span>';
+                $color = preg_match('/^[a-f0-9]{3}$|^[a-f0-9]{6}$/i', $color) ? '#'.$color : $color;
+                $newcontent = '<span style="color: '.$color.'">'.$shortcodes->process($content).'</span>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'size',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
+            function($attributes, $content, $tagName) use ($shortcodes) {
                 $size = ltrim($attributes[0], '=');
-                $newcontent = '<span style="font-size: ' .$size. '">' . $shortcodes->process($content) . '</span>';
+                $newcontent = '<span style="font-size: '.$size.'">'.$shortcodes->process($content).'</span>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'font',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
+            function($attributes, $content, $tagName) use ($shortcodes) {
                 $font = ltrim($attributes[0], '=');
-                $newcontent = '<span style="font-family: ' .$font. '">' . $shortcodes->process($content) . '</span>';
+                $newcontent = '<span style="font-family: '.$font.'">'.$shortcodes->process($content).'</span>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'email',
-            function ($attributes, $content, $tagName) {
+            function($attributes, $content, $tagName) {
                 $content = trim($content);
-                $newcontent = '<a href="mailto:' . $content . '">' . $content . '</a>';
+                $newcontent = '<a href="mailto:'.$content.'">'.$content.'</a>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'b',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<strong>' . $shortcodes->process($content) . '</strong>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<strong>'.$shortcodes->process($content).'</strong>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'i',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<em>' . $shortcodes->process($content) . '</em>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<em>'.$shortcodes->process($content).'</em>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'u',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<u>' . $shortcodes->process($content) . '</u>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<u>'.$shortcodes->process($content).'</u>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'd',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<del>' . $shortcodes->process($content) . '</del>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<del>'.$shortcodes->process($content).'</del>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'center',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<div style="text-align: center;">' . $shortcodes->process($content) . '</div>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<div style="text-align: center;">'.$shortcodes->process($content).'</div>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'left',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<div style="text-align: left;">' . $shortcodes->process($content) . '</div>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<div style="text-align: left;">'.$shortcodes->process($content).'</div>';
                 return $newcontent;
             }
         );
 
         $shortcodes->addShortcode(
             'right',
-            function ($attributes, $content, $tagName) use ($shortcodes) {
-                $newcontent = '<div style="text-align: right;">' . $shortcodes->process($content) . '</div>';
+            function($attributes, $content, $tagName) use ($shortcodes) {
+                $newcontent = '<div style="text-align: right;">'.$shortcodes->process($content).'</div>';
                 return $newcontent;
             }
         );

xoops_lib/Xoops/Form/DhtmlTextArea.php

Spacing +42 added lines, -43 removed lines

@@ -143,7 +143,7 @@ 
                 }
             } else {
                 list ($class, $path) = $this->htmlEditor;
-                include_once \XoopsBaseConfig::get('root-path') . $path;
+                include_once \XoopsBaseConfig::get('root-path').$path;
                 if (class_exists($class)) {
                     $this->htmlEditor = new $class($options);
                 }
@@ -172,10 +172,10 @@ 
 
         $xoops = \Xoops::getInstance();
 
-        $extra = ($this->getExtra() != '' ? " " . $this->getExtra() : '');
+        $extra = ($this->getExtra() != '' ? " ".$this->getExtra() : '');
         $ret = "";
         // actions
-        $ret .= $this->xoopsCodeControls() . "<br />\n";
+        $ret .= $this->xoopsCodeControls()."<br />\n";
         // fonts
         $ret .= $this->typographyControls();
 
@@ -184,7 +184,7 @@ 
         $this->suppressRender(['value']);
         $attributes = $this->renderAttributeString();
 
-        $ret .= '<textarea ' . $attributes . $extra . '>' . $this->getValue() . "</textarea>\n";
+        $ret .= '<textarea '.$attributes.$extra.'>'.$this->getValue()."</textarea>\n";
 
         if (empty($this->skipPreview)) {
             if (!$xoops->theme()) {
@@ -192,15 +192,15 @@ 
             } else {
                 $xoops->theme()->addScript('media/xoops/image.js', array('type' => 'text/javascript'));
             }
-            $button = "<input id='" . $this->getName() . "_preview_button' " . "type='button' " . "class='btn btn-sm btn-default' value='" . \XoopsLocale::A_PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $this->getName() . "','" . XOOPS_URL . "/images', " . (int)($this->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
-            $ret .= "<br />" . "<div id='" . $this->getName() . "_hidden' style='display: block;'> " . "<fieldset>" . "<legend>" . $button . "</legend>" . "<div id='" . $this->getName() . "_hidden_data'>" . \XoopsLocale::CLICK_PREVIEW_TO_SEE_CONTENT . "</div>" . "</fieldset>" . "</div>";
+            $button = "<input id='".$this->getName()."_preview_button' "."type='button' "."class='btn btn-sm btn-default' value='".\XoopsLocale::A_PREVIEW."' "."onclick=\"form_instantPreview('".XOOPS_URL."', '".$this->getName()."','".XOOPS_URL."/images', ".(int)($this->doHtml).", '".$xoops->security()->createToken()."')\""." />";
+            $ret .= "<br />"."<div id='".$this->getName()."_hidden' style='display: block;'> "."<fieldset>"."<legend>".$button."</legend>"."<div id='".$this->getName()."_hidden_data'>".\XoopsLocale::CLICK_PREVIEW_TO_SEE_CONTENT."</div>"."</fieldset>"."</div>";
         }
         // Load javascript
         if (empty($js_loaded)) {
             $javascript = (($this->js)
-                ? '<script type="text/javascript">' . $this->js . '</script>'
-                : '') . '<script type="text/javascript" src="' . \XoopsBaseConfig::get('url') . '/include/formdhtmltextarea.js"></script>';
-            $ret = $javascript . $ret;
+                ? '<script type="text/javascript">'.$this->js.'</script>'
+                : '').'<script type="text/javascript" src="'.\XoopsBaseConfig::get('url').'/include/formdhtmltextarea.js"></script>';
+            $ret = $javascript.$ret;
             $js_loaded = true;
         }
         return $ret;
@@ -332,63 +332,63 @@ 
 
         $fontStr = '<div class="row"><div class="col-md-12"><div class="btn-group" role="toolbar">';
         $fontStr .= '<div class="btn-group">'
-            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'. \XoopsLocale::SIZE .'"'
+            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'.\XoopsLocale::SIZE.'"'
             . ' data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'
             . '<span class = "glyphicon glyphicon-text-height"></span><span class="caret"></span></button>'
             . '<ul class="dropdown-menu">';
         $localeFontSizes = \XoopsLocale::getFontSizes();
         foreach ($localeFontSizes as $value => $name) {
-            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'size\', \'' . $value . '\', \''
-                . $textarea_id . '\', \'' . $hiddentext . '\');">' . $name . '</a></li>';
+            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'size\', \''.$value.'\', \''
+                . $textarea_id.'\', \''.$hiddentext.'\');">'.$name.'</a></li>';
         }
         $fontStr .= '</ul></div>';
 
         $fontStr .= '<div class="btn-group">'
-            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'. \XoopsLocale::FONT .'"'
+            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'.\XoopsLocale::FONT.'"'
             . ' data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'
             . '<span class = "glyphicon glyphicon-font"></span><span class="caret"></span></button>'
             . '<ul class="dropdown-menu">';
         //. _FONT . '&nbsp;&nbsp;<span class="caret"></span></button><ul class="dropdown-menu">';
         foreach ($fontarray as $font) {
-            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'font\', \'' . $font . '\', \''
-                . $textarea_id . '\', \'' . $hiddentext . '\');">' . $font . '</a></li>';
+            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'font\', \''.$font.'\', \''
+                . $textarea_id.'\', \''.$hiddentext.'\');">'.$font.'</a></li>';
         }
         $fontStr .= '</ul></div>';
 
         $fontStr .= '<div class="btn-group">'
-            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'. \XoopsLocale::COLOR .'"'
+            . '<button type="button" class="btn btn-default btn-sm dropdown-toggle" title="'.\XoopsLocale::COLOR.'"'
             . ' data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'
             . '<span class = "glyphicon glyphicon-text-color"></span><span class="caret"></span></button>'
             . '<ul class="dropdown-menu">';
         //. _COLOR . '&nbsp;&nbsp;<span class="caret"></span></button><ul class="dropdown-menu">';
         foreach ($colorArray as $color => $hex) {
-            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'color\', \'' . $hex . '\', \''
-                . $textarea_id . '\', \'' . $hiddentext . '\');">'
-                . '<span style="color:#' . $hex . ';">' . $color .'</span></a></li>';
+            $fontStr .= '<li><a href="javascript:xoopsSetElementAttribute(\'color\', \''.$hex.'\', \''
+                . $textarea_id.'\', \''.$hiddentext.'\');">'
+                . '<span style="color:#'.$hex.';">'.$color.'</span></a></li>';
         }
         $fontStr .= '</ul></div>';
         $fontStr .= '</div>';
 
         //$styleStr = "<div class='row'><div class='col-md-12'>";
         $styleStr  = "<div class='btn-group' role='group'>";
-        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::BOLD . "' aria-label='Left Align'><span class='fa fa-bold' aria-hidden='true'></span></button>";
-        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::ITALIC . "' aria-label='Left Align'><span class='fa fa-italic' aria-hidden='true'></span></button>";
-        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::UNDERLINE . "' aria-label='Left Align'>" . '<span class="fa fa-underline"></span></button>';
-        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::LINE_THROUGH . "' aria-label='Left Align'>" . '<span class="fa fa-strikethrough"></span></button>';
+        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::BOLD."' aria-label='Left Align'><span class='fa fa-bold' aria-hidden='true'></span></button>";
+        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::ITALIC."' aria-label='Left Align'><span class='fa fa-italic' aria-hidden='true'></span></button>";
+        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::UNDERLINE."' aria-label='Left Align'>".'<span class="fa fa-underline"></span></button>';
+        $styleStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::LINE_THROUGH."' aria-label='Left Align'>".'<span class="fa fa-strikethrough"></span></button>';
         $styleStr .= "</div>";
 
         $alignStr = "<div class='btn-group' role='group'>";
-        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::LEFT . "' aria-label='Left Align'><span class='fa fa-align-left' aria-hidden='true'></span></button>";
-        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::CENTER . "' aria-label='Left Align'><span class='fa fa-align-center' aria-hidden='true'></span></button>";
-        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . \XoopsLocale::RIGHT . "' aria-label='Left Align'><span class='fa fa-align-right' aria-hidden='true'></span></button>";
+        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::LEFT."' aria-label='Left Align'><span class='fa fa-align-left' aria-hidden='true'></span></button>";
+        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::CENTER."' aria-label='Left Align'><span class='fa fa-align-center' aria-hidden='true'></span></button>";
+        $alignStr .= "<button type='button' class='btn btn-default btn-sm' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' title='".\XoopsLocale::RIGHT."' aria-label='Left Align'><span class='fa fa-align-right' aria-hidden='true'></span></button>";
         $alignStr .= "</div>";
 
         $fontStr .= "&nbsp;{$styleStr}&nbsp;{$alignStr}&nbsp;\n";
 
         $fontStr .= "<button type='button' class='btn btn-default btn-sm' onclick=\"XoopsCheckLength('"
-            . $this->getName() . "', '" . @$this->configs['maxlength'] . "', '"
-            . \XoopsLocale::F_CURRENT_TEXT_LENGTH . "', '" . \XoopsLocale::MAXIMUM_LENGTH . "');\" title='"
-            . \XoopsLocale::CHECK_TEXT_LENGTH . "'><span class='fa fa-check-square-o' aria-hidden='true'></span></button>";
+            . $this->getName()."', '".@$this->configs['maxlength']."', '"
+            . \XoopsLocale::F_CURRENT_TEXT_LENGTH."', '".\XoopsLocale::MAXIMUM_LENGTH."');\" title='"
+            . \XoopsLocale::CHECK_TEXT_LENGTH."'><span class='fa fa-check-square-o' aria-hidden='true'></span></button>";
         $fontStr .= "</div></div>";
 
         return $fontStr;
@@ -405,24 +405,23 @@ 
         $hiddentext = $this->hiddenText;
 
         $fontStr = "<script type=\"text/javascript\" language=\"JavaScript\">";
-        $fontStr .= "var _editor_dialog = ''" . "+ '<select class=\"span2\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
-        $fontStr .= "+ '<option value=\'SIZE\'>" . \XoopsLocale::SIZE . "</option>'";
+        $fontStr .= "var _editor_dialog = ''"."+ '<select class=\"span2\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
+        $fontStr .= "+ '<option value=\'SIZE\'>".\XoopsLocale::SIZE."</option>'";
         $localeFontSizes = \XoopsLocale::getFontSizes();
         foreach ($localeFontSizes as $_val => $_name) {
             $fontStr .= " + '<option value=\'{$_val}\'>{$_name}</option>'";
         }
         $fontStr .= " + '</select> '";
         $fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Font\' onchange=\'xoopsSetElementAttribute(\"font\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
-        $fontStr .= "+ '<option value=\'FONT\'>" . \XoopsLocale::FONT . "</option>'";
+        $fontStr .= "+ '<option value=\'FONT\'>".\XoopsLocale::FONT."</option>'";
         $localeFonts = \XoopsLocale::getFonts();
-        $fontarray = !empty($localeFonts) ? $localeFonts :
-            array("Arial", "Courier", "Georgia", "Helvetica", "Impact", "Verdana", "Haettenschweiler");
+        $fontarray = !empty($localeFonts) ? $localeFonts : array("Arial", "Courier", "Georgia", "Helvetica", "Impact", "Verdana", "Haettenschweiler");
         foreach ($fontarray as $font) {
             $fontStr .= " + '<option value=\'{$font}\'>{$font}</option>'";
         }
         $fontStr .= " + '</select> '";
         $fontStr .= "+ '<select class=\"span2\" id=\'{$textarea_id}Color\' onchange=\'xoopsSetElementAttribute(\"color\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'";
-        $fontStr .= "+ '<option value=\'COLOR\'>" . \XoopsLocale::COLOR . "</option>';";
+        $fontStr .= "+ '<option value=\'COLOR\'>".\XoopsLocale::COLOR."</option>';";
         $fontStr .= "var _color_array = new Array('00', '33', '66', '99', 'CC', 'FF');
             for(var i = 0; i < _color_array.length; i ++) {
                 for(var j = 0; j < _color_array.length; j ++) {
@@ -436,15 +435,15 @@ 
 
         $fontStr .= "document.write(_editor_dialog); </script>";
 
-        $styleStr = "<img src='" . \XoopsBaseConfig::get('url') . "/images/bold.gif' alt='" . \XoopsLocale::BOLD . "' title='" . \XoopsLocale::BOLD . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
-        $styleStr .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/italic.gif' alt='" . \XoopsLocale::ITALIC . "' title='" . \XoopsLocale::ITALIC . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
-        $styleStr .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/underline.gif' alt='" . \XoopsLocale::UNDERLINE . "' title='" . \XoopsLocale::UNDERLINE . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");'/>&nbsp;";
-        $styleStr .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/linethrough.gif' alt='" . \XoopsLocale::LINE_THROUGH . "' title='" . \XoopsLocale::LINE_THROUGH . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $styleStr = "<img src='".\XoopsBaseConfig::get('url')."/images/bold.gif' alt='".\XoopsLocale::BOLD."' title='".\XoopsLocale::BOLD."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $styleStr .= "<img src='".\XoopsBaseConfig::get('url')."/images/italic.gif' alt='".\XoopsLocale::ITALIC."' title='".\XoopsLocale::ITALIC."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $styleStr .= "<img src='".\XoopsBaseConfig::get('url')."/images/underline.gif' alt='".\XoopsLocale::UNDERLINE."' title='".\XoopsLocale::UNDERLINE."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");'/>&nbsp;";
+        $styleStr .= "<img src='".\XoopsBaseConfig::get('url')."/images/linethrough.gif' alt='".\XoopsLocale::LINE_THROUGH."' title='".\XoopsLocale::LINE_THROUGH."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
 
-        $alignStr = "<img src='" . \XoopsBaseConfig::get('url') . "/images/alignleft.gif' alt='" . \XoopsLocale::LEFT . "' title='" . \XoopsLocale::LEFT . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
-        $alignStr .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/aligncenter.gif' alt='" . \XoopsLocale::CENTER . "' title='" . \XoopsLocale::CENTER . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
-        $alignStr .= "<img src='" . \XoopsBaseConfig::get('url') . "/images/alignright.gif' alt='" . \XoopsLocale::RIGHT . "' title='" . \XoopsLocale::RIGHT . "' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
-        $fontStr = $fontStr . "<br />\n{$styleStr}&nbsp;{$alignStr}&nbsp;\n";
+        $alignStr = "<img src='".\XoopsBaseConfig::get('url')."/images/alignleft.gif' alt='".\XoopsLocale::LEFT."' title='".\XoopsLocale::LEFT."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $alignStr .= "<img src='".\XoopsBaseConfig::get('url')."/images/aligncenter.gif' alt='".\XoopsLocale::CENTER."' title='".\XoopsLocale::CENTER."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $alignStr .= "<img src='".\XoopsBaseConfig::get('url')."/images/alignright.gif' alt='".\XoopsLocale::RIGHT."' title='".\XoopsLocale::RIGHT."' onmouseover='style.cursor=\"hand\"' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' />&nbsp;";
+        $fontStr = $fontStr."<br />\n{$styleStr}&nbsp;{$alignStr}&nbsp;\n";
         return $fontStr;
     }