XOOPS / XoopsCore

xoops_lib/Xoops/Core/Text/Sanitizer/ExtensionAbstract.php

Spacing +4 added lines, -4 removed lines

@@ -69,12 +69,12 @@
         $altText = $this->ts->escapeForJavascript($altText);
 
         $buttonCode = '<button type="button" class="btn btn-default btn-sm" '
-            . ' alt="' . $altText .'" title="' . $altText . '"'
-            . ' onclick="' . $onclick . '(\'' . $textAreaId . '\'';
+            . ' alt="'.$altText.'" title="'.$altText.'"'
+            . ' onclick="'.$onclick.'(\''.$textAreaId.'\'';
         foreach ($prompts as $prompt) {
-            $buttonCode .= ', \'' . $this->ts->escapeForJavascript($prompt) . '\'';
+            $buttonCode .= ', \''.$this->ts->escapeForJavascript($prompt).'\'';
         }
-        $buttonCode .= ');" /><span class="' . $iconClass . '" aria-hidden="true"></span></button>';
+        $buttonCode .= ');" /><span class="'.$iconClass.'" aria-hidden="true"></span></button>';
 
         return $buttonCode;
     }

xoops_lib/Xoops/Html/Button.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     public function render()
     {
         $this->suppressRender(['value']);
-        $tag = '<button ' . $this->renderAttributeString() . '>'
+        $tag = '<button '.$this->renderAttributeString().'>'
             . $this->get('value', '')
             . '</button>';
 

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;
     }
 

xoops_lib/Xoops/Form/Renderer/Bootstrap3Renderer.php

Spacing +38 added lines, -38 removed lines

@@ -22,7 +22,7 @@ 
 {
     public function render(\Xoops\Form\Element $element):string
     {
-        $methodName = 'render' . str_replace('\\' , '', get_class($element));
+        $methodName = 'render'.str_replace('\\', '', get_class($element));
         if (true === method_exists($this, $methodName)) {
             return $this->$methodName($element);
         }
@@ -57,7 +57,7 @@ 
 			$element->add('class', 'btn btn-default');
 		}
 		$attributes = $element->renderAttributeString();
-        return '<input ' . $attributes . $element->getExtra() .' >';
+        return '<input '.$attributes.$element->getExtra().' >';
 	}
 
 	/**
@@ -71,18 +71,18 @@ 
     {
 		$ret = '';
         $element->add('class', 'btn');
-        $class = 'class="' . $element->getClass() . '"';
+        $class = 'class="'.$element->getClass().'"';
 
         $attributes = $element->renderAttributeString();
 
-        if ((bool) $element->get(':showdelete', false)) {
-            $ret .= '<input type="submit"' . $class . ' name="delete" id="delete" value="'
-                . \XoopsLocale::A_DELETE . '" onclick="this.form.elements.op.value=\'delete\'">';
+        if ((bool)$element->get(':showdelete', false)) {
+            $ret .= '<input type="submit"'.$class.' name="delete" id="delete" value="'
+                . \XoopsLocale::A_DELETE.'" onclick="this.form.elements.op.value=\'delete\'">';
         }
-        $ret .= ' <input type="button" ' . $class . ' value="' . \XoopsLocale::A_CANCEL
+        $ret .= ' <input type="button" '.$class.' value="'.\XoopsLocale::A_CANCEL
             . '" onclick="history.go(-1);return true;" />'
-            . ' <input type="reset"' . $class . ' name="reset"  id="reset" value="' . \XoopsLocale::A_RESET . '" />'
-            . ' <input ' . $attributes . $element->getExtra() . ' />';
+            . ' <input type="reset"'.$class.' name="reset"  id="reset" value="'.\XoopsLocale::A_RESET.'" />'
+            . ' <input '.$attributes.$element->getExtra().' />';
         return $ret;
 	}
 
@@ -99,21 +99,21 @@ 
         if ($xoops->theme()) {
             $xoops->theme()->addScript('include/color-picker.js');
         } else {
-            echo '<script type="text/javascript" src="' . $xoops->url('/include/color-picker.js') . '"></script>';
+            echo '<script type="text/javascript" src="'.$xoops->url('/include/color-picker.js').'"></script>';
         }
         $temp = $element->get('value', '');
         if (!empty($temp)) {
-            $element->set('style', 'background-color:' . $temp . ';');
+            $element->set('style', 'background-color:'.$temp.';');
         }
         $element->set('class', 'form-control');
         $ret = '<div class="input-group">';
         $attributes = $element->renderAttributeString();
-        $ret .= '<input ' . $attributes . ' ' . $element->getExtra() .' >';
+        $ret .= '<input '.$attributes.' '.$element->getExtra().' >';
         $ret .= '<span class="input-group-btn">';
         $ret .= '<button class="btn btn-default" type="button" ';
-        $ret .= 'data-toggle="tooltip" data-placement="left" title="' . \XoopsLocale::A_SELECT . '" ';
+        $ret .= 'data-toggle="tooltip" data-placement="left" title="'.\XoopsLocale::A_SELECT.'" ';
         $ret .= 'onclick="return TCP.popup(\'';
-        $ret .= $xoops->url('/include/') . '\',document.getElementById(\'' . $element->getName() . '\'));">';
+        $ret .= $xoops->url('/include/').'\',document.getElementById(\''.$element->getName().'\'));">';
         $ret .= '<span class="glyphicon glyphicon-option-horizontal" aria-hidden="true"></span></button>';
         $ret .= '</span></div>';
 
@@ -135,7 +135,7 @@ 
 
         $dataList = $element->isDatalist();
         if (!empty($dataList)) {
-            $element->add('list', 'list_' . $element->getName());
+            $element->add('list', 'list_'.$element->getName());
         }
 
 		$element->add('class', 'form-control');
@@ -149,17 +149,17 @@ 
         $xoops->theme()->addScript(
             '',
             '',
-            ' $(function() { $( "#' . $element->get('id') . '" ).datepicker({' .
-            'showOn: "focus", changeYear: true, constrainInput: false ' .
+            ' $(function() { $( "#'.$element->get('id').'" ).datepicker({'.
+            'showOn: "focus", changeYear: true, constrainInput: false '.
             ' }); }); '
         );
 
         $ret = '<div class="input-group">';
-        $ret .= '<input ' . $attributes . ' value="' . $display_value . '" ' . $element->getExtra() .' >';
+        $ret .= '<input '.$attributes.' value="'.$display_value.'" '.$element->getExtra().' >';
         $ret .= '<span class="input-group-btn">';
         $ret .= '<button class="btn btn-default" type="button" ';
-        $ret .= 'data-toggle="tooltip" data-placement="left" title="' . \XoopsLocale::A_SELECT . '" ';
-        $ret .= 'onclick="$( \'#' . $element->get('id') . '\' ).datepicker( \'show\' );"> ';
+        $ret .= 'data-toggle="tooltip" data-placement="left" title="'.\XoopsLocale::A_SELECT.'" ';
+        $ret .= 'onclick="$( \'#'.$element->get('id').'\' ).datepicker( \'show\' );"> ';
         $ret .= '<span class="glyphicon glyphicon-calendar" aria-hidden="true"></span></button>';
         $ret .= '</span></div>';
 
@@ -184,10 +184,10 @@ 
 
         $xoops = \Xoops::getInstance();
 
-        $extra = ($element->getExtra() != '' ? " " . $element->getExtra() : '');
+        $extra = ($element->getExtra() != '' ? " ".$element->getExtra() : '');
         $ret = "";
         // actions
-        $ret .= $element->xoopsCodeControls() . "<br />\n";
+        $ret .= $element->xoopsCodeControls()."<br />\n";
         // fonts
         $ret .= $element->typographyControls();
 
@@ -196,7 +196,7 @@ 
 		$element->set('class', 'form-control');
         $attributes = $element->renderAttributeString();
 
-        $ret .= '<textarea ' . $attributes . $extra . '>' . $element->getValue() . "</textarea>\n";
+        $ret .= '<textarea '.$attributes.$extra.'>'.$element->getValue()."</textarea>\n";
 
         if (empty($element->skipPreview)) {
             if (!$xoops->theme()) {
@@ -204,15 +204,15 @@ 
             } else {
                 $xoops->theme()->addScript('media/xoops/image.js', array('type' => 'text/javascript'));
             }
-            $button = "<input id='" . $element->getName() . "_preview_button' " . "type='button' " . "class='btn btn-sm btn-default' value='" . \XoopsLocale::A_PREVIEW . "' " . "onclick=\"form_instantPreview('" . XOOPS_URL . "', '" . $element->getName() . "','" . XOOPS_URL . "/images', " . (int)($element->doHtml) . ", '" . $xoops->security()->createToken() . "')\"" . " />";
-            $ret .= "<br />" . "<div id='" . $element->getName() . "_hidden' style='display: block;'> " . "<fieldset>" . "<legend>" . $button . "</legend>" . "<div id='" . $element->getName() . "_hidden_data'>" . \XoopsLocale::CLICK_PREVIEW_TO_SEE_CONTENT . "</div>" . "</fieldset>" . "</div>";
+            $button = "<input id='".$element->getName()."_preview_button' "."type='button' "."class='btn btn-sm btn-default' value='".\XoopsLocale::A_PREVIEW."' "."onclick=\"form_instantPreview('".XOOPS_URL."', '".$element->getName()."','".XOOPS_URL."/images', ".(int)($element->doHtml).", '".$xoops->security()->createToken()."')\""." />";
+            $ret .= "<br />"."<div id='".$element->getName()."_hidden' style='display: block;'> "."<fieldset>"."<legend>".$button."</legend>"."<div id='".$element->getName()."_hidden_data'>".\XoopsLocale::CLICK_PREVIEW_TO_SEE_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="' . \XoopsBaseConfig::get('url') . '/include/formdhtmltextarea.js"></script>';
-            $ret = $javascript . $ret;
+                    ? '<script type="text/javascript">'.$element->js.'</script>'
+                    : '').'<script type="text/javascript" src="'.\XoopsBaseConfig::get('url').'/include/formdhtmltextarea.js"></script>';
+            $ret = $javascript.$ret;
             $js_loaded = true;
         }
         return $ret;
@@ -229,7 +229,7 @@ 
     {
         $element->add('class', 'form-control');
 		$attributes = $element->renderAttributeString();
-        return '<input ' . $attributes . $element->getExtra() .' >';
+        return '<input '.$attributes.$element->getExtra().' >';
 	}
 
 	/**
@@ -241,19 +241,19 @@ 
      */
 	protected function renderXoopsFormSelect(\Xoops\Form\Select $element):string
     {
-        $selected = (array) $element->getValue();
+        $selected = (array)$element->getValue();
 
         $ele_options = $element->getOptions();
 
-        $extra = ($element->getExtra() != '' ? " " . $element->getExtra() : '');
+        $extra = ($element->getExtra() != '' ? " ".$element->getExtra() : '');
         $element->add('class', 'form-control');
         $attributes = $element->renderAttributeString();
-        $ret = '<select ' . $attributes . $extra .' >' . "\n";
+        $ret = '<select '.$attributes.$extra.' >'."\n";
 
         if (empty($ele_optgroup)) {
             foreach ($ele_options as $value => $display) {
                 if (is_array($display)) {
-                    $ret .= '<optgroup label="' . $value . '">' . "\n";
+                    $ret .= '<optgroup label="'.$value.'">'."\n";
                     foreach ($display as $optvalue => $optdisplay) {
                         $ret .= $element->renderOption($optvalue, $optdisplay, $selected);
                     }
@@ -262,7 +262,7 @@ 
                 }
             }
         }
-        $ret .= '</select>' . "\n";
+        $ret .= '</select>'."\n";
 
         return $ret;
 	}
@@ -279,11 +279,11 @@ 
         $element->add('class', 'form-control');
         $dataList = $element->isDatalist();
         if (!empty($dataList)) {
-            $element->add('list', 'list_' . $element->getName());
+            $element->add('list', 'list_'.$element->getName());
         }
 
         $attributes = $element->renderAttributeString();
-        return '<input ' . $attributes . ' ' . $element->getExtra() .' >';
+        return '<input '.$attributes.' '.$element->getExtra().' >';
 	}
 
 	/**
@@ -298,7 +298,7 @@ 
         $element->suppressRender(['value']);
 		$element->add('class', 'form-control');
         $attributes = $element->renderAttributeString();
-        return '<textarea ' . $attributes . ' ' . $element->getExtra() .' >'
-            . $element->getValue() . '</textarea>';
+        return '<textarea '.$attributes.' '.$element->getExtra().' >'
+            . $element->getValue().'</textarea>';
 	}
 }

Indentation +36 added lines, -36 removed lines

@@ -44,32 +44,32 @@ 
 		return '';
     }*/
 
-	/**
+    /**
      * Render support for XoopsFormButton
      *
      * @param XoopsFormButton $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormButton(\Xoops\Form\Button $element):string
+    protected function renderXoopsFormButton(\Xoops\Form\Button $element):string
     {
-		if (false == $element->hasClassLike('btn')) {
-			$element->add('class', 'btn btn-default');
-		}
-		$attributes = $element->renderAttributeString();
+        if (false == $element->hasClassLike('btn')) {
+            $element->add('class', 'btn btn-default');
+        }
+        $attributes = $element->renderAttributeString();
         return '<input ' . $attributes . $element->getExtra() .' >';
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormButtonTray
      *
      * @param XoopsFormButtonTray $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormButtonTray(\Xoops\Form\ButtonTray $element):string
+    protected function renderXoopsFormButtonTray(\Xoops\Form\ButtonTray $element):string
     {
-		$ret = '';
+        $ret = '';
         $element->add('class', 'btn');
         $class = 'class="' . $element->getClass() . '"';
 
@@ -84,16 +84,16 @@ 
             . ' <input type="reset"' . $class . ' name="reset"  id="reset" value="' . \XoopsLocale::A_RESET . '" />'
             . ' <input ' . $attributes . $element->getExtra() . ' />';
         return $ret;
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormColorPicker
      *
      * @param XoopsFormColorPicker $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormColorPicker(\Xoops\Form\ColorPicker $element):string
+    protected function renderXoopsFormColorPicker(\Xoops\Form\ColorPicker $element):string
     {
         $xoops = \Xoops::getInstance();
         if ($xoops->theme()) {
@@ -118,16 +118,16 @@ 
         $ret .= '</span></div>';
 
         return $ret;
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormDateSelect
      *
      * @param XoopsFormDateSelect $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormDateSelect(\Xoops\Form\DateSelect $element):string
+    protected function renderXoopsFormDateSelect(\Xoops\Form\DateSelect $element):string
     {
         $xoops = \Xoops::getInstance();
 
@@ -138,7 +138,7 @@ 
             $element->add('list', 'list_' . $element->getName());
         }
 
-		$element->add('class', 'form-control');
+        $element->add('class', 'form-control');
         $element->suppressRender(['value']);
         $attributes = $element->renderAttributeString();
 
@@ -164,16 +164,16 @@ 
         $ret .= '</span></div>';
 
         return $ret;
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormDhtmlTextArea
      *
      * @param XoopsFormDhtmlTextArea $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormDhtmlTextArea(\Xoops\Form\DhtmlTextArea $element):string
+    protected function renderXoopsFormDhtmlTextArea(\Xoops\Form\DhtmlTextArea $element):string
     {
         if ($element->htmlEditor && is_object($element->htmlEditor)) {
             if (!isset($element->htmlEditor->isEnabled) || $element->htmlEditor->isEnabled) {
@@ -193,7 +193,7 @@ 
 
         // the textarea box
         $element->suppressRender(['value']);
-		$element->set('class', 'form-control');
+        $element->set('class', 'form-control');
         $attributes = $element->renderAttributeString();
 
         $ret .= '<textarea ' . $attributes . $extra . '>' . $element->getValue() . "</textarea>\n";
@@ -216,30 +216,30 @@ 
             $js_loaded = true;
         }
         return $ret;
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormPassword
      *
      * @param XoopsFormPassword $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormPassword(\Xoops\Form\Password $element):string
+    protected function renderXoopsFormPassword(\Xoops\Form\Password $element):string
     {
         $element->add('class', 'form-control');
-		$attributes = $element->renderAttributeString();
+        $attributes = $element->renderAttributeString();
         return '<input ' . $attributes . $element->getExtra() .' >';
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormSelect
      *
      * @param XoopsFormSelect $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormSelect(\Xoops\Form\Select $element):string
+    protected function renderXoopsFormSelect(\Xoops\Form\Select $element):string
     {
         $selected = (array) $element->getValue();
 
@@ -265,16 +265,16 @@ 
         $ret .= '</select>' . "\n";
 
         return $ret;
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormText
      *
      * @param XoopsFormText $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormText(\Xoops\Form\Text $element):string
+    protected function renderXoopsFormText(\Xoops\Form\Text $element):string
     {
         $element->add('class', 'form-control');
         $dataList = $element->isDatalist();
@@ -284,21 +284,21 @@ 
 
         $attributes = $element->renderAttributeString();
         return '<input ' . $attributes . ' ' . $element->getExtra() .' >';
-	}
+    }
 
-	/**
+    /**
      * Render support for XoopsFormTextArea
      *
      * @param XoopsFormTextArea $element form element
      *
      * @return string rendered form element
      */
-	protected function renderXoopsFormTextArea(\Xoops\Form\TextArea $element):string
+    protected function renderXoopsFormTextArea(\Xoops\Form\TextArea $element):string
     {
         $element->suppressRender(['value']);
-		$element->add('class', 'form-control');
+        $element->add('class', 'form-control');
         $attributes = $element->renderAttributeString();
         return '<textarea ' . $attributes . ' ' . $element->getExtra() .' >'
             . $element->getValue() . '</textarea>';
-	}
+    }
 }

xoops_lib/Xoops/Core/Service/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -48,7 +48,7 @@ 
      * Service Mode constant - Multiple mode where all located services will be
      * dispatched in priority order.
      */
-    const MODE_MULTIPLE  = 8;
+    const MODE_MULTIPLE = 8;
 
     /**
      * Provider priorities
@@ -247,12 +247,12 @@ 
         } else {
             $xoops = \Xoops::getInstance();
             $provider = new Provider($this, $service);
-            $event = 'core.service.locate.' . $service;
+            $event = 'core.service.locate.'.$service;
             // locate service provider(s)
             // In response to trigger message, the contract implementor should register()
             $xoops->events()->triggerEvent($event, $provider);
             // get reference to the list of providers and prioritize it.
-            $registered=$provider->getRegistered();
+            $registered = $provider->getRegistered();
             if (count($registered)) {
                 $choices = $this->providerPrefs[$service] ?? [];
                 foreach ($registered as $p) {

htdocs/include/common.php

Spacing +16 added lines, -16 removed lines

@@ -28,27 +28,27 @@ 
  * Temporarily try and fix, but set up a (delayed) warning
  */
 if (!class_exists('XoopsLoad', false)) {
-    require_once dirname(__DIR__). '/class/XoopsBaseConfig.php';
+    require_once dirname(__DIR__).'/class/XoopsBaseConfig.php';
     XoopsBaseConfig::bootstrapTransition();
     $delayedWarning = 'Patch mainfile.php for XoopsBaseConfig';
 }
 
 global $xoops;
-$GLOBALS['xoops'] =& $xoops;
+$GLOBALS['xoops'] = & $xoops;
 
 //Legacy support
 global $xoopsDB;
-$GLOBALS['xoopsDB'] =& $xoopsDB;
+$GLOBALS['xoopsDB'] = & $xoopsDB;
 /**
  * YOU SHOULD NEVER USE THE FOLLOWING TO CONSTANTS, THEY WILL BE REMOVED
  */
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('NWLINE')or define('NWLINE', "\n");
+defined('NWLINE') or define('NWLINE', "\n");
 
 /**
  * Include files with definitions
  */
-include_once __DIR__ . '/defines.php';
+include_once __DIR__.'/defines.php';
 // include_once __DIR__ . '/version.php';
 
 /**
@@ -64,7 +64,7 @@ 
  */
 $xoops = Xoops::getInstance();
 
-$xoops->option =& $GLOBALS['xoopsOption'];
+$xoops->option = & $GLOBALS['xoopsOption'];
 
 /**
  * Create Instance Xoops\Core\Logger Object, the logger manager
@@ -86,7 +86,7 @@ 
 //$xoops->cache()->delete($key);
 $autoloadPrefixDirList = $xoops->cache()->cacheRead(
     $key,
-    function () use ($xoops) {
+    function() use ($xoops) {
         try {
             $criteria = new CriteriaCompo(new Criteria('isactive', 1));
             $criteria->add(new Criteria('namespace', '', '!='));
@@ -99,7 +99,7 @@ 
         /** @var XoopsObject $almod */
         foreach ($autoloadModules as $almod) {
             $prefix = $almod->getVar('namespace');
-            $base_dir = $xoops->path('modules/' . $almod->getVar('dirname') . '/src');
+            $base_dir = $xoops->path('modules/'.$almod->getVar('dirname').'/src');
             $autoloadPrefixDirList[] = [$prefix, $base_dir];
         }
         return $autoloadPrefixDirList;
@@ -158,7 +158,7 @@ 
  * Requires functions and database loaded
  */
 $xoops->getConfigs();
-$xoopsConfig =& $xoops->config;
+$xoopsConfig = & $xoops->config;
 
 /**
  * Merge file and db configs.
@@ -167,7 +167,7 @@ 
     $xoops->addConfigs(include $file);
     unset($file);
 } else {
-    trigger_error('File Path Error: ' . 'var/configs/system_configs.php' . ' does not exist.');
+    trigger_error('File Path Error: '.'var/configs/system_configs.php'.' does not exist.');
 }
 
 $xoops->events()->triggerEvent('core.include.common.configs.success');
@@ -184,7 +184,7 @@ 
 $xFrameOptions = $xoopsConfig['xFrameOptions'] ?? 'sameorigin';
 $xoops->events()->triggerEvent('core.include.common.xframeoption');
 if (!headers_sent() && !empty($xFrameOptions)) {
-    header('X-Frame-Options: ' .$xFrameOptions);
+    header('X-Frame-Options: '.$xFrameOptions);
 }
 
 /**
@@ -265,7 +265,7 @@ 
     } else {
         if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), FixedGroups::ANONYMOUS)) {
             $xoops->redirect(
-                $xoops_url . '/user.php?from=' . $xoops->module->getVar('dirname', 'n'),
+                $xoops_url.'/user.php?from='.$xoops->module->getVar('dirname', 'n'),
                 1,
                 XoopsLocale::E_NO_ACCESS_PERMISSION
             );
@@ -291,10 +291,10 @@ 
 
 $xoopsTpl = $xoops->tpl();
 $xoTheme = null;
-$xoopsUser =& $xoops->user;
-$xoopsModule =& $xoops->module;
-$xoopsUserIsAdmin =& $xoops->userIsAdmin;
-$xoopsModuleConfig =& $xoops->moduleConfig;
+$xoopsUser = & $xoops->user;
+$xoopsModule = & $xoops->module;
+$xoopsUserIsAdmin = & $xoops->userIsAdmin;
+$xoopsModuleConfig = & $xoops->moduleConfig;
 
 //Creates 'system_modules_active' cache file if it has been deleted.
 $xoops->getActiveModules();

htdocs/modules/publisher/include/ajax_rating.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/header.php';
+require_once dirname(__DIR__).'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -56,7 +56,7 @@ 
 
 //Checking permissions
 if (!$helper->getConfig('perm_rating') || !$gpermHandler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
-    $output = "unit_long$itemid|" . XoopsLocale::E_NO_ACCESS_PERMISSION . "\n";
+    $output = "unit_long$itemid|".XoopsLocale::E_NO_ACCESS_PERMISSION."\n";
     echo $output;
     exit();
 }
@@ -65,7 +65,7 @@ 
 $units = 5;
 
 if ($rating > 5 || $rating < 1) {
-    $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_BAD . "\n";
+    $output = "unit_long$itemid|"._MD_PUBLISHER_VOTE_BAD."\n";
     echo $output;
     exit();
 }
@@ -87,7 +87,7 @@ 
 }
 
 if ($voted) {
-    $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_ALREADY . "\n";
+    $output = "unit_long$itemid|"._MD_PUBLISHER_VOTE_ALREADY."\n";
     echo $output;
     exit();
 }
@@ -111,8 +111,8 @@ 
 // $new_back is what gets 'drawn' on your page after a successful 'AJAX/Javascript' vote
 $new_back = [];
 
-$new_back[] .= '<div class="publisher_unit-rating" style="width:' . $units * $rating_unitwidth . 'px;">';
-$new_back[] .= '<div class="publisher_current-rating" style="width:' . @number_format($current_rating / $count, 2) * $rating_unitwidth . 'px;">' . _MD_PUBLISHER_VOTE_RATING . '</div>';
+$new_back[] .= '<div class="publisher_unit-rating" style="width:'.$units * $rating_unitwidth.'px;">';
+$new_back[] .= '<div class="publisher_current-rating" style="width:'.@number_format($current_rating / $count, 2) * $rating_unitwidth.'px;">'._MD_PUBLISHER_VOTE_RATING.'</div>';
 $new_back[] .= '<div class="publisher_r1-unit">1</div>';
 $new_back[] .= '<div class="publisher_r2-unit">2</div>';
 $new_back[] .= '<div class="publisher_r3-unit">3</div>';
@@ -124,8 +124,8 @@ 
 $new_back[] .= '<div class="publisher_r9-unit">9</div>';
 $new_back[] .= '<div class="publisher_r10-unit">10</div>';
 $new_back[] .= '</div>';
-$new_back[] .= '<div class="publisher_voted">' . _MD_PUBLISHER_VOTE_RATING . ' <strong>' . @number_format($current_rating / $count, 2) . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ')</div>';
-$new_back[] .= '<div class="publisher_thanks">' . _MD_PUBLISHER_VOTE_THANKS . '</div>';
+$new_back[] .= '<div class="publisher_voted">'._MD_PUBLISHER_VOTE_RATING.' <strong>'.@number_format($current_rating / $count, 2).'</strong>/'.$units.' ('.$count.' '.$tense.')</div>';
+$new_back[] .= '<div class="publisher_thanks">'._MD_PUBLISHER_VOTE_THANKS.'</div>';
 
 $allnewback = implode("\n", $new_back);
 

htdocs/modules/publisher/include/ajax_upload.php

Spacing +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@ 
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-require_once __DIR__ . '/common.php';
+include dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+require_once __DIR__.'/common.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -74,7 +74,7 @@ 
 
 $image = null;
 if (false === $error) {
-    $uploader = new XoopsMediaUploader(XoopsBaseConfig::get('uploads-path') . '/images', [
+    $uploader = new XoopsMediaUploader(XoopsBaseConfig::get('uploads-path').'/images', [
         'image/gif',
         'image/jpeg',
         'image/pjpeg',
@@ -107,7 +107,7 @@ 
             }
         }
     } else {
-        $error = sprintf(_CO_PUBLISHER_FAILSAVEIMG, $filename) . '<br>' . implode('<br>', $uploader->getErrors(false));
+        $error = sprintf(_CO_PUBLISHER_FAILSAVEIMG, $filename).'<br>'.implode('<br>', $uploader->getErrors(false));
     }
 }