geekwright / XoopsCore

htdocs/modules/debugbar/class/debugbarlogger.php

Spacing +14 added lines, -14 removed lines

@@ -177,12 +177,12 @@ 
                 $excludes = array(
                     //'/vendor/font-awesome/', // font-awesome needs special process
                     //'/vendor/highlightjs/',  // highlightjs has some negative side effects
-                    '/vendor/jquery/',       // jquery is already available
+                    '/vendor/jquery/', // jquery is already available
                 );
 
                 $cssAssets = array_filter(
                     $cssAssets,
-                    function ($filename) use ($excludes) {
+                    function($filename) use ($excludes) {
                         foreach ($excludes as $exclude) {
                             if (false !== strpos($filename, $exclude)) {
                                 return false;
@@ -194,7 +194,7 @@ 
 
                 $jsAssets = array_filter(
                     $jsAssets,
-                    function ($filename) use ($excludes) {
+                    function($filename) use ($excludes) {
                         foreach ($excludes as $exclude) {
                             if (false !== strpos($filename, $exclude)) {
                                 return false;
@@ -390,7 +390,7 @@ 
     {
         if ($this->activated) {
             $this->debugbar->stackData();
-            $this->activated=false;
+            $this->activated = false;
             $this->renderingEnabled = false;
         }
     }
@@ -431,9 +431,9 @@ 
         $pattern = '<!--<xo-logger-output>-->';
         $pos = strpos($output, $pattern);
         if ($pos !== false) {
-            return substr($output, 0, $pos) . $log . substr($output, $pos + strlen($pattern));
+            return substr($output, 0, $pos).$log.substr($output, $pos + strlen($pattern));
         } else {
-            return $output . $log;
+            return $output.$log;
         }
     }
 
@@ -452,15 +452,15 @@ 
             }
             $this->addToTheme();
             $this->addExtra(_MD_DEBUGBAR_PHP_VERSION, PHP_VERSION);
-            $this->addExtra(_MD_DEBUGBAR_INCLUDED_FILES, (string) count(get_included_files()));
+            $this->addExtra(_MD_DEBUGBAR_INCLUDED_FILES, (string)count(get_included_files()));
             $conn = \Xoops::getInstance()->db()->getWrappedConnection();
             if ($conn instanceof \PDO) {
                 $this->addExtra(
-                    $conn->getAttribute(\PDO::ATTR_DRIVER_NAME) . ' version',
+                    $conn->getAttribute(\PDO::ATTR_DRIVER_NAME).' version',
                     $conn->getAttribute(\PDO::ATTR_SERVER_VERSION)
                 );
                 $this->addExtra(
-                    $conn->getAttribute(\PDO::ATTR_DRIVER_NAME) . ' stats',
+                    $conn->getAttribute(\PDO::ATTR_DRIVER_NAME).' stats',
                     $conn->getAttribute(\PDO::ATTR_SERVER_INFO)
                 );
             }
@@ -638,7 +638,7 @@ 
             switch ($chan) {
                 case 'blocks':
                     $channel = 'Blocks';
-                    $msg = $message . ': ';
+                    $msg = $message.': ';
                     if ($context['cached']) {
                         $msg .= sprintf(_MD_DEBUGBAR_CACHED, (int)($context['cachetime']));
                     } else {
@@ -651,7 +651,7 @@ 
                     break;
                 case 'extra':
                     $channel = 'Extra';
-                    $msg = $context['name'] . ': ' . $message;
+                    $msg = $context['name'].': '.$message;
                     break;
                 case 'queries':
                     $channel = 'Queries';
@@ -663,11 +663,11 @@ 
                         //    \Xmf\Debug::dump($context);
                         //}
                         $msg .= ' -- Error number: '
-                            . (is_scalar($context['errno']) ?  $context['errno'] : '?')
+                            . (is_scalar($context['errno']) ? $context['errno'] : '?')
                             . ' Error message: '
-                            . (is_scalar($context['error']) ?  $context['error'] : '?');
+                            . (is_scalar($context['error']) ? $context['error'] : '?');
                     }
-                    $msg = $qt . $msg;
+                    $msg = $qt.$msg;
                     break;
             }
         }

htdocs/modules/debugbar/class/plugin/userconfigs.php

Spacing +2 added lines, -2 removed lines

@@ -58,7 +58,7 @@ 
      */
     public function configs()
     {
-        $config[]=array(
+        $config[] = array(
             'name' => 'debugbar_enable',
             'title' => '_MI_DEBUGBAR_UCONF_ENABLE_BAR',
             'description' => '',
@@ -69,7 +69,7 @@ 
             'category' => 'cat_options'
         );
 
-        $config[]=array(
+        $config[] = array(
             'name' => 'debug_smarty_enable',
             'title' => '_MI_DEBUGBAR_UCONF_ENABLE_SMARTY',
             'description' => '',

htdocs/modules/publisher/pop.php

Spacing +1 added lines, -1 removed lines

@@ -23,4 +23,4 @@
 $doNotStartPrint = true;
 $noTitle = true;
 $smartPopup = true;
-include_once __DIR__ . '/print.php';
+include_once __DIR__.'/print.php';

htdocs/modules/publisher/rate.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
  * @version         $Id$
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -37,11 +37,11 @@ 
 if (!$publisher->getConfig('perm_rating')
     || !$gperm_handler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)
 ) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 if ($rating > 5 || $rating < 1) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_BAD);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_BAD);
 }
 
 $criteria = new Criteria('itemid', $itemid);
@@ -62,7 +62,7 @@ 
 }
 
 if ($voted) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_ALREADY);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_ALREADY);
 }
 
 $newRatingObj = $publisher->getRatingHandler()->create();
@@ -79,4 +79,4 @@ 
 $publisher->getItemHandler()->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
 $publisher->getItemHandler()->updateAll('votes', $count, $criteria, true);
 
-$xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_THANKS);
+$xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_THANKS);

htdocs/modules/publisher/admin/about.php

Spacing +1 added lines, -1 removed lines

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

htdocs/modules/publisher/admin/import/smartsection.php

Spacing +27 added lines, -27 removed lines

@@ -20,10 +20,10 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/admin_header.php';
+include_once dirname(__DIR__).'/admin_header.php';
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();
 
-$importFromModuleName = "Smartsection " . @$_POST['smartsection_version'];
+$importFromModuleName = "Smartsection ".@$_POST['smartsection_version'];
 
 $scriptname = "smartsection.php";
 
@@ -39,26 +39,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     PublisherUtils::openCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("smartsection_categories"));
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("smartsection_categories"));
     list ($totalCat) = $xoopsDB->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_PUBLISHER_IMPORT_NO_CATEGORY."</span>";
     } else {
-        include_once \XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        include_once \XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix('smartsection_items'));
+        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix('smartsection_items'));
         list ($totalArticles) = $xoopsDB->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles)."</span>";
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat)."</span>";
 
-            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/{$scriptname}");
+            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/{$scriptname}");
 
             // Categories to be imported
-            $sql = "SELECT cat.categoryid, cat.parentid, cat.name, COUNT(art.itemid) FROM " . $xoopsDB->prefix('smartsection_categories') . " AS cat INNER JOIN " . $xoopsDB->prefix('smartsection_items') . " AS art ON cat.categoryid=art.categoryid GROUP BY art.categoryid";
+            $sql = "SELECT cat.categoryid, cat.parentid, cat.name, COUNT(art.itemid) FROM ".$xoopsDB->prefix('smartsection_categories')." AS cat INNER JOIN ".$xoopsDB->prefix('smartsection_items')." AS art ON cat.categoryid=art.categoryid GROUP BY art.categoryid";
 
             $result = $xoopsDB->query($sql);
             $cat_cbox_options = array();
@@ -111,7 +111,7 @@ 
 
     $parentId = $_POST['parent_category'];
 
-    $sql = "SELECT * FROM " . $xoopsDB->prefix('smartsection_categories');
+    $sql = "SELECT * FROM ".$xoopsDB->prefix('smartsection_categories');
 
     $resultCat = $xoopsDB->query($sql);
 
@@ -131,20 +131,20 @@ 
 
         // Copy category image
         if (($arrCat['image'] !== 'blank.gif') && ($arrCat['image'] != '')) {
-            copy(\XoopsBaseConfig::get('root-path') . "/uploads/smartsection/images/category/" . $arrCat['image'], \XoopsBaseConfig::get('root-path') . "/uploads/publisher/images/category/" . $arrCat['image']);
+            copy(\XoopsBaseConfig::get('root-path')."/uploads/smartsection/images/category/".$arrCat['image'], \XoopsBaseConfig::get('root-path')."/uploads/publisher/images/category/".$arrCat['image']);
         }
 
         if (!$publisher->getCategoryHandler()->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['name'])."<br/>";
             continue;
         }
 
         $newCat['newid'] = $categoryObj->getVar('categoryid');
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = "SELECT * FROM " . $xoopsDB->prefix('smartsection_items') . " WHERE categoryid=" . $arrCat['categoryid'];
+        $sql = "SELECT * FROM ".$xoopsDB->prefix('smartsection_items')." WHERE categoryid=".$arrCat['categoryid'];
         $resultArticles = $xoopsDB->query($sql);
 
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
@@ -172,31 +172,31 @@ 
             */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf("  "._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title'])."<br/>";
                 continue;
             } else {
 
                 // Linkes files
-                $sql = "SELECT * FROM " . $xoopsDB->prefix("smartsection_files") . " WHERE itemid=" . $arrArticle['itemid'];
+                $sql = "SELECT * FROM ".$xoopsDB->prefix("smartsection_files")." WHERE itemid=".$arrArticle['itemid'];
                 $resultFiles = $xoopsDB->query($sql);
                 $allowed_mimetypes = null;
                 while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                    $filename = \XoopsBaseConfig::get('root-path') . "/uploads/smartsection/" . $arrFile['filename'];
+                    $filename = \XoopsBaseConfig::get('root-path')."/uploads/smartsection/".$arrFile['filename'];
                     if (XoopsLoad::fileExists($filename)) {
-                        if (copy($filename, \XoopsBaseConfig::get('root-path') . "/uploads/publisher/" . $arrFile['filename'])) {
+                        if (copy($filename, \XoopsBaseConfig::get('root-path')."/uploads/publisher/".$arrFile['filename'])) {
                             $fileObj = $publisher->getFileHandler()->create();
                             $fileObj->setVars($arrFile);
                             $fileObj->setVar('fileid', 0);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filename']) . "<br />";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filename'])."<br />";
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['itemid']] = $itemObj->getVar('itemid');
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title())."<br />";
                 ++$cnt_imported_articles;
             }
         }
@@ -228,7 +228,7 @@ 
     }
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS."<br />";
 
     $publisher_module_id = $publisher->getModule()->mid();
 
@@ -241,17 +241,17 @@ 
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$comment_handler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title'))."<br />";
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title'))."<br />";
         }
 
     }
 
     echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat)."<br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles)."<br/>";
+    echo "<br/><a href='".PUBLISHER_URL."/'>"._AM_PUBLISHER_IMPORT_GOTOMODULE."</a><br/>";
 
     PublisherUtils::closeCollapsableBar('newsimportgo', 'newsimportgoicon');
     $xoops->footer();

htdocs/modules/publisher/admin/import/wfsection.php

Spacing +31 added lines, -31 removed lines

@@ -20,10 +20,10 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/admin_header.php';
+include_once dirname(__DIR__).'/admin_header.php';
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();
 
-$importFromModuleName = "WF-Section " . @$_POST['wfs_version'];
+$importFromModuleName = "WF-Section ".@$_POST['wfs_version'];
 
 $scriptname = "wfsection.php";
 
@@ -39,26 +39,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     PublisherUtils::openCollapsableBar('wfsectionimport', 'wfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("wfs_category"));
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("wfs_category"));
     list ($totalCat) = $xoopsDB->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_PUBLISHER_IMPORT_NOCATSELECTED."</span>";
     } else {
-        include_once \XoopsBaseConfig::get('root-path') . "/class/xoopstree.php";
+        include_once \XoopsBaseConfig::get('root-path')."/class/xoopstree.php";
 
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("wfs_article"));
+        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("wfs_article"));
         list ($totalArticles) = $xoopsDB->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles)."</span>";
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat)."</span>";
 
-            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/$scriptname");
 
             // Categories to be imported
-            $sql = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM " . $xoopsDB->prefix("wfs_category") . " AS cat INNER JOIN " . $xoopsDB->prefix("wfs_article") . " AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
+            $sql = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ".$xoopsDB->prefix("wfs_category")." AS cat INNER JOIN ".$xoopsDB->prefix("wfs_article")." AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
             $result = $xoopsDB->query($sql);
             $cat_cbox_values = array();
             $cat_cbox_options = array();
@@ -109,7 +109,7 @@ 
         $orders = 'orders';
     }
     //$sql = "SELECT * FROM ".$xoopsDB->prefix("wfs_category")." ORDER by orders";
-    $sql = "SELECT * FROM " . $xoopsDB->prefix("wfs_category") . " ORDER by $orders";
+    $sql = "SELECT * FROM ".$xoopsDB->prefix("wfs_category")." ORDER by $orders";
     //end added to support 2.0.7
     $resultCat = $xoopsDB->query($sql);
 
@@ -134,13 +134,13 @@ 
 
         // Category image
         if (($arrCat['imgurl'] !== 'blank.gif') && ($arrCat['imgurl'])) {
-            if (copy(XOOPS_ROOT_PATH . "/modules/wfsection/images/category/" . $arrCat['imgurl'], PUBLISHER_UPLOADS_PATH . "/images/category/" . $arrCat['imgurl'])) {
+            if (copy(XOOPS_ROOT_PATH."/modules/wfsection/images/category/".$arrCat['imgurl'], PUBLISHER_UPLOADS_PATH."/images/category/".$arrCat['imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['imgurl']);
             }
         }
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title'])."<br/>";
             continue;
         }
 
@@ -151,9 +151,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = "SELECT * FROM " . $xoopsDB->prefix("wfs_article") . " WHERE categoryid=" . $arrCat['id'] . " ORDER BY weight";
+        $sql = "SELECT * FROM ".$xoopsDB->prefix("wfs_article")." WHERE categoryid=".$arrCat['id']." ORDER BY weight";
         $resultArticles = $xoopsDB->query($sql);
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
             // insert article
@@ -175,28 +175,28 @@ 
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = \XoopsBaseConfig::get('root-path') . "/modules/wfsection/html/" . $arrArticle['htmlpage'];
+                $pagewrap_filename = \XoopsBaseConfig::get('root-path')."/modules/wfsection/html/".$arrArticle['htmlpage'];
                 if (XoopsLoad::fileExists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH . "/content/" . $arrArticle['htmlpage'])) {
-                        $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH."/content/".$arrArticle['htmlpage'])) {
+                        $itemObj->setVar('body', "[pagewrap=".$arrArticle['htmlpage']."]");
+                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;"._AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage'])."<br/>";
                     }
                 }
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf("  "._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title'])."<br/>";
                 continue;
             } else {
                 // Linkes files
 
-                $sql = "SELECT * FROM " . $xoopsDB->prefix("wfs_files") . " WHERE articleid=" . $arrArticle['articleid'];
+                $sql = "SELECT * FROM ".$xoopsDB->prefix("wfs_files")." WHERE articleid=".$arrArticle['articleid'];
                 $resultFiles = $xoopsDB->query($sql);
                 $allowed_mimetypes = '';
                 while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                    $filename = \XoopsBaseConfig::get('root-path') . "/modules/wfsection/cache/uploaded/" . $arrFile['filerealname'];
+                    $filename = \XoopsBaseConfig::get('root-path')."/modules/wfsection/cache/uploaded/".$arrFile['filerealname'];
                     if (XoopsLoad::fileExists($filename)) {
-                        if (copy($filename, PUBLISHER_UPLOADS_PATH . "/" . $arrFile['filerealname'])) {
+                        if (copy($filename, PUBLISHER_UPLOADS_PATH."/".$arrFile['filerealname'])) {
                             $fileObj = $publisher->getFileHandler()->create();
                             $fileObj->setVar('name', $arrFile['fileshowname']);
                             $fileObj->setVar('description', $arrFile['filedescript']);
@@ -209,14 +209,14 @@ 
                             $fileObj->setVar('filename', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname'])."<br />";
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['articleid']] = $itemObj->getVar('itemid');
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title())."<br />";
                 ++$cnt_imported_articles;
             }
         }
@@ -239,7 +239,7 @@ 
     }
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS."<br />";
 
     $module_handler = xoops_getHandler('module');
     $moduleObj = $module_handler->getByDirname('wfsection');
@@ -256,17 +256,17 @@ 
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$comment_handler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title'))."<br />";
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title'))."<br />";
         }
 
     }
 
     echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat)."<br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles)."<br/>";
+    echo "<br/><a href='".PUBLISHER_URL."/'>"._AM_PUBLISHER_IMPORT_GOTOMODULE."</a><br/>";
 
     PublisherUtils::closeCollapsableBar('wfsectionimportgo', 'wfsectionimportgoicon');
     $xoops->footer();

htdocs/modules/publisher/admin/import/news.php

Spacing +23 added lines, -23 removed lines

@@ -20,10 +20,10 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/admin_header.php';
+include_once dirname(__DIR__).'/admin_header.php';
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();
 
-$importFromModuleName = "News " . @$_POST['news_version'];
+$importFromModuleName = "News ".@$_POST['news_version'];
 
 $scriptname = "news.php";
 
@@ -39,26 +39,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     PublisherUtils::openCollapsableBar('newsimport', 'newsimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("topics"));
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("topics"));
     list ($totalCat) = $xoopsDB->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NO_CATEGORY . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_PUBLISHER_IMPORT_NO_CATEGORY."</span>";
     } else {
-        include_once \XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        include_once \XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("stories"));
+        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("stories"));
         list ($totalArticles) = $xoopsDB->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles)."</span>";
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat)."</span>";
 
-            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/$scriptname");
 
             // Categories to be imported
-            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM " . $xoopsDB->prefix("topics") . " AS cat INNER JOIN " . $xoopsDB->prefix("stories") . " AS art ON cat.topic_id=art.topicid GROUP BY art.topicid";
+            $sql = "SELECT cat.topic_id, cat.topic_pid, cat.topic_title, COUNT(art.storyid) FROM ".$xoopsDB->prefix("topics")." AS cat INNER JOIN ".$xoopsDB->prefix("stories")." AS art ON cat.topic_id=art.topicid GROUP BY art.topicid";
 
             $result = $xoopsDB->query($sql);
             $cat_cbox_options = array();
@@ -111,7 +111,7 @@ 
 
     $parentId = $_POST['parent_category'];
 
-    $sql = "SELECT * FROM " . $xoopsDB->prefix('topics');
+    $sql = "SELECT * FROM ".$xoopsDB->prefix('topics');
 
     $resultCat = $xoopsDB->query($sql);
 
@@ -133,22 +133,22 @@ 
 
         // Category image
         if (($arrCat['topic_imgurl'] !== 'blank.gif') && ($arrCat['topic_imgurl'] != '')) {
-            if (copy(\XoopsBaseConfig::get('root-path') . "/modules/news/images/topics/" . $arrCat['topic_imgurl'], \XoopsBaseConfig::get('root-path') . "/uploads/publisher/images/category/" . $arrCat['topic_imgurl'])) {
+            if (copy(\XoopsBaseConfig::get('root-path')."/modules/news/images/topics/".$arrCat['topic_imgurl'], \XoopsBaseConfig::get('root-path')."/uploads/publisher/images/category/".$arrCat['topic_imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['topic_imgurl']);
             }
         }
 
         if (!$publisher->getCategoryHandler()->insert($categoryObj)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['topic_title'])."<br/>";
             continue;
         }
 
         $newCat['newid'] = $categoryObj->getVar('categoryid');
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = "SELECT * FROM " . $xoopsDB->prefix('stories') . " WHERE topicid=" . $arrCat['topic_id'];
+        $sql = "SELECT * FROM ".$xoopsDB->prefix('stories')." WHERE topicid=".$arrCat['topic_id'];
         $resultArticles = $xoopsDB->query($sql);
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
             // insert article
@@ -186,7 +186,7 @@ 
              */
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf("  "._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title'])."<br/>";
                 continue;
             } else {
                 /*
@@ -218,7 +218,7 @@ 
                  }
                  */
                 $newArticleArray[$arrArticle['storyid']] = $itemObj->getVar('itemid');
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title())."<br />";
                 ++$cnt_imported_articles;
             }
         }
@@ -250,7 +250,7 @@ 
     }
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS."<br />";
 
     $publisher_module_id = $publisher->getModule()->mid();
 
@@ -263,17 +263,17 @@ 
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$comment_handler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title'))."<br />";
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title'))."<br />";
         }
 
     }
 
     echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . PUBLISHER_URL . "/'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat)."<br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles)."<br/>";
+    echo "<br/><a href='".PUBLISHER_URL."/'>"._AM_PUBLISHER_IMPORT_GOTOMODULE."</a><br/>";
 
     PublisherUtils::closeCollapsableBar('newsimportgo', 'newsimportgoicon');
     $xoops->footer();

htdocs/modules/publisher/admin/import/xfsection.php

Spacing +31 added lines, -31 removed lines

@@ -20,10 +20,10 @@ 
  * @version         $Id$
  */
 
-include_once dirname(__DIR__) . '/admin_header.php';
+include_once dirname(__DIR__).'/admin_header.php';
 $myts = \Xoops\Core\Text\Sanitizer::getInstance();
 
-$importFromModuleName = "XF-Section " . @$_POST['xfs_version'];
+$importFromModuleName = "XF-Section ".@$_POST['xfs_version'];
 
 $scriptname = "xfsection.php";
 
@@ -39,26 +39,26 @@ 
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     PublisherUtils::openCollapsableBar('xfsectionimport', 'xfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("xfs_category"));
+    $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xfs_category"));
     list ($totalCat) = $xoopsDB->fetchRow($result);
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_PUBLISHER_IMPORT_NOCATSELECTED . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_PUBLISHER_IMPORT_NOCATSELECTED."</span>";
     } else {
-        include_once \XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        include_once \XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query("SELECT COUNT(*) FROM " . $xoopsDB->prefix("xfs_article"));
+        $result = $xoopsDB->query("SELECT COUNT(*) FROM ".$xoopsDB->prefix("xfs_article"));
         list ($totalArticles) = $xoopsDB->fetchRow($result);
 
         if ($totalArticles == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles)."</span>";
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . "</span>";
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat)."</span>";
 
-            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new Xoops\Form\ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/$scriptname");
 
             // Categories to be imported
-            $sql = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM " . $xoopsDB->prefix("xfs_category") . " AS cat INNER JOIN " . $xoopsDB->prefix("xfs_article") . " AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
+            $sql = "SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ".$xoopsDB->prefix("xfs_category")." AS cat INNER JOIN ".$xoopsDB->prefix("xfs_article")." AS art ON cat.id=art.categoryid GROUP BY art.categoryid";
             $result = $xoopsDB->query($sql);
             $cat_cbox_values = array();
             $cat_cbox_options = array();
@@ -104,7 +104,7 @@ 
     $parentId = $_POST['parent_category'];
 
 
-    $sql = "SELECT * FROM " . $xoopsDB->prefix("xfs_category") . " ORDER by orders";
+    $sql = "SELECT * FROM ".$xoopsDB->prefix("xfs_category")." ORDER by orders";
 
     $resultCat = $xoopsDB->query($sql);
 
@@ -127,13 +127,13 @@ 
 
         // Category image
         if (($arrCat['imgurl'] !== 'blank.gif') && ($arrCat['imgurl'])) {
-            if (copy(\XoopsBaseConfig::get('root-path') . "/modules/xfsection/images/category/" . $arrCat['imgurl'], PUBLISHER_UPLOADS_PATH . "/images/category/" . $arrCat['imgurl'])) {
+            if (copy(\XoopsBaseConfig::get('root-path')."/modules/xfsection/images/category/".$arrCat['imgurl'], PUBLISHER_UPLOADS_PATH."/images/category/".$arrCat['imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['imgurl']);
             }
         }
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . "<br/>";
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title'])."<br/>";
             continue;
         }
 
@@ -144,9 +144,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = "SELECT * FROM " . $xoopsDB->prefix("xfs_article") . " WHERE categoryid=" . $arrCat['id'] . " ORDER BY weight";
+        $sql = "SELECT * FROM ".$xoopsDB->prefix("xfs_article")." WHERE categoryid=".$arrCat['id']." ORDER BY weight";
         $resultArticles = $xoopsDB->query($sql);
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
             // insert article
@@ -174,28 +174,28 @@ 
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = \XoopsBaseConfig::get('root-path') . "/modules/xfsection/html/" . $arrArticle['htmlpage'];
+                $pagewrap_filename = \XoopsBaseConfig::get('root-path')."/modules/xfsection/html/".$arrArticle['htmlpage'];
                 if (XoopsLoad::fileExists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH . "/content/" . $arrArticle['htmlpage'])) {
-                        $itemObj->setVar('body', "[pagewrap=" . $arrArticle['htmlpage'] . "]");
-                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;" . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . "<br/>";
+                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH."/content/".$arrArticle['htmlpage'])) {
+                        $itemObj->setVar('body', "[pagewrap=".$arrArticle['htmlpage']."]");
+                        echo sprintf("&nbsp;&nbsp;&nbsp;&nbsp;"._AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage'])."<br/>";
                     }
                 }
             }
 
             if (!$itemObj->store()) {
-                echo sprintf("  " . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . "<br/>";
+                echo sprintf("  "._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title'])."<br/>";
                 continue;
             } else {
                 // Linkes files
 
-                $sql = "SELECT * FROM " . $xoopsDB->prefix("xfs_files") . " WHERE articleid=" . $arrArticle['articleid'];
+                $sql = "SELECT * FROM ".$xoopsDB->prefix("xfs_files")." WHERE articleid=".$arrArticle['articleid'];
                 $resultFiles = $xoopsDB->query($sql);
                 $allowed_mimetypes = '';
                 while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                    $filename = \XoopsBaseConfig::get('root-path') . "/modules/xfsection/cache/uploaded/" . $arrFile['filerealname'];
+                    $filename = \XoopsBaseConfig::get('root-path')."/modules/xfsection/cache/uploaded/".$arrFile['filerealname'];
                     if (XoopsLoad::fileExists($filename)) {
-                        if (copy($filename, PUBLISHER_UPLOADS_PATH . "/" . $arrFile['filerealname'])) {
+                        if (copy($filename, PUBLISHER_UPLOADS_PATH."/".$arrFile['filerealname'])) {
                             $fileObj = $publisher->getFileHandler()->create();
                             $fileObj->setVar('name', $arrFile['fileshowname']);
                             $fileObj->setVar('description', $arrFile['filedescript']);
@@ -208,14 +208,14 @@ 
                             $fileObj->setVar('filename', $arrFile['filerealname']);
 
                             if ($fileObj->store($allowed_mimetypes, true, false)) {
-                                echo "&nbsp;&nbsp;&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . "<br />";
+                                echo "&nbsp;&nbsp;&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname'])."<br />";
                             }
                         }
                     }
                 }
 
                 $newArticleArray[$arrArticle['articleid']] = $itemObj->getVar('itemid');
-                echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . "<br />";
+                echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title())."<br />";
                 ++$cnt_imported_articles;
             }
         }
@@ -238,7 +238,7 @@ 
     }
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . "<br />";
+    echo _AM_PUBLISHER_IMPORT_COMMENTS."<br />";
 
     $module_handler = xoops_getHandler('module');
     $moduleObj = $module_handler->getByDirname('xfsection');
@@ -255,17 +255,17 @@ 
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$comment_handler->insert($comment)) {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title'))."<br />";
         } else {
-            echo "&nbsp;&nbsp;" . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . "<br />";
+            echo "&nbsp;&nbsp;".sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title'))."<br />";
         }
 
     }
 
     echo "<br/><br/>Done.<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . "<br/>";
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . "<br/>";
-    echo "<br/><a href='" . publisher_URL . "'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . "</a><br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat)."<br/>";
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles)."<br/>";
+    echo "<br/><a href='".publisher_URL."'>"._AM_PUBLISHER_IMPORT_GOTOMODULE."</a><br/>";
 
     PublisherUtils::closeCollapsableBar('xfsectionimportgo', 'xfsectionimportgoicon');
     $xoops->footer();