XOOPS / XoopsCore25

htdocs/class/xoopseditor/tinymce/formtinymce.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         $this->configs['area_height'] = isset($this->configs['height']) ? $this->configs['height'] : $this->height;
         $this->configs['fonts']       = $this->getFonts();
 
-        require_once __DIR__ . '/tinymce.php';
+        require_once __DIR__.'/tinymce.php';
         $this->editor = new TinyMCE($this->configs);
     }
 
@@ -137,6 +137,6 @@ 
      */
     public function isActive()
     {
-        return is_readable(XOOPS_ROOT_PATH . $this->rootPath . '/tinymce.php');
+        return is_readable(XOOPS_ROOT_PATH.$this->rootPath.'/tinymce.php');
     }
 }

htdocs/class/xoopseditor/tinymce/settings.php

Indentation +4 added lines, -4 removed lines

@@ -51,10 +51,10 @@
     'theme_advanced_resizing' => true,
     // load plugins
     'plugins' => 'xoopsimagemanager,xoopsquote,xoopscode,xoopsemotions,xoopsmlcontent,' . // Xoops plugins
-                 //"safari,autoresize,xhtmlxtras,directionality," . // plugins added from TinyMCE 3.2.5
-                 'safari,xhtmlxtras,directionality,' . // fixed from TinyMCE 3.3.6
-                 'advlist,style,xhtmlxtras,searchreplace,' . // plugins added from TinyMCE 3.3.6
-                 'table,advimage,advlink,emotions,insertdatetime,preview,media,contextmenu,' . 'paste,fullscreen,visualchars,nonbreaking,inlinepopups',
+                    //"safari,autoresize,xhtmlxtras,directionality," . // plugins added from TinyMCE 3.2.5
+                    'safari,xhtmlxtras,directionality,' . // fixed from TinyMCE 3.3.6
+                    'advlist,style,xhtmlxtras,searchreplace,' . // plugins added from TinyMCE 3.3.6
+                    'table,advimage,advlink,emotions,insertdatetime,preview,media,contextmenu,' . 'paste,fullscreen,visualchars,nonbreaking,inlinepopups',
     //"pagebreak,spellchecker,layer,save,advhr,iespell,inlinepopups," .
     //"print,directionality,noneditable,template,"
 

Spacing +5 added lines, -5 removed lines

@@ -50,11 +50,11 @@ 
     'theme_advanced_resize_horizontal' => false,
     'theme_advanced_resizing' => true,
     // load plugins
-    'plugins' => 'xoopsimagemanager,xoopsquote,xoopscode,xoopsemotions,xoopsmlcontent,' . // Xoops plugins
+    'plugins' => 'xoopsimagemanager,xoopsquote,xoopscode,xoopsemotions,xoopsmlcontent,'.// Xoops plugins
                  //"safari,autoresize,xhtmlxtras,directionality," . // plugins added from TinyMCE 3.2.5
-                 'safari,xhtmlxtras,directionality,' . // fixed from TinyMCE 3.3.6
-                 'advlist,style,xhtmlxtras,searchreplace,' . // plugins added from TinyMCE 3.3.6
-                 'table,advimage,advlink,emotions,insertdatetime,preview,media,contextmenu,' . 'paste,fullscreen,visualchars,nonbreaking,inlinepopups',
+                 'safari,xhtmlxtras,directionality,'.// fixed from TinyMCE 3.3.6
+                 'advlist,style,xhtmlxtras,searchreplace,'.// plugins added from TinyMCE 3.3.6
+                 'table,advimage,advlink,emotions,insertdatetime,preview,media,contextmenu,'.'paste,fullscreen,visualchars,nonbreaking,inlinepopups',
     //"pagebreak,spellchecker,layer,save,advhr,iespell,inlinepopups," .
     //"print,directionality,noneditable,template,"
 
@@ -69,6 +69,6 @@ 
     'theme_advanced_buttons3' => 'search,replace,|,tablecontrols,|,cleanup,visualaid,visualchars,|,insertdate,inserttime,|,preview,fullscreen,help,code',
     'theme_advanced_buttons4' => 'xoopsimagemanager,xoopsemotions,xoopsquote,xoopscode,xoopsmlcontent',
     // Full XHTML rule set
-    'valid_elements' => '' . 'a[accesskey|charset|class|coords|dir<ltr?rtl|href|hreflang|id|lang|name' . '|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rel|rev' . '|shape<circle?default?poly?rect|style|tabindex|title|target|type],' . 'abbr[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'acronym[class|dir<ltr?rtl|id|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'address[class|align|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'applet[align<bottom?left?middle?right?top|alt|archive|class|code|codebase' . '|height|hspace|id|name|object|style|title|vspace|width],' . 'area[accesskey|alt|class|coords|dir<ltr?rtl|href|id|lang|nohref<nohref' . '|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup' . '|shape<circle?default?poly?rect|style|tabindex|title|target],' . 'base[href|target],' . 'basefont[color|face|id|size],' . 'bdo[class|dir<ltr?rtl|id|lang|style|title],' . 'big[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'blockquote[cite|class|dir<ltr?rtl|id|lang|onclick|ondblclick' . '|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout' . '|onmouseover|onmouseup|style|title],' . 'body[alink|background|bgcolor|class|dir<ltr?rtl|id|lang|link|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|onunload|style|title|text|vlink],' . 'br[class|clear<all?left?none?right|id|style|title],' . 'button[accesskey|class|dir<ltr?rtl|disabled<disabled|id|lang|name|onblur' . '|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|style|tabindex|title|type' . '|value],' . 'caption[align<bottom?left?right?top|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'center[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'cite[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'code[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'col[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id' . '|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title' . '|valign<baseline?bottom?middle?top|width],' . 'colgroup[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl' . '|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title' . '|valign<baseline?bottom?middle?top|width],' . 'dd[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],' . 'del[cite|class|datetime|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'dfn[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'dir[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'div[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'dl[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'dt[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],' . 'em/i[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'fieldset[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'font[class|color|dir<ltr?rtl|face|id|lang|size|style|title],' . 'form[accept|accept-charset|action|class|dir<ltr?rtl|enctype|id|lang' . '|method<get?post|name|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onsubmit' . '|style|title|target],' . 'frame[class|frameborder|id|longdesc|marginheight|marginwidth|name' . '|noresize<noresize|scrolling<auto?no?yes|src|style|title],' . 'frameset[class|cols|id|onload|onunload|rows|style|title],' . 'h1[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'h2[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'h3[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'h4[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'h5[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'h6[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'head[dir<ltr?rtl|lang|profile],' . 'hr[align<center?left?right|class|dir<ltr?rtl|id|lang|noshade<noshade|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|size|style|title|width],' . 'html[dir<ltr?rtl|lang|version],' . 'iframe[align<bottom?left?middle?right?top|class|frameborder|height|id' . '|longdesc|marginheight|marginwidth|name|scrolling<auto?no?yes|src|style' . '|title|width],' . 'img[align<bottom?left?middle?right?top|alt|border|class|dir<ltr?rtl|height' . '|hspace|id|ismap<ismap|lang|longdesc|name|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|src|style|title|usemap|vspace|width],' . 'input[accept|accesskey|align<bottom?left?middle?right?top|alt' . '|checked<checked|class|dir<ltr?rtl|disabled<disabled|id|ismap<ismap|lang' . '|maxlength|name|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect' . '|readonly<readonly|size|src|style|tabindex|title' . '|type<button?checkbox?file?hidden?image?password?radio?reset?submit?text' . '|usemap|value],' . 'ins[cite|class|datetime|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'isindex[class|dir<ltr?rtl|id|lang|prompt|style|title],' . 'kbd[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'label[accesskey|class|dir<ltr?rtl|for|id|lang|onblur|onclick|ondblclick' . '|onfocus|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout' . '|onmouseover|onmouseup|style|title],' . 'legend[align<bottom?left?right?top|accesskey|class|dir<ltr?rtl|id|lang' . '|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'li[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title|type' . '|value],' . 'link[charset|class|dir<ltr?rtl|href|hreflang|id|lang|media|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|rel|rev|style|title|target|type],' . 'map[class|dir<ltr?rtl|id|lang|name|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'menu[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'meta[content|dir<ltr?rtl|http-equiv|lang|name|scheme],' . 'noframes[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'noscript[class|dir<ltr?rtl|id|lang|style|title],' . 'object[align<bottom?left?middle?right?top|archive|border|class|classid' . '|codebase|codetype|data|declare|dir<ltr?rtl|height|hspace|id|lang|name' . '|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|standby|style|tabindex|title|type|usemap' . '|vspace|width],' . 'ol[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|start|style|title|type],' . 'optgroup[class|dir<ltr?rtl|disabled<disabled|id|label|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'option[class|dir<ltr?rtl|disabled<disabled|id|label|lang|onclick|ondblclick' . '|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout' . '|onmouseover|onmouseup|selected<selected|style|title|value],' . 'p[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|style|title],' . 'param[id|name|type|value|valuetype<DATA?OBJECT?REF],' . 'pre/listing/plaintext/xmp[align|class|dir<ltr?rtl|id|lang|onclick|ondblclick' . '|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout' . '|onmouseover|onmouseup|style|title|width],' . 'q[cite|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 's[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],' . 'samp[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'script[charset|defer|language|src|type],' . 'select[class|dir<ltr?rtl|disabled<disabled|id|lang|multiple<multiple|name' . '|onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|size|style' . '|tabindex|title],' . 'small[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'span[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'strike[class|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title],' . 'strong/b[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'style[dir<ltr?rtl|lang|media|title|type],' . 'sub[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'sup[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title],' . 'table[align<center?left?right|bgcolor|border|cellpadding|cellspacing|class' . '|dir<ltr?rtl|frame|height|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rules' . '|style|summary|title|width],' . 'tbody[align<center?char?justify?left?right|char|class|charoff|dir<ltr?rtl|id' . '|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|style|title' . '|valign<baseline?bottom?middle?top],' . 'td[abbr|align<center?char?justify?left?right|axis|bgcolor|char|charoff|class' . '|colspan|dir<ltr?rtl|headers|height|id|lang|nowrap<nowrap|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|rowspan|scope<col?colgroup?row?rowgroup' . '|style|title|valign<baseline?bottom?middle?top|width],' . 'textarea[accesskey|class|cols|dir<ltr?rtl|disabled<disabled|id|lang|name' . '|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect' . '|readonly<readonly|rows|style|tabindex|title],' . 'tfoot[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id' . '|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|style|title' . '|valign<baseline?bottom?middle?top],' . 'th[abbr|align<center?char?justify?left?right|axis|bgcolor|char|charoff|class' . '|colspan|dir<ltr?rtl|headers|height|id|lang|nowrap<nowrap|onclick' . '|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove' . '|onmouseout|onmouseover|onmouseup|rowspan|scope<col?colgroup?row?rowgroup' . '|style|title|valign<baseline?bottom?middle?top|width],' . 'thead[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id' . '|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown' . '|onmousemove|onmouseout|onmouseover|onmouseup|style|title' . '|valign<baseline?bottom?middle?top],' . 'title[dir<ltr?rtl|lang],' . 'tr[abbr|align<center?char?justify?left?right|bgcolor|char|charoff|class' . '|rowspan|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title|valign<baseline?bottom?middle?top],' . 'tt[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],' . 'u[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup' . '|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],' . 'ul[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown' . '|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover' . '|onmouseup|style|title|type],' . 'var[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress' . '|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style' . '|title]'
+    'valid_elements' => ''.'a[accesskey|charset|class|coords|dir<ltr?rtl|href|hreflang|id|lang|name'.'|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rel|rev'.'|shape<circle?default?poly?rect|style|tabindex|title|target|type],'.'abbr[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'acronym[class|dir<ltr?rtl|id|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'address[class|align|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'applet[align<bottom?left?middle?right?top|alt|archive|class|code|codebase'.'|height|hspace|id|name|object|style|title|vspace|width],'.'area[accesskey|alt|class|coords|dir<ltr?rtl|href|id|lang|nohref<nohref'.'|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup'.'|shape<circle?default?poly?rect|style|tabindex|title|target],'.'base[href|target],'.'basefont[color|face|id|size],'.'bdo[class|dir<ltr?rtl|id|lang|style|title],'.'big[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'blockquote[cite|class|dir<ltr?rtl|id|lang|onclick|ondblclick'.'|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout'.'|onmouseover|onmouseup|style|title],'.'body[alink|background|bgcolor|class|dir<ltr?rtl|id|lang|link|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onload|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|onunload|style|title|text|vlink],'.'br[class|clear<all?left?none?right|id|style|title],'.'button[accesskey|class|dir<ltr?rtl|disabled<disabled|id|lang|name|onblur'.'|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|style|tabindex|title|type'.'|value],'.'caption[align<bottom?left?right?top|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'center[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'cite[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'code[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'col[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id'.'|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title'.'|valign<baseline?bottom?middle?top|width],'.'colgroup[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl'.'|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|span|style|title'.'|valign<baseline?bottom?middle?top|width],'.'dd[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],'.'del[cite|class|datetime|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'dfn[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'dir[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'div[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'dl[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'dt[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],'.'em/i[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'fieldset[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'font[class|color|dir<ltr?rtl|face|id|lang|size|style|title],'.'form[accept|accept-charset|action|class|dir<ltr?rtl|enctype|id|lang'.'|method<get?post|name|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onreset|onsubmit'.'|style|title|target],'.'frame[class|frameborder|id|longdesc|marginheight|marginwidth|name'.'|noresize<noresize|scrolling<auto?no?yes|src|style|title],'.'frameset[class|cols|id|onload|onunload|rows|style|title],'.'h1[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'h2[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'h3[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'h4[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'h5[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'h6[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'head[dir<ltr?rtl|lang|profile],'.'hr[align<center?left?right|class|dir<ltr?rtl|id|lang|noshade<noshade|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|size|style|title|width],'.'html[dir<ltr?rtl|lang|version],'.'iframe[align<bottom?left?middle?right?top|class|frameborder|height|id'.'|longdesc|marginheight|marginwidth|name|scrolling<auto?no?yes|src|style'.'|title|width],'.'img[align<bottom?left?middle?right?top|alt|border|class|dir<ltr?rtl|height'.'|hspace|id|ismap<ismap|lang|longdesc|name|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|src|style|title|usemap|vspace|width],'.'input[accept|accesskey|align<bottom?left?middle?right?top|alt'.'|checked<checked|class|dir<ltr?rtl|disabled<disabled|id|ismap<ismap|lang'.'|maxlength|name|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect'.'|readonly<readonly|size|src|style|tabindex|title'.'|type<button?checkbox?file?hidden?image?password?radio?reset?submit?text'.'|usemap|value],'.'ins[cite|class|datetime|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'isindex[class|dir<ltr?rtl|id|lang|prompt|style|title],'.'kbd[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'label[accesskey|class|dir<ltr?rtl|for|id|lang|onblur|onclick|ondblclick'.'|onfocus|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout'.'|onmouseover|onmouseup|style|title],'.'legend[align<bottom?left?right?top|accesskey|class|dir<ltr?rtl|id|lang'.'|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'li[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title|type'.'|value],'.'link[charset|class|dir<ltr?rtl|href|hreflang|id|lang|media|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|rel|rev|style|title|target|type],'.'map[class|dir<ltr?rtl|id|lang|name|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'menu[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'meta[content|dir<ltr?rtl|http-equiv|lang|name|scheme],'.'noframes[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'noscript[class|dir<ltr?rtl|id|lang|style|title],'.'object[align<bottom?left?middle?right?top|archive|border|class|classid'.'|codebase|codetype|data|declare|dir<ltr?rtl|height|hspace|id|lang|name'.'|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|standby|style|tabindex|title|type|usemap'.'|vspace|width],'.'ol[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|start|style|title|type],'.'optgroup[class|dir<ltr?rtl|disabled<disabled|id|label|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'option[class|dir<ltr?rtl|disabled<disabled|id|label|lang|onclick|ondblclick'.'|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout'.'|onmouseover|onmouseup|selected<selected|style|title|value],'.'p[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|style|title],'.'param[id|name|type|value|valuetype<DATA?OBJECT?REF],'.'pre/listing/plaintext/xmp[align|class|dir<ltr?rtl|id|lang|onclick|ondblclick'.'|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout'.'|onmouseover|onmouseup|style|title|width],'.'q[cite|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'s[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],'.'samp[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'script[charset|defer|language|src|type],'.'select[class|dir<ltr?rtl|disabled<disabled|id|lang|multiple<multiple|name'.'|onblur|onchange|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|size|style'.'|tabindex|title],'.'small[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'span[align<center?justify?left?right|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'strike[class|class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title],'.'strong/b[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'style[dir<ltr?rtl|lang|media|title|type],'.'sub[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'sup[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title],'.'table[align<center?left?right|bgcolor|border|cellpadding|cellspacing|class'.'|dir<ltr?rtl|frame|height|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|rules'.'|style|summary|title|width],'.'tbody[align<center?char?justify?left?right|char|class|charoff|dir<ltr?rtl|id'.'|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|style|title'.'|valign<baseline?bottom?middle?top],'.'td[abbr|align<center?char?justify?left?right|axis|bgcolor|char|charoff|class'.'|colspan|dir<ltr?rtl|headers|height|id|lang|nowrap<nowrap|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|rowspan|scope<col?colgroup?row?rowgroup'.'|style|title|valign<baseline?bottom?middle?top|width],'.'textarea[accesskey|class|cols|dir<ltr?rtl|disabled<disabled|id|lang|name'.'|onblur|onclick|ondblclick|onfocus|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|onselect'.'|readonly<readonly|rows|style|tabindex|title],'.'tfoot[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id'.'|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|style|title'.'|valign<baseline?bottom?middle?top],'.'th[abbr|align<center?char?justify?left?right|axis|bgcolor|char|charoff|class'.'|colspan|dir<ltr?rtl|headers|height|id|lang|nowrap<nowrap|onclick'.'|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown|onmousemove'.'|onmouseout|onmouseover|onmouseup|rowspan|scope<col?colgroup?row?rowgroup'.'|style|title|valign<baseline?bottom?middle?top|width],'.'thead[align<center?char?justify?left?right|char|charoff|class|dir<ltr?rtl|id'.'|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup|onmousedown'.'|onmousemove|onmouseout|onmouseover|onmouseup|style|title'.'|valign<baseline?bottom?middle?top],'.'title[dir<ltr?rtl|lang],'.'tr[abbr|align<center?char?justify?left?right|bgcolor|char|charoff|class'.'|rowspan|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title|valign<baseline?bottom?middle?top],'.'tt[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],'.'u[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress|onkeyup'.'|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style|title],'.'ul[class|compact<compact|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown'.'|onkeypress|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover'.'|onmouseup|style|title|type],'.'var[class|dir<ltr?rtl|id|lang|onclick|ondblclick|onkeydown|onkeypress'.'|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style'.'|title]'
 
 );

htdocs/class/xoopseditor/textarea/editor_registry.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
  */
 return $config = array(
     'class' => 'FormTextArea',
-    'file' => XOOPS_ROOT_PATH . '/class/xoopseditor/textarea/textarea.php',
+    'file' => XOOPS_ROOT_PATH.'/class/xoopseditor/textarea/textarea.php',
     'title' => _XOOPS_EDITOR_TEXTAREA, // display to end user
     'order' => 1, // 0 will disable the editor
     'nohtml' => 1 // For forms that have "dohtml" disabled

htdocs/class/template.php

Indentation +6 added lines, -6 removed lines

@@ -60,12 +60,12 @@
         parent::__construct();
         $this->setCompileId();
         $this->assign(array(
-                          'xoops_url'        => XOOPS_URL,
-                          'xoops_rootpath'   => XOOPS_ROOT_PATH,
-                          'xoops_langcode'   => _LANGCODE,
-                          'xoops_charset'    => _CHARSET,
-                          'xoops_version'    => XOOPS_VERSION,
-                          'xoops_upload_url' => XOOPS_UPLOAD_URL));
+                            'xoops_url'        => XOOPS_URL,
+                            'xoops_rootpath'   => XOOPS_ROOT_PATH,
+                            'xoops_langcode'   => _LANGCODE,
+                            'xoops_charset'    => _CHARSET,
+                            'xoops_version'    => XOOPS_VERSION,
+                            'xoops_upload_url' => XOOPS_UPLOAD_URL));
     }
 
     /**

Spacing +13 added lines, -13 removed lines

@@ -22,8 +22,8 @@ 
 /**
  * Base class: Smarty template engine
  */
-define('SMARTY_DIR', XOOPS_ROOT_PATH . '/class/smarty/');
-require_once SMARTY_DIR . 'Smarty.class.php';
+define('SMARTY_DIR', XOOPS_ROOT_PATH.'/class/smarty/');
+require_once SMARTY_DIR.'Smarty.class.php';
 
 /**
  * Template engine
@@ -45,12 +45,12 @@ 
         $this->left_delimiter  = '<{';
         $this->right_delimiter = '}>';
         $this->template_dir    = XOOPS_THEME_PATH;
-        $this->cache_dir       = XOOPS_VAR_PATH . '/caches/smarty_cache';
-        $this->compile_dir     = XOOPS_VAR_PATH . '/caches/smarty_compile';
+        $this->cache_dir       = XOOPS_VAR_PATH.'/caches/smarty_cache';
+        $this->compile_dir     = XOOPS_VAR_PATH.'/caches/smarty_compile';
         $this->compile_check   = ($xoopsConfig['theme_fromfile'] == 1);
         $this->plugins_dir     = array(
-            XOOPS_ROOT_PATH . '/class/smarty/xoops_plugins',
-            XOOPS_ROOT_PATH . '/class/smarty/plugins');
+            XOOPS_ROOT_PATH.'/class/smarty/xoops_plugins',
+            XOOPS_ROOT_PATH.'/class/smarty/plugins');
         if ($xoopsConfig['debug_mode']) {
             $this->debugging_ctrl = 'URL';
             if ($xoopsConfig['debug_mode'] == 3) {
@@ -80,7 +80,7 @@ 
     public function fetchFromData($tplSource, $display = false, $vars = null)
     {
         if (!function_exists('smarty_function_eval')) {
-            require_once SMARTY_DIR . '/plugins/function.eval.php';
+            require_once SMARTY_DIR.'/plugins/function.eval.php';
         }
         if (isset($vars)) {
             $oldVars = $this->_tpl_vars;
@@ -123,7 +123,7 @@ 
     public function _get_auto_id($cache_id = null, $compile_id = null)
     {
         if (isset($cache_id)) {
-            return isset($compile_id) ? $compile_id . '-' . $cache_id : $cache_id;
+            return isset($compile_id) ? $compile_id.'-'.$cache_id : $cache_id;
         } elseif (isset($compile_id)) {
             return $compile_id;
         } else {
@@ -146,7 +146,7 @@ 
         $template_set      = empty($template_set) ? $xoopsConfig['template_set'] : $template_set;
         $theme_set         = empty($theme_set) ? $xoopsConfig['theme_set'] : $theme_set;
         $module_dirname    = empty($module_dirname) ? (empty($GLOBALS['xoopsModule']) ? 'system' : $GLOBALS['xoopsModule']->getVar('dirname', 'n')) : $module_dirname;
-        $this->compile_id  = substr(md5(XOOPS_URL), 0, 8) . '-' . $module_dirname . '-' . $theme_set . '-' . $template_set;
+        $this->compile_id  = substr(md5(XOOPS_URL), 0, 8).'-'.$module_dirname.'-'.$theme_set.'-'.$template_set;
         $this->_compile_id = $this->compile_id;
     }
 
@@ -162,13 +162,13 @@ 
     {
         $compile_id = $this->compile_id;
         $this->setCompileId($module_dirname, $template_set, $theme_set);
-        $_params           = array(
+        $_params = array(
             'auto_base'   => $this->cache_dir,
             'auto_source' => null,
             'auto_id'     => $this->compile_id,
             'exp_time'    => null);
         $this->_compile_id = $this->compile_id = $compile_id;
-        require_once SMARTY_CORE_DIR . 'core.rm_auto.php';
+        require_once SMARTY_CORE_DIR.'core.rm_auto.php';
 
         return smarty_core_rm_auto($_params, $this);
     }
@@ -288,7 +288,7 @@ 
         $file = $tplfile->getVar('tpl_file', 'n');
         $tpl  = new XoopsTpl();
 
-        return $tpl->touch('db:' . $file);
+        return $tpl->touch('db:'.$file);
     }
 
     return false;
@@ -309,7 +309,7 @@ 
         $xoopsTpl->caching = 2;
         for ($i = 0; $i < $count; ++$i) {
             if ($block_arr[$i]->getVar('template') != '') {
-                $xoopsTpl->clear_cache('db:' . $block_arr[$i]->getVar('template'), 'blk_' . $block_arr[$i]->getVar('bid'));
+                $xoopsTpl->clear_cache('db:'.$block_arr[$i]->getVar('template'), 'blk_'.$block_arr[$i]->getVar('bid'));
             }
         }
     }

htdocs/class/smarty/Smarty_Compiler.class.php

Indentation +30 added lines, -30 removed lines

@@ -130,7 +130,7 @@ 
 
         // matches all valid variables (no quotes, no modifiers)
         $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+            . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
 
         // matches valid variable syntax:
         // $foo
@@ -172,7 +172,7 @@ 
         // |foo|bar
         // |foo:$foo->bar
         $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+            . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
 
         // matches valid function name:
         // foo123
@@ -193,7 +193,7 @@ 
         // "text"|bar
         // $foo->bar
         $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+            . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -210,7 +210,7 @@ 
         // _foo_bar($foo,"bar")
         // foo123($foo,$foo->bar(),"foo")
         $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
+            . $this->_parenth_param_regexp . '))';
     }
 
     /**
@@ -262,7 +262,7 @@ 
 
         /* replace special blocks by "{php}" */
         $source_content = preg_replace_callback($search, array($this,'_preg_callback')
-                                       , $source_content);
+                                        , $source_content);
 
         /* Gather all template tags. */
         preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match);
@@ -383,7 +383,7 @@ 
                 if ($postfilter === false) continue;
                 if ($postfilter[3] || is_callable($postfilter[0])) {
                     $compiled_content = call_user_func_array($postfilter[0],
-                                                              array($compiled_content, &$this));
+                                                                array($compiled_content, &$this));
                     $this->_plugins['postfilter'][$filter_name][3] = true;
                 } else {
                     $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented");
@@ -644,8 +644,8 @@ 
                 $output = call_user_func_array($plugin_func, array($tag_args, &$this));
                 if($output != '') {
                 $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
-                                   . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
+                                    . $output
+                                    . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
                 }
             } else {
                 $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
@@ -751,9 +751,9 @@ 
 
     function _preg_callback ($matches) {
     return $this->_quote_replace($this->left_delimiter)
-           . 'php'
-           . str_repeat("\n", substr_count($matches[1], "\n"))
-           . $this->_quote_replace($this->right_delimiter);
+            . 'php'
+            . str_repeat("\n", substr_count($matches[1], "\n"))
+            . $this->_quote_replace($this->right_delimiter);
     }
     /**
      * compile custom function tag
@@ -1108,7 +1108,7 @@ 
             $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
         else
             $output .= "if ({$section_props}['max'] < 0)\n" .
-                       "    {$section_props}['max'] = {$section_props}['loop'];\n";
+                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
 
         if (!isset($attrs['step']))
             $output .= "{$section_props}['step'] = 1;\n";
@@ -1117,9 +1117,9 @@ 
             $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
         else {
             $output .= "if ({$section_props}['start'] < 0)\n" .
-                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
-                       "else\n" .
-                       "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
+                        "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
+                        "else\n" .
+                        "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
         }
 
         $output .= "if ({$section_props}['show']) {\n";
@@ -1129,9 +1129,9 @@ 
             $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
         }
         $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
-                   "    {$section_props}['total'] = 0;\n";
+                    "        {$section_props}['show'] = false;\n" .
+                    "} else\n" .
+                    "    {$section_props}['total'] = 0;\n";
 
         $output .= "if ({$section_props}['show']):\n";
         $output .= "
@@ -1980,8 +1980,8 @@ 
         }
         if (!isset($this->_plugin_info[$type][$name])) {
             $this->_plugin_info[$type][$name] = array($this->_current_file,
-                                                      $this->_current_line_no,
-                                                      $delayed_loading);
+                                                        $this->_current_line_no,
+                                                        $delayed_loading);
         }
     }
 
@@ -2049,7 +2049,7 @@ 
             case 'get':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_GET";
@@ -2058,7 +2058,7 @@ 
             case 'post':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_POST";
@@ -2067,7 +2067,7 @@ 
             case 'cookies':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_COOKIE";
@@ -2076,7 +2076,7 @@ 
             case 'env':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_ENV";
@@ -2085,7 +2085,7 @@ 
             case 'server':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SERVER";
@@ -2094,7 +2094,7 @@ 
             case 'session':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 $compiled_ref = "\$_SESSION";
@@ -2107,7 +2107,7 @@ 
             case 'request':
                 if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) {
                     $this->_syntax_error("(secure mode) super global access not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 if ($this->request_use_auto_globals) {
@@ -2134,7 +2134,7 @@ 
             case 'const':
                 if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) {
                     $this->_syntax_error("(secure mode) constants not permitted",
-                                         E_USER_WARNING, __FILE__, __LINE__);
+                                            E_USER_WARNING, __FILE__, __LINE__);
                     return;
                 }
                 array_shift($indexes);
@@ -2190,7 +2190,7 @@ 
                 return ((is_object($this->_plugins[$type][$name][0][0])) ?
                         "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
                         : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
+                        ). $this->_plugins[$type][$name][0][1];
 
             } else {
                 /* function callback */
@@ -2335,7 +2335,7 @@ 
             $message = " expected {/$_open_tag} (opened line $_line_no).";
         }
         $this->_syntax_error("mismatched tag {/$close_tag}.$message",
-                             E_USER_ERROR, __FILE__, __LINE__);
+                                E_USER_ERROR, __FILE__, __LINE__);
     }
 
 }

Spacing +230 added lines, -230 removed lines

@@ -38,41 +38,41 @@ 
     /**#@+
      * @access private
      */
-    var $_folded_blocks         =   array();    // keeps folded template blocks
-    var $_current_file          =   null;       // the current template being compiled
-    var $_current_line_no       =   1;          // line number for error messages
-    var $_capture_stack         =   array();    // keeps track of nested capture buffers
-    var $_plugin_info           =   array();    // keeps track of plugins to load
-    var $_init_smarty_vars      =   false;
-    var $_permitted_tokens      =   array('true','false','yes','no','on','off','null');
-    var $_db_qstr_regexp        =   null;        // regexps are setup in the constructor
-    var $_si_qstr_regexp        =   null;
-    var $_qstr_regexp           =   null;
-    var $_func_regexp           =   null;
-    var $_reg_obj_regexp        =   null;
-    var $_var_bracket_regexp    =   null;
-    var $_num_const_regexp      =   null;
-    var $_dvar_guts_regexp      =   null;
-    var $_dvar_regexp           =   null;
-    var $_cvar_regexp           =   null;
-    var $_svar_regexp           =   null;
-    var $_avar_regexp           =   null;
-    var $_mod_regexp            =   null;
-    var $_var_regexp            =   null;
-    var $_parenth_param_regexp  =   null;
-    var $_func_call_regexp      =   null;
-    var $_obj_ext_regexp        =   null;
-    var $_obj_start_regexp      =   null;
-    var $_obj_params_regexp     =   null;
-    var $_obj_call_regexp       =   null;
-    var $_cacheable_state       =   0;
-    var $_cache_attrs_count     =   0;
-    var $_nocache_count         =   0;
-    var $_cache_serial          =   null;
-    var $_cache_include         =   null;
-
-    var $_strip_depth           =   0;
-    var $_additional_newline    =   "\n";
+    var $_folded_blocks         = array(); // keeps folded template blocks
+    var $_current_file          = null; // the current template being compiled
+    var $_current_line_no       = 1; // line number for error messages
+    var $_capture_stack         = array(); // keeps track of nested capture buffers
+    var $_plugin_info           = array(); // keeps track of plugins to load
+    var $_init_smarty_vars      = false;
+    var $_permitted_tokens      = array('true', 'false', 'yes', 'no', 'on', 'off', 'null');
+    var $_db_qstr_regexp        = null; // regexps are setup in the constructor
+    var $_si_qstr_regexp        = null;
+    var $_qstr_regexp           = null;
+    var $_func_regexp           = null;
+    var $_reg_obj_regexp        = null;
+    var $_var_bracket_regexp    = null;
+    var $_num_const_regexp      = null;
+    var $_dvar_guts_regexp      = null;
+    var $_dvar_regexp           = null;
+    var $_cvar_regexp           = null;
+    var $_svar_regexp           = null;
+    var $_avar_regexp           = null;
+    var $_mod_regexp            = null;
+    var $_var_regexp            = null;
+    var $_parenth_param_regexp  = null;
+    var $_func_call_regexp      = null;
+    var $_obj_ext_regexp        = null;
+    var $_obj_start_regexp      = null;
+    var $_obj_params_regexp     = null;
+    var $_obj_call_regexp       = null;
+    var $_cacheable_state       = 0;
+    var $_cache_attrs_count     = 0;
+    var $_nocache_count         = 0;
+    var $_cache_serial          = null;
+    var $_cache_include         = null;
+
+    var $_strip_depth           = 0;
+    var $_additional_newline    = "\n";
 
     /**#@-*/
     /**
@@ -91,7 +91,7 @@ 
         $this->_si_qstr_regexp = '\'[^\'\\\\]*(?:\\\\.[^\'\\\\]*)*\'';
 
         // matches single or double quoted strings
-        $this->_qstr_regexp = '(?:' . $this->_db_qstr_regexp . '|' . $this->_si_qstr_regexp . ')';
+        $this->_qstr_regexp = '(?:'.$this->_db_qstr_regexp.'|'.$this->_si_qstr_regexp.')';
 
         // matches bracket portion of vars
         // [0]
@@ -115,9 +115,9 @@ 
         // $foo[5].bar[$foobar][4]
         $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))';
         $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]';
-        $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp
-                . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?';
-        $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp;
+        $this->_dvar_guts_regexp = '\w+(?:'.$this->_var_bracket_regexp
+                . ')*(?:\.\$?\w+(?:'.$this->_var_bracket_regexp.')*)*(?:'.$this->_dvar_math_regexp.'(?:'.$this->_num_const_regexp.'|'.$this->_dvar_math_var_regexp.')*)?';
+        $this->_dvar_regexp = '\$'.$this->_dvar_guts_regexp;
 
         // matches config vars:
         // #foo#
@@ -129,8 +129,8 @@ 
         $this->_svar_regexp = '\%\w+\.\w+\%';
 
         // matches all valid variables (no quotes, no modifiers)
-        $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|'
-           . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')';
+        $this->_avar_regexp = '(?:'.$this->_dvar_regexp.'|'
+           . $this->_cvar_regexp.'|'.$this->_svar_regexp.')';
 
         // matches valid variable syntax:
         // $foo
@@ -139,7 +139,7 @@ 
         // #foo#
         // "text"
         // "text"
-        $this->_var_regexp = '(?:' . $this->_avar_regexp . '|' . $this->_qstr_regexp . ')';
+        $this->_var_regexp = '(?:'.$this->_avar_regexp.'|'.$this->_qstr_regexp.')';
 
         // matches valid object call (one level of object nesting allowed in parameters):
         // $foo->bar
@@ -152,16 +152,16 @@ 
         // $foo->bar($foo->bar)
         // $foo->bar($foo->bar())
         // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar))
-        $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')';
+        $this->_obj_ext_regexp = '\->(?:\$?'.$this->_dvar_guts_regexp.')';
         $this->_obj_restricted_param_regexp = '(?:'
-                . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')'
-                . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)';
-        $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)';
-        $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp
-                . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)';
-        $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)';
-        $this->_obj_call_regexp = '(?:' . $this->_obj_start_regexp . '(?:' . $this->_obj_params_regexp . ')?(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?)';
+                . '(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.')(?:'.$this->_obj_ext_regexp.'(?:\((?:(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.')'
+                . '(?:\s*,\s*(?:'.$this->_var_regexp.'|'.$this->_num_const_regexp.'))*)?\))?)*)';
+        $this->_obj_single_param_regexp = '(?:\w+|'.$this->_obj_restricted_param_regexp.'(?:\s*,\s*(?:(?:\w+|'
+                . $this->_var_regexp.$this->_obj_restricted_param_regexp.')))*)';
+        $this->_obj_params_regexp = '\((?:'.$this->_obj_single_param_regexp
+                . '(?:\s*,\s*'.$this->_obj_single_param_regexp.')*)?\)';
+        $this->_obj_start_regexp = '(?:'.$this->_dvar_regexp.'(?:'.$this->_obj_ext_regexp.')+)';
+        $this->_obj_call_regexp = '(?:'.$this->_obj_start_regexp.'(?:'.$this->_obj_params_regexp.')?(?:'.$this->_dvar_math_regexp.'(?:'.$this->_num_const_regexp.'|'.$this->_dvar_math_var_regexp.')*)?)';
         
         // matches valid modifier syntax:
         // |foo
@@ -171,8 +171,8 @@ 
         // |foo:"bar":$foobar
         // |foo|bar
         // |foo:$foo->bar
-        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|'
-           . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)';
+        $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|'.$this->_num_const_regexp.'|'
+           . $this->_obj_call_regexp.'|'.$this->_avar_regexp.'|'.$this->_qstr_regexp.'))*)';
 
         // matches valid function name:
         // foo123
@@ -192,8 +192,8 @@ 
         // "text"
         // "text"|bar
         // $foo->bar
-        $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|'
-           . $this->_var_regexp . '|' . $this->_num_const_regexp  . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)';
+        $this->_param_regexp = '(?:\s*(?:'.$this->_obj_call_regexp.'|'
+           . $this->_var_regexp.'|'.$this->_num_const_regexp.'|\w+)(?>'.$this->_mod_regexp.'*)\s*)';
 
         // matches valid parenthesised function parameters:
         //
@@ -201,16 +201,16 @@ 
         //    $foo, $bar, "text"
         // $foo|bar, "foo"|bar, $foo->bar($foo)|bar
         $this->_parenth_param_regexp = '(?:\((?:\w+|'
-                . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|'
-                . $this->_param_regexp . ')))*)?\))';
+                . $this->_param_regexp.'(?:\s*,\s*(?:(?:\w+|'
+                . $this->_param_regexp.')))*)?\))';
 
         // matches valid function call:
         // foo()
         // foo_bar($foo)
         // _foo_bar($foo,"bar")
         // foo123($foo,$foo->bar(),"foo")
-        $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:'
-           . $this->_parenth_param_regexp . '))';
+        $this->_func_call_regexp = '(?:'.$this->_func_regexp.'\s*(?:'
+           . $this->_parenth_param_regexp.'))';
     }
 
     /**
@@ -257,11 +257,11 @@ 
         /* fetch all special blocks */
         $search = "~{$ldq}\*(.*?)\*{$rdq}|{$ldq}\s*literal\s*{$rdq}(.*?){$ldq}\s*/literal\s*{$rdq}|{$ldq}\s*php\s*{$rdq}(.*?){$ldq}\s*/php\s*{$rdq}~s";
 
-        preg_match_all($search, $source_content, $match,  PREG_SET_ORDER);
+        preg_match_all($search, $source_content, $match, PREG_SET_ORDER);
         $this->_folded_blocks = $match;
 
         /* replace special blocks by "{php}" */
-        $source_content = preg_replace_callback($search, array($this,'_preg_callback')
+        $source_content = preg_replace_callback($search, array($this, '_preg_callback')
                                        , $source_content);
 
         /* Gather all template tags. */
@@ -278,7 +278,7 @@ 
                 $sp_match[1] = array_unique($sp_match[1]);
                 usort($sp_match[1], '_smarty_sort_length');
                 for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
-                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp],'%%%SMARTYSP'.$curr_sp.'%%%',$text_blocks[$curr_tb]);
+                    $text_blocks[$curr_tb] = str_replace($sp_match[1][$curr_sp], '%%%SMARTYSP'.$curr_sp.'%%%', $text_blocks[$curr_tb]);
                 }
                 /* process each one */
                 for ($curr_sp = 0, $for_max2 = count($sp_match[1]); $curr_sp < $for_max2; $curr_sp++) {
@@ -307,7 +307,7 @@ 
             $compiled_tags[] = $this->_compile_tag($template_tags[$i]);
             $this->_current_line_no += substr_count($template_tags[$i], "\n");
         }
-        if (count($this->_tag_stack)>0) {
+        if (count($this->_tag_stack) > 0) {
             list($_open_tag, $_line_no) = end($this->_tag_stack);
             $this->_syntax_error("unclosed tag \{$_open_tag} (opened line $_line_no).", E_USER_ERROR, __FILE__, __LINE__);
             return;
@@ -332,7 +332,7 @@ 
                         /* remove trailing whitespaces from the last text_block */
                         $text_blocks[$j] = rtrim($text_blocks[$j]);
                     }
-                    $text_blocks[$j] = "<?php echo '" . strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>";
+                    $text_blocks[$j] = "<?php echo '".strtr($text_blocks[$j], array("'"=>"\'", "\\"=>"\\\\"))."'; ?>";
                     if ($compiled_tags[$j] == '{/strip}') {
                         $compiled_tags[$j] = "\n"; /* slurped by php, but necessary
                                     if a newline is following the closing strip-tag */
@@ -345,19 +345,19 @@ 
         }
         $compiled_content = '';
         
-        $tag_guard = '%%%SMARTYOTG' . md5(uniqid(rand(), true)) . '%%%';
+        $tag_guard = '%%%SMARTYOTG'.md5(uniqid(rand(), true)).'%%%';
         
         /* Interleave the compiled contents and text blocks to get the final result. */
         for ($i = 0, $for_max = count($compiled_tags); $i < $for_max; $i++) {
             if ($compiled_tags[$i] == '') {
                 // tag result empty, remove first newline from following text block
-                $text_blocks[$i+1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i+1]);
+                $text_blocks[$i + 1] = preg_replace('~^(\r\n|\r|\n)~', '', $text_blocks[$i + 1]);
             }
             // replace legit PHP tags with placeholder
             $text_blocks[$i] = str_replace('<?', $tag_guard, $text_blocks[$i]);
             $compiled_tags[$i] = str_replace('<?', $tag_guard, $compiled_tags[$i]);
             
-            $compiled_content .= $text_blocks[$i] . $compiled_tags[$i];
+            $compiled_content .= $text_blocks[$i].$compiled_tags[$i];
         }
         $compiled_content .= str_replace('<?', $tag_guard, $text_blocks[$i]);
 
@@ -369,12 +369,12 @@ 
         $compiled_content = str_replace($tag_guard, '<?', $compiled_content); 
         
         // remove \n from the end of the file, if any
-        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n") ) {
+        if (strlen($compiled_content) && (substr($compiled_content, -1) == "\n")) {
             $compiled_content = substr($compiled_content, 0, -1);
         }
 
         if (!empty($this->_cache_serial)) {
-            $compiled_content = "<?php \$this->_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>" . $compiled_content;
+            $compiled_content = "<?php \$this->_cache_serials['".$this->_cache_include."'] = '".$this->_cache_serial."'; ?>".$compiled_content;
         }
 
         // run compiled template through postfilter functions
@@ -401,7 +401,7 @@ 
             $_plugins_params = "array('plugins' => array(";
             foreach ($this->_plugin_info as $plugin_type => $plugins) {
                 foreach ($plugins as $plugin_name => $plugin_info) {
-                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '" . strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\")) . "', $plugin_info[1], ";
+                    $_plugins_params .= "array('$plugin_type', '$plugin_name', '".strtr($plugin_info[0], array("'" => "\\'", "\\" => "\\\\"))."', $plugin_info[1], ";
                     $_plugins_params .= $plugin_info[2] ? 'true),' : 'false),';
                 }
             }
@@ -417,7 +417,7 @@ 
             $this->_init_smarty_vars = false;
         }
 
-        $compiled_content = $template_header . $compiled_content;
+        $compiled_content = $template_header.$compiled_content;
         return true;
     }
 
@@ -434,8 +434,8 @@ 
             return '';
         
         /* Split tag into two three parts: command, command modifiers and the arguments. */
-        if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
-                . '|\/?' . $this->_reg_obj_regexp . '|\/?' . $this->_func_regexp . ')(' . $this->_mod_regexp . '*))
+        if (!preg_match('~^(?:('.$this->_num_const_regexp.'|'.$this->_obj_call_regexp.'|'.$this->_var_regexp
+                . '|\/?'.$this->_reg_obj_regexp.'|\/?'.$this->_func_regexp.')('.$this->_mod_regexp.'*))
                       (?:\s+(.*))?$
                     ~xs', $template_tag, $match)) {
             $this->_syntax_error("unrecognized tag: $template_tag", E_USER_ERROR, __FILE__, __LINE__);
@@ -445,14 +445,14 @@ 
         $tag_modifier = isset($match[2]) ? $match[2] : null;
         $tag_args = isset($match[3]) ? $match[3] : null;
 
-        if (preg_match('~^' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '$~', $tag_command)) {
+        if (preg_match('~^'.$this->_num_const_regexp.'|'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'$~', $tag_command)) {
             /* tag name is a variable or object */
-            $_return = $this->_parse_var_props($tag_command . $tag_modifier);
-            return "<?php echo $_return; ?>" . $this->_additional_newline;
+            $_return = $this->_parse_var_props($tag_command.$tag_modifier);
+            return "<?php echo $_return; ?>".$this->_additional_newline;
         }
 
         /* If the tag name is a registered object, we process it. */
-        if (preg_match('~^\/?' . $this->_reg_obj_regexp . '$~', $tag_command)) {
+        if (preg_match('~^\/?'.$this->_reg_obj_regexp.'$~', $tag_command)) {
             return $this->_compile_registered_object_tag($tag_command, $this->_parse_attrs($tag_args), $tag_modifier);
         }
 
@@ -534,17 +534,17 @@ 
 
             case 'strip':
             case '/strip':
-                if (substr($tag_command, 0, 1)=='/') {
+                if (substr($tag_command, 0, 1) == '/') {
                     $this->_pop_tag('strip');
-                    if (--$this->_strip_depth==0) { /* outermost closing {/strip} */
+                    if (--$this->_strip_depth == 0) { /* outermost closing {/strip} */
                         $this->_additional_newline = "\n";
-                        return '{' . $tag_command . '}';
+                        return '{'.$tag_command.'}';
                     }
                 } else {
                     $this->_push_tag('strip');
-                    if ($this->_strip_depth++==0) { /* outermost opening {strip} */
+                    if ($this->_strip_depth++ == 0) { /* outermost opening {strip} */
                         $this->_additional_newline = "";
-                        return '{' . $tag_command . '}';
+                        return '{'.$tag_command.'}';
                     }
                 }
                 return '';
@@ -560,14 +560,14 @@ 
                         return '';
 
                     case 3: /* literal */
-                        return "<?php echo '" . strtr($block[2], array("'"=>"\'", "\\"=>"\\\\")) . "'; ?>" . $this->_additional_newline;
+                        return "<?php echo '".strtr($block[2], array("'"=>"\'", "\\"=>"\\\\"))."'; ?>".$this->_additional_newline;
 
                     case 4: /* php */
                         if ($this->security && !$this->security_settings['PHP_TAGS']) {
                             $this->_syntax_error("(secure mode) php tags not permitted", E_USER_WARNING, __FILE__, __LINE__);
                             return;
                         }
-                        return '<?php ' . $block[3] .' ?>';
+                        return '<?php '.$block[3].' ?>';
                 }
                 break;
 
@@ -624,7 +624,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_compiler_' . $tag_command;
+            $plugin_func = 'smarty_compiler_'.$tag_command;
             if (!is_callable($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -642,10 +642,10 @@ 
         if ($found) {
             if ($have_function) {
                 $output = call_user_func_array($plugin_func, array($tag_args, &$this));
-                if($output != '') {
-                $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command)
+                if ($output != '') {
+                $output = '<?php '.$this->_push_cacheable_state('compiler', $tag_command)
                                    . $output
-                                   . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>';
+                                   . $this->_pop_cacheable_state('compiler', $tag_command).' ?>';
                 }
             } else {
                 $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__);
@@ -699,7 +699,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_block_' . $tag_command;
+            $plugin_func = 'smarty_block_'.$tag_command;
             if (!function_exists($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -729,12 +729,12 @@ 
             $this->_pop_tag($tag_command);
 
         if ($start_tag) {
-            $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
+            $output = '<?php '.$this->_push_cacheable_state('block', $tag_command);
             $attrs = $this->_parse_attrs($tag_args);
-            $_cache_attrs='';
+            $_cache_attrs = '';
             $arg_list = $this->_compile_arg_list('block', $tag_command, $attrs, $_cache_attrs);
             $output .= "$_cache_attrs\$this->_tag_stack[] = array('$tag_command', array(".implode(',', $arg_list).')); ';
-            $output .= '$_block_repeat=true;' . $this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
+            $output .= '$_block_repeat=true;'.$this->_compile_plugin_call('block', $tag_command).'($this->_tag_stack[count($this->_tag_stack)-1][1], null, $this, $_block_repeat);';
             $output .= 'while ($_block_repeat) { ob_start(); ?>';
         } else {
             $output = '<?php $_block_content = ob_get_contents(); ob_end_clean(); ';
@@ -742,14 +742,14 @@ 
             if ($tag_modifier != '') {
                 $this->_parse_modifiers($_out_tag_text, $tag_modifier);
             }
-            $output .= '$_block_repeat=false;echo ' . $_out_tag_text . '; } ';
-            $output .= " array_pop(\$this->_tag_stack); " . $this->_pop_cacheable_state('block', $tag_command) . '?>';
+            $output .= '$_block_repeat=false;echo '.$_out_tag_text.'; } ';
+            $output .= " array_pop(\$this->_tag_stack); ".$this->_pop_cacheable_state('block', $tag_command).'?>';
         }
 
         return true;
     }
 
-    function _preg_callback ($matches) {
+    function _preg_callback($matches) {
     return $this->_quote_replace($this->left_delimiter)
            . 'php'
            . str_repeat("\n", substr_count($matches[1], "\n"))
@@ -789,7 +789,7 @@ 
 
             include_once $plugin_file;
 
-            $plugin_func = 'smarty_function_' . $tag_command;
+            $plugin_func = 'smarty_function_'.$tag_command;
             if (!function_exists($plugin_func)) {
                 $message = "plugin function $plugin_func() not found in $plugin_file\n";
                 $have_function = false;
@@ -816,13 +816,13 @@ 
         $arg_list = $this->_compile_arg_list('function', $tag_command, $attrs, $_cache_attrs);
 
         $output = $this->_compile_plugin_call('function', $tag_command).'(array('.implode(',', $arg_list)."), \$this)";
-        if($tag_modifier != '') {
+        if ($tag_modifier != '') {
             $this->_parse_modifiers($output, $tag_modifier);
         }
 
-        if($output != '') {
-            $output =  '<?php ' . $_cacheable_state . $_cache_attrs . 'echo ' . $output . ';'
-                . $this->_pop_cacheable_state('function', $tag_command) . "?>" . $this->_additional_newline;
+        if ($output != '') {
+            $output = '<?php '.$_cacheable_state.$_cache_attrs.'echo '.$output.';'
+                . $this->_pop_cacheable_state('function', $tag_command)."?>".$this->_additional_newline;
         }
 
         return true;
@@ -848,10 +848,10 @@ 
         list($object, $obj_comp) = explode('->', $tag_command);
 
         $arg_list = array();
-        if(count($attrs)) {
+        if (count($attrs)) {
             $_assign_var = false;
             foreach ($attrs as $arg_name => $arg_value) {
-                if($arg_name == 'assign') {
+                if ($arg_name == 'assign') {
                     $_assign_var = $arg_value;
                     unset($attrs['assign']);
                     continue;
@@ -862,7 +862,7 @@ 
             }
         }
 
-        if($this->_reg_objects[$object][2]) {
+        if ($this->_reg_objects[$object][2]) {
             // smarty object argument format
             $args = "array(".implode(',', (array)$arg_list)."), \$this";
         } else {
@@ -876,13 +876,13 @@ 
         $prefix = '';
         $postfix = '';
         $newline = '';
-        if(!is_object($this->_reg_objects[$object][0])) {
-            $this->_trigger_fatal_error("registered '$object' is not an object" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
+        if (!is_object($this->_reg_objects[$object][0])) {
+            $this->_trigger_fatal_error("registered '$object' is not an object", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
+        } elseif (!empty($this->_reg_objects[$object][1]) && !in_array($obj_comp, $this->_reg_objects[$object][1])) {
             $this->_trigger_fatal_error("'$obj_comp' is not a registered component of object '$object'", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
-        } elseif(method_exists($this->_reg_objects[$object][0], $obj_comp)) {
+        } elseif (method_exists($this->_reg_objects[$object][0], $obj_comp)) {
             // method
-            if(in_array($obj_comp, $this->_reg_objects[$object][3])) {
+            if (in_array($obj_comp, $this->_reg_objects[$object][3])) {
                 // block method
                 if ($start_tag) {
                     $prefix = "\$this->_tag_stack[] = array('$obj_comp', $args); ";
@@ -904,22 +904,22 @@ 
             $return = "\$this->_reg_objects['$object'][0]->$obj_comp";
         }
 
-        if($return != null) {
-            if($tag_modifier != '') {
+        if ($return != null) {
+            if ($tag_modifier != '') {
                 $this->_parse_modifiers($return, $tag_modifier);
             }
 
-            if(!empty($_assign_var)) {
-                $output = "\$this->assign('" . $this->_dequote($_assign_var) ."',  $return);";
+            if (!empty($_assign_var)) {
+                $output = "\$this->assign('".$this->_dequote($_assign_var)."',  $return);";
             } else {
-                $output = 'echo ' . $return . ';';
+                $output = 'echo '.$return.';';
                 $newline = $this->_additional_newline;
             }
         } else {
             $output = '';
         }
 
-        return '<?php ' . $prefix . $output . $postfix . "?>" . $newline;
+        return '<?php '.$prefix.$output.$postfix."?>".$newline;
     }
 
     /**
@@ -957,7 +957,7 @@ 
 
         $_params = "array('args' => array(".implode(', ', (array)$arg_list)."))";
 
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.run_insert_handler.php');\necho smarty_core_run_insert_handler($_params, \$this); ?>".$this->_additional_newline;
     }
 
     /**
@@ -998,13 +998,13 @@ 
             "\$_smarty_tpl_vars = \$this->_tpl_vars;\n";
 
 
-        $_params = "array('smarty_include_tpl_file' => " . $include_file . ", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
-        $output .= "\$this->_smarty_include($_params);\n" .
-        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n" .
+        $_params = "array('smarty_include_tpl_file' => ".$include_file.", 'smarty_include_vars' => array(".implode(',', (array)$arg_list)."))";
+        $output .= "\$this->_smarty_include($_params);\n".
+        "\$this->_tpl_vars = \$_smarty_tpl_vars;\n".
         "unset(\$_smarty_tpl_vars);\n";
 
         if (isset($assign_var)) {
-            $output .= "\$this->assign(" . $assign_var . ", ob_get_contents()); ob_end_clean();\n";
+            $output .= "\$this->assign(".$assign_var.", ob_get_contents()); ob_end_clean();\n";
         }
 
         $output .= ' ?>';
@@ -1028,20 +1028,20 @@ 
         }
 
         $assign_var = (empty($attrs['assign'])) ? '' : $this->_dequote($attrs['assign']);
-        $once_var = (empty($attrs['once']) || $attrs['once']=='false') ? 'false' : 'true';
+        $once_var = (empty($attrs['once']) || $attrs['once'] == 'false') ? 'false' : 'true';
 
         $arg_list = array();
-        foreach($attrs as $arg_name => $arg_value) {
-            if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
-                if(is_bool($arg_value))
+        foreach ($attrs as $arg_name => $arg_value) {
+            if ($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
+                if (is_bool($arg_value))
                     $arg_value = $arg_value ? 'true' : 'false';
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
 
-        $_params = "array('smarty_file' => " . $attrs['file'] . ", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
+        $_params = "array('smarty_file' => ".$attrs['file'].", 'smarty_assign' => '$assign_var', 'smarty_once' => $once_var, 'smarty_include_vars' => array(".implode(',', $arg_list)."))";
 
-        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>" . $this->_additional_newline;
+        return "<?php require_once(SMARTY_CORE_DIR . 'core.smarty_include_php.php');\nsmarty_core_smarty_include_php($_params, \$this); ?>".$this->_additional_newline;
     }
 
 
@@ -1107,7 +1107,7 @@ 
         if (!isset($attrs['max']))
             $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
         else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
+            $output .= "if ({$section_props}['max'] < 0)\n".
                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
 
         if (!isset($attrs['step']))
@@ -1116,9 +1116,9 @@ 
         if (!isset($attrs['start']))
             $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
         else {
-            $output .= "if ({$section_props}['start'] < 0)\n" .
-                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
-                       "else\n" .
+            $output .= "if ({$section_props}['start'] < 0)\n".
+                       "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n".
+                       "else\n".
                        "    {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n";
         }
 
@@ -1128,9 +1128,9 @@ 
         } else {
             $output .= "    {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n";
         }
-        $output .= "    if ({$section_props}['total'] == 0)\n" .
-                   "        {$section_props}['show'] = false;\n" .
-                   "} else\n" .
+        $output .= "    if ({$section_props}['total'] == 0)\n".
+                   "        {$section_props}['show'] = false;\n".
+                   "} else\n".
                    "    {$section_props}['total'] = 0;\n";
 
         $output .= "if ({$section_props}['show']):\n";
@@ -1175,7 +1175,7 @@ 
         }
 
         if (isset($attrs['key'])) {
-            $key  = $this->_dequote($attrs['key']);
+            $key = $this->_dequote($attrs['key']);
             if (!preg_match('~^\w+$~', $key)) {
                 return $this->_syntax_error("foreach: 'key' must to be a variable name (literal string)", E_USER_ERROR, __FILE__, __LINE__);
             }
@@ -1255,8 +1255,8 @@ 
 
         /* Tokenize args for 'if' tag. */
         preg_match_all('~(?>
-                ' . $this->_obj_call_regexp . '(?:' . $this->_mod_regexp . '*)? | # valid object call
-                ' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)?    | # var or quoted string
+                ' . $this->_obj_call_regexp.'(?:'.$this->_mod_regexp.'*)? | # valid object call
+                ' . $this->_var_regexp.'(?:'.$this->_mod_regexp.'*)?    | # var or quoted string
                 \-?0[xX][0-9a-fA-F]+|\-?\d+(?:\.\d+)?|\.\d+|!==|===|==|!=|<>|<<|>>|<=|>=|\&\&|\|\||\(|\)|,|\!|\^|=|\&|\~|<|>|\||\%|\+|\-|\/|\*|\@    | # valid non-word token
                 \b\w+\b                                                        | # valid word token
                 \S+                                                           # anything else
@@ -1264,7 +1264,7 @@ 
 
         $tokens = $match[0];
 
-        if(empty($tokens)) {
+        if (empty($tokens)) {
             $_error_msg = $elseif ? "'elseif'" : "'if'";
             $_error_msg .= ' statement requires arguments'; 
             $this->_syntax_error($_error_msg, E_USER_ERROR, __FILE__, __LINE__);
@@ -1273,7 +1273,7 @@ 
                 
         // make sure we have balanced parenthesis
         $token_count = array_count_values($tokens);
-        if(isset($token_count['(']) && $token_count['('] != $token_count[')']) {
+        if (isset($token_count['(']) && $token_count['('] != $token_count[')']) {
             $this->_syntax_error("unbalanced parenthesis in if statement", E_USER_ERROR, __FILE__, __LINE__);
         }
 
@@ -1363,15 +1363,15 @@ 
                     /* If last token was a ')', we operate on the parenthesized
                        expression. The start of the expression is on the stack.
                        Otherwise, we operate on the last encountered token. */
-                    if ($tokens[$i-1] == ')') {
+                    if ($tokens[$i - 1] == ')') {
                         $is_arg_start = array_pop($is_arg_stack);
                         if ($is_arg_start != 0) {
-                            if (preg_match('~^' . $this->_func_regexp . '$~', $tokens[$is_arg_start-1])) {
+                            if (preg_match('~^'.$this->_func_regexp.'$~', $tokens[$is_arg_start - 1])) {
                                 $is_arg_start--;
                             } 
                         } 
                     } else
-                        $is_arg_start = $i-1;
+                        $is_arg_start = $i - 1;
                     /* Construct the argument for 'is' expression, so it knows
                        what to operate on. */
                     $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
@@ -1381,7 +1381,7 @@ 
                        return modified tokens, where the first one is the result
                        of the 'is' expression and the rest are the tokens it
                        didn't touch. */
-                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i+1));
+                    $new_tokens = $this->_parse_is_expr($is_arg, array_slice($tokens, $i + 1));
 
                     /* Replace the old tokens with the new ones. */
                     array_splice($tokens, $is_arg_start, count($tokens), $new_tokens);
@@ -1392,19 +1392,19 @@ 
                     break;
 
                 default:
-                    if(preg_match('~^' . $this->_func_regexp . '$~', $token) ) {
+                    if (preg_match('~^'.$this->_func_regexp.'$~', $token)) {
                             // function call
-                            if($this->security &&
+                            if ($this->security &&
                                !in_array($token, $this->security_settings['IF_FUNCS'])) {
                                 $this->_syntax_error("(secure mode) '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);
                             }
-                    } elseif(preg_match('~^' . $this->_var_regexp . '$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i+1]) && $tokens[$i+1] == '(') {
+                    } elseif (preg_match('~^'.$this->_var_regexp.'$~', $token) && (strpos('+-*/^%&|', substr($token, -1)) === false) && isset($tokens[$i + 1]) && $tokens[$i + 1] == '(') {
                         // variable function call
                         $this->_syntax_error("variable function call '$token' not allowed in if statement", E_USER_ERROR, __FILE__, __LINE__);                      
-                    } elseif(preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . '*)$~', $token)) {
+                    } elseif (preg_match('~^'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'(?:'.$this->_mod_regexp.'*)$~', $token)) {
                         // object or variable
                         $token = $this->_parse_var_props($token);
-                    } elseif(is_numeric($token)) {
+                    } elseif (is_numeric($token)) {
                         // number, skip it
                     } else {
                         $this->_syntax_error("unidentified token '$token'", E_USER_ERROR, __FILE__, __LINE__);
@@ -1476,7 +1476,7 @@ 
                 if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
+                    $expr = "!(1 & ($is_arg / ".$this->_parse_var_props($expr_arg)."))";
                 } else
                     $expr = "!(1 & $is_arg)";
                 break;
@@ -1485,7 +1485,7 @@ 
                 if (isset($tokens[$expr_end]) && $tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
+                    $expr = "(1 & ($is_arg / ".$this->_parse_var_props($expr_arg)."))";
                 } else
                     $expr = "(1 & $is_arg)";
                 break;
@@ -1494,7 +1494,7 @@ 
                 if (@$tokens[$expr_end] == 'by') {
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
-                    $expr = "!($is_arg % " . $this->_parse_var_props($expr_arg) . ")";
+                    $expr = "!($is_arg % ".$this->_parse_var_props($expr_arg).")";
                 } else {
                     $this->_syntax_error("expecting 'by' after 'div'", E_USER_ERROR, __FILE__, __LINE__);
                 }
@@ -1525,11 +1525,11 @@ 
     {
 
         /* Tokenize tag attributes. */
-        preg_match_all('~(?:' . $this->_obj_call_regexp . '|' . $this->_qstr_regexp . ' | (?>[^"\'=\s]+)
+        preg_match_all('~(?:'.$this->_obj_call_regexp.'|'.$this->_qstr_regexp.' | (?>[^"\'=\s]+)
                          )+ |
                          [=]
                         ~x', $tag_args, $match);
-        $tokens       = $match[0];
+        $tokens = $match[0];
 
         $attrs = array();
         /* Parse state:
@@ -1570,9 +1570,9 @@ 
                             $token = 'false';
                         } else if ($token == 'null') {
                             $token = 'null';
-                        } else if (preg_match('~^' . $this->_num_const_regexp . '|0[xX][0-9a-fA-F]+$~', $token)) {
+                        } else if (preg_match('~^'.$this->_num_const_regexp.'|0[xX][0-9a-fA-F]+$~', $token)) {
                             /* treat integer literally */
-                        } else if (!preg_match('~^' . $this->_obj_call_regexp . '|' . $this->_var_regexp . '(?:' . $this->_mod_regexp . ')*$~', $token)) {
+                        } else if (!preg_match('~^'.$this->_obj_call_regexp.'|'.$this->_var_regexp.'(?:'.$this->_mod_regexp.')*$~', $token)) {
                             /* treat as a string, double-quote it escaping quotes */
                             $token = '"'.addslashes($token).'"';
                         }
@@ -1586,8 +1586,8 @@ 
             $last_token = $token;
         }
 
-        if($state != 0) {
-            if($state == 1) {
+        if ($state != 0) {
+            if ($state == 1) {
                 $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
             } else {
                 $this->_syntax_error("missing attribute value", E_USER_ERROR, __FILE__, __LINE__);
@@ -1607,7 +1607,7 @@ 
      */
     function _parse_vars_props(&$tokens)
     {
-        foreach($tokens as $key => $val) {
+        foreach ($tokens as $key => $val) {
             $tokens[$key] = $this->_parse_var_props($val);
         }
     }
@@ -1624,52 +1624,52 @@ 
     {
         $val = trim($val);
 
-        if(preg_match('~^(' . $this->_obj_call_regexp . '|' . $this->_dvar_regexp . ')(' . $this->_mod_regexp . '*)$~', $val, $match)) {
+        if (preg_match('~^('.$this->_obj_call_regexp.'|'.$this->_dvar_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match)) {
             // $ variable or object
             $return = $this->_parse_var($match[1]);
             $modifiers = $match[2];
-            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~',$modifiers)) {
-                $_default_mod_string = implode('|',(array)$this->default_modifiers);
-                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string . '|' . $modifiers;
+            if (!empty($this->default_modifiers) && !preg_match('~(^|\|)smarty:nodefaults($|\|)~', $modifiers)) {
+                $_default_mod_string = implode('|', (array)$this->default_modifiers);
+                $modifiers = empty($modifiers) ? $_default_mod_string : $_default_mod_string.'|'.$modifiers;
             }
             $this->_parse_modifiers($return, $modifiers);
             return $return;
-        } elseif (preg_match('~^' . $this->_db_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        } elseif (preg_match('~^'.$this->_db_qstr_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // double quoted text
-                preg_match('~^(' . $this->_db_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
+                preg_match('~^('.$this->_db_qstr_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match);
                 $return = $this->_expand_quoted_text($match[1]);
-                if($match[2] != '') {
+                if ($match[2] != '') {
                     $this->_parse_modifiers($return, $match[2]);
                 }
                 return $return;
             }
-        elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        elseif (preg_match('~^'.$this->_num_const_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // numerical constant
-                preg_match('~^(' . $this->_num_const_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
+                preg_match('~^('.$this->_num_const_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match);
+                if ($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
             }
-        elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        elseif (preg_match('~^'.$this->_si_qstr_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // single quoted text
-                preg_match('~^(' . $this->_si_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
-                if($match[2] != '') {
+                preg_match('~^('.$this->_si_qstr_regexp.')('.$this->_mod_regexp.'*)$~', $val, $match);
+                if ($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
             }
-        elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        elseif (preg_match('~^'.$this->_cvar_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // config var
                 return $this->_parse_conf_var($val);
             }
-        elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+        elseif (preg_match('~^'.$this->_svar_regexp.'(?:'.$this->_mod_regexp.'*)$~', $val)) {
                 // section var
                 return $this->_parse_section_prop($val);
             }
-        elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
+        elseif (!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
             // literal string
-            return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
+            return $this->_expand_quoted_text('"'.strtr($val, array('\\' => '\\\\', '"' => '\\"')).'"');
         }
         return $val;
     }
@@ -1683,11 +1683,11 @@ 
     function _expand_quoted_text($var_expr)
     {
         // if contains unescaped $, expand it
-        if(preg_match_all('~(?:\`(?<!\\\\)\$' . $this->_dvar_guts_regexp . '(?:' . $this->_obj_ext_regexp . ')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
+        if (preg_match_all('~(?:\`(?<!\\\\)\$'.$this->_dvar_guts_regexp.'(?:'.$this->_obj_ext_regexp.')*\`)|(?:(?<!\\\\)\$\w+(\[[a-zA-Z0-9]+\])*)~', $var_expr, $_match)) {
             $_match = $_match[0];
             $_replace = array();
-            foreach($_match as $_var) {
-                $_replace[$_var] = '".(' . $this->_parse_var(str_replace('`','',$_var)) . ')."';
+            foreach ($_match as $_var) {
+                $_replace[$_var] = '".('.$this->_parse_var(str_replace('`', '', $_var)).')."';
             }
             $var_expr = strtr($var_expr, $_replace);
             $_return = preg_replace('~\.""|(?<!\\\\)""\.~', '', $var_expr);
@@ -1695,7 +1695,7 @@ 
             $_return = $var_expr;
         }
         // replace double quoted literal string with single quotes
-        $_return = preg_replace('~^"([\s\w]+)"$~',"'\\1'",$_return);
+        $_return = preg_replace('~^"([\s\w]+)"$~', "'\\1'", $_return);
         return $_return;
     }
 
@@ -1711,26 +1711,26 @@ 
         $_has_math = false;
         $_math_vars = preg_split('~('.$this->_dvar_math_regexp.'|'.$this->_qstr_regexp.')~', $var_expr, -1, PREG_SPLIT_DELIM_CAPTURE);
 
-        if(count($_math_vars) > 1) {
+        if (count($_math_vars) > 1) {
             $_first_var = "";
             $_complete_var = "";
             $_output = "";
             // simple check if there is any math, to stop recursion (due to modifiers with "xx % yy" as parameter)
-            foreach($_math_vars as $_k => $_math_var) {
+            foreach ($_math_vars as $_k => $_math_var) {
                 $_math_var = $_math_vars[$_k];
 
-                if(!empty($_math_var) || is_numeric($_math_var)) {
+                if (!empty($_math_var) || is_numeric($_math_var)) {
                     // hit a math operator, so process the stuff which came before it
-                    if(preg_match('~^' . $this->_dvar_math_regexp . '$~', $_math_var)) {
+                    if (preg_match('~^'.$this->_dvar_math_regexp.'$~', $_math_var)) {
                         $_has_math = true;
-                        if(!empty($_complete_var) || is_numeric($_complete_var)) {
+                        if (!empty($_complete_var) || is_numeric($_complete_var)) {
                             $_output .= $this->_parse_var($_complete_var);
                         }
 
                         // just output the math operator to php
                         $_output .= $_math_var;
 
-                        if(empty($_first_var))
+                        if (empty($_first_var))
                             $_first_var = $_complete_var;
 
                         $_complete_var = "";
@@ -1739,8 +1739,8 @@ 
                     }
                 }
             }
-            if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
+            if ($_has_math) {
+                if (!empty($_complete_var) || is_numeric($_complete_var))
                     $_output .= $this->_parse_var($_complete_var);
 
                 // get the modifiers working (only the last var from math + modifier is left)
@@ -1749,15 +1749,15 @@ 
         }
 
         // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric(substr($var_expr, 0, 1)))
+        if (is_numeric(substr($var_expr, 0, 1)))
             $_var_ref = $var_expr;
         else
             $_var_ref = substr($var_expr, 1);
         
-        if(!$_has_math) {
+        if (!$_has_math) {
             
             // get [foo] and .foo and ->foo and (...) pieces
-            preg_match_all('~(?:^\w+)|' . $this->_obj_params_regexp . '|(?:' . $this->_var_bracket_regexp . ')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
+            preg_match_all('~(?:^\w+)|'.$this->_obj_params_regexp.'|(?:'.$this->_var_bracket_regexp.')|->\$?\w+|\.\$?\w+|\S+~', $_var_ref, $match);
                         
             $_indexes = $match[0];
             $_var_name = array_shift($_indexes);
@@ -1775,9 +1775,9 @@ 
                     $_var_name = substr(array_shift($_indexes), 1);
                     $_output = "\$this->_smarty_vars['$_var_name']";
                 }
-            } elseif(is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
+            } elseif (is_numeric($_var_name) && is_numeric(substr($var_expr, 0, 1))) {
                 // because . is the operator for accessing arrays thru inidizes we need to put it together again for floating point numbers
-                if(count($_indexes) > 0)
+                if (count($_indexes) > 0)
                 {
                     $_var_name .= implode("", $_indexes);
                     $_indexes = array();
@@ -1794,9 +1794,9 @@ 
                         $_output .= "[$_index]";
                     } elseif (substr($_index, 0, 1) == '$') {
                         if (strpos($_index, '.') !== false) {
-                            $_output .= '[' . $this->_parse_var($_index) . ']';
+                            $_output .= '['.$this->_parse_var($_index).']';
                         } else {
-                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 1) . "']]";
+                            $_output .= "[\$this->_tpl_vars['".substr($_index, 1)."']]";
                         }
                     } else {
                         $_var_parts = explode('.', $_index);
@@ -1806,19 +1806,19 @@ 
                     }
                 } else if (substr($_index, 0, 1) == '.') {
                     if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
+                        $_output .= "[\$this->_tpl_vars['".substr($_index, 2)."']]";
                     else
-                        $_output .= "['" . substr($_index, 1) . "']";
-                } else if (substr($_index,0,2) == '->') {
-                    if(substr($_index,2,2) == '__') {
+                        $_output .= "['".substr($_index, 1)."']";
+                } else if (substr($_index, 0, 2) == '->') {
+                    if (substr($_index, 2, 2) == '__') {
                         $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
-                    } elseif($this->security && substr($_index, 2, 1) == '_') {
+                    } elseif ($this->security && substr($_index, 2, 1) == '_') {
                         $this->_syntax_error('(secure) call to private object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                     } elseif (substr($_index, 2, 1) == '$') {
                         if ($this->security) {
                             $this->_syntax_error('(secure) call to dynamic object member is not allowed', E_USER_ERROR, __FILE__, __LINE__);
                         } else {
-                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index,3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
+                            $_output .= '->{(($_var=$this->_tpl_vars[\''.substr($_index, 3).'\']) && substr($_var,0,2)!=\'__\') ? $_var : $this->trigger_error("cannot access property \\"$_var\\"")}';
                         }
                     } else {
                         $_output .= $_index;
@@ -1843,7 +1843,7 @@ 
      */
     function _parse_parenth_args($parenth_args)
     {
-        preg_match_all('~' . $this->_param_regexp . '~',$parenth_args, $match);
+        preg_match_all('~'.$this->_param_regexp.'~', $parenth_args, $match);
         $orig_vals = $match = $match[0];
         $this->_parse_vars_props($match);
         $replace = array();
@@ -1906,18 +1906,18 @@ 
      */
     function _parse_modifiers(&$output, $modifier_string)
     {
-        preg_match_all('~\|(@?\w+)((?>:(?:'. $this->_qstr_regexp . '|[^|]+))*)~', '|' . $modifier_string, $_match);
+        preg_match_all('~\|(@?\w+)((?>:(?:'.$this->_qstr_regexp.'|[^|]+))*)~', '|'.$modifier_string, $_match);
         list(, $_modifiers, $modifier_arg_strings) = $_match;
 
         for ($_i = 0, $_for_max = count($_modifiers); $_i < $_for_max; $_i++) {
             $_modifier_name = $_modifiers[$_i];
 
-            if($_modifier_name == 'smarty') {
+            if ($_modifier_name == 'smarty') {
                 // skip smarty modifier
                 continue;
             }
 
-            preg_match_all('~:(' . $this->_qstr_regexp . '|[^:]+)~', $modifier_arg_strings[$_i], $_match);
+            preg_match_all('~:('.$this->_qstr_regexp.'|[^:]+)~', $modifier_arg_strings[$_i], $_match);
             $_modifier_args = $_match[1];
 
             if (substr($_modifier_name, 0, 1) == '@') {
@@ -1931,22 +1931,22 @@ 
                 && !$this->_get_plugin_filepath('modifier', $_modifier_name)
                 && function_exists($_modifier_name)) {
                 if ($this->security && !in_array($_modifier_name, $this->security_settings['MODIFIER_FUNCS'])) {
-                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed" , $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
+                    $this->_trigger_fatal_error("[plugin] (secure mode) modifier '$_modifier_name' is not allowed", $this->_current_file, $this->_current_line_no, __FILE__, __LINE__);
                 } else {
-                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name,  null, null, false);
+                    $this->_plugins['modifier'][$_modifier_name] = array($_modifier_name, null, null, false);
                 }
             }
             $this->_add_plugin('modifier', $_modifier_name);
 
             $this->_parse_vars_props($_modifier_args);
 
-            if($_modifier_name == 'default') {
+            if ($_modifier_name == 'default') {
                 // supress notifications of default modifier vars and args
-                if(substr($output, 0, 1) == '$') {
-                    $output = '@' . $output;
+                if (substr($output, 0, 1) == '$') {
+                    $output = '@'.$output;
                 }
-                if(isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
-                    $_modifier_args[0] = '@' . $_modifier_args[0];
+                if (isset($_modifier_args[0]) && substr($_modifier_args[0], 0, 1) == '$') {
+                    $_modifier_args[0] = '@'.$_modifier_args[0];
                 }
             }
             if (count($_modifier_args) > 0)
@@ -1955,7 +1955,7 @@ 
                 $_modifier_args = '';
 
             if ($_map_array) {
-                $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : " . $this->_compile_plugin_call('modifier', $_modifier_name) . "(\$_tmp$_modifier_args))";
+                $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : ".$this->_compile_plugin_call('modifier', $_modifier_name)."(\$_tmp$_modifier_args))";
 
             } else {
 
@@ -1996,9 +1996,9 @@ 
     {
         /* Extract the reference name. */
         $_ref = substr($indexes[0], 1);
-        foreach($indexes as $_index_no=>$_index) {
-            if (substr($_index, 0, 1) != '.' && $_index_no<2 || !preg_match('~^(\.|\[|->)~', $_index)) {
-                $this->_syntax_error('$smarty' . implode('', array_slice($indexes, 0, 2)) . ' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
+        foreach ($indexes as $_index_no=>$_index) {
+            if (substr($_index, 0, 1) != '.' && $_index_no < 2 || !preg_match('~^(\.|\[|->)~', $_index)) {
+                $this->_syntax_error('$smarty'.implode('', array_slice($indexes, 0, 2)).' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
             }
         }
 
@@ -2122,7 +2122,7 @@ 
                 return null;
 
             case 'template':
-                $compiled_ref = "'" . addslashes($this->_current_file) . "'";
+                $compiled_ref = "'".addslashes($this->_current_file)."'";
                 $_max_index = 1;
                 break;
 
@@ -2139,10 +2139,10 @@ 
                 }
                 array_shift($indexes);
                 if (preg_match('!^\.\w+$!', $indexes[0])) {
-                    $compiled_ref = '@' . substr($indexes[0], 1);
+                    $compiled_ref = '@'.substr($indexes[0], 1);
                 } else {
                     $_val = $this->_parse_var_props(substr($indexes[0], 1));
-                    $compiled_ref = '@constant(' . $_val . ')';
+                    $compiled_ref = '@constant('.$_val.')';
                 }
                 $_max_index = 1;
                 break;
@@ -2161,12 +2161,12 @@ 
                 break;
                 
             default:
-                $this->_syntax_error('$smarty.' . $_ref . ' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
+                $this->_syntax_error('$smarty.'.$_ref.' is an unknown reference', E_USER_ERROR, __FILE__, __LINE__);
                 break;
         }
 
         if (isset($_max_index) && count($indexes) > $_max_index) {
-            $this->_syntax_error('$smarty' . implode('', $indexes) .' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
+            $this->_syntax_error('$smarty'.implode('', $indexes).' is an invalid reference', E_USER_ERROR, __FILE__, __LINE__);
         }
 
         array_shift($indexes);
@@ -2190,7 +2190,7 @@ 
                 return ((is_object($this->_plugins[$type][$name][0][0])) ?
                         "\$this->_plugins['$type']['$name'][0][0]->"    /* method callback */
                         : (string)($this->_plugins[$type][$name][0][0]).'::'    /* class callback */
-                       ). $this->_plugins[$type][$name][0][1];
+                       ).$this->_plugins[$type][$name][0][1];
 
             } else {
                 /* function callback */
@@ -2214,7 +2214,7 @@ 
                 if ($prefilter === false) {
                     unset($this->_plugins['prefilter'][$filter_name]);
                     $_params = array('plugins' => array(array('prefilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR.'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2224,7 +2224,7 @@ 
                 if ($postfilter === false) {
                     unset($this->_plugins['postfilter'][$filter_name]);
                     $_params = array('plugins' => array(array('postfilter', $filter_name, null, null, false)));
-                    require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
+                    require_once(SMARTY_CORE_DIR.'core.load_plugins.php');
                     smarty_core_load_plugins($_params, $this);
                 }
             }
@@ -2251,7 +2251,7 @@ 
      * @param string $file
      * @param integer $line
      */
-    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file=null, $line=null)
+    function _syntax_error($error_msg, $error_type = E_USER_ERROR, $file = null, $line = null)
     {
         $this->_trigger_fatal_error("syntax error: $error_msg", $this->_current_file, $this->_current_line_no, $file, $line, $error_type);
     }
@@ -2266,10 +2266,10 @@ 
     function _push_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
+            || 0 < $this->_cacheable_state++) return '';
         if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
         $_ret = 'if ($this->caching && !$this->_cache_including): echo \'{nocache:'
-            . $this->_cache_serial . '#' . $this->_nocache_count
+            . $this->_cache_serial.'#'.$this->_nocache_count
             . '}\'; endif;';
         return $_ret;
     }
@@ -2284,9 +2284,9 @@ 
     function _pop_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || --$this->_cacheable_state>0) return '';
+            || --$this->_cacheable_state > 0) return '';
         return 'if ($this->caching && !$this->_cache_including): echo \'{/nocache:'
-            . $this->_cache_serial . '#' . ($this->_nocache_count++)
+            . $this->_cache_serial.'#'.($this->_nocache_count++)
             . '}\'; endif;';
     }
 
@@ -2309,12 +2309,12 @@ 
     function _pop_tag($close_tag)
     {
         $message = '';
-        if (count($this->_tag_stack)>0) {
+        if (count($this->_tag_stack) > 0) {
             list($_open_tag, $_line_no) = array_pop($this->_tag_stack);
             if ($close_tag == $_open_tag) {
                 return $_open_tag;
             }
-            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif' )) {
+            if ($close_tag == 'if' && ($_open_tag == 'else' || $_open_tag == 'elseif')) {
                 return $this->_pop_tag($close_tag);
             }
             if ($close_tag == 'section' && $_open_tag == 'sectionelse') {
@@ -2350,10 +2350,10 @@ 
  */
 function _smarty_sort_length($a, $b)
 {
-    if($a == $b)
+    if ($a == $b)
         return 0;
 
-    if(strlen($a) == strlen($b))
+    if (strlen($a) == strlen($b))
         return ($a > $b) ? -1 : 1;
 
     return (strlen($a) > strlen($b)) ? -1 : 1;

Braces +145 added lines, -106 removed lines

@@ -243,7 +243,9 @@ 
         // run template source through prefilter functions
         if (count($this->_plugins['prefilter']) > 0) {
             foreach ($this->_plugins['prefilter'] as $filter_name => $prefilter) {
-                if ($prefilter === false) continue;
+                if ($prefilter === false) {
+                    continue;
+                }
                 if ($prefilter[3] || is_callable($prefilter[0])) {
                     $source_content = call_user_func_array($prefilter[0],
                                                             array($source_content, &$this));
@@ -380,7 +382,9 @@ 
         // run compiled template through postfilter functions
         if (count($this->_plugins['postfilter']) > 0) {
             foreach ($this->_plugins['postfilter'] as $filter_name => $postfilter) {
-                if ($postfilter === false) continue;
+                if ($postfilter === false) {
+                    continue;
+                }
                 if ($postfilter[3] || is_callable($postfilter[0])) {
                     $compiled_content = call_user_func_array($postfilter[0],
                                                               array($compiled_content, &$this));
@@ -430,8 +434,9 @@ 
     function _compile_tag($template_tag)
     {
         /* Matched comment. */
-        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*')
-            return '';
+        if (substr($template_tag, 0, 1) == '*' && substr($template_tag, -1) == '*') {
+                    return '';
+        }
         
         /* Split tag into two three parts: command, command modifiers and the arguments. */
         if(! preg_match('~^(?:(' . $this->_num_const_regexp . '|' . $this->_obj_call_regexp . '|' . $this->_var_regexp
@@ -469,18 +474,21 @@ 
 
             case 'else':
                 list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
-                else
-                    $this->_push_tag('else');
+                if ($_open_tag != 'if' && $_open_tag != 'elseif') {
+                                    $this->_syntax_error('unexpected {else}', E_USER_ERROR, __FILE__, __LINE__);
+                } else {
+                                    $this->_push_tag('else');
+                }
                 return '<?php else: ?>';
 
             case 'elseif':
                 list($_open_tag) = end($this->_tag_stack);
-                if ($_open_tag != 'if' && $_open_tag != 'elseif')
-                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
-                if ($_open_tag == 'if')
-                    $this->_push_tag('elseif');
+                if ($_open_tag != 'if' && $_open_tag != 'elseif') {
+                                    $this->_syntax_error('unexpected {elseif}', E_USER_ERROR, __FILE__, __LINE__);
+                }
+                if ($_open_tag == 'if') {
+                                    $this->_push_tag('elseif');
+                }
                 return $this->_compile_if_tag($tag_args, true);
 
             case '/if':
@@ -510,10 +518,11 @@ 
 
             case '/section':
                 $_open_tag = $this->_pop_tag('section');
-                if ($_open_tag == 'sectionelse')
-                    return "<?php endif; ?>";
-                else
-                    return "<?php endfor; endif; ?>";
+                if ($_open_tag == 'sectionelse') {
+                                    return "<?php endif; ?>";
+                } else {
+                                    return "<?php endfor; endif; ?>";
+                }
 
             case 'foreach':
                 $this->_push_tag('foreach');
@@ -526,10 +535,11 @@ 
 
             case '/foreach':
                 $_open_tag = $this->_pop_tag('foreach');
-                if ($_open_tag == 'foreachelse')
-                    return "<?php endif; unset(\$_from); ?>";
-                else
-                    return "<?php endforeach; endif; unset(\$_from); ?>";
+                if ($_open_tag == 'foreachelse') {
+                                    return "<?php endif; unset(\$_from); ?>";
+                } else {
+                                    return "<?php endforeach; endif; unset(\$_from); ?>";
+                }
                 break;
 
             case 'strip':
@@ -672,8 +682,9 @@ 
         if (substr($tag_command, 0, 1) == '/') {
             $start_tag = false;
             $tag_command = substr($tag_command, 1);
-        } else
-            $start_tag = true;
+        } else {
+                    $start_tag = true;
+        }
 
         $found = false;
         $have_function = true;
@@ -723,10 +734,11 @@ 
          */
         $this->_add_plugin('block', $tag_command);
 
-        if ($start_tag)
-            $this->_push_tag($tag_command);
-        else
-            $this->_pop_tag($tag_command);
+        if ($start_tag) {
+                    $this->_push_tag($tag_command);
+        } else {
+                    $this->_pop_tag($tag_command);
+        }
 
         if ($start_tag) {
             $output = '<?php ' . $this->_push_cacheable_state('block', $tag_command);
@@ -856,8 +868,9 @@ 
                     unset($attrs['assign']);
                     continue;
                 }
-                if (is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
+                if (is_bool($arg_value)) {
+                                    $arg_value = $arg_value ? 'true' : 'false';
+                }
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
@@ -948,8 +961,9 @@ 
         }
 
         foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
             $arg_list[] = "'$arg_name' => $arg_value";
         }
 
@@ -983,8 +997,9 @@ 
                 $assign_var = $arg_value;
                 continue;
             }
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
             $arg_list[] = "'$arg_name' => $arg_value";
         }
 
@@ -1033,8 +1048,9 @@ 
         $arg_list = array();
         foreach($attrs as $arg_name => $arg_value) {
             if($arg_name != 'file' AND $arg_name != 'once' AND $arg_name != 'assign') {
-                if(is_bool($arg_value))
-                    $arg_value = $arg_value ? 'true' : 'false';
+                if(is_bool($arg_value)) {
+                                    $arg_value = $arg_value ? 'true' : 'false';
+                }
                 $arg_list[] = "'$arg_name' => $arg_value";
             }
         }
@@ -1072,10 +1088,11 @@ 
                     break;
 
                 case 'show':
-                    if (is_bool($attr_value))
-                        $show_attr_value = $attr_value ? 'true' : 'false';
-                    else
-                        $show_attr_value = "(bool)$attr_value";
+                    if (is_bool($attr_value)) {
+                                            $show_attr_value = $attr_value ? 'true' : 'false';
+                    } else {
+                                            $show_attr_value = "(bool)$attr_value";
+                    }
                     $output .= "{$section_props}['show'] = $show_attr_value;\n";
                     break;
 
@@ -1098,24 +1115,28 @@ 
             }
         }
 
-        if (!isset($attrs['show']))
-            $output .= "{$section_props}['show'] = true;\n";
+        if (!isset($attrs['show'])) {
+                    $output .= "{$section_props}['show'] = true;\n";
+        }
 
-        if (!isset($attrs['loop']))
-            $output .= "{$section_props}['loop'] = 1;\n";
+        if (!isset($attrs['loop'])) {
+                    $output .= "{$section_props}['loop'] = 1;\n";
+        }
 
-        if (!isset($attrs['max']))
-            $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
-        else
-            $output .= "if ({$section_props}['max'] < 0)\n" .
+        if (!isset($attrs['max'])) {
+                    $output .= "{$section_props}['max'] = {$section_props}['loop'];\n";
+        } else {
+                    $output .= "if ({$section_props}['max'] < 0)\n" .
                        "    {$section_props}['max'] = {$section_props}['loop'];\n";
+        }
 
-        if (!isset($attrs['step']))
-            $output .= "{$section_props}['step'] = 1;\n";
+        if (!isset($attrs['step'])) {
+                    $output .= "{$section_props}['step'] = 1;\n";
+        }
 
-        if (!isset($attrs['start']))
-            $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
-        else {
+        if (!isset($attrs['start'])) {
+                    $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n";
+        } else {
             $output .= "if ({$section_props}['start'] < 0)\n" .
                        "    {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" .
                        "else\n" .
@@ -1370,8 +1391,9 @@ 
                                 $is_arg_start--;
                             } 
                         } 
-                    } else
-                        $is_arg_start = $i-1;
+                    } else {
+                                            $is_arg_start = $i-1;
+                    }
                     /* Construct the argument for 'is' expression, so it knows
                        what to operate on. */
                     $is_arg = implode(' ', array_slice($tokens, $is_arg_start, $i - $is_arg_start));
@@ -1413,10 +1435,11 @@ 
             }
         }
 
-        if ($elseif)
-            return '<?php elseif ('.implode(' ', $tokens).'): ?>';
-        else
-            return '<?php if ('.implode(' ', $tokens).'): ?>';
+        if ($elseif) {
+                    return '<?php elseif ('.implode(' ', $tokens).'): ?>';
+        } else {
+                    return '<?php if ('.implode(' ', $tokens).'): ?>';
+        }
     }
 
 
@@ -1440,10 +1463,12 @@ 
         }
 
         foreach ($attrs as $arg_name => $arg_value) {
-            if (is_bool($arg_value))
-                $arg_value = $arg_value ? 'true' : 'false';
-            if (is_null($arg_value))
-                $arg_value = 'null';
+            if (is_bool($arg_value)) {
+                            $arg_value = $arg_value ? 'true' : 'false';
+            }
+            if (is_null($arg_value)) {
+                            $arg_value = 'null';
+            }
             if ($_cache_attrs && in_array($arg_name, $_cache_attrs)) {
                 $arg_list[] = "'$arg_name' => (\$this->_cache_including) ? \$_cache_attrs['$arg_name'] : (\$_cache_attrs['$arg_name']=$arg_value)";
             } else {
@@ -1468,8 +1493,9 @@ 
         if (($first_token = array_shift($tokens)) == 'not') {
             $negate_expr = true;
             $expr_type = array_shift($tokens);
-        } else
-            $expr_type = $first_token;
+        } else {
+                    $expr_type = $first_token;
+        }
 
         switch ($expr_type) {
             case 'even':
@@ -1477,8 +1503,9 @@ 
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
                     $expr = "!(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "!(1 & $is_arg)";
+                } else {
+                                    $expr = "!(1 & $is_arg)";
+                }
                 break;
 
             case 'odd':
@@ -1486,8 +1513,9 @@ 
                     $expr_end++;
                     $expr_arg = $tokens[$expr_end++];
                     $expr = "(1 & ($is_arg / " . $this->_parse_var_props($expr_arg) . "))";
-                } else
-                    $expr = "(1 & $is_arg)";
+                } else {
+                                    $expr = "(1 & $is_arg)";
+                }
                 break;
 
             case 'div':
@@ -1546,16 +1574,18 @@ 
                     if (preg_match('~^\w+$~', $token)) {
                         $attr_name = $token;
                         $state = 1;
-                    } else
-                        $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("invalid attribute name: '$token'", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
 
                 case 1:
                     /* If the token is '=', then we go to state 2. */
                     if ($token == '=') {
                         $state = 2;
-                    } else
-                        $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("expecting '=' after attribute name '$last_token'", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
 
                 case 2:
@@ -1579,8 +1609,9 @@ 
 
                         $attrs[$attr_name] = $token;
                         $state = 0;
-                    } else
-                        $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
+                    } else {
+                                            $this->_syntax_error("'=' cannot be an attribute value", E_USER_ERROR, __FILE__, __LINE__);
+                    }
                     break;
             }
             $last_token = $token;
@@ -1642,32 +1673,27 @@ 
                     $this->_parse_modifiers($return, $match[2]);
                 }
                 return $return;
-            }
-        elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_num_const_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // numerical constant
                 preg_match('~^(' . $this->_num_const_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
                 if($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
-            }
-        elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_si_qstr_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // single quoted text
                 preg_match('~^(' . $this->_si_qstr_regexp . ')('. $this->_mod_regexp . '*)$~', $val, $match);
                 if($match[2] != '') {
                     $this->_parse_modifiers($match[1], $match[2]);
                     return $match[1];
                 }
-            }
-        elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_cvar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // config var
                 return $this->_parse_conf_var($val);
-            }
-        elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
+            } elseif(preg_match('~^' . $this->_svar_regexp . '(?:' . $this->_mod_regexp . '*)$~', $val)) {
                 // section var
                 return $this->_parse_section_prop($val);
-            }
-        elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
+            } elseif(!in_array($val, $this->_permitted_tokens) && !is_numeric($val)) {
             // literal string
             return $this->_expand_quoted_text('"' . strtr($val, array('\\' => '\\\\', '"' => '\\"')) .'"');
         }
@@ -1730,8 +1756,9 @@ 
                         // just output the math operator to php
                         $_output .= $_math_var;
 
-                        if(empty($_first_var))
-                            $_first_var = $_complete_var;
+                        if(empty($_first_var)) {
+                                                    $_first_var = $_complete_var;
+                        }
 
                         $_complete_var = "";
                     } else {
@@ -1740,8 +1767,9 @@ 
                 }
             }
             if($_has_math) {
-                if(!empty($_complete_var) || is_numeric($_complete_var))
-                    $_output .= $this->_parse_var($_complete_var);
+                if(!empty($_complete_var) || is_numeric($_complete_var)) {
+                                    $_output .= $this->_parse_var($_complete_var);
+                }
 
                 // get the modifiers working (only the last var from math + modifier is left)
                 $var_expr = $_complete_var;
@@ -1749,10 +1777,11 @@ 
         }
 
         // prevent cutting of first digit in the number (we _definitly_ got a number if the first char is a digit)
-        if(is_numeric(substr($var_expr, 0, 1)))
-            $_var_ref = $var_expr;
-        else
-            $_var_ref = substr($var_expr, 1);
+        if(is_numeric(substr($var_expr, 0, 1))) {
+                    $_var_ref = $var_expr;
+        } else {
+                    $_var_ref = substr($var_expr, 1);
+        }
         
         if(!$_has_math) {
             
@@ -1805,10 +1834,11 @@ 
                         $_output .= "[\$this->_sections['$_var_section']['$_var_section_prop']]";
                     }
                 } else if (substr($_index, 0, 1) == '.') {
-                    if (substr($_index, 1, 1) == '$')
-                        $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
-                    else
-                        $_output .= "['" . substr($_index, 1) . "']";
+                    if (substr($_index, 1, 1) == '$') {
+                                            $_output .= "[\$this->_tpl_vars['" . substr($_index, 2) . "']]";
+                    } else {
+                                            $_output .= "['" . substr($_index, 1) . "']";
+                    }
                 } else if (substr($_index,0,2) == '->') {
                     if(substr($_index,2,2) == '__') {
                         $this->_syntax_error('call to internal object members is not allowed', E_USER_ERROR, __FILE__, __LINE__);
@@ -1949,10 +1979,11 @@ 
                     $_modifier_args[0] = '@' . $_modifier_args[0];
                 }
             }
-            if (count($_modifier_args) > 0)
-                $_modifier_args = ', '.implode(', ', $_modifier_args);
-            else
-                $_modifier_args = '';
+            if (count($_modifier_args) > 0) {
+                            $_modifier_args = ', '.implode(', ', $_modifier_args);
+            } else {
+                            $_modifier_args = '';
+            }
 
             if ($_map_array) {
                 $output = "((is_array(\$_tmp=$output)) ? \$this->_run_mod_handler('$_modifier_name', true, \$_tmp$_modifier_args) : " . $this->_compile_plugin_call('modifier', $_modifier_name) . "(\$_tmp$_modifier_args))";
@@ -2266,8 +2297,12 @@ 
     function _push_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || 0<$this->_cacheable_state++) return '';
-        if (!isset($this->_cache_serial)) $this->_cache_serial = md5(uniqid('Smarty'));
+            || 0<$this->_cacheable_state++) {
+            return '';
+        }
+        if (!isset($this->_cache_serial)) {
+            $this->_cache_serial = md5(uniqid('Smarty'));
+        }
         $_ret = 'if ($this->caching && !$this->_cache_including): echo \'{nocache:'
             . $this->_cache_serial . '#' . $this->_nocache_count
             . '}\'; endif;';
@@ -2284,7 +2319,9 @@ 
     function _pop_cacheable_state($type, $name) {
         $_cacheable = !isset($this->_plugins[$type][$name]) || $this->_plugins[$type][$name][4];
         if ($_cacheable
-            || --$this->_cacheable_state>0) return '';
+            || --$this->_cacheable_state>0) {
+            return '';
+        }
         return 'if ($this->caching && !$this->_cache_including): echo \'{/nocache:'
             . $this->_cache_serial . '#' . ($this->_nocache_count++)
             . '}\'; endif;';
@@ -2350,11 +2387,13 @@ 
  */
 function _smarty_sort_length($a, $b)
 {
-    if($a == $b)
-        return 0;
+    if($a == $b) {
+            return 0;
+    }
 
-    if(strlen($a) == strlen($b))
-        return ($a > $b) ? -1 : 1;
+    if(strlen($a) == strlen($b)) {
+            return ($a > $b) ? -1 : 1;
+    }
 
     return (strlen($a) > strlen($b)) ? -1 : 1;
 }

htdocs/class/smarty/Config_File.class.php

Spacing +16 added lines, -16 removed lines

@@ -43,24 +43,24 @@ 
     /**
      * Controls whether variables with the same name overwrite each other.
      */
-    var $overwrite        =    true;
+    var $overwrite = true;
 
     /**
      * Controls whether config values of on/true/yes and off/false/no get
      * converted to boolean values automatically.
      */
-    var $booleanize        =    true;
+    var $booleanize = true;
 
     /**
      * Controls whether hidden config sections/vars are read from the file.
      */
-    var $read_hidden     =    true;
+    var $read_hidden = true;
 
     /**
      * Controls whether or not to fix mac or dos formatted newlines.
      * If set to true, \r or \r\n will be changed to \n.
      */
-    var $fix_newlines =    true;
+    var $fix_newlines = true;
     /**#@-*/
 
     /** @access private */
@@ -92,7 +92,7 @@ 
                 $this->_trigger_error_msg("Bad config file path '$config_path'");
                 return;
             }
-            if(substr($config_path, -1) != DIRECTORY_SEPARATOR) {
+            if (substr($config_path, -1) != DIRECTORY_SEPARATOR) {
                 $config_path .= DIRECTORY_SEPARATOR;
             }
 
@@ -115,7 +115,7 @@ 
             $this->_trigger_error_msg('Empty config file name');
             return;
         } else {
-            $file_name = $this->_config_path . $file_name;
+            $file_name = $this->_config_path.$file_name;
             if (!isset($this->_config_data[$file_name]))
                 $this->load_file($file_name, false);
         }
@@ -124,7 +124,7 @@ 
             if (empty($section_name)) {
                 return $this->_config_data[$file_name]["vars"][$var_name];
             } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
+                if (isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
                     return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
                 else
                     return array();
@@ -133,7 +133,7 @@ 
             if (empty($section_name)) {
                 return (array)$this->_config_data[$file_name]["vars"];
             } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
+                if (isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
                     return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
                 else
                     return array();
@@ -175,7 +175,7 @@ 
      */
     function get_section_names($file_name)
     {
-        $file_name = $this->_config_path . $file_name;
+        $file_name = $this->_config_path.$file_name;
         if (!isset($this->_config_data[$file_name])) {
             $this->_trigger_error_msg("Unknown config file '$file_name'");
             return;
@@ -233,7 +233,7 @@ 
     function load_file($file_name, $prepend_path = true)
     {
         if ($prepend_path && $this->_config_path != "")
-            $config_file = $this->_config_path . $file_name;
+            $config_file = $this->_config_path.$file_name;
         else
             $config_file = $file_name;
 
@@ -270,7 +270,7 @@ 
      */
     function parse_contents($contents)
     {
-        if($this->fix_newlines) {
+        if ($this->fix_newlines) {
             // fix mac/dos formatted newlines
             $contents = preg_replace('!\r\n?!', "\n", $contents);
         }
@@ -280,16 +280,16 @@ 
         $config_data['vars'] = array();
 
         /* reference to fill with data */
-        $vars =& $config_data['vars'];
+        $vars = & $config_data['vars'];
 
         /* parse file line by line */
         preg_match_all('!^.*\r?\n?!m', $contents, $match);
         $lines = $match[0];
-        for ($i=0, $count=count($lines); $i<$count; $i++) {
+        for ($i = 0, $count = count($lines); $i < $count; $i++) {
             $line = $lines[$i];
             if (empty($line)) continue;
 
-            if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
+            if (substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match)) {
                 /* section found */
                 if (substr($match[1], 0, 1) == '.') {
                     /* hidden section */
@@ -306,7 +306,7 @@ 
                 }
                 if (!isset($config_data['sections'][$section_name]))
                     $config_data['sections'][$section_name] = array('vars' => array());
-                $vars =& $config_data['sections'][$section_name]['vars'];
+                $vars = & $config_data['sections'][$section_name]['vars'];
                 continue;
             }
 
@@ -317,7 +317,7 @@ 
                     /* handle multiline-value */
                     $lines[$i] = substr($match[2], 3);
                     $var_value = '';
-                    while ($i<$count) {
+                    while ($i < $count) {
                         if (($pos = strpos($lines[$i], '"""')) === false) {
                             $var_value .= $lines[$i++];
                         } else {

Braces +50 added lines, -38 removed lines

@@ -75,8 +75,9 @@ 
      */
     public function __construct($config_path = NULL)
     {
-        if (isset($config_path))
-            $this->set_path($config_path);
+        if (isset($config_path)) {
+                    $this->set_path($config_path);
+        }
     }
 
 
@@ -116,27 +117,30 @@ 
             return;
         } else {
             $file_name = $this->_config_path . $file_name;
-            if (!isset($this->_config_data[$file_name]))
-                $this->load_file($file_name, false);
+            if (!isset($this->_config_data[$file_name])) {
+                            $this->load_file($file_name, false);
+            }
         }
 
         if (!empty($var_name)) {
             if (empty($section_name)) {
                 return $this->_config_data[$file_name]["vars"][$var_name];
             } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name]))
-                    return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
-                else
-                    return array();
+                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name])) {
+                                    return $this->_config_data[$file_name]["sections"][$section_name]["vars"][$var_name];
+                } else {
+                                    return array();
+                }
             }
         } else {
             if (empty($section_name)) {
                 return (array)$this->_config_data[$file_name]["vars"];
             } else {
-                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"]))
-                    return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
-                else
-                    return array();
+                if(isset($this->_config_data[$file_name]["sections"][$section_name]["vars"])) {
+                                    return (array)$this->_config_data[$file_name]["sections"][$section_name]["vars"];
+                } else {
+                                    return array();
+                }
             }
         }
     }
@@ -202,10 +206,11 @@ 
             return;
         }
 
-        if (empty($section))
-            return array_keys($this->_config_data[$file_name]["vars"]);
-        else
-            return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
+        if (empty($section)) {
+                    return array_keys($this->_config_data[$file_name]["vars"]);
+        } else {
+                    return array_keys($this->_config_data[$file_name]["sections"][$section]["vars"]);
+        }
     }
 
 
@@ -216,10 +221,11 @@ 
      */
     function clear($file_name = NULL)
     {
-        if ($file_name === NULL)
-            $this->_config_data = array();
-        else if (isset($this->_config_data[$file_name]))
-            $this->_config_data[$file_name] = array();
+        if ($file_name === NULL) {
+                    $this->_config_data = array();
+        } else if (isset($this->_config_data[$file_name])) {
+                    $this->_config_data[$file_name] = array();
+        }
     }
 
 
@@ -232,10 +238,11 @@ 
      */
     function load_file($file_name, $prepend_path = true)
     {
-        if ($prepend_path && $this->_config_path != "")
-            $config_file = $this->_config_path . $file_name;
-        else
-            $config_file = $file_name;
+        if ($prepend_path && $this->_config_path != "") {
+                    $config_file = $this->_config_path . $file_name;
+        } else {
+                    $config_file = $file_name;
+        }
 
         ini_set('track_errors', true);
         $fp = @fopen($config_file, "r");
@@ -287,7 +294,9 @@ 
         $lines = $match[0];
         for ($i=0, $count=count($lines); $i<$count; $i++) {
             $line = $lines[$i];
-            if (empty($line)) continue;
+            if (empty($line)) {
+                continue;
+            }
 
             if ( substr($line, 0, 1) == '[' && preg_match('!^\[(.*?)\]!', $line, $match) ) {
                 /* section found */
@@ -304,8 +313,9 @@ 
                 } else {                    
                     $section_name = $match[1];
                 }
-                if (!isset($config_data['sections'][$section_name]))
-                    $config_data['sections'][$section_name] = array('vars' => array());
+                if (!isset($config_data['sections'][$section_name])) {
+                                    $config_data['sections'][$section_name] = array('vars' => array());
+                }
                 $vars =& $config_data['sections'][$section_name]['vars'];
                 continue;
             }
@@ -352,10 +362,11 @@ 
     function _set_config_var(&$container, $var_name, $var_value, $booleanize)
     {
         if (substr($var_name, 0, 1) == '.') {
-            if (!$this->read_hidden)
-                return;
-            else
-                $var_name = substr($var_name, 1);
+            if (!$this->read_hidden) {
+                            return;
+            } else {
+                            $var_name = substr($var_name, 1);
+            }
         }
 
         if (!preg_match("/^[a-zA-Z_]\w*$/", $var_name)) {
@@ -364,15 +375,16 @@ 
         }
 
         if ($booleanize) {
-            if (preg_match("/^(on|true|yes)$/i", $var_value))
-                $var_value = true;
-            else if (preg_match("/^(off|false|no)$/i", $var_value))
-                $var_value = false;
+            if (preg_match("/^(on|true|yes)$/i", $var_value)) {
+                            $var_value = true;
+            } else if (preg_match("/^(off|false|no)$/i", $var_value)) {
+                            $var_value = false;
+            }
         }
 
-        if (!isset($container[$var_name]) || $this->overwrite)
-            $container[$var_name] = $var_value;
-        else {
+        if (!isset($container[$var_name]) || $this->overwrite) {
+                    $container[$var_name] = $var_value;
+        } else {
             settype($container[$var_name], 'array');
             $container[$var_name][] = $var_value;
         }

htdocs/class/smarty/xoops_plugins/compiler.xoAdminIcons.php

Spacing +5 added lines, -5 removed lines

@@ -29,15 +29,15 @@
         $icons = 'default';
     }
 
-    if (file_exists($xoops->path('modules/system/images/icons/' . $icons . '/index.html'))) {
-        $url = $xoops->url('modules/system/images/icons/' . $icons . '/' . $argStr);
+    if (file_exists($xoops->path('modules/system/images/icons/'.$icons.'/index.html'))) {
+        $url = $xoops->url('modules/system/images/icons/'.$icons.'/'.$argStr);
     } else {
-        if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
-            $url = $xoops->url('modules/system/images/icons/default/' . $argStr);
+        if (file_exists($xoops->path('modules/system/images/icons/default/'.$argStr))) {
+            $url = $xoops->url('modules/system/images/icons/default/'.$argStr);
         } else {
             $url = $xoops->url('modules/system/images/icons/default/xoops/xoops.png');
         }
     }
 
-    return "\necho '" . addslashes($url) . "';";
+    return "\necho '".addslashes($url)."';";
 }

htdocs/class/smarty/xoops_plugins/compiler.xoModuleIcons16.php

Spacing +4 added lines, -4 removed lines

@@ -28,14 +28,14 @@
     //    if ( $icons == '' ) $icons = 'default';
 
     if (file_exists($xoops->path('Frameworks/moduleclasses/icons/16/index.html'))) {
-        $url = $xoops->url('Frameworks/moduleclasses/icons/16/' . $argStr);
+        $url = $xoops->url('Frameworks/moduleclasses/icons/16/'.$argStr);
     } else {
-        if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
-            $url = $xoops->url('modules/system/images/icons/default/' . $argStr);
+        if (file_exists($xoops->path('modules/system/images/icons/default/'.$argStr))) {
+            $url = $xoops->url('modules/system/images/icons/default/'.$argStr);
         } else {
             $url = $xoops->url('modules/system/images/icons/default/xoops/xoops.png');
         }
     }
 
-    return "\necho '" . addslashes($url) . "';";
+    return "\necho '".addslashes($url)."';";
 }

htdocs/class/smarty/xoops_plugins/compiler.xoAdminNav.php

Spacing +5 added lines, -5 removed lines

@@ -29,13 +29,13 @@
         $icons = 'default';
     }
 
-    if (file_exists($xoops->path('modules/system/images/breadcrumb/' . $icons . '/index.html'))) {
-        $url = $xoops->url('modules/system/images/breadcrumb/' . $icons . '/' . $argStr);
+    if (file_exists($xoops->path('modules/system/images/breadcrumb/'.$icons.'/index.html'))) {
+        $url = $xoops->url('modules/system/images/breadcrumb/'.$icons.'/'.$argStr);
     } else {
-        if (file_exists($xoops->path('modules/system/images/breadcrumb/default/' . $argStr))) {
-            $url = $xoops->url('modules/system/images/icons/default/' . $argStr);
+        if (file_exists($xoops->path('modules/system/images/breadcrumb/default/'.$argStr))) {
+            $url = $xoops->url('modules/system/images/icons/default/'.$argStr);
         }
     }
 
-    return "\necho '" . addslashes($url) . "';";
+    return "\necho '".addslashes($url)."';";
 }