XOOPS / XoopsCore

htdocs/modules/menus/decorators/smarty/decorator.php

Indentation +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 
         if ($validator === 'smarty') {
             if (isset($xoops->tpl()->_tpl_vars[$value])) {
-               $string = str_replace($expression, $xoops->tpl()->_tpl_vars[$value], $string);
+                $string = str_replace($expression, $xoops->tpl()->_tpl_vars[$value], $string);
             }
         }
 

htdocs/modules/menus/decorators/default/decorator.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
             $menu[$decoration] = self::_doDecoration($menu[$decoration]);
             if ($decoration === 'link') {
                 if (!preg_match('/mailto:/i', $menu['link']) && !preg_match('#://#i', $menu['link'])) {
-                    $menu['link'] = \XoopsBaseConfig::get('url') . '/' . $menu['link']; //Do not do this in other decorators
+                    $menu['link'] = \XoopsBaseConfig::get('url').'/'.$menu['link']; //Do not do this in other decorators
                 }
             }
         }

htdocs/modules/menus/class/decorator.php

Spacing +2 added lines, -2 removed lines

@@ -47,7 +47,7 @@ 
             $dirnames = XoopsLists::getDirListAsArray($helper->path('decorators/'), '');
             foreach ($dirnames as $dirname) {
                 if (XoopsLoad::loadFile($helper->path("decorators/{$dirname}/decorator.php"))) {
-                    $className = 'Menus' . ucfirst($dirname) . 'Decorator';
+                    $className = 'Menus'.ucfirst($dirname).'Decorator';
                     $class = new $className($dirname);
                     if ($class instanceof MenusDecoratorAbstract && $class instanceof MenusDecoratorInterface) {
                         $decorators[$dirname] = $class;
@@ -76,7 +76,7 @@ 
     {
         $helper = Menus::getInstance();
 
-        $language =  XoopsLocale::getLegacyLanguage();
+        $language = XoopsLocale::getLegacyLanguage();
         $path = $helper->path("decorators/{$name}/language");
         if (!$ret = XoopsLoad::loadFile("{$path}/{$language}/decorator.php")) {
             $ret = XoopsLoad::loadFile("{$path}/english/decorator.php");

htdocs/modules/menus/class/helper.php

Spacing +3 added lines, -3 removed lines

@@ -63,7 +63,7 @@ 
         $error = false;
         $path = '';
         if ($skin_from_theme) {
-            $path = "themes/" . $this->xoops()->getConfig('theme_set') . "/menu";
+            $path = "themes/".$this->xoops()->getConfig('theme_set')."/menu";
             if (!XoopsLoad::fileExists($this->xoops()->path("{$path}/skin_version.php"))) {
                 $error = true;
             }
@@ -78,7 +78,7 @@ 
 
         if (XoopsLoad::fileExists($file)) {
             include $file;
-            $info =& $skinversion;
+            $info = & $skinversion;
         }
 
         $info['path'] = $this->xoops()->path($path);
@@ -87,7 +87,7 @@ 
         if (!isset($info['template'])) {
             $info['template'] = $this->xoops()->path("modules/menus/templates/block.tpl");
         } else {
-            $info['template'] = $this->xoops()->path("{$path}/" . $info['template']);
+            $info['template'] = $this->xoops()->path("{$path}/".$info['template']);
         }
 
         if (!isset($info['prefix'])) {

htdocs/modules/menus/class/builder.php

Spacing +3 added lines, -3 removed lines

@@ -133,11 +133,11 @@
     {
         //get the currentpage
         $sel = array();
-        $query_string = $_SERVER['QUERY_STRING'] ? '?' . $_SERVER['QUERY_STRING'] : '';
-        $self = 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . $query_string;
+        $query_string = $_SERVER['QUERY_STRING'] ? '?'.$_SERVER['QUERY_STRING'] : '';
+        $self = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['PHP_SELF'].$query_string;
 
         //set a default page in case we don't get matches
-        $default = \XoopsBaseConfig::get('url') . "/index.php";
+        $default = \XoopsBaseConfig::get('url')."/index.php";
 
         //get all matching links
         foreach ($this->output as $idx => $menu) {

htdocs/modules/menus/class/menu.php

Spacing +8 added lines, -8 removed lines

@@ -61,24 +61,24 @@
      */
     public function update_weights(MenusMenu $obj)
     {
-        $sql = "UPDATE " . $this->table
+        $sql = "UPDATE ".$this->table
         . " SET weight = weight+1"
-        . " WHERE weight >= " . $obj->getVar('weight')
-        . " AND id <> " . $obj->getVar('id')
+        . " WHERE weight >= ".$obj->getVar('weight')
+        . " AND id <> ".$obj->getVar('id')
         /*. " AND pid = " . $obj->getVar('pid')*/
-        . " AND mid = " . $obj->getVar('mid')
+        . " AND mid = ".$obj->getVar('mid')
         ;
         $this->db->queryF($sql);
 
-        $sql = "SELECT id FROM " . $this->table
-        . " WHERE mid = " . $obj->getVar('mid')
+        $sql = "SELECT id FROM ".$this->table
+        . " WHERE mid = ".$obj->getVar('mid')
         /*. " AND pid = " . $obj->getVar('pid')*/
         . " ORDER BY weight ASC"
         ;
         $result = $this->db->query($sql);
-        $i = 1;  //lets start at 1 please!
+        $i = 1; //lets start at 1 please!
         while (false !== (list($id) = $this->db->fetchRow($result))) {
-            $sql = "UPDATE " . $this->table
+            $sql = "UPDATE ".$this->table
             . " SET weight = {$i}"
             . " WHERE id = {$id}"
             ;

htdocs/modules/menus/skins/superfish/skin_version.php

Indentation +3 added lines, -3 removed lines

@@ -23,9 +23,9 @@
 $skinversion['css'] = 'css/superfish.css';
 
 $skinversion['js'] = array('../../js/jquery-1.3.2.min.js',
-                             '../../js/hoverIntent.js',
-                             '../../js/superfish.js'
-                             );
+                                '../../js/hoverIntent.js',
+                                '../../js/superfish.js'
+                                );
 
 $header  = "\n" . '<script type="text/javascript">';
 $header .= "\n" . '  var $sf = jQuery.noConflict()';

Spacing +10 added lines, -10 removed lines

@@ -27,15 +27,15 @@
                              '../../js/superfish.js'
                              );
 
-$header  = "\n" . '<script type="text/javascript">';
-$header .= "\n" . '  var $sf = jQuery.noConflict()';
-$header .= "\n" . '  $sf(function(){';
-$header .= "\n" . '    $sf(\'ul.sf-menu\').superfish({';
-$header .= "\n" . '       delay:       1000,';
-$header .= "\n" . '       animation:   {opacity:\'show\',height:\'show\'},';
-$header .= "\n" . '       speed:       \'fast\'';
-$header .= "\n" . '    });';
-$header .= "\n" . '  });';
-$header .= "\n" . '</script>';
+$header  = "\n".'<script type="text/javascript">';
+$header .= "\n".'  var $sf = jQuery.noConflict()';
+$header .= "\n".'  $sf(function(){';
+$header .= "\n".'    $sf(\'ul.sf-menu\').superfish({';
+$header .= "\n".'       delay:       1000,';
+$header .= "\n".'       animation:   {opacity:\'show\',height:\'show\'},';
+$header .= "\n".'       speed:       \'fast\'';
+$header .= "\n".'    });';
+$header .= "\n".'  });';
+$header .= "\n".'</script>';
 
 $skinversion['header'] = $header;

htdocs/modules/menus/skins/superfish_navbar/skin_version.php

Spacing +8 added lines, -8 removed lines

@@ -31,13 +31,13 @@
     '../../js/superfish.js'
 );
 
-$header = "\n" . '<script type="text/javascript">';
-$header .= "\n" . '  var $sfnav = jQuery.noConflict()';
-$header .= "\n" . '  $sfnav(function(){';
-$header .= "\n" . '    $sfnav(\'ul.sf-menu\').superfish({';
-$header .= "\n" . '       pathClass:  \'current\'';
-$header .= "\n" . '    });';
-$header .= "\n" . '  });';
-$header .= "\n" . '</script>';
+$header = "\n".'<script type="text/javascript">';
+$header .= "\n".'  var $sfnav = jQuery.noConflict()';
+$header .= "\n".'  $sfnav(function(){';
+$header .= "\n".'    $sfnav(\'ul.sf-menu\').superfish({';
+$header .= "\n".'       pathClass:  \'current\'';
+$header .= "\n".'    });';
+$header .= "\n".'  });';
+$header .= "\n".'</script>';
 
 $skinversion['header'] = $header;

htdocs/modules/mailusers/admin/send_mails.php

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 // Parameters
@@ -36,7 +36,7 @@ 
 $xoops->header('admin:mailusers/mailusers_send_mail.tpl');
 // Define Stylesheet
 $xoops->theme()->addBaseStylesheetAssets('modules/system/css/admin.css');
-$xoops->theme()->addBaseScriptAssets(array('@jquery','media/xoops/xoops.js','modules/system/js/admin.js'));
+$xoops->theme()->addBaseScriptAssets(array('@jquery', 'media/xoops/xoops.js', 'modules/system/js/admin.js'));
 
 $admin_page = new \Xoops\Module\Admin();
 $admin_page->renderNavigation('send_mails.php');
@@ -48,13 +48,13 @@ 
         $display_criteria = 1;
         $form = new Xoops\Form\ThemeForm(_AM_MAILUSERS_LIST, "mailusers", "send_mails.php", 'post', true);
         //----------------------------------------
-        if (!empty($memberslist_id) && (Request::getMethod()==='POST')) {
+        if (!empty($memberslist_id) && (Request::getMethod() === 'POST')) {
             $user_count = count($memberslist_id);
             $display_names = "";
             for ($i = 0; $i < $user_count; ++$i) {
                 $uid_hidden = new Xoops\Form\Hidden("mail_to_user[]", $memberslist_id[$i]);
                 $form->addElement($uid_hidden);
-                $display_names .= "<a href='" . \XoopsBaseConfig::get('url') . "/userinfo.php?uid=" . $memberslist_id[$i] . "' rel='external'>" . XoopsUser::getUnameFromId($memberslist_id[$i]) . "</a>, ";
+                $display_names .= "<a href='".\XoopsBaseConfig::get('url')."/userinfo.php?uid=".$memberslist_id[$i]."' rel='external'>".XoopsUser::getUnameFromId($memberslist_id[$i])."</a>, ";
                 unset($uid_hidden);
             }
             $users_label = new Xoops\Form\Label(_AM_MAILUSERS_SENDTOUSERS2, substr($display_names, 0, -2));
@@ -65,41 +65,41 @@ 
         //----------------------------------------
         if (!empty($display_criteria)) {
             $selected_groups = array();
-            $group_select = new Xoops\Form\SelectGroup('<div class="bold spacer">' . _AM_MAILUSERS_GROUPIS . '<span class="bold green">*</span></div>', "mail_to_group", false, $selected_groups, 5, true);
+            $group_select = new Xoops\Form\SelectGroup('<div class="bold spacer">'._AM_MAILUSERS_GROUPIS.'<span class="bold green">*</span></div>', "mail_to_group", false, $selected_groups, 5, true);
 
-            $lastlog_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMIN . '<span class="bold green">*</span>', 'mail_lastlog_min');
+            $lastlog_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMIN.'<span class="bold green">*</span>', 'mail_lastlog_min');
             $lastlog_min->setValue('');
-            $lastlog_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMAX . '<span class="bold green">*</span>', 'mail_lastlog_max');
+            $lastlog_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_LASTLOGMAX.'<span class="bold green">*</span>', 'mail_lastlog_max');
             $lastlog_max->setValue('');
 
-            $date = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_DATE . '</div>', '');
+            $date = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_DATE.'</div>', '');
             $date->addElement($lastlog_min);
             $date->addElement($lastlog_max);
 
-            $idle_more = new Xoops\Form\Text(_AM_MAILUSERS_IDLEMORE . '<span class="bold green">*</span>', "mail_idle_more", 2, 5);
-            $idle_less = new Xoops\Form\Text(_AM_MAILUSERS_IDLELESS . '<span class="bold green">*</span>', "mail_idle_less", 2, 5);
+            $idle_more = new Xoops\Form\Text(_AM_MAILUSERS_IDLEMORE.'<span class="bold green">*</span>', "mail_idle_more", 2, 5);
+            $idle_less = new Xoops\Form\Text(_AM_MAILUSERS_IDLELESS.'<span class="bold green">*</span>', "mail_idle_less", 2, 5);
 
-            $idle = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_DAY . '</div>', '');
+            $idle = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_DAY.'</div>', '');
             $idle->addElement($idle_more);
             $idle->addElement($idle_less);
 
-            $regd_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMIN . '<span class="bold green">*</span>', "mail_regd_min");
+            $regd_min = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMIN.'<span class="bold green">*</span>', "mail_regd_min");
             $regd_min->setValue('');
-            $regd_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMAX . '<span class="bold green">*</span>', "mail_regd_max");
+            $regd_max = new Xoops\Form\DateSelect(_AM_MAILUSERS_REGDMAX.'<span class="bold green">*</span>', "mail_regd_max");
             $regd_max->setValue('');
 
-            $regdate = new Xoops\Form\ElementTray('<div class="bold spacer">' . _AM_MAILUSERS_REGDATE . '</div>', '');
+            $regdate = new Xoops\Form\ElementTray('<div class="bold spacer">'._AM_MAILUSERS_REGDATE.'</div>', '');
             $regdate->addElement($regd_min);
             $regdate->addElement($regd_max);
 
             $mailok_cbox = new Xoops\Form\Checkbox('', 'mail_mailok');
-            $mailok_cbox->addOption(1, _AM_MAILUSERS_MAILOK . '<span class="bold green">*</span>');
+            $mailok_cbox->addOption(1, _AM_MAILUSERS_MAILOK.'<span class="bold green">*</span>');
             $inactive_cbox = new Xoops\Form\Checkbox('', "mail_inactive");
-            $inactive_cbox->addOption(1, _AM_MAILUSERS_INACTIVE . '<span class="bold green">*</span>');
+            $inactive_cbox->addOption(1, _AM_MAILUSERS_INACTIVE.'<span class="bold green">*</span>');
             $inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group[]\");'");
 
             $criteria_tray = new Xoops\Form\ElementTray(_AM_MAILUSERS_SENDTOUSERS, "<br /><br />");
-            $criteria_tray->setDescription('<span class="bold green">*</span>' . _AM_MAILUSERS_OPTIONAL);
+            $criteria_tray->setDescription('<span class="bold green">*</span>'._AM_MAILUSERS_OPTIONAL);
             $criteria_tray->addElement($group_select);
             //$criteria_tray->addElement($lastlog);
             $criteria_tray->addElement($date);
@@ -114,12 +114,12 @@ 
             //$criteria_tray->addElement($regd_max);
             $form->addElement($criteria_tray);
         }
-        $fname_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFNAME, "mail_fromname", 30, 255, $xoops->getConfig('fromname') ? $xoops->getConfig('fromname') :htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES));
+        $fname_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFNAME, "mail_fromname", 30, 255, $xoops->getConfig('fromname') ? $xoops->getConfig('fromname') : htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES));
         $fromemail = $xoops->getConfig('from') ? $xoops->getConfig('from') : $xoops->user->getVar("email", "E");
         $femail_text = new Xoops\Form\Text(_AM_MAILUSERS_MAILFMAIL, "mail_fromemail", 30, 255, $fromemail);
-        $subject_caption = _AM_MAILUSERS_MAILSUBJECT . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_MAILUSERS_MAILTAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_MAILUSERS_MAILTAGS2 . "</span>";
+        $subject_caption = _AM_MAILUSERS_MAILSUBJECT."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_MAILUSERS_MAILTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_MAILUSERS_MAILTAGS2."</span>";
         $subject_text = new Xoops\Form\Text($subject_caption, "mail_subject", 50, 255);
-        $body_caption = _AM_MAILUSERS_MAILBODY . "<br /><br /><span style='font-size:x-small;font-weight:bold;'>" . _AM_MAILUSERS_MAILTAGS . "</span><br /><span style='font-size:x-small;font-weight:normal;'>" . _AM_MAILUSERS_MAILTAGS1 . "<br />" . _AM_MAILUSERS_MAILTAGS2 . "<br />" . _AM_MAILUSERS_MAILTAGS3 . "<br />" . _AM_MAILUSERS_MAILTAGS4 . "</span>";
+        $body_caption = _AM_MAILUSERS_MAILBODY."<br /><br /><span style='font-size:x-small;font-weight:bold;'>"._AM_MAILUSERS_MAILTAGS."</span><br /><span style='font-size:x-small;font-weight:normal;'>"._AM_MAILUSERS_MAILTAGS1."<br />"._AM_MAILUSERS_MAILTAGS2."<br />"._AM_MAILUSERS_MAILTAGS3."<br />"._AM_MAILUSERS_MAILTAGS4."</span>";
         $editor_configs = array();
         $editor_configs["name"] = "mail_body";
         $editor_configs["value"] = '';