XOOPS / XoopsCore25

htdocs/class/xoopsform/tableform.php

Spacing +8 added lines, -8 removed lines

@@ -42,25 +42,25 @@
      */
     public function render()
     {
-        $ret    = $this->getTitle() . NWLINE . '<form name="' . $this->getName() . '" id="' . $this->getName() . '" action="' . $this->getAction() . '" method="' . $this->getMethod() . '"' . $this->getExtra() . '>' . NWLINE . '<table border="0" width="100%">' . NWLINE;
+        $ret    = $this->getTitle().NWLINE.'<form name="'.$this->getName().'" id="'.$this->getName().'" action="'.$this->getAction().'" method="'.$this->getMethod().'"'.$this->getExtra().'>'.NWLINE.'<table border="0" width="100%">'.NWLINE;
         $hidden = '';
         foreach ($this->getElements() as $ele) {
             if (!$ele->isHidden()) {
                 if (!$ele->getNocolspan()) {
-                    $ret .= '<tr valign="top" align="left"><td>' . $ele->getCaption();
+                    $ret .= '<tr valign="top" align="left"><td>'.$ele->getCaption();
                     if ($ele_desc = $ele->getDescription()) {
-                        $ret .= '<br><br><span style="font-weight: normal;">' . $ele_desc . '</span>';
+                        $ret .= '<br><br><span style="font-weight: normal;">'.$ele_desc.'</span>';
                     }
-                    $ret .= '</td><td>' . $ele->render() . '</td></tr>';
+                    $ret .= '</td><td>'.$ele->render().'</td></tr>';
                 } else {
-                    $ret .= '<tr valign="top" align="left"><td colspan="2">' . $ele->getCaption();
-                    $ret .= '</td></tr><tr valign="top" align="left"><td>' . $ele->render() . '</td></tr>';
+                    $ret .= '<tr valign="top" align="left"><td colspan="2">'.$ele->getCaption();
+                    $ret .= '</td></tr><tr valign="top" align="left"><td>'.$ele->render().'</td></tr>';
                 }
             } else {
-                $hidden .= $ele->render() . NWLINE;
+                $hidden .= $ele->render().NWLINE;
             }
         }
-        $ret .= '</table>' . NWLINE . ' ' . $hidden . '</form>' . NWLINE;
+        $ret .= '</table>'.NWLINE.' '.$hidden.'</form>'.NWLINE;
 
         return $ret;
     }

htdocs/class/xoopsform/formdatetime.php

Spacing +6 added lines, -6 removed lines

@@ -46,7 +46,7 @@ 
     public function __construct($caption, $name, $size = 15, $value = 0, $showtime = true)
     {
         parent::__construct($caption, ' ');
-        switch ((int) $showtime) {
+        switch ((int)$showtime) {
             case static::SHOW_DATE:
                 $displayDate = true;
                 $displayTime = false;
@@ -64,12 +64,12 @@ 
         $value    = ($value > 0) ? $value : time();
         $datetime = getdate($value);
         if ($displayDate) {
-            $this->addElement(new XoopsFormTextDateSelect('', $name . '[date]', $size, $value));
+            $this->addElement(new XoopsFormTextDateSelect('', $name.'[date]', $size, $value));
         } else {
             $value = !is_numeric($value) ? time() : (int)$value;
             $value = ($value == 0) ? time() : $value;
             $displayValue = date(_SHORTDATESTRING, $value);
-            $this->addElement(new XoopsFormHidden($name . '[date]', $displayValue));
+            $this->addElement(new XoopsFormHidden($name.'[date]', $displayValue));
         }
 
         if ($displayTime) {
@@ -77,16 +77,16 @@ 
             for ($i = 0; $i < 24; ++$i) {
                 for ($j = 0; $j < 60; $j += 10) {
                     $key = ($i * 3600) + ($j * 60);
-                    $timearray[$key] = ($j != 0) ? $i . ':' . $j : $i . ':0' . $j;
+                    $timearray[$key] = ($j != 0) ? $i.':'.$j : $i.':0'.$j;
                 }
             }
             ksort($timearray);
 
-            $timeselect = new XoopsFormSelect('', $name . '[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
+            $timeselect = new XoopsFormSelect('', $name.'[time]', $datetime['hours'] * 3600 + 600 * ceil($datetime['minutes'] / 10));
             $timeselect->addOptionArray($timearray);
             $this->addElement($timeselect);
         } else {
-            $this->addElement(new XoopsFormHidden($name . '[time]', 0));
+            $this->addElement(new XoopsFormHidden($name.'[time]', 0));
         }
     }
 }

htdocs/class/xoopsform/formcheckbox.php

Spacing +1 added lines, -1 removed lines

@@ -203,7 +203,7 @@
             $eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
             $eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
 
-            return NWLINE . "var hasChecked = false; var checkBox = myform.elements['{$eltname}']; if (checkBox.length) {for (var i = 0; i < checkBox.length; i++) {if (checkBox[i].checked == true) {hasChecked = true; break;}}} else {if (checkBox.checked == true) {hasChecked = true;}}if (!hasChecked) {window.alert(\"{$eltmsg}\");if (checkBox.length) {checkBox[0].focus();} else {checkBox.focus();}return false;}";
+            return NWLINE."var hasChecked = false; var checkBox = myform.elements['{$eltname}']; if (checkBox.length) {for (var i = 0; i < checkBox.length; i++) {if (checkBox[i].checked == true) {hasChecked = true; break;}}} else {if (checkBox.checked == true) {hasChecked = true;}}if (!hasChecked) {window.alert(\"{$eltmsg}\");if (checkBox.length) {checkBox[0].focus();} else {checkBox.focus();}return false;}";
         }
 
         return '';

htdocs/class/xoopsform/form.php

Spacing +11 added lines, -11 removed lines

@@ -167,7 +167,7 @@ 
                     @$var['func'] = $this->getArrayID($value, $key, $var['func'], $hashinfo);
                 }
 
-                @$this->_objid = md5($var['name'] . ':' . $var['func'] . ':' . $var['value']);
+                @$this->_objid = md5($var['name'].':'.$var['func'].':'.$var['value']);
 
                 return $this->_objid;
                 break;
@@ -186,7 +186,7 @@ 
                     @$var['func'] = $this->getArrayID($value, $key, $var['func'], $hashinfo);
                 }
 
-                @$this->_objid = sha1($var['name'] . ':' . $var['func'] . ':' . $var['value']);
+                @$this->_objid = sha1($var['name'].':'.$var['func'].':'.$var['value']);
 
                 return $this->_objid;
 
@@ -207,10 +207,10 @@ 
             case 'md5':
                 if (is_array($value)) {
                     foreach ($value as $keyb => $valueb) {
-                        @$ret = md5($ret . ':' . $this->getArrayID($valueb, $keyb, $ret, $hashinfo));
+                        @$ret = md5($ret.':'.$this->getArrayID($valueb, $keyb, $ret, $hashinfo));
                     }
                 } else {
-                    @$ret = md5($ret . ':' . $key . ':' . $value);
+                    @$ret = md5($ret.':'.$key.':'.$value);
                 }
 
                 return $ret;
@@ -218,10 +218,10 @@ 
             default:
                 if (is_array($value)) {
                     foreach ($value as $keyb => $valueb) {
-                        @$ret = sha1($ret . ':' . $this->getArrayID($valueb, $keyb, $ret, $hashinfo));
+                        @$ret = sha1($ret.':'.$this->getArrayID($valueb, $keyb, $ret, $hashinfo));
                     }
                 } else {
-                    @$ret = sha1($ret . ':' . $key . ':' . $value);
+                    @$ret = sha1($ret.':'.$key.':'.$value);
                 }
 
                 return $ret;
@@ -372,7 +372,7 @@ 
      */
     public function &getElementByName($name)
     {
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         $count    = count($elements);
         for ($i = 0; $i < $count; ++$i) {
             if ($name == $elements[$i]->getName(false)) {
@@ -488,7 +488,7 @@ 
      */
     public function &getExtra()
     {
-        $extra = empty($this->_extra) ? '' : ' ' . implode(' ', $this->_extra);
+        $extra = empty($this->_extra) ? '' : ' '.implode(' ', $this->_extra);
 
         return $extra;
     }
@@ -576,7 +576,7 @@ 
         }
         $formname = $this->getName();
         $js .= "function xoopsFormValidate_{$formname}() { var myform = window.document.{$formname}; ";
-        $elements =& $this->getElements(true);
+        $elements = & $this->getElements(true);
         foreach ($elements as $elt) {
             if (method_exists($elt, 'renderValidationJS')) {
                 $js .= $elt->renderValidationJS();
@@ -601,7 +601,7 @@ 
         $i        = -1;
         $elements = array();
         if (count($this->getRequired()) > 0) {
-            $this->_elements[] = "<tr class='foot'><td colspan='2'>* = " . _REQUIRED . '</td></tr>';
+            $this->_elements[] = "<tr class='foot'><td colspan='2'>* = "._REQUIRED.'</td></tr>';
         }
         foreach ($this->getElements() as $ele) {
             ++$i;
@@ -627,7 +627,7 @@ 
             'name'       => $this->getName(),
             'action'     => $this->getAction(),
             'method'     => $this->getMethod(),
-            'extra'      => 'onsubmit="return xoopsFormValidate_' . $this->getName() . '();"' . $this->getExtra(),
+            'extra'      => 'onsubmit="return xoopsFormValidate_'.$this->getName().'();"'.$this->getExtra(),
             'javascript' => $js,
             'elements'   => $elements,
             'rendered'   => $this->render(),

htdocs/class/xoopsform/formdhtmltextarea.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
                 }
             } else {
                 list($class, $path) = $this->htmlEditor;
-                include_once XOOPS_ROOT_PATH . $path;
+                include_once XOOPS_ROOT_PATH.$path;
                 if (class_exists($class)) {
                     $this->htmlEditor = new $class($options);
                 }

htdocs/class/xoopsform/formselect.php

Spacing +1 added lines, -1 removed lines

@@ -219,7 +219,7 @@
             $eltmsg     = empty($eltcaption) ? sprintf(_FORM_ENTER, $eltname) : sprintf(_FORM_ENTER, $eltcaption);
             $eltmsg     = str_replace('"', '\"', stripslashes($eltmsg));
 
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};" . "for (i = 0; i < selectBox.options.length; i++) { if (selectBox.options[i].selected == true && selectBox.options[i].value != '') { hasSelected = true; break; } }" . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"."for (i = 0; i < selectBox.options.length; i++) { if (selectBox.options[i].selected == true && selectBox.options[i].value != '') { hasSelected = true; break; } }"."if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
         }
 
         return '';

htdocs/class/xoopsform/formselecteditor.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
         $editor_handler->allowed_editors = $this->allowed_editors;
         $option_select                   = new XoopsFormSelect('', $this->name, $this->value);
         $extra                           = 'onchange="if (this.options[this.selectedIndex].value.length > 0) {
-            window.document.forms.' . $this->form->getName() . '.submit();
+            window.document.forms.' . $this->form->getName().'.submit();
             }"';
         $option_select->setExtra($extra);
         $option_select->addOptionArray($editor_handler->getList($this->nohtml));

htdocs/class/xoopsform/simpleform.php

Spacing +3 added lines, -3 removed lines

@@ -36,12 +36,12 @@
      */
     public function render()
     {
-        $ret = $this->getTitle() . "\n<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n";
+        $ret = $this->getTitle()."\n<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n";
         foreach ($this->getElements() as $ele) {
             if (!$ele->isHidden()) {
-                $ret .= '<strong>' . $ele->getCaption() . '</strong><br>' . $ele->render() . "<br>\n";
+                $ret .= '<strong>'.$ele->getCaption().'</strong><br>'.$ele->render()."<br>\n";
             } else {
-                $ret .= $ele->render() . "\n";
+                $ret .= $ele->render()."\n";
             }
         }
         $ret .= "</form>\n";

htdocs/class/xoopsform/renderer/XoopsFormRendererLegacy.php

Spacing +126 added lines, -126 removed lines

@@ -30,9 +30,9 @@ 
      */
     public function renderFormButton(XoopsFormButton $element)
     {
-        return "<input type='" . $element->getType() . "' class='formButton' name='" . $element->getName()
-            . "'  id='" . $element->getName() . "' value='" . $element->getValue() . "' title='"
-            . $element->getValue() . "'" . $element->getExtra() . ' />';
+        return "<input type='".$element->getType()."' class='formButton' name='".$element->getName()
+            . "'  id='".$element->getName()."' value='".$element->getValue()."' title='"
+            . $element->getValue()."'".$element->getExtra().' />';
     }
 
     /**
@@ -46,13 +46,13 @@ 
     {
         $ret = '';
         if ($element->_showDelete) {
-            $ret .= '<input type="submit" class="formbutton" name="delete" id="delete" value="' . _DELETE
+            $ret .= '<input type="submit" class="formbutton" name="delete" id="delete" value="'._DELETE
                 . '" onclick="this.form.elements.op.value=\'delete\'">&nbsp;';
         }
-        $ret .= '<input type="button" value="' . _CANCEL . '" onClick="history.go(-1);return true;" />&nbsp;'
-            . '<input type="reset" class="formbutton"  name="reset"  id="reset" value="' . _RESET . '" />&nbsp;'
-            . '<input type="' . $element->getType() . '" class="formbutton"  name="' . $element->getName()
-            . '" id="' . $element->getName() . '" value="' . $element->getValue() . '"' . $element->getExtra()
+        $ret .= '<input type="button" value="'._CANCEL.'" onClick="history.go(-1);return true;" />&nbsp;'
+            . '<input type="reset" class="formbutton"  name="reset"  id="reset" value="'._RESET.'" />&nbsp;'
+            . '<input type="'.$element->getType().'" class="formbutton"  name="'.$element->getName()
+            . '" id="'.$element->getName().'" value="'.$element->getValue().'"'.$element->getExtra()
             . ' />';
 
         return $ret;
@@ -97,14 +97,14 @@ 
                 $ret .= '<td>';
             }
             // $name may be a link, should we use $name in the title tag?
-            $ret .= '<input type="checkbox" name="' . $ele_name . '" id="' . $ele_id .$id_ele . '" '
-                . ' title="' . $ele_title . '" value="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+            $ret .= '<input type="checkbox" name="'.$ele_name.'" id="'.$ele_id.$id_ele.'" '
+                . ' title="'.$ele_title.'" value="'.htmlspecialchars($value, ENT_QUOTES).'"';
 
             if (count($ele_value) > 0 && in_array($value, $ele_value)) {
                 $ret .= ' checked';
             }
-            $ret .= $ele_extra . ' />' . '<label name="xolb_' . $ele_name . '" for="'
-            . $ele_id . $id_ele . '" >' . $name . '</label>' . $ele_delimiter;
+            $ret .= $ele_extra.' />'.'<label name="xolb_'.$ele_name.'" for="'
+            . $ele_id.$id_ele.'" >'.$name.'</label>'.$ele_delimiter;
 
 
             if (!empty($element->columns)) {
@@ -116,7 +116,7 @@ 
         }
         if (!empty($element->columns)) {
             if ($span = $i % $element->columns) {
-                $ret .= '<td colspan="' . ($element->columns - $span) . '"></td></tr>';
+                $ret .= '<td colspan="'.($element->columns - $span).'"></td></tr>';
             }
             $ret .= '</table>';
         }
@@ -138,12 +138,12 @@ 
             $GLOBALS['xoTheme']->addScript('include/spectrum.js');
             $GLOBALS['xoTheme']->addStylesheet('include/spectrum.css');
         } else {
-            echo '<script type="text/javascript" src="' . XOOPS_URL . '/include/spectrum.js"></script>';
-            echo '<link rel="stylesheet" type="text/css" href="' . XOOPS_URL . '/include/spectrum.css">';
+            echo '<script type="text/javascript" src="'.XOOPS_URL.'/include/spectrum.js"></script>';
+            echo '<link rel="stylesheet" type="text/css" href="'.XOOPS_URL.'/include/spectrum.css">';
         }
-        return "<input type='color' name='" . $element->getName() . "' title='" . $element->getTitle()
-            . "' id='" . $element->getName() . "' size='" . $element->getSize() . "' maxlength='"
-            . $element->getMaxlength() . "' value='" . $element->getValue() . "'" . $element->getExtra()
+        return "<input type='color' name='".$element->getName()."' title='".$element->getTitle()
+            . "' id='".$element->getName()."' size='".$element->getSize()."' maxlength='"
+            . $element->getMaxlength()."' value='".$element->getValue()."'".$element->getExtra()
             . ' />';
     }
 
@@ -161,29 +161,29 @@ 
         xoops_loadLanguage('formdhtmltextarea');
         $ret = '';
         // actions
-        $ret .= $this->renderFormDhtmlTAXoopsCode($element) . "<br>\n";
+        $ret .= $this->renderFormDhtmlTAXoopsCode($element)."<br>\n";
         // fonts
         $ret .= $this->renderFormDhtmlTATypography($element);
         // length checker
-        $ret .= "<button type='button' class='btn btn-default' onclick=\"XoopsCheckLength('" . $element->getName() . "', '" . @$element->configs['maxlength'] . "', '" . _XOOPS_FORM_ALT_LENGTH . "', '" . _XOOPS_FORM_ALT_LENGTH_MAX . "');\" title='" . _XOOPS_FORM_ALT_CHECKLENGTH . "'><span class='fa fa-check-square-o' aria-hidden='true'></span></button>&nbsp;";
+        $ret .= "<button type='button' class='btn btn-default' onclick=\"XoopsCheckLength('".$element->getName()."', '".@$element->configs['maxlength']."', '"._XOOPS_FORM_ALT_LENGTH."', '"._XOOPS_FORM_ALT_LENGTH_MAX."');\" title='"._XOOPS_FORM_ALT_CHECKLENGTH."'><span class='fa fa-check-square-o' aria-hidden='true'></span></button>&nbsp;";
         $ret .= "<br>\n";
         // the textarea box
-        $ret .= "<textarea id='" . $element->getName() . "' name='" . $element->getName() . "' title='" . $element->getTitle() . "' onselect=\"xoopsSavePosition('" . $element->getName() . "');\" onclick=\"xoopsSavePosition('" . $element->getName() . "');\" onkeyup=\"xoopsSavePosition('" . $element->getName() . "');\" cols='" . $element->getCols() . "' rows='" . $element->getRows() . "'" . $element->getExtra() . '>' . $element->getValue() . "</textarea><br>\n";
+        $ret .= "<textarea id='".$element->getName()."' name='".$element->getName()."' title='".$element->getTitle()."' onselect=\"xoopsSavePosition('".$element->getName()."');\" onclick=\"xoopsSavePosition('".$element->getName()."');\" onkeyup=\"xoopsSavePosition('".$element->getName()."');\" cols='".$element->getCols()."' rows='".$element->getRows()."'".$element->getExtra().'>'.$element->getValue()."</textarea><br>\n";
 
         if (empty($element->skipPreview)) {
             if (empty($GLOBALS['xoTheme'])) {
-                $element->js .= implode('', file(XOOPS_ROOT_PATH . '/class/textsanitizer/image/image.js'));
+                $element->js .= implode('', file(XOOPS_ROOT_PATH.'/class/textsanitizer/image/image.js'));
             } else {
                 $GLOBALS['xoTheme']->addScript('/class/textsanitizer/image/image.js', array('type' => 'text/javascript'));
             }
-            $button = "<button type='button' class='btn btn-primary' onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $element->getName() . "','" . XOOPS_URL . "/images', " . (int)$element->doHtml . ", '" . $GLOBALS['xoopsSecurity']->createToken() . "')\" title='" . _PREVIEW . "'>" . _PREVIEW . "</button>";
+            $button = "<button type='button' class='btn btn-primary' onclick=\"form_instantPreview('".XOOPS_URL."', '".$element->getName()."','".XOOPS_URL."/images', ".(int)$element->doHtml.", '".$GLOBALS['xoopsSecurity']->createToken()."')\" title='"._PREVIEW."'>"._PREVIEW."</button>";
 
-            $ret .= '<br>' . "<div id='" . $element->getName() . "_hidden' style='display: block;'> " . '   <fieldset>' . '       <legend>' . $button . '</legend>' . "       <div id='" . $element->getName() . "_hidden_data'>" . _XOOPS_FORM_PREVIEW_CONTENT . '</div>' . '   </fieldset>' . '</div>';
+            $ret .= '<br>'."<div id='".$element->getName()."_hidden' style='display: block;'> ".'   <fieldset>'.'       <legend>'.$button.'</legend>'."       <div id='".$element->getName()."_hidden_data'>"._XOOPS_FORM_PREVIEW_CONTENT.'</div>'.'   </fieldset>'.'</div>';
         }
         // Load javascript
         if (empty($js_loaded)) {
-            $javascript = ($element->js ? '<script type="text/javascript">' . $element->js . '</script>' : '') . '<script type="text/javascript" src="' . XOOPS_URL . '/include/formdhtmltextarea.js"></script>';
-            $ret        = $javascript . $ret;
+            $javascript = ($element->js ? '<script type="text/javascript">'.$element->js.'</script>' : '').'<script type="text/javascript" src="'.XOOPS_URL.'/include/formdhtmltextarea.js"></script>';
+            $ret        = $javascript.$ret;
             $js_loaded  = true;
         }
 
@@ -202,13 +202,13 @@ 
         $textarea_id = $element->getName();
         $code = '';
         $code .= '<a name="moresmiley"></a>';
-        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_URL . "'><span class='fa fa-fw fa-link' aria-hidden='true'></span></button>";
-        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTEREMAIL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_EMAIL . "'><span class='fa fa-fw fa-envelope-o' aria-hidden='true'></span></button>";
-        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeImg(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERIMGURL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(_IMGPOSRORL, ENT_QUOTES) . "\", \"" . htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES) . "\", \"" . htmlspecialchars(_XOOPS_FORM_ALT_ENTERWIDTH, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_IMG . "'><span class='fa fa-fw fa-file-image-o' aria-hidden='true'></span></button>";
-        $code .= "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"" . XOOPS_URL . "/imagemanager.php?target={$textarea_id}\",\"imgmanager\",400,430);' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_IMAGE . "'><span class='fa fa-file-image-o' aria-hidden='true'></span><span style='font-size:75%;'> Manager</span></button>";
-        $code .= "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"" . XOOPS_URL . "/misc.php?action=showpopups&amp;type=smilies&amp;target={$textarea_id}\",\"smilies\",300,475);' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_SMILEY . "'><span class='fa fa-fw fa-smile-o' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeUrl(\"{$textarea_id}\", \"".htmlspecialchars(_ENTERURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_URL."'><span class='fa fa-fw fa-link' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeEmail(\"{$textarea_id}\", \"".htmlspecialchars(_ENTEREMAIL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERWEBTITLE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_EMAIL."'><span class='fa fa-fw fa-envelope-o' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeImg(\"{$textarea_id}\", \"".htmlspecialchars(_ENTERIMGURL, ENT_QUOTES)."\", \"".htmlspecialchars(_ENTERIMGPOS, ENT_QUOTES)."\", \"".htmlspecialchars(_IMGPOSRORL, ENT_QUOTES)."\", \"".htmlspecialchars(_ERRORIMGPOS, ENT_QUOTES)."\", \"".htmlspecialchars(_XOOPS_FORM_ALT_ENTERWIDTH, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_IMG."'><span class='fa fa-fw fa-file-image-o' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"".XOOPS_URL."/imagemanager.php?target={$textarea_id}\",\"imgmanager\",400,430);' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_IMAGE."'><span class='fa fa-file-image-o' aria-hidden='true'></span><span style='font-size:75%;'> Manager</span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"".XOOPS_URL."/misc.php?action=showpopups&amp;type=smilies&amp;target={$textarea_id}\",\"smilies\",300,475);' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_SMILEY."'><span class='fa fa-fw fa-smile-o' aria-hidden='true'></span></button>";
 
-        $myts        = MyTextSanitizer::getInstance();
+        $myts = MyTextSanitizer::getInstance();
 
         $extensions = array_filter($myts->config['extensions']);
         foreach (array_keys($extensions) as $key) {
@@ -222,8 +222,8 @@ 
                 $element->js .= $js;
             }
         }
-        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeCode(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERCODE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_CODE . "'><span class='fa fa-fw fa-code' aria-hidden='true'></span></button>";
-        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"" . htmlspecialchars(_ENTERQUOTE, ENT_QUOTES) . "\");' onmouseover='style.cursor=\"hand\"' title='" . _XOOPS_FORM_ALT_QUOTE . "'><span class='fa fa-fw fa-quote-right' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeCode(\"{$textarea_id}\", \"".htmlspecialchars(_ENTERCODE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_CODE."'><span class='fa fa-fw fa-code' aria-hidden='true'></span></button>";
+        $code .= "<button type='button' class='btn btn-default' onclick='xoopsCodeQuote(\"{$textarea_id}\", \"".htmlspecialchars(_ENTERQUOTE, ENT_QUOTES)."\");' onmouseover='style.cursor=\"hand\"' title='"._XOOPS_FORM_ALT_QUOTE."'><span class='fa fa-fw fa-quote-right' aria-hidden='true'></span></button>";
 
         $xoopsPreload = XoopsPreload::getInstance();
         $xoopsPreload->triggerEvent('core.class.xoopsform.formdhtmltextarea.codeicon', array(&$code));
@@ -242,13 +242,13 @@ 
     {
         $textarea_id = $element->getName();
         $hiddentext  = $element->_hiddenText;
-        $fontStr = "<script type=\"text/javascript\">" . "var _editor_dialog = ''" . "+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'" . "+ '<option value=\'SIZE\'>" . _SIZE . "</option>'";
+        $fontStr = "<script type=\"text/javascript\">"."var _editor_dialog = ''"."+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Size\' onchange=\'xoopsSetElementAttribute(\"size\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'"."+ '<option value=\'SIZE\'>"._SIZE."</option>'";
 
         foreach ($GLOBALS['formtextdhtml_sizes'] as $_val => $_name) {
             $fontStr .= " + '<option value=\'{$_val}\'>{$_name}</option>'";
         }
         $fontStr .= " + '</select> '";
-        $fontStr .= "+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Font\' onchange=\'xoopsSetElementAttribute(\"font\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'" . "+ '<option value=\'FONT\'>" . _FONT . "</option>'";
+        $fontStr .= "+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Font\' onchange=\'xoopsSetElementAttribute(\"font\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'"."+ '<option value=\'FONT\'>"._FONT."</option>'";
         $fontarray = !empty($GLOBALS['formtextdhtml_fonts']) ? $GLOBALS['formtextdhtml_fonts'] : array(
             'Arial',
             'Courier',
@@ -261,7 +261,7 @@ 
             $fontStr .= " + '<option value=\'{$font}\'>{$font}</option>'";
         }
         $fontStr .= " + '</select> '";
-        $fontStr .= "+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Color\' onchange=\'xoopsSetElementAttribute(\"color\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'" . "+ '<option value=\'COLOR\'>" . _COLOR . "</option>';" . "var _color_array = new Array('00', '33', '66', '99', 'CC', 'FF');
+        $fontStr .= "+ '<select class=\"input-sm form-control\" id=\'{$textarea_id}Color\' onchange=\'xoopsSetElementAttribute(\"color\", this.options[this.selectedIndex].value, \"{$textarea_id}\", \"{$hiddentext}\");\'>'"."+ '<option value=\'COLOR\'>"._COLOR."</option>';"."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 ++) {
                         for (var k = 0; k < _color_array.length; k ++) {
@@ -274,14 +274,14 @@ 
         $fontStr .= ";";
         $fontStr .= 'document.write(_editor_dialog); </script>';
 
-        $styleStr  = "<button type='button' class='btn btn-default' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_BOLD . "' aria-label='Left Align'><span class='fa fa-bold' aria-hidden='true'></span></button>";
-        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_ITALIC . "' aria-label='Left Align'><span class='fa fa-italic' aria-hidden='true'></span></button>";
-        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_UNDERLINE . "' aria-label='Left Align'>" . '<span class="fa fa-underline"></span></button>';
-        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_LINETHROUGH . "' aria-label='Left Align'>" . '<span class="fa fa-strikethrough"></span></button>';
+        $styleStr  = "<button type='button' class='btn btn-default' onclick='xoopsMakeBold(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_BOLD."' aria-label='Left Align'><span class='fa fa-bold' aria-hidden='true'></span></button>";
+        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeItalic(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_ITALIC."' aria-label='Left Align'><span class='fa fa-italic' aria-hidden='true'></span></button>";
+        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeUnderline(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_UNDERLINE."' aria-label='Left Align'>".'<span class="fa fa-underline"></span></button>';
+        $styleStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeLineThrough(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_LINETHROUGH."' aria-label='Left Align'>".'<span class="fa fa-strikethrough"></span></button>';
 
-        $alignStr  = "<button type='button' class='btn btn-default' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_LEFT . "' aria-label='Left Align'><span class='fa fa-align-left' aria-hidden='true'></span></button>";
-        $alignStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_CENTER . "' aria-label='Left Align'><span class='fa fa-align-center' aria-hidden='true'></span></button>";
-        $alignStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' title='" . _XOOPS_FORM_ALT_RIGHT . "' aria-label='Left Align'><span class='fa fa-align-right' aria-hidden='true'></span></button>";
+        $alignStr  = "<button type='button' class='btn btn-default' onclick='xoopsMakeLeft(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_LEFT."' aria-label='Left Align'><span class='fa fa-align-left' aria-hidden='true'></span></button>";
+        $alignStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeCenter(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_CENTER."' aria-label='Left Align'><span class='fa fa-align-center' aria-hidden='true'></span></button>";
+        $alignStr .= "<button type='button' class='btn btn-default' onclick='xoopsMakeRight(\"{$hiddentext}\", \"{$textarea_id}\");' title='"._XOOPS_FORM_ALT_RIGHT."' aria-label='Left Align'><span class='fa fa-align-right' aria-hidden='true'></span></button>";
 
         $fontStr .= "<br>\n{$styleStr}&nbsp;{$alignStr}&nbsp;\n";
         return $fontStr;
@@ -303,9 +303,9 @@ 
                 $ret .= $element->getDelimeter();
             }
             if ($ele->getCaption() != '') {
-                $ret .= $ele->getCaption() . '&nbsp;';
+                $ret .= $ele->getCaption().'&nbsp;';
             }
-            $ret .= $ele->render() . NWLINE;
+            $ret .= $ele->render().NWLINE;
             if (!$ele->isHidden()) {
                 ++$count;
             }
@@ -322,10 +322,10 @@ 
      */
     public function renderFormFile(XoopsFormFile $element)
     {
-        return '<input type="hidden" name="MAX_FILE_SIZE" value="' . $element->getMaxFileSize() . '" />'
-            . '<input type="file" name="' . $element->getName() . '" id="' . $element->getName() . '" title="'
-            . $element->getTitle() . '" ' . $element->getExtra() . ' />'
-            . '<input type="hidden" name="xoops_upload_file[]" id="xoops_upload_file[]" value="' . $element->getName()
+        return '<input type="hidden" name="MAX_FILE_SIZE" value="'.$element->getMaxFileSize().'" />'
+            . '<input type="file" name="'.$element->getName().'" id="'.$element->getName().'" title="'
+            . $element->getTitle().'" '.$element->getExtra().' />'
+            . '<input type="hidden" name="xoops_upload_file[]" id="xoops_upload_file[]" value="'.$element->getName()
             . '" />';
 
     }
@@ -351,9 +351,9 @@ 
      */
     public function renderFormPassword(XoopsFormPassword $element)
     {
-        return '<input type="password" name="' . $element->getName() . '" id="' . $element->getName() . '" size="'
-            . $element->getSize() . '" maxlength="' . $element->getMaxlength() . '" value="' . $element->getValue()
-            . '"' . $element->getExtra() . ' ' . ($element->autoComplete ? '' : 'autocomplete="off" ') . '/>';
+        return '<input type="password" name="'.$element->getName().'" id="'.$element->getName().'" size="'
+            . $element->getSize().'" maxlength="'.$element->getMaxlength().'" value="'.$element->getValue()
+            . '"'.$element->getExtra().' '.($element->autoComplete ? '' : 'autocomplete="off" ').'/>';
     }
 
     /**
@@ -386,14 +386,14 @@ 
                 $ret .= '<td>';
             }
 
-            $ret .= '<input type="radio" name="' . $ele_name . '" id="' . $ele_name . $id_ele
-                . '" title = "' . htmlspecialchars($ele_title, ENT_QUOTES) . '" value="'
-                . htmlspecialchars($value, ENT_QUOTES) . '"';
+            $ret .= '<input type="radio" name="'.$ele_name.'" id="'.$ele_name.$id_ele
+                . '" title = "'.htmlspecialchars($ele_title, ENT_QUOTES).'" value="'
+                . htmlspecialchars($value, ENT_QUOTES).'"';
             if (isset($ele_value) && $value == $ele_value) {
                 $ret .= ' checked';
             }
-            $ret .= $ele_extra . ' />' . "<label name='xolb_{$ele_name}' for='" . $ele_name . $id_ele
-                . "'>" . $name . '</label>' . $ele_delimiter;
+            $ret .= $ele_extra.' />'."<label name='xolb_{$ele_name}' for='".$ele_name.$id_ele
+                . "'>".$name.'</label>'.$ele_delimiter;
             if (!empty($element->columns)) {
                 $ret .= '</td>';
                 if (++$i % $element->columns == 0) {
@@ -403,7 +403,7 @@ 
         }
         if (!empty($element->columns)) {
             if ($span = $i % $element->columns) {
-                $ret .= '<td colspan="' . ($element->columns - $span) . '"></td></tr>';
+                $ret .= '<td colspan="'.($element->columns - $span).'"></td></tr>';
             }
             $ret .= '</table>';
         }
@@ -424,19 +424,19 @@ 
         $ele_title   = $element->getTitle();
         $ele_value   = $element->getValue();
         $ele_options = $element->getOptions();
-        $ret = '<select size="' . $element->getSize() . '"' . $element->getExtra();
+        $ret = '<select size="'.$element->getSize().'"'.$element->getExtra();
         if ($element->isMultiple() != false) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title
                 . '" multiple="multiple">';
         } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
         foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . htmlspecialchars($value, ENT_QUOTES) . '"';
+            $ret .= '<option value="'.htmlspecialchars($value, ENT_QUOTES).'"';
             if (count($ele_value) > 0 && in_array($value, $ele_value)) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $name . '</option>';
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
 
@@ -452,9 +452,9 @@ 
      */
     public function renderFormText(XoopsFormText $element)
     {
-        return "<input type='text' name='" . $element->getName() . "' title='" . $element->getTitle()
-            . "' id='" . $element->getName() . "' size='" . $element->getSize() . "' maxlength='"
-            . $element->getMaxlength() . "' value='" . $element->getValue() . "'" . $element->getExtra()
+        return "<input type='text' name='".$element->getName()."' title='".$element->getTitle()
+            . "' id='".$element->getName()."' size='".$element->getSize()."' maxlength='"
+            . $element->getMaxlength()."' value='".$element->getValue()."'".$element->getExtra()
             . ' />';
     }
 
@@ -467,9 +467,9 @@ 
      */
     public function renderFormTextArea(XoopsFormTextArea $element)
     {
-        return "<textarea name='" . $element->getName() . "' id='" . $element->getName() . "'  title='"
-            . $element->getTitle() . "' rows='" . $element->getRows() . "' cols='" . $element->getCols()
-            . "'" . $element->getExtra() . '>' . $element->getValue() . '</textarea>';
+        return "<textarea name='".$element->getName()."' id='".$element->getName()."'  title='"
+            . $element->getTitle()."' rows='".$element->getRows()."' cols='".$element->getCols()
+            . "'".$element->getExtra().'>'.$element->getValue().'</textarea>';
     }
 
     /**
@@ -482,10 +482,10 @@ 
     public function renderFormTextDateSelect(XoopsFormTextDateSelect $element)
     {
         static $included = false;
-        if (file_exists(XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php')) {
-            include_once XOOPS_ROOT_PATH . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/calendar.php';
+        if (file_exists(XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php')) {
+            include_once XOOPS_ROOT_PATH.'/language/'.$GLOBALS['xoopsConfig']['language'].'/calendar.php';
         } else {
-            include_once XOOPS_ROOT_PATH . '/language/english/calendar.php';
+            include_once XOOPS_ROOT_PATH.'/language/english/calendar.php';
         }
 
         $ele_name  = $element->getName();
@@ -532,7 +532,7 @@ 
                     if (calendar != null) {
                     calendar.hide();
                     } else {
-                    var cal = new Calendar(true, "' . $jstime . '", selected, closeHandler);
+                    var cal = new Calendar(true, "' . $jstime.'", selected, closeHandler);
                     calendar = cal;
                     cal.setRange(1900, 2100);
                     calendar.create();
@@ -546,55 +546,55 @@ 
                     }
 
                     Calendar._DN = new Array
-                    ("' . _CAL_SUNDAY . '",
-                    "' . _CAL_MONDAY . '",
-                    "' . _CAL_TUESDAY . '",
-                    "' . _CAL_WEDNESDAY . '",
-                    "' . _CAL_THURSDAY . '",
-                    "' . _CAL_FRIDAY . '",
-                    "' . _CAL_SATURDAY . '",
-                    "' . _CAL_SUNDAY . '");
+                    ("' . _CAL_SUNDAY.'",
+                    "' . _CAL_MONDAY.'",
+                    "' . _CAL_TUESDAY.'",
+                    "' . _CAL_WEDNESDAY.'",
+                    "' . _CAL_THURSDAY.'",
+                    "' . _CAL_FRIDAY.'",
+                    "' . _CAL_SATURDAY.'",
+                    "' . _CAL_SUNDAY.'");
                     Calendar._MN = new Array
-                    ("' . _CAL_JANUARY . '",
-                    "' . _CAL_FEBRUARY . '",
-                    "' . _CAL_MARCH . '",
-                    "' . _CAL_APRIL . '",
-                    "' . _CAL_MAY . '",
-                    "' . _CAL_JUNE . '",
-                    "' . _CAL_JULY . '",
-                    "' . _CAL_AUGUST . '",
-                    "' . _CAL_SEPTEMBER . '",
-                    "' . _CAL_OCTOBER . '",
-                    "' . _CAL_NOVEMBER . '",
-                    "' . _CAL_DECEMBER . '");
+                    ("' . _CAL_JANUARY.'",
+                    "' . _CAL_FEBRUARY.'",
+                    "' . _CAL_MARCH.'",
+                    "' . _CAL_APRIL.'",
+                    "' . _CAL_MAY.'",
+                    "' . _CAL_JUNE.'",
+                    "' . _CAL_JULY.'",
+                    "' . _CAL_AUGUST.'",
+                    "' . _CAL_SEPTEMBER.'",
+                    "' . _CAL_OCTOBER.'",
+                    "' . _CAL_NOVEMBER.'",
+                    "' . _CAL_DECEMBER.'");
 
                     Calendar._TT = {};
-                    Calendar._TT["TOGGLE"] = "' . _CAL_TGL1STD . '";
-                    Calendar._TT["PREV_YEAR"] = "' . _CAL_PREVYR . '";
-                    Calendar._TT["PREV_MONTH"] = "' . _CAL_PREVMNTH . '";
-                    Calendar._TT["GO_TODAY"] = "' . _CAL_GOTODAY . '";
-                    Calendar._TT["NEXT_MONTH"] = "' . _CAL_NXTMNTH . '";
-                    Calendar._TT["NEXT_YEAR"] = "' . _CAL_NEXTYR . '";
-                    Calendar._TT["SEL_DATE"] = "' . _CAL_SELDATE . '";
-                    Calendar._TT["DRAG_TO_MOVE"] = "' . _CAL_DRAGMOVE . '";
-                    Calendar._TT["PART_TODAY"] = "(' . _CAL_TODAY . ')";
-                    Calendar._TT["MON_FIRST"] = "' . _CAL_DISPM1ST . '";
-                    Calendar._TT["SUN_FIRST"] = "' . _CAL_DISPS1ST . '";
-                    Calendar._TT["CLOSE"] = "' . _CLOSE . '";
-                    Calendar._TT["TODAY"] = "' . _CAL_TODAY . '";
+                    Calendar._TT["TOGGLE"] = "' . _CAL_TGL1STD.'";
+                    Calendar._TT["PREV_YEAR"] = "' . _CAL_PREVYR.'";
+                    Calendar._TT["PREV_MONTH"] = "' . _CAL_PREVMNTH.'";
+                    Calendar._TT["GO_TODAY"] = "' . _CAL_GOTODAY.'";
+                    Calendar._TT["NEXT_MONTH"] = "' . _CAL_NXTMNTH.'";
+                    Calendar._TT["NEXT_YEAR"] = "' . _CAL_NEXTYR.'";
+                    Calendar._TT["SEL_DATE"] = "' . _CAL_SELDATE.'";
+                    Calendar._TT["DRAG_TO_MOVE"] = "' . _CAL_DRAGMOVE.'";
+                    Calendar._TT["PART_TODAY"] = "(' . _CAL_TODAY.')";
+                    Calendar._TT["MON_FIRST"] = "' . _CAL_DISPM1ST.'";
+                    Calendar._TT["SUN_FIRST"] = "' . _CAL_DISPS1ST.'";
+                    Calendar._TT["CLOSE"] = "' . _CLOSE.'";
+                    Calendar._TT["TODAY"] = "' . _CAL_TODAY.'";
 
                     // date formats
-                    Calendar._TT["DEF_DATE_FORMAT"] = "' . _SHORTDATESTRING . '";
-                    Calendar._TT["TT_DATE_FORMAT"] = "' . _SHORTDATESTRING . '";
+                    Calendar._TT["DEF_DATE_FORMAT"] = "' . _SHORTDATESTRING.'";
+                    Calendar._TT["TT_DATE_FORMAT"] = "' . _SHORTDATESTRING.'";
 
                     Calendar._TT["WK"] = "";
                 ');
             }
         }
-        return '<input type="text" name="' . $ele_name . '" id="' . $ele_name . '" size="'
-            . $element->getSize() . '" maxlength="' . $element->getMaxlength() . '" value="'
-            . $display_value . '"' . $element->getExtra()
-            . ' /><input type="reset" value=" ... " onclick="return showCalendar(\'' . $ele_name
+        return '<input type="text" name="'.$ele_name.'" id="'.$ele_name.'" size="'
+            . $element->getSize().'" maxlength="'.$element->getMaxlength().'" value="'
+            . $display_value.'"'.$element->getExtra()
+            . ' /><input type="reset" value=" ... " onclick="return showCalendar(\''.$ele_name
             . '\');">';
         /*
         return "<input type='text' name='" . $ele_name . "' id='" . $ele_name . "' size='"
@@ -615,9 +615,9 @@ 
     public function renderThemeForm(XoopsThemeForm $form)
     {
         $ele_name = $form->getName();
-        $ret      = '<form name="' . $ele_name . '" id="' . $ele_name . '" action="' . $form->getAction() . '" method="' . $form->getMethod() . '" onsubmit="return xoopsFormValidate_' . $ele_name . '();"' . $form->getExtra() . '>
+        $ret      = '<form name="'.$ele_name.'" id="'.$ele_name.'" action="'.$form->getAction().'" method="'.$form->getMethod().'" onsubmit="return xoopsFormValidate_'.$ele_name.'();"'.$form->getExtra().'>
             <table width="100%" class="outer" cellspacing="1">
-            <tr><th colspan="2">' . $form->getTitle() . '</th></tr>
+            <tr><th colspan="2">' . $form->getTitle().'</th></tr>
         ';
         $hidden   = '';
         $class    = 'even';
@@ -628,30 +628,30 @@ 
                 if (!$ele->getNocolspan()) {
                     $ret .= '<tr valign="top" align="left"><td class="head">';
                     if (($caption = $ele->getCaption()) != '') {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
                     if (($desc = $ele->getDescription()) != '') {
-                        $ret .= '<div class="xoops-form-element-help">' . $desc . '</div>';
+                        $ret .= '<div class="xoops-form-element-help">'.$desc.'</div>';
                     }
-                    $ret .= '</td><td class="' . $class . '">' . $ele->render() . '</td></tr>' . NWLINE;
+                    $ret .= '</td><td class="'.$class.'">'.$ele->render().'</td></tr>'.NWLINE;
                 } else {
                     $ret .= '<tr valign="top" align="left"><td class="head" colspan="2">';
                     if (($caption = $ele->getCaption()) != '') {
-                        $ret .= '<div class="xoops-form-element-caption' . ($ele->isRequired() ? '-required' : '') . '">';
-                        $ret .= '<span class="caption-text">' . $caption . '</span>';
+                        $ret .= '<div class="xoops-form-element-caption'.($ele->isRequired() ? '-required' : '').'">';
+                        $ret .= '<span class="caption-text">'.$caption.'</span>';
                         $ret .= '<span class="caption-marker">*</span>';
                         $ret .= '</div>';
                     }
-                    $ret .= '</td></tr><tr valign="top" align="left"><td class="' . $class . '" colspan="2">' . $ele->render() . '</td></tr>';
+                    $ret .= '</td></tr><tr valign="top" align="left"><td class="'.$class.'" colspan="2">'.$ele->render().'</td></tr>';
                 }
             } else {
                 $hidden .= $ele->render();
             }
         }
-        $ret .= '</table>' . NWLINE . ' ' . $hidden . '</form>' . NWLINE;
+        $ret .= '</table>'.NWLINE.' '.$hidden.'</form>'.NWLINE;
         $ret .= $form->renderValidationJS(true);
 
         return $ret;
@@ -668,13 +668,13 @@ 
      */
     public function addThemeFormBreak(XoopsThemeForm $form, $extra, $class)
     {
-        $class = ($class != '') ? " class='" . preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class) . "'" : '';
+        $class = ($class != '') ? " class='".preg_replace('/[^A-Za-z0-9\s\s_-]/i', '', $class)."'" : '';
         // Fix for $extra tag not showing
         if ($extra) {
-            $extra = '<tr><td colspan="2" ' . $class . '>' . $extra . '</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>'.$extra.'</td></tr>';
             $form->addElement($extra);
         } else {
-            $extra = '<tr><td colspan="2" ' . $class . '>&nbsp;</td></tr>';
+            $extra = '<tr><td colspan="2" '.$class.'>&nbsp;</td></tr>';
             $form->addElement($extra);
         }
     }