mambax7 / smartfaq

language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -385,7 +385,7 @@
 
 //Help
 define('_MI_SF_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('_MI_SF_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_SF_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_SF_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_SF_OVERVIEW', 'Overview');
 

Indentation +3 added lines, -3 removed lines

@@ -115,7 +115,7 @@ 
 define('_MI_SF_REQUESTINTROMSGDSC', 'Introduction message to be displayed in the Request a Q&A page of the module.');
 define(
     '_MI_SF_REQUESTINTROMSGDEF',
-       'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!'
+        'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!'
 );
 
 define('_MI_SF_OPENINTROMSG', 'Open Questions section introduction message:');
@@ -128,7 +128,7 @@ 
 define('_MI_SF_HELP_PATH_SELECT', "Path of SmartFAQ's help files");
 define(
     '_MI_SF_HELP_PATH_SELECT_DSC',
-       "SELECT FROM where you would LIKE TO access SmartFAQ's help files. If you downloaded the 'SmartFAQ's Help Package' AND uploaded it IN 'modules/smartfaq/doc/', you can SELECT 'Inside the module'. Alternatively, you can access the module's help file directly from docs.xoops.org by chosing this in the selector. You can also select 'Custom Path' and specify yourself the path of the help files in the next config option 'Custom path of SmartFAQ's help files'"
+        "SELECT FROM where you would LIKE TO access SmartFAQ's help files. If you downloaded the 'SmartFAQ's Help Package' AND uploaded it IN 'modules/smartfaq/doc/', you can SELECT 'Inside the module'. Alternatively, you can access the module's help file directly from docs.xoops.org by chosing this in the selector. You can also select 'Custom Path' and specify yourself the path of the help files in the next config option 'Custom path of SmartFAQ's help files'"
 );
 
 define('_MI_SF_HELP_PATH_CUSTOM', "Custom path of SmartFAQ's help files");
@@ -351,7 +351,7 @@ 
 define('_MI_SF_DIR_ATTACHMENT', 'Attachments physical path.');
 define(
     '_MI_SF_DIR_ATTACHMENT_DESC',
-       "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
+        "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'"
 );
 define('_MI_SF_PATH_MAGICK', 'Path for ImageMagick');
 define('_MI_SF_PATH_MAGICK_DESC', "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");

comment_delete.php

Spacing +2 added lines, -2 removed lines

@@ -6,5 +6,5 @@
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once XOOPS_ROOT_PATH . '/include/comment_delete.php';
+include __DIR__.'/../../mainfile.php';
+require_once XOOPS_ROOT_PATH.'/include/comment_delete.php';

open_index.php

Indentation +7 added lines, -7 removed lines

@@ -116,13 +116,13 @@
 // Language constants
 $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign([
-                      'lang_on'       => _MD_SF_ON,
-                      'lang_postedby' => _MD_SF_POSTEDBY,
-                      'lang_total'    => $totalQnasOnPage,
-                      'lang_faq'      => _MD_SF_FAQ,
-                      'lang_datesub'  => _MD_SF_DATESUB,
-                      'lang_hits'     => _MD_SF_HITS
-                  ]);
+                        'lang_on'       => _MD_SF_ON,
+                        'lang_postedby' => _MD_SF_POSTEDBY,
+                        'lang_total'    => $totalQnasOnPage,
+                        'lang_faq'      => _MD_SF_FAQ,
+                        'lang_datesub'  => _MD_SF_DATESUB,
+                        'lang_hits'     => _MD_SF_HITS
+                    ]);
 
 $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign('lang_mainhead', sprintf(_MD_SF_OPEN_WELCOME, $xoopsConfig['sitename']));

Spacing +16 added lines, -16 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -46,8 +46,8 @@ 
 
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_index.tpl';
 
-require_once XOOPS_ROOT_PATH . '/header.php';
-require_once __DIR__ . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+require_once __DIR__.'/footer.php';
 
 //get all categories for future reference
 $allcategories = $categoryHandler->getObjects(null, true);
@@ -69,11 +69,11 @@ 
             if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
                 if (isset($last_qnaObj[$subcat_id])) {
                     $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
-                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question(50) . '</a>');
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question(50).'</a>');
                 }
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
                 $categories[$cat_id]['subcats'][$subcat_id] = $subcat->toArray(null, true);
-                $total                                      += $totalQnas[$subcat_id];
+                $total += $totalQnas[$subcat_id];
             }
         }
     }
@@ -105,7 +105,7 @@ 
         }
 
         $memberHandler = xoops_getHandler('member');
-        $users         = $memberHandler->getUsers(new \Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
+        $users         = $memberHandler->getUsers(new \Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
         for ($i = 0; $i < $totalQnasOnPage; ++$i) {
             $faq = $faqsObj[$i]->toArray(null, $allcategories);
 
@@ -118,7 +118,7 @@ 
     }
 }
 // Language constants
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign([
                       'lang_on'       => _MD_SF_ON,
                       'lang_postedby' => _MD_SF_POSTEDBY,
@@ -128,7 +128,7 @@ 
                       'lang_hits'     => _MD_SF_HITS
                   ]);
 
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign('lang_mainhead', sprintf(_MD_SF_OPEN_WELCOME, $xoopsConfig['sitename']));
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['openquestionintromsg'], 1));
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_QUESTIONS);
@@ -136,7 +136,7 @@ 
 $xoopsTpl->assign('lang_description', _MD_SF_DESCRIPTION);
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
 $xoopsTpl->assign('sectionname', $moduleName);
-$xoopsTpl->assign('whereInSection', "<a href='index.php'>" . $moduleName . '</a> > ' . _MD_SF_OPEN_SECTION);
+$xoopsTpl->assign('whereInSection', "<a href='index.php'>".$moduleName.'</a> > '._MD_SF_OPEN_SECTION);
 
 $xoopsTpl->assign('displayFull', false);
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
@@ -152,25 +152,25 @@ 
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
 
 // Category Navigation Bar
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 $pagenav = new \XoopsPageNav($totalCategories, $xoopsModuleConfig['catperpage'], $catstart, 'catstart', '');
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
 } else {
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
 }
 
 // FAQ Navigation Bar
 $pagenav = new \XoopsPageNav($totalFaqs, $xoopsModuleConfig['indexperpage'], $start, 'start', '');
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
 } else {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
 }
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category->getVar('name'));
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category->getVar('name'));
 // End Page Title Hack by marcan
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

footer.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 $xoopsTpl->assign('isAdmin', $isAdmin);
 
 $xoopsTpl->assign([
-                      'lang_on'       => _MD_SF_ON,
-                      'lang_postedby' => _MD_SF_POSTEDBY,
-                      'lang_faq'      => _MD_SF_QUESTION,
-                      'lang_datesub'  => _MD_SF_DATESUB,
-                      'lang_hits'     => _MD_SF_HITS
-                  ]);
+                        'lang_on'       => _MD_SF_ON,
+                        'lang_postedby' => _MD_SF_POSTEDBY,
+                        'lang_faq'      => _MD_SF_QUESTION,
+                        'lang_datesub'  => _MD_SF_DATESUB,
+                        'lang_hits'     => _MD_SF_HITS
+                    ]);
 $xoopsTpl->assign('sectionname', $myts->displayTarea($xoopsModule->getVar('name')));
 
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $uid     = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
 $isAdmin = (Smartfaq\Utility::userIsAdmin() || Smartfaq\Utility::hasModerator());
 
-$xoopsTpl->assign('sf_adminpage', "<a href='" . XOOPS_URL . "/modules/smartfaq/admin/index.php'>" . _MD_SF_ADMIN_PAGE . '</a>');
+$xoopsTpl->assign('sf_adminpage', "<a href='".XOOPS_URL."/modules/smartfaq/admin/index.php'>"._MD_SF_ADMIN_PAGE.'</a>');
 $xoopsTpl->assign('isAdmin', $isAdmin);
 
 $xoopsTpl->assign([
@@ -36,4 +36,4 @@ 
 
 $xoopsTpl->assign('ref_smartfaq', 'SmartFAQ is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)');
 
-$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='" . XOOPS_URL . "/modules/smartfaq/assets/css/smartfaq.css'>");
+$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartfaq/assets/css/smartfaq.css'>");

admin/category.php

Indentation +17 added lines, -17 removed lines

@@ -46,18 +46,18 @@ 
 
     echo '<tr>';
     echo "<td class='even' align='lefet'>"
-         . $spaces
-         . "<a href='"
-         . XOOPS_URL
-         . '/modules/'
-         . $xoopsModule->dirname()
-         . '/category.php?categoryid='
-         . $categoryObj->categoryid()
-         . "'><img src='"
-         . XOOPS_URL
-         . "/modules/smartfaq/assets/images/icon/subcat.gif' alt=''>&nbsp;"
-         . $categoryObj->name()
-         . '</a></td>';
+            . $spaces
+            . "<a href='"
+            . XOOPS_URL
+            . '/modules/'
+            . $xoopsModule->dirname()
+            . '/category.php?categoryid='
+            . $categoryObj->categoryid()
+            . "'><img src='"
+            . XOOPS_URL
+            . "/modules/smartfaq/assets/images/icon/subcat.gif' alt=''>&nbsp;"
+            . $categoryObj->name()
+            . '</a></td>';
     echo "<td class='even' align='left'>" . $description . '</td>';
     echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
@@ -314,11 +314,11 @@ 
             $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
             xoops_cp_header();
             xoops_confirm([
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                                'op'         => 'del',
+                                'categoryid' => $categoryObj->categoryid(),
+                                'confirm'    => 1,
+                                'name'       => $categoryObj->name()
+                            ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
             xoops_cp_footer();
         }
         exit();

Switch Indentation +120 added lines, -120 removed lines

@@ -231,149 +231,149 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryid  = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
-        $destList    = isset($_POST['destList']) ? $_POST['destList'] : '';
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
+        case 'mod':
+            $categoryid  = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            $destList    = isset($_POST['destList']) ? $_POST['destList'] : '';
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            xoops_cp_header();
 
-        $adminObject->displayNavigation(basename(__FILE__));
-        editcat(true, $categoryid);
-        break;
+            $adminObject->displayNavigation(basename(__FILE__));
+            editcat(true, $categoryid);
+            break;
 
-    case 'addcategory':
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
+        case 'addcategory':
+            global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
 
-        if (0 != $categoryid) {
-            $categoryObj = new Smartfaq\Category($categoryid);
-        } else {
-            $categoryObj = $categoryHandler->create();
-        }
+            if (0 != $categoryid) {
+                $categoryObj = new Smartfaq\Category($categoryid);
+            } else {
+                $categoryObj = $categoryHandler->create();
+            }
 
-        //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
-        //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
+            //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
+            //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
 
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+            $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
+            $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
+            $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
 
-        // Groups and permissions
-        if (isset($_POST['groups_read'])) {
-            $categoryObj->setGroups_read($_POST['groups_read']);
-        } else {
-            $categoryObj->setGroups_read();
-        }
-        //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
-        //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
-
-        $categoryObj->setVar('name', $_POST['name']);
-
-        $categoryObj->setVar('description', $_POST['description']);
-        if ($categoryObj->isNew()) {
-            $redirect_msg = _AM_SF_CATCREATED;
-            $redirect_to  = 'category.php?op=mod';
-        } else {
-            $redirect_msg = _AM_SF_COLMODIFIED;
-            $redirect_to  = 'category.php';
-        }
-
-        if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
-        }
-        // TODO : put this function in the category class
-        Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
-        //Smartfaq\Utility::saveCategoryPermissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
+            // Groups and permissions
+            if (isset($_POST['groups_read'])) {
+                $categoryObj->setGroups_read($_POST['groups_read']);
+            } else {
+                $categoryObj->setGroups_read();
+            }
+            //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
+            //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
+
+            $categoryObj->setVar('name', $_POST['name']);
+
+            $categoryObj->setVar('description', $_POST['description']);
+            if ($categoryObj->isNew()) {
+                $redirect_msg = _AM_SF_CATCREATED;
+                $redirect_to  = 'category.php?op=mod';
+            } else {
+                $redirect_msg = _AM_SF_COLMODIFIED;
+                $redirect_to  = 'category.php';
+            }
 
-        if ($applyall) {
+            if (!$categoryObj->store()) {
+                redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
+            }
             // TODO : put this function in the category class
-            Smartfaq\Utility::overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
-        }
+            Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
+            //Smartfaq\Utility::saveCategoryPermissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
 
-        redirect_header($redirect_to, 2, $redirect_msg);
-        break;
+            if ($applyall) {
+                // TODO : put this function in the category class
+                Smartfaq\Utility::overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
+            }
 
-    case 'del':
-        global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
+            redirect_header($redirect_to, 2, $redirect_msg);
+            break;
 
-        $module_id    = $xoopsModule->getVar('mid');
-        $gpermHandler = xoops_getHandler('groupperm');
+        case 'del':
+            global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+            $module_id    = $xoopsModule->getVar('mid');
+            $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryObj = new Smartfaq\Category($categoryid);
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
 
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
-        $name    = isset($_POST['name']) ? $_POST['name'] : '';
+            $categoryObj = new Smartfaq\Category($categoryid);
 
-        if ($confirm) {
-            if (!$categoryHandler->delete($categoryObj)) {
-                redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+            $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
+            $name    = isset($_POST['name']) ? $_POST['name'] : '';
+
+            if ($confirm) {
+                if (!$categoryHandler->delete($categoryObj)) {
+                    redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+                }
+                redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
+            } else {
+                // no confirm: show deletion condition
+                $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+                xoops_cp_header();
+                xoops_confirm([
+                                  'op'         => 'del',
+                                  'categoryid' => $categoryObj->categoryid(),
+                                  'confirm'    => 1,
+                                  'name'       => $categoryObj->name()
+                              ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                xoops_cp_footer();
             }
-            redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
-        } else {
-            // no confirm: show deletion condition
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            exit();
+            break;
+
+        case 'cancel':
+            redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
+            break;
+        case 'default':
+        default:
+            $adminObject = \Xmf\Module\Admin::getInstance();
             xoops_cp_header();
-            xoops_confirm([
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
-            xoops_cp_footer();
-        }
-        exit();
-        break;
-
-    case 'cancel':
-        redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
-        break;
-    case 'default':
-    default:
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
-
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo "<br>\n";
 
-        // Creating the objects for top categories
-        $categoriesObj =& $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
-
-        Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
-        echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
-
-        echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
-        echo '</tr>';
-        $totalCategories = $categoryHandler->getCategoriesCount(0);
-        if (count($categoriesObj) > 0) {
-            foreach ($categoriesObj as $key => $thiscat) {
-                displayCategory($thiscat);
-            }
-        } else {
+            $adminObject->displayNavigation(basename(__FILE__));
+            echo "<br>\n";
+
+            // Creating the objects for top categories
+            $categoriesObj =& $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
+
+            Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
+            echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+            echo "<div id='toptable'>";
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+
+            echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
+            echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
+            echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
+            echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
             echo '</tr>';
-            $categoryid = '0';
-        }
-        echo "</table>\n";
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        $pagenav = new \XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo '</div>';
+            $totalCategories = $categoryHandler->getCategoriesCount(0);
+            if (count($categoriesObj) > 0) {
+                foreach ($categoriesObj as $key => $thiscat) {
+                    displayCategory($thiscat);
+                }
+            } else {
+                echo '<tr>';
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+                echo '</tr>';
+                $categoryid = '0';
+            }
+            echo "</table>\n";
+            require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav = new \XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
+            echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+            echo '</div>';
 
-        editcat(false);
+            editcat(false);
 
-        break;
+            break;
 }
 
 require_once __DIR__ . '/admin_footer.php';

Spacing +25 added lines, -25 removed lines

@@ -8,7 +8,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Creating the category handler object
 /** @var \XoopsModules\Smartfaq\CategoryHandler $categoryHandler */
@@ -36,11 +36,11 @@ 
     $description = $categoryObj->description();
     if (!XOOPS_USE_MULTIBYTES) {
         if (strlen($description) >= 100) {
-            $description = substr($description, 0, 100 - 1) . '...';
+            $description = substr($description, 0, 100 - 1).'...';
         }
     }
-    $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITCOL . "' alt='" . _AM_SF_EDITCOL . "'></a>";
-    $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETECOL . "' alt='" . _AM_SF_DELETECOL . "'></a>";
+    $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITCOL."' alt='"._AM_SF_EDITCOL."'></a>";
+    $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETECOL."' alt='"._AM_SF_DELETECOL."'></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -61,11 +61,11 @@ 
          . "/modules/smartfaq/assets/images/icon/subcat.gif' alt=''>&nbsp;"
          . $categoryObj->name()
          . '</a></td>';
-    echo "<td class='even' align='left'>" . $description . '</td>';
-    echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
+    echo "<td class='even' align='left'>".$description.'</td>';
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo '</tr>';
-    $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
+    $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
     if (count($subCategoriesObj) > 0) {
         ++$level;
         foreach ($subCategoriesObj as $key => $thiscat) {
@@ -85,7 +85,7 @@ 
     //$allmods = array();
     $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the faq handler object
     /** @var \XoopsModules\Smartfaq\FaqHandler $faqHandler */
@@ -108,13 +108,13 @@ 
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
         }
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
         echo "<div id='bottomtable'>";
     } else {
         $categoryObj = $categoryHandler->create();
         echo "<br>\n";
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
         echo "<div id='bottomtable'>";
     }
     // Start category form
@@ -159,7 +159,7 @@ 
     }
     $sform->addElement($groups_read_checkbox);
     // Apply permissions on all faqs
-    $addapplyall_radio = new \XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+    $addapplyall_radio = new \XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
     $sform->addElement($addapplyall_radio);
     // MODERATORS
     //$moderators_tray = new \XoopsFormElementTray(_AM_SF_MODERATORS_DEF, '');
@@ -224,7 +224,7 @@ 
     echo '</div>';
 
     if ($categoryid) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
     }
 
     unset($hidden);
@@ -280,7 +280,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -322,7 +322,7 @@ 
                               'categoryid' => $categoryObj->categoryid(),
                               'confirm'    => 1,
                               'name'       => $categoryObj->name()
-                          ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                          ], 'category.php', _AM_SF_DELETECOL." '".$categoryObj->name()."'. <br> <br>"._AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
             xoops_cp_footer();
         }
         exit();
@@ -340,19 +340,19 @@ 
         echo "<br>\n";
 
         // Creating the objects for top categories
-        $categoriesObj =& $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
+        $categoriesObj = & $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_CATEGORIES_DSC.'</span>';
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         $totalCategories = $categoryHandler->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -361,14 +361,14 @@ 
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
             echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $pagenav = new \XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '</div>';
 
         editcat(false);
@@ -376,4 +376,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/question.php

Indentation +5 added lines, -5 removed lines

@@ -284,11 +284,11 @@
             $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
             xoops_cp_header();
             xoops_confirm([
-                              'op'      => 'del',
-                              'faqid'   => $faqObj->faqid(),
-                              'confirm' => 1,
-                              'name'    => $faqObj->question()
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                                'op'      => 'del',
+                                'faqid'   => $faqObj->faqid(),
+                                'confirm' => 1,
+                                'name'    => $faqObj->question()
+                            ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 

Spacing +29 added lines, -29 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 global $xoopsUser;
 
@@ -40,7 +40,7 @@ 
 {
     global $faqHandler, $categoryHandler, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts;
 
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if (-1 != $faqid) {
         // Creating the FAQ object
@@ -72,9 +72,9 @@ 
 
         echo "<br>\n";
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . $collapsableBar_title . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".$collapsableBar_title.'</h3>';
         echo "<div id='bottomtable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $collapsableBar_info . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$collapsableBar_info.'</span>';
     } else {
         // there's no parameter, so we're adding a faq
         $faqObj = $faqHandler->create();
@@ -85,7 +85,7 @@ 
         $button_caption    = _AM_SF_CREATE;
 
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CREATEQUESTION . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CREATEQUESTION.'</h3>';
         echo "<div id='bottomtable'>";
     }
     $sform = new \XoopsThemeForm(_AM_SF_OPEN_QUESTION, 'op', xoops_getenv('PHP_SELF'), 'post', true);
@@ -159,7 +159,7 @@ 
         $button_tray->addElement($butt_create);
 
         $butt_edit = new \XoopsFormButton('', '', _AM_SF_OPEN_QUESTION_EDIT, 'button');
-        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=" . $faqid . "'\"");
+        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=".$faqid."'\"");
         $button_tray->addElement($butt_edit);
 
         $butt_cancel = new \XoopsFormButton('', '', _AM_SF_CANCEL, 'button');
@@ -191,7 +191,7 @@ 
         xoops_cp_header();
 
         $adminObject->displayNavigation(basename(__FILE__));
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         editfaq(true, $faqid);
         break;
@@ -252,7 +252,7 @@ 
 
         // Storing the FAQ
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR . Smartfaq\Utility::formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR.Smartfaq\Utility::formatErrors($faqObj->getErrors()));
         }
 
         // Send notifications
@@ -293,7 +293,7 @@ 
                               'faqid'   => $faqObj->faqid(),
                               'confirm' => 1,
                               'name'    => $faqObj->question()
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                          ], 'question.php', _AM_SF_DELETETHISQUESTION." <br>'".$faqObj->question()."'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 
@@ -306,8 +306,8 @@ 
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
         global  $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $smartModuleConfig;
 
@@ -315,9 +315,9 @@ 
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
 
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_OPENED_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_OPENED_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_OPENED_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_OPENED_DSC.'</span>';
 
         // Get the total number of published FAQs
         $totalfaqs = $faqHandler->getFaqsCount(-1, [Constants::SF_STATUS_OPENED]);
@@ -327,14 +327,14 @@ 
         $allCats         = $categoryHandler->getObjects(null, true);
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
-        echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
+        echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+        echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
 
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
 
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         //var_dump( $faqsObj);
         if ($totalfaqs > 0) {
@@ -342,33 +342,33 @@ 
             foreach (array_keys($faqsObj) as $i) {
                 $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
 
-                $modify = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_EDITART . "'></a>";
-                $delete = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $modify = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_EDITART."'></a>";
+                $delete = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
 
                 $requester = Smartfaq\Utility::getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
 
                 echo '<tr>';
-                echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
-                echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
-                echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/answer.php?faqid=' . $faqsObj[$i]->faqid() . "'>" . $faqsObj[$i]->question(100) . '</a></td>';
+                echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
+                echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
+                echo "<td class='even' align='left'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/answer.php?faqid='.$faqsObj[$i]->faqid()."'>".$faqsObj[$i]->question(100).'</a></td>';
 
-                echo "<td class='even' align='center'>" . $requester . '</td>';
+                echo "<td class='even' align='center'>".$requester.'</td>';
 
-                echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
+                echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
                 echo "<td class='even' align='center'> $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $faqid = -1;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOQUEUED . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOQUEUED.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new \XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '</div>';
 
         $totalcategories = $categoryHandler->getCategoriesCount(-1);
@@ -379,4 +379,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

include/notification.inc.php

Spacing +4 added lines, -4 removed lines

@@ -35,22 +35,22 @@
 
     if ('category' === $category) {
         // Assume we have a valid category id
-        $sql          = 'SELECT name FROM ' . $xoopsDB->prefix('smartfaq_categories') . ' WHERE categoryid  = ' . $item_id;
+        $sql          = 'SELECT name FROM '.$xoopsDB->prefix('smartfaq_categories').' WHERE categoryid  = '.$item_id;
         $result       = $xoopsDB->queryF($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['name'];
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/category.php?categoryid=' . $item_id;
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/category.php?categoryid='.$item_id;
 
         return $item;
     }
 
     if ('faq' === $category) {
         // Assume we have a valid story id
-        $sql          = 'SELECT question FROM ' . $xoopsDB->prefix('smartfaq_faq') . ' WHERE faqid = ' . $item_id;
+        $sql          = 'SELECT question FROM '.$xoopsDB->prefix('smartfaq_faq').' WHERE faqid = '.$item_id;
         $result       = $xoopsDB->queryF($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['question'];
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/faq.php?faqid=' . $item_id;
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/faq.php?faqid='.$item_id;
 
         return $item;
     }

admin/answer.php

Indentation +12 added lines, -12 removed lines

@@ -114,18 +114,18 @@
     foreach ($proposed_answers as $proposed_answer) {
         if (Constants::SF_STATUS_NEW_ANSWER == $faqObj->status()) {
             $merge   = "<a href='faq.php?op=merge&amp;faqid="
-                       . $faqObj->faqid()
-                       . '&amp;answerid='
-                       . $proposed_answer->answerid()
-                       . "'><img src='"
-                       . XOOPS_URL
-                       . '/modules/'
-                       . $xoopsModule->dirname()
-                       . "/assets/images/icon/merge.gif' title='"
-                       . _AM_SF_FAQ_MERGE
-                       . "' alt='"
-                       . _AM_SF_FAQ_MERGE
-                       . "'></a>&nbsp;";
+                        . $faqObj->faqid()
+                        . '&amp;answerid='
+                        . $proposed_answer->answerid()
+                        . "'><img src='"
+                        . XOOPS_URL
+                        . '/modules/'
+                        . $xoopsModule->dirname()
+                        . "/assets/images/icon/merge.gif' title='"
+                        . _AM_SF_FAQ_MERGE
+                        . "' alt='"
+                        . _AM_SF_FAQ_MERGE
+                        . "'></a>&nbsp;";
             $approve = "<a href='answer.php?op=selectanswer&amp;faqid=" . $faqid . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/on.png' . "' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "'></a>";
         }
         $modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "'></a>&nbsp;";

Spacing +27 added lines, -27 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $op = '';
 
@@ -32,7 +32,7 @@ 
 {
     global $answerHandler, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts, $pathIcon16, $smartModuleConfig;
 
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the FAQ object
     $faqObj = new Smartfaq\Faq($faqid);
@@ -69,9 +69,9 @@ 
     $official_answer = $faqObj->answer();
 
     Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_SUBMITTED_ANSWER . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_SUBMITTED_ANSWER.'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_SUBMITTED_ANSWER_INFO . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_SUBMITTED_ANSWER_INFO.'</span>';
 
     $proposed_answers = $answerHandler->getAllAnswers($faqid, Constants::SF_AN_STATUS_PROPOSED);
 
@@ -81,31 +81,31 @@ 
 
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_CATEGORY . "</td>
-              <td class='even'>" . $categoryObj->name() . "</td>
+              <td class='head' width='100px'>" . _AM_SF_CATEGORY."</td>
+              <td class='even'>" . $categoryObj->name()."</td>
             </tr>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_QUESTION . "</td>
-              <td class='even'>" . $faqObj->question() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_QUESTION."</td>
+              <td class='even'>" . $faqObj->question().'</td>
             </tr>';
     if ($official_answer) {
         echo "
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL . "</td>
-              <td class='even'>" . $official_answer->answer() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL."</td>
+              <td class='even'>" . $official_answer->answer().'</td>
             </tr>';
     }
     echo "</table><br>\n";
 
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
     echo '<tr>';
-    echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
-    echo "<th class='bg3' class='bg3' align='center'><b>" . _AM_SF_ANSWER . '</b></td>';
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+    echo "<th class='bg3' class='bg3' align='center'><b>"._AM_SF_ANSWER.'</b></td>';
 
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
 
-    echo "<th width='180' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-    echo "<th width='120' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+    echo "<th width='180' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+    echo "<th width='120' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
     echo '</tr>';
 
     $merge   = '';
@@ -113,7 +113,7 @@ 
     $approve = '';
     foreach ($proposed_answers as $proposed_answer) {
         if (Constants::SF_STATUS_NEW_ANSWER == $faqObj->status()) {
-            $merge   = "<a href='faq.php?op=merge&amp;faqid="
+            $merge = "<a href='faq.php?op=merge&amp;faqid="
                        . $faqObj->faqid()
                        . '&amp;answerid='
                        . $proposed_answer->answerid()
@@ -126,19 +126,19 @@ 
                        . "' alt='"
                        . _AM_SF_FAQ_MERGE
                        . "'></a>&nbsp;";
-            $approve = "<a href='answer.php?op=selectanswer&amp;faqid=" . $faqid . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/on.png' . "' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "'></a>";
+            $approve = "<a href='answer.php?op=selectanswer&amp;faqid=".$faqid.'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/on.png'."' title='"._AM_SF_FAQ_APPROVE_NEW_ANSWER."' alt='"._AM_SF_APPROVESUB."'></a>";
         }
-        $modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "'></a>&nbsp;";
-        $delete = "<a href='answer.php?op=del&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETESUBM . "' alt='" . _AM_SF_DELETESUBM . "'></a>";
+        $modify = "<a href='faq.php?op=mod&amp;faqid=".$faqObj->faqid().'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_REVIEW."' alt='"._AM_SF_FAQ_REVIEW."'></a>&nbsp;";
+        $delete = "<a href='answer.php?op=del&amp;faqid=".$faqObj->faqid().'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETESUBM."' alt='"._AM_SF_DELETESUBM."'></a>";
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $proposed_answer->answerid() . '</td>';
-        echo "<td class='even' align='left'>" . $proposed_answer->answer() . '</td>';
+        echo "<td class='head' align='center'>".$proposed_answer->answerid().'</td>';
+        echo "<td class='even' align='left'>".$proposed_answer->answer().'</td>';
 
         //show name of the answer submitter
         $submitter = Smartfaq\Utility::getLinkedUnameFromId($proposed_answer->uid(), $smartModuleConfig['userealname']);
-        echo "<td class='even' align='center'>" . $submitter . '</td>';
+        echo "<td class='even' align='center'>".$submitter.'</td>';
 
-        echo "<td class='even' align='center'>" . $proposed_answer->datesub() . '</td>';
+        echo "<td class='even' align='center'>".$proposed_answer->datesub().'</td>';
         echo "<td class='even' align='center'> $merge $modify $approve $delete </td>";
         echo '</tr>';
     }
@@ -150,7 +150,7 @@ 
 switch ($op) {
     case 'mod':
         xoops_cp_header();
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts;
         $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
         editfaq($faqid);
@@ -257,7 +257,7 @@ 
                     $proposed_answers = $answerHandler->getAllAnswers($faqid, Constants::SF_AN_STATUS_PROPOSED);
                     if (count($proposed_answers) > 0) {
                         // This question has other proposed answer
-                        $redirect_page = 'answer.php?op=mod&faqid=' . $faqid;
+                        $redirect_page = 'answer.php?op=mod&faqid='.$faqid;
                         $redirect_msg  = _AM_SF_ANSWER_REJECTED;
                     } else {
                         // The question has no other proposed answer
@@ -281,11 +281,11 @@ 
     default:
         xoops_cp_header();
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 
         editfaq();
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/xoopsfaq.php

Spacing +25 added lines, -25 removed lines

@@ -14,7 +14,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'XoopsFAQ';
 $scriptname           = 'xoopsfaq.php';
@@ -27,33 +27,33 @@ 
 
 if ('start' === $op) {
     xoops_cp_header();
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_categories'));
+    $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_categories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
 
     if (0 == $totalCat) {
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_NO_CATEGORY.'</span>';
     } else {
-        require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_contents'));
+        $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_contents'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if (0 == $totalFAQ) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
         } else {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ) . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ).'</span>';
 
-            $form = new \XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL . '/modules/smartfaq/admin/' . $scriptname);
+            $form = new \XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL.'/modules/smartfaq/admin/'.$scriptname);
 
             // Categories to be imported
             $cat_cbox = new \XoopsFormCheckBox(sprintf(_AM_SF_IMPORT_CATEGORIES, $importFromModuleName), 'import_category', -1);
-            $result   = $xoopsDB->queryF('SELECT c.category_id, c.category_title, count(q.contents_id) FROM ' . $xoopsDB->prefix('xoopsfaq_categories') . ' AS c, ' . $xoopsDB->prefix('xoopsfaq_contents') . ' AS q WHERE c.category_id=q.category_id GROUP BY c.category_id ORDER BY category_order');
+            $result   = $xoopsDB->queryF('SELECT c.category_id, c.category_title, count(q.contents_id) FROM '.$xoopsDB->prefix('xoopsfaq_categories').' AS c, '.$xoopsDB->prefix('xoopsfaq_contents').' AS q WHERE c.category_id=q.category_id GROUP BY c.category_id ORDER BY category_order');
 
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
@@ -68,7 +68,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -81,7 +81,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = [];
@@ -105,7 +105,7 @@ 
 }
 
 if ('go' === $op) {
-    require_once __DIR__ . '/admin_header.php';
+    require_once __DIR__.'/admin_header.php';
 
     $import_category = (isset($_POST['import_category']) ? $_POST['import_category'] : null);
     if (!$import_category) {
@@ -115,9 +115,9 @@ 
     xoops_cp_header();
 
     Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_RESULT . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -146,7 +146,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('xoopsfaq_categories') . " where category_id in ($import_category_list) order by category_order");
+    $resultCat = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('xoopsfaq_categories')." where category_id in ($import_category_list) order by category_order");
 
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
         extract($arrCat, EXTR_PREFIX_ALL, 'xcat');
@@ -160,7 +160,7 @@ 
         $categoryObj->setVar('name', $xcat_category_title);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br>';
             continue;
         }
 
@@ -168,9 +168,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
 
-        $resultFAQ = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('xoopsfaq_contents') . " where category_id=$xcat_category_id order by contents_order");
+        $resultFAQ = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('xoopsfaq_contents')." where category_id=$xcat_category_id order by contents_order");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'xfaq');
 
@@ -198,7 +198,7 @@ 
             $faqObj->setVar('cancomment', $cancomment);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title) . '<br>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title).'<br>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -207,10 +207,10 @@ 
                 $answerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
 
                 if (!$answerObj->store()) {
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br>';
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br>';
                     continue;
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br>';
                     ++$cnt_imported_faq;
                 }
             }
@@ -220,8 +220,8 @@ 
     }
 
     echo 'Done.<br>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br>';
 
     exit();
 }