XOOPS / XoopsCore

htdocs/modules/profile/index.php

Spacing +11 added lines, -11 removed lines

@@ -22,7 +22,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 $op = 'main';
@@ -50,7 +50,7 @@ 
         $xoops->tpl()->assign('lang_youremail', XoopsLocale::C_YOUR_EMAIL);
         $xoops->tpl()->assign('lang_sendpassword', XoopsLocale::SEND_PASSWORD);
         $xoops->tpl()->assign('mailpasswd_token', $xoops->security()->createToken());
-        include __DIR__ . '/footer.php';
+        include __DIR__.'/footer.php';
     }
     if (!empty($_GET['xoops_redirect'])) {
         $redirect = trim($_GET['xoops_redirect']);
@@ -62,11 +62,11 @@ 
             }
         }
         if (!$isExternal) {
-            header('Location: ' . $redirect);
+            header('Location: '.$redirect);
             exit();
         }
     }
-    header('Location: ./userinfo.php?uid=' . $xoops->user->getVar('uid'));
+    header('Location: ./userinfo.php?uid='.$xoops->user->getVar('uid'));
     exit();
 }
 
@@ -83,8 +83,8 @@ 
     if ($xoops->isUser()) {
         $xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
     }
-    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
-    $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 1, $message);
+    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT.'<br />'.XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
+    $xoops->redirect(\XoopsBaseConfig::get('url').'/', 1, $message);
 }
 
 if ($op === 'actv') {
@@ -95,12 +95,12 @@ 
 
 if ($op === 'delete') {
     if (!$xoops->isUser() || $xoops->getConfig('self_delete') != 1) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+        $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
     } else {
         $groups = $xoops->user->getGroups();
         if (in_array(FixedGroups::ADMIN, $groups)) {
             // users in the webmasters group may not be deleted
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
         }
         $ok = !isset($_POST['ok']) ? 0 : (int)($_POST['ok']);
         if ($ok != 1) {
@@ -108,9 +108,9 @@ 
             echo $xoops->confirm(
                 array('op' => 'delete', 'ok' => 1),
                 'user.php',
-                XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO
+                XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT.'<br/>'.XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO
             );
-            include __DIR__ . '/footer.php';
+            include __DIR__.'/footer.php';
         } else {
             $del_uid = $xoops->user->getVar("uid");
             if (false != $xoops->getHandlerMember()->deleteUser($xoops->user)) {
@@ -122,7 +122,7 @@ 
                 }
                 $xoops->redirect('index.php', 5, XoopsLocale::S_YOUR_ACCOUNT_DELETED);
             }
-            $xoops->redirect(XOOPS_URL . '/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
+            $xoops->redirect(XOOPS_URL.'/', 5, XoopsLocale::E_NO_ACTION_PERMISSION);
         }
     }
 }

htdocs/modules/profile/header.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 $xoops = Xoops::getInstance();
 
 $xoops->registry()->set('profile_breadcrumbs', new ItemList());

htdocs/modules/pdf/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->header();
 $aboutAdmin = new \Xoops\Module\Admin();

htdocs/modules/pdf/admin/index.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @since           2.6.0
  * @author          Mage Grégory (AKA Mage)
  */
-include __DIR__ . '/header.php';
+include __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 

htdocs/modules/pdf/admin/header.php

Spacing +1 added lines, -1 removed lines

@@ -19,4 +19,4 @@
  * @author          Mage Grégory (AKA Mage)
  * @version         $Id$
  */
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';

htdocs/modules/pdf/preloads/preload.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     public static function eventCoreServiceLocateHtmlToPdf(Provider $provider)
     {
         if (is_a($provider, '\Xoops\Core\Service\Provider')) {
-            $path = dirname(__DIR__) . '/class/HtmlToPdfProvider.php';
+            $path = dirname(__DIR__).'/class/HtmlToPdfProvider.php';
             require $path;
             $object = new HtmlToPdfProvider();
             $provider->register($object);

htdocs/modules/pdf/class/HtmlToPdfProvider.php

Spacing +8 added lines, -8 removed lines

@@ -344,7 +344,7 @@ 
         $this->pdfKeywords = $pdfKeywords;
         if (isset($this->pdfEngine)) {
             $keywords =
-                is_array($this->pdfKeywords) ? implode(', ', $this->pdfKeywords) : (string) $this->pdfKeywords;
+                is_array($this->pdfKeywords) ? implode(', ', $this->pdfKeywords) : (string)$this->pdfKeywords;
             $this->pdfEngine->SetKeywords($keywords);
         }
     }
@@ -435,7 +435,7 @@ 
             }
             if (isset($this->pdfKeywords)) {
                 $keywords =
-                    is_array($this->pdfKeywords) ? implode(', ', $this->pdfKeywords) : (string) $this->pdfKeywords;
+                    is_array($this->pdfKeywords) ? implode(', ', $this->pdfKeywords) : (string)$this->pdfKeywords;
                 $this->pdfEngine->SetKeywords($keywords);
             }
             if (!empty($this->pdfCreator)) {
@@ -466,21 +466,21 @@ 
      */
     private function decodeEntities($text)
     {
-        $text= html_entity_decode($text, ENT_QUOTES, "UTF-8");
-        $text= preg_replace_callback(
+        $text = html_entity_decode($text, ENT_QUOTES, "UTF-8");
+        $text = preg_replace_callback(
             '/&#(\d+);/m',
-            function ($m) {
+            function($m) {
                 return utf8_encode(chr($m[1]));
             },
             $text
         ); // decimal notation
-        $text= preg_replace_callback(
+        $text = preg_replace_callback(
             '/&#x([a-f0-9]+);/mi',
-            function ($m) {
+            function($m) {
                 return utf8_encode(chr('0x'.$m[1]));
             },
             $text
-        );  //hex notation
+        ); //hex notation
         return $text;
     }
 }

htdocs/modules/protector/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
  * @version         $Id$
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();

htdocs/modules/protector/admin/prefix_manager.php

Spacing +27 added lines, -27 removed lines

@@ -19,9 +19,9 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
-require_once dirname(__DIR__) . '/class/gtickets.php';
+require_once dirname(__DIR__).'/class/gtickets.php';
 
 $xoops = Xoops::getInstance();
 $xoops->db();
@@ -41,13 +41,13 @@ 
 
     // Ticket check
     if (!$xoopsGTicket->check(true, 'protector_admin')) {
-        $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 3, $xoopsGTicket->getErrors());
+        $xoops->redirect(\XoopsBaseConfig::get('url').'/', 3, $xoopsGTicket->getErrors());
     }
 
-    $new_prefix = empty($_POST['new_prefix']) ? 'x' . substr(md5(time()), -5) : $_POST['new_prefix'];
+    $new_prefix = empty($_POST['new_prefix']) ? 'x'.substr(md5(time()), -5) : $_POST['new_prefix'];
     $old_prefix = $_POST['old_prefix'];
 
-    $srs = $db->queryF('SHOW TABLE STATUS FROM `' . \XoopsBaseConfig::get('db-name') . '`');
+    $srs = $db->queryF('SHOW TABLE STATUS FROM `'.\XoopsBaseConfig::get('db-name').'`');
 
     if (!$db->getRowsNum($srs)) {
         $xoops->tpl()->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NACT);
@@ -59,15 +59,15 @@ 
     while (false !== ($row_table = $db->fetchArray($srs))) {
         ++$count;
         $old_table = $row_table['Name'];
-        if (substr($old_table, 0, strlen($old_prefix) + 1) !== $old_prefix . '_') {
+        if (substr($old_table, 0, strlen($old_prefix) + 1) !== $old_prefix.'_') {
             continue;
         }
 
-        $new_table = $new_prefix . substr($old_table, strlen($old_prefix));
+        $new_table = $new_prefix.substr($old_table, strlen($old_prefix));
 
-        $crs = $db->queryF('SHOW CREATE TABLE ' . $old_table);
+        $crs = $db->queryF('SHOW CREATE TABLE '.$old_table);
         if (!$db->getRowsNum($crs)) {
-            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_SCT, $old_table) . '<br />';
+            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_SCT, $old_table).'<br />';
             continue;
         }
         $row_create = $db->fetchArray($crs);
@@ -75,13 +75,13 @@ 
 
         $crs = $db->queryF($create_sql);
         if (!$crs) {
-            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_CT, $new_table) . '<br />';
+            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_CT, $new_table).'<br />';
             continue;
         }
 
         $irs = $db->queryF("INSERT INTO `$new_table` SELECT * FROM `$old_table`");
         if (!$irs) {
-            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_II, $new_table) . '<br />';
+            $error .= sprintf(_AM_PROTECTOR_PREFIX_ERROR_II, $new_table).'<br />';
             continue;
         }
     }
@@ -107,13 +107,13 @@ 
 
         // Ticket check
         if (!$xoopsGTicket->check(true, 'protector_admin')) {
-            $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 3, $xoopsGTicket->getErrors());
+            $xoops->redirect(\XoopsBaseConfig::get('url').'/', 3, $xoopsGTicket->getErrors());
         }
 
         $prefix = $_POST['prefix'];
 
         // get table list
-        $srs = $db->queryF('SHOW TABLE STATUS FROM `' . \XoopsBaseConfig::get('db-name') . '`');
+        $srs = $db->queryF('SHOW TABLE STATUS FROM `'.\XoopsBaseConfig::get('db-name').'`');
         if (!$db->getRowsNum($srs)) {
             $xoops->tpl()->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NADT);
             $xoops->footer();
@@ -124,11 +124,11 @@ 
 
         while (false !== ($row_table = $db->fetchArray($srs))) {
             $table = $row_table['Name'];
-            if (substr($table, 0, strlen($prefix) + 1) !== $prefix . '_') {
+            if (substr($table, 0, strlen($prefix) + 1) !== $prefix.'_') {
                 continue;
             }
             $drs = $db->queryF("SHOW CREATE TABLE `$table`");
-            $export_string .= "\nDROP TABLE IF EXISTS `$table`;\n" . mysql_result($drs, 0, 1) . ";\n\n";
+            $export_string .= "\nDROP TABLE IF EXISTS `$table`;\n".mysql_result($drs, 0, 1).";\n\n";
             $result = mysqli_query("SELECT * FROM `$table`");
             $fields_cnt = mysql_num_fields($result);
             $field_flags = array();
@@ -159,24 +159,24 @@ 
                             if (empty($row[$j]) && $row[$j] != '0') {
                                 $values[] = '\'\'';
                             } else {
-                                $values[] = '0x' . bin2hex($row[$j]);
+                                $values[] = '0x'.bin2hex($row[$j]);
                             }
                             // something else -> treat as a string
                         } else {
-                            $values[] = '\'' . str_replace($search, $replace, addslashes($row[$j])) . '\'';
+                            $values[] = '\''.str_replace($search, $replace, addslashes($row[$j])).'\'';
                         }
                     } // end if
                 } // end for
 
-                $export_string .= "INSERT INTO `$table` VALUES (" . implode(', ', $values) . ");\n";
+                $export_string .= "INSERT INTO `$table` VALUES (".implode(', ', $values).");\n";
                 unset($values);
             } // end while
             mysql_free_result($result);
         }
 
         header('Content-Type: Application/octet-stream');
-        header('Content-Disposition: attachment; filename="' . $prefix . '_' . date('YmdHis') . '.sql"');
-        header('Content-Length: ' . strlen($export_string));
+        header('Content-Disposition: attachment; filename="'.$prefix.'_'.date('YmdHis').'.sql"');
+        header('Content-Length: '.strlen($export_string));
         set_time_limit(0);
         echo $export_string;
         exit;
@@ -192,7 +192,7 @@ 
 
             // Ticket check
             if (!$xoopsGTicket->check(true, 'protector_admin')) {
-                $xoops->redirect(\XoopsBaseConfig::get('url') . '/', 3, $xoopsGTicket->getErrors());
+                $xoops->redirect(\XoopsBaseConfig::get('url').'/', 3, $xoopsGTicket->getErrors());
             }
 
             $prefix = $_POST['prefix'];
@@ -213,7 +213,7 @@ 
             }
 
             // get table list
-            $srs = $db->queryF('SHOW TABLE STATUS FROM `' . \XoopsBaseConfig::get('db-name') . '`');
+            $srs = $db->queryF('SHOW TABLE STATUS FROM `'.\XoopsBaseConfig::get('db-name').'`');
             if (!$db->getRowsNum($srs)) {
                 $xoops->tpl()->assign('error', _AM_PROTECTOR_PREFIX_ERROR_NADT);
                 $xoops->footer();
@@ -222,7 +222,7 @@ 
 
             while (false !== ($row_table = $db->fetchArray($srs))) {
                 $table = $row_table['Name'];
-                if (substr($table, 0, strlen($prefix) + 1) !== $prefix . '_') {
+                if (substr($table, 0, strlen($prefix) + 1) !== $prefix.'_') {
                     continue;
                 }
                 $drs = $db->queryF("DROP TABLE `$table`");
@@ -241,7 +241,7 @@ 
 $admin_page = new \Xoops\Module\Admin();
 $admin_page->renderNavigation('prefix_manager.php');
 
-$xoops->tpl()->assign('prefix', sprintf(_AM_TXT_HOWTOCHANGEDB, \XoopsBaseConfig::get('var_path') . "/data/secure.php"));
+$xoops->tpl()->assign('prefix', sprintf(_AM_TXT_HOWTOCHANGEDB, \XoopsBaseConfig::get('var_path')."/data/secure.php"));
 $xoops->tpl()->assign('prefix_line', sprintf(_AM_PROTECTOR_PREFIX_CHANGEDBLINE, \XoopsBaseConfig::get('db-prefix')));
 
 // Display Log if exists
@@ -252,7 +252,7 @@ 
 }
 
 // query
-$srs = $db->queryF("SHOW TABLE STATUS FROM `" . \XoopsBaseConfig::get('db-name') . '`');
+$srs = $db->queryF("SHOW TABLE STATUS FROM `".\XoopsBaseConfig::get('db-name').'`');
 if (!$db->getRowsNum($srs)) {
     $xoops->tpl()->assign('error', '_AM_PROTECTOR_PREFIX_ERROR_NACT');
     $xoops->footer();
@@ -278,10 +278,10 @@ 
     $table_count = 0;
     $has_xoopscomments = false;
     foreach ($tables as $table) {
-        if ($table == $prefix['name'] . '_xoopscomments') {
+        if ($table == $prefix['name'].'_xoopscomments') {
             $has_xoopscomments = true;
         }
-        if (substr($table, 0, strlen($prefix['name']) + 1) === $prefix['name'] . '_') {
+        if (substr($table, 0, strlen($prefix['name']) + 1) === $prefix['name'].'_') {
             ++$table_count;
         }
     }