mambax7 / smartfaq

category.php

Spacing +19 added lines, -19 removed lines

@@ -6,9 +6,9 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
 
 // Creating the category handler object
 $categoryHandler = sf_gethandler('category');
@@ -32,11 +32,11 @@ 
 }
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.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';
 
 // At which record shall we start
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 // Creating the faq handler object
 $faqHandler = sf_gethandler('faq');
@@ -70,7 +70,7 @@ 
     // Get the last smartfaq
     $last_qnaObj = $faqHandler->getLastPublishedByCat();
 }
-$lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
+$lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
 // Creating the sub-categories objects that belong to the selected category
 $subcatsObj    = $categoryHandler->getCategories(0, 0, $categoryid);
 $total_subcats = count($subcatsObj);
@@ -82,18 +82,18 @@ 
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
             if (isset($last_qnaObj[$subcat_id])) {
                 $subcatsObj[$i]->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
-                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
+                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
             }
         }
         $subcatsObj[$i]->setVar('faqcount', $totalQnas[$subcat_id]);
         $subcats[$subcat_id] = $subcatsObj[$i]->toArray();
-        $total_faqs          += $totalQnas[$subcat_id];
+        $total_faqs += $totalQnas[$subcat_id];
         //}replacé ligne 92
     }
     $xoopsTpl->assign('subcats', $subcats);
 }
 $thiscategory_faqcount = isset($totalQnas[$categoryid]) ? $totalQnas[$categoryid] : 0;
-$category['total']     = $thiscategory_faqcount + $total_faqs;
+$category['total']     = $thiscategory_faqcount+$total_faqs;
 
 if (count($faqsObj) > 0) {
     $userids = [];
@@ -109,7 +109,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);
     // Adding the Q&As of the selected category
     for ($i = 0; $i < $totalQnasOnPage; ++$i) {
         $faq = $faqsObj[$i]->toArray(null, $categoryObj);
@@ -135,7 +135,7 @@ 
 
     if (isset($last_qnaObj) && $last_qnaObj) {
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
-        $category['last_question_link'] = "<a href='faq.php?faqid=" . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid') . "'>" . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize) . '</a>';
+        $category['last_question_link'] = "<a href='faq.php?faqid=".$last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')."'>".$last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize).'</a>';
     }
 }
 
@@ -160,26 +160,26 @@ 
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
 
 // The Navigation Bar
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-$pagenav = new XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+$pagenav = new XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    $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>');
 }
 
 $xoopsTpl->assign('category', $category);
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
 // End Page Title Hack by marcan
 
 //code to include smartie
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
+    require_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
     $xoopsTpl->assign('smarttie', 1);
 }
 //end code for smarttie
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.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 +18 added lines, -18 removed lines

@@ -6,15 +6,15 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
 // At which record shall we start for the Categories
-$catstart = isset($_GET['catstart']) ? (int)$_GET['catstart'] : 0;
+$catstart = isset($_GET['catstart']) ? (int) $_GET['catstart'] : 0;
 
 // At which record shall we start for the FAQs
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 // Creating the category handler object
 $categoryHandler = sf_gethandler('category');
@@ -42,8 +42,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);
@@ -65,11 +65,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];
             }
         }
     }
@@ -101,7 +101,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);
 
@@ -114,7 +114,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,
@@ -124,7 +124,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);
@@ -132,7 +132,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']);
@@ -148,25 +148,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 ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    $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 ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    $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';

include/blocksadmin.inc.php

Spacing +22 added lines, -22 removed lines

@@ -28,8 +28,8 @@ 
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
     exit('Access Denied');
 }
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blocksadmin.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blocksadmin.php';
 
 $op = 'list';
 if (isset($HTTP_POST_VARS)) {
@@ -43,13 +43,13 @@ 
         || $HTTP_GET_VARS['op'] === 'clone'
         || $HTTP_GET_VARS['op'] === 'previewpopup') {
         $op  = $HTTP_GET_VARS['op'];
-        $bid = isset($HTTP_GET_VARS['bid']) ? (int)$HTTP_GET_VARS['bid'] : 0;
+        $bid = isset($HTTP_GET_VARS['bid']) ? (int) $HTTP_GET_VARS['bid'] : 0;
     }
 }
 
 if (isset($previewblock)) {
     xoops_cp_header();
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
     $xoopsTpl->xoops_setCaching(0);
     if (isset($bid)) {
@@ -83,8 +83,8 @@ 
                  . $myblock->getContent('S', $bctype)
                  . '</td></tr></table></body></html>';
 
-    $dummyfile = '_dummyfile_' . time() . '.html';
-    $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');
+    $dummyfile = '_dummyfile_'.time().'.html';
+    $fp        = fopen(XOOPS_CACHE_PATH.'/'.$dummyfile, 'w');
     fwrite($fp, $dummyhtml);
     fclose($fp);
     $block['edit_form'] = false;
@@ -95,24 +95,24 @@ 
     $block['visible']   = $bvisible;
     $block['title']     = $myblock->getVar('title', 'E');
     $block['content']   = $myblock->getVar('content', 'E');
-    $block['modules']   =& $bmodule;
+    $block['modules']   = & $bmodule;
     $block['ctype']     = isset($bctype) ? $bctype : $myblock->getVar('c_type');
     $block['is_custom'] = true;
-    $block['cachetime'] = (int)$bcachetime;
-    echo '<a href="admin.php?fct=blocksadmin">' . _AM_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . $block['form_title'] . '<br><br>';
-    include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blockform.php';
+    $block['cachetime'] = (int) $bcachetime;
+    echo '<a href="admin.php?fct=blocksadmin">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br><br>';
+    include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
     $form->display();
     xoops_cp_footer();
     echo '<script type="text/javascript">
     <!--//
-    preview_window = openWithSelfMain("' . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file=' . $dummyfile . '", "popup", 250, 200);
+    preview_window = openWithSelfMain("' . XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file='.$dummyfile.'", "popup", 250, 200);
     //-->
     </script>';
     exit();
 }
 
 if ($op === 'previewpopup') {
-    $file = str_replace('..', '', XOOPS_CACHE_PATH . '/' . trim($HTTP_GET_VARS['file']));
+    $file = str_replace('..', '', XOOPS_CACHE_PATH.'/'.trim($HTTP_GET_VARS['file']));
     if (file_exists($file)) {
         include $file;
         @unlink($file);
@@ -150,7 +150,7 @@ 
 }
 
 if ($op === 'update') {
-    $bcachetime = isset($bcachetime) ? (int)$bcachetime : 0;
+    $bcachetime = isset($bcachetime) ? (int) $bcachetime : 0;
     $options    = isset($options) ? $options : [];
     $bcontent   = isset($bcontent) ? $bcontent : '';
     $bctype     = isset($bctype) ? $bctype : '';
@@ -251,27 +251,27 @@ 
         $sql = sprintf('DELETE FROM %s WHERE block_id = %u', $db->prefix('block_module_link'), $bid);
         $db->query($sql);
         foreach ($bmodule as $bmid) {
-            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int)$bmid);
+            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int) $bmid);
             $db->query($sql);
         }
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $xoopsTpl = new XoopsTpl();
         $xoopsTpl->xoops_setCaching(2);
         if ($myblock->getVar('template') != '') {
-            if ($xoopsTpl->is_cached('db:' . $myblock->getVar('template'))) {
-                if (!$xoopsTpl->clear_cache('db:' . $myblock->getVar('template'))) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            if ($xoopsTpl->is_cached('db:'.$myblock->getVar('template'))) {
+                if (!$xoopsTpl->clear_cache('db:'.$myblock->getVar('template'))) {
+                    $msg = 'Unable to clear cache for block ID'.$bid;
                 }
             }
         } else {
-            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block' . $bid)) {
-                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block' . $bid)) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block'.$bid)) {
+                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block'.$bid)) {
+                    $msg = 'Unable to clear cache for block ID'.$bid;
                 }
             }
         }
     } else {
-        $msg = 'Failed update of block. ID:' . $bid;
+        $msg = 'Failed update of block. ID:'.$bid;
     }
 
     return $msg; // GIJ +

include/search.inc.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 
 function smartfaq_search($queryarray, $andor, $limit, $offset, $userid)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $ret = [];
 
@@ -25,7 +25,7 @@ 
 
     for ($i = 0, $iMax = count($faqsObj); $i < $iMax; ++$i) {
         $ret[$i]['image'] = 'assets/images/smartfaq.gif';
-        $ret[$i]['link']  = 'faq.php?faqid=' . $faqsObj[$i]->faqid();
+        $ret[$i]['link']  = 'faq.php?faqid='.$faqsObj[$i]->faqid();
         $ret[$i]['title'] = $faqsObj[$i]->question(50);
         $ret[$i]['time']  = $faqsObj[$i]->getVar('datesub');
         $ret[$i]['uid']   = $faqsObj[$i]->uid();

include/functions.render.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-defined('NEWBB_FUNCTIONS_INI') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')):
@@ -56,16 +56,16 @@ 
             // decode xcode
             if ($image != 0) {
                 // image allowed
-                $text =& $myts->xoopsCodeDecode($text);
+                $text = & $myts->xoopsCodeDecode($text);
             } else {
                 // image not allowed
-                $text =& $myts->xoopsCodeDecode($text, 0);
+                $text = & $myts->xoopsCodeDecode($text, 0);
             }
         }
         if ($br != 0) {
-            $text =& $myts->nl2Br($text);
+            $text = & $myts->nl2Br($text);
         }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
 
         return $text;
     }
@@ -95,7 +95,7 @@ 
     {
         $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}'>";
         if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . sf_displayImage($button, $alt, true) . '</a>';
+            $button = "<a href='{$link}' title='{$alt}' {$extra}>".sf_displayImage($button, $alt, true).'</a>';
         }
 
         return $button;
@@ -147,7 +147,7 @@ 
         }
 
         if (!class_exists('NewbbIconHandler')) {
-            require_once __DIR__ . '/../class/icon.php';
+            require_once __DIR__.'/../class/icon.php';
         }
 
         $iconHandler           = NewbbIconHandler::getInstance();

include/functions.php

Spacing +28 added lines, -28 removed lines

@@ -7,9 +7,9 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/faq.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/answer.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/faq.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/answer.php';
 
 /**
  * @return mixed|null
@@ -63,7 +63,7 @@ 
             break;
 
         case 'inside':
-            return XOOPS_URL . '/modules/smartfaq/doc/';
+            return XOOPS_URL.'/modules/smartfaq/doc/';
             break;
 
         case 'custom':
@@ -80,7 +80,7 @@ 
 {
     $ret = '';
     foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
+        $ret .= '<br> - '.$value;
     }
 
     return $ret;
@@ -103,11 +103,11 @@ 
         $spaces .= '--';
     }
 
-    $ret .= "<option value='" . $categoryObj->categoryid() . "'";
+    $ret .= "<option value='".$categoryObj->categoryid()."'";
     if ($selectedid == $categoryObj->categoryid()) {
         $ret .= ' selected';
     }
-    $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
+    $ret .= '>'.$spaces.$categoryObj->name()."</option>\n";
 
     $subCategoriesObj = $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
     if (count($subCategoriesObj) > 0) {
@@ -128,10 +128,10 @@ 
  */
 function sf_createCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true)
 {
-    $ret = '' . _MB_SF_SELECTCAT . "&nbsp;<select name='options[]'>";
+    $ret = ''._MB_SF_SELECTCAT."&nbsp;<select name='options[]'>";
     if ($allCatOption) {
         $ret .= "<option value='0'";
-        $ret .= '>' . _MB_SF_ALLCAT . "</option>\n";
+        $ret .= '>'._MB_SF_ALLCAT."</option>\n";
     }
 
     // Creating the category handler object
@@ -199,9 +199,9 @@ 
 {
     $smartModule = sf_getModuleInfo();
 
-    $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
+    $modfootertxt = 'Module '.$smartModule->getInfo('name').' - Version '.$smartModule->getInfo('version').'';
 
-    $modfooter = "<a href='" . $smartModule->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+    $modfooter = "<a href='".$smartModule->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/sfcssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
 
     return $modfooter;
 }
@@ -297,7 +297,7 @@ 
 
     $gpermHandler = xoops_getHandler('groupperm');
 
-    $sql    = 'SELECT faqid FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE categoryid = '$categoryid' ";
+    $sql    = 'SELECT faqid FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE categoryid = '$categoryid' ";
     $result = $xoopsDB->queryF($sql);
 
     if (count($result) > 0) {
@@ -412,7 +412,7 @@ 
     $ret = [];
     global $xoopsDB;
 
-    $result = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE faqid = '$faqid'");
+    $result = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE faqid = '$faqid'");
     $ret    = $xoopsDB->fetcharray($result);
 
     return $ret;
@@ -431,26 +431,26 @@ 
 {
     global $xoopsUser, $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
     $adminLinks = '';
-    $modulePath = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/';
+    $modulePath = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/';
     $page       = $open ? 'question.php' : 'faq.php';
     if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
         // Edit button
-        $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=mod&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/edit.gif'" . " title='" . _MD_SF_EDIT . "' alt='" . _MD_SF_EDIT . "'></a>";
+        $adminLinks .= "<a href='".$modulePath."admin/$page?op=mod&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/edit.gif'"." title='"._MD_SF_EDIT."' alt='"._MD_SF_EDIT."'></a>";
         $adminLinks .= ' ';
         // Delete button
-        $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=del&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/delete.gif'" . " title='" . _MD_SF_DELETE . "' alt='" . _MD_SF_DELETE . "'></a>";
+        $adminLinks .= "<a href='".$modulePath."admin/$page?op=del&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/delete.gif'"." title='"._MD_SF_DELETE."' alt='"._MD_SF_DELETE."'></a>";
         $adminLinks .= ' ';
     }
     // Print button
-    $adminLinks .= "<a href='" . $modulePath . 'print.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/print.gif' title='" . _MD_SF_PRINT . "' alt='" . _MD_SF_PRINT . "'></a>";
+    $adminLinks .= "<a href='".$modulePath.'print.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/print.gif' title='"._MD_SF_PRINT."' alt='"._MD_SF_PRINT."'></a>";
     $adminLinks .= ' ';
     // Email button
-    $maillink   = 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . $modulePath . 'faq.php?faqid=' . $faqid;
-    $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'></a>";
+    $maillink = 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.$modulePath.'faq.php?faqid='.$faqid;
+    $adminLinks .= '<a href="'.$maillink."\"><img src='".$modulePath."assets/images/links/friend.gif' title='"._MD_SF_MAIL."' alt='"._MD_SF_MAIL."'></a>";
     $adminLinks .= ' ';
     // Submit New Answer button
     if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
-        $adminLinks .= "<a href='" . $modulePath . 'answer.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/newanswer.gif' title='" . _MD_SF_SUBMITANSWER . "' alt='" . _MD_SF_SUBMITANSWER . "'></a>";
+        $adminLinks .= "<a href='".$modulePath.'answer.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/newanswer.gif' title='"._MD_SF_SUBMITANSWER."' alt='"._MD_SF_SUBMITANSWER."'></a>";
         $adminLinks .= ' ';
     }
 
@@ -471,7 +471,7 @@ 
         return $userid;
     }
 
-    $userid = (int)$userid;
+    $userid = (int) $userid;
     if ($userid > 0) {
         if ($users == []) {
             //fetching users
@@ -481,7 +481,7 @@ 
             if (!isset($users[$userid])) {
                 return $GLOBALS['xoopsConfig']['anonymous'];
             }
-            $user =& $users[$userid];
+            $user = & $users[$userid];
         }
 
         if (is_object($user)) {
@@ -495,9 +495,9 @@ 
                 $fullname = $user->getVar('name');
             }
             if (!empty($fullname)) {
-                $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
             } else {
-                $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
             }
 
             return $linkeduser;
@@ -579,7 +579,7 @@ 
         //-->
     </script>
     <?php
-    echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
+    echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('".$tablename."'); toggleIcon('".$iconname."');\">";
 }
 
 /**
@@ -592,16 +592,16 @@ 
     static $handlers;
     $name = strtolower(trim($name));
     if (!isset($handlers[$name])) {
-        if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/modules/smartfaq/class/' . $name . '.php')) {
+        if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/modules/smartfaq/class/'.$name.'.php')) {
             require_once $hnd_file;
         }
-        $class = 'sf' . ucfirst($name) . 'Handler';
+        $class = 'sf'.ucfirst($name).'Handler';
         if (class_exists($class)) {
             $handlers[$name] = new $class($GLOBALS['xoopsDB']);
         }
     }
     if (!$optional && !isset($handlers[$name])) {
-        trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+        trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
     }
     $false = false;
 

include/displayfaqs.php

Spacing +19 added lines, -19 removed lines

@@ -23,9 +23,9 @@ 
 
 sf_collapsableBar('toptable', 'toptableicon');
 
-echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . $faqs_title . '</h3>';
+echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".$faqs_title.'</h3>';
 echo "<div id='toptable'>";
-echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $faqs_info . '</span>';
+echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$faqs_info.'</span>';
 
 // Get the total number of published FAQs
 $totalfaqs = $faqHandler->getFaqsCount($sel_cat, [_SF_STATUS_PUBLISHED, _SF_STATUS_NEW_ANSWER]);
@@ -36,22 +36,22 @@ 
 $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_ANSWERED . '</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_ANSWERED.'</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>';
 if ($totalfaqs > 0) {
     global $pathIcon16, $smartModuleConfig;
     for ($i = 0; $i < $totalFaqsOnPage; ++$i) {
         $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
-        $modify      = "<a href='faq.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='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+        $modify      = "<a href='faq.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='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_DELETEART."'></a>";
 
         //adding name of the Question Submitter
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
@@ -79,26 +79,26 @@ 
         }
 
         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() . '/faq.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().'/faq.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'>" . $answerSubmitter . '</td>';
+        echo "<td class='even' align='center'>".$requester.'</td>';
+        echo "<td class='even' align='center'>".$answerSubmitter.'</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_NOFAQS . '</td>';
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQS.'</td>';
     echo '</tr>';
 }
 echo "</table>\n";
 echo "<br>\n";
 
 $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq', $pagenav_extra_args);
-echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 echo '</div>';

class/category.php

Indentation +2 added lines, -2 removed lines

@@ -336,7 +336,7 @@ 
             $sql = sprintf(
                 'INSERT INTO %s (categoryid, parentid, name, description, total, weight, created) VALUES (NULL, %u, %s, %s, %u, %u, %u)',
                 $this->db->prefix('smartfaq_categories'),
-                           $parentid,
+                            $parentid,
                 $this->db->quoteString($name),
                 $this->db->quoteString($description),
                 $total,
@@ -348,7 +348,7 @@ 
                 'UPDATE %s SET parentid = %u, name = %s, description = %s, total = %s, weight = %u, created = %u WHERE categoryid = %u',
                 $this->db->prefix('smartfaq_categories'),
                 $parentid,
-                           $this->db->quoteString($name),
+                            $this->db->quoteString($name),
                 $this->db->quoteString($description),
                 $total,
                 $weight,

Spacing +34 added lines, -34 removed lines

@@ -48,7 +48,7 @@ 
                 $this->assignVars($id);
             } else {
                 $categoryHandler = new sfCategoryHandler($this->db);
-                $category        =& $categoryHandler->get($id);
+                $category        = & $categoryHandler->get($id);
                 foreach ($category->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -81,7 +81,7 @@ 
      */
     public function checkPermission()
     {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $userIsAdmin = sf_userIsAdmin();
         if ($userIsAdmin) {
@@ -158,7 +158,7 @@ 
             $filename = 'open_category.php';
         }
         if ($withAllLink) {
-            $ret = "<a href='" . XOOPS_URL . '/modules/smartfaq/' . $filename . '?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $ret = "<a href='".XOOPS_URL.'/modules/smartfaq/'.$filename.'?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
             $ret = $this->name();
         }
@@ -170,7 +170,7 @@ 
                 exit;
             }
             $parentid = $parentObj->parentid();
-            $ret      = $parentObj->getCategoryPath(true, $open) . ' > ' . $ret;
+            $ret      = $parentObj->getCategoryPath(true, $open).' > '.$ret;
         }
 
         return $ret;
@@ -224,7 +224,7 @@ 
         $tags                  = [];
         $tags['MODULE_NAME']   = $myts->htmlSpecialChars($smartModule->getVar('name'));
         $tags['CATEGORY_NAME'] = $this->name();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
 
         $notificationHandler = xoops_getHandler('notification');
         $notificationHandler->triggerEvent('global_faq', 0, 'category_created', $tags);
@@ -240,9 +240,9 @@ 
         $category['categoryid'] = $this->categoryid();
         $category['name']       = $this->name();
         if ($open !== false) {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/open_category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/open_category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         }
         $category['total']       = $this->getVar('faqcount');
         $category['description'] = $this->description();
@@ -291,8 +291,8 @@ 
     public function get($id)
     {
         $false = false;
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return $false;
             }
@@ -393,7 +393,7 @@ 
         }
 
         // Deleteing the sub categories
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
+        $subcats = & $this->getCategories(0, 0, $category->categoryid());
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -430,11 +430,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -476,7 +476,7 @@ 
         $order = 'ASC',
         $id_as_key = true
     ) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $criteria = new CriteriaCompo();
 
@@ -490,7 +490,7 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $criteria->setStart($start);
         $criteria->setLimit($limit);
@@ -514,7 +514,7 @@ 
         $sort = 'weight',
         $order = 'ASC'
     ) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $criteria = new CriteriaCompo();
 
@@ -528,7 +528,7 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
 
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
@@ -537,11 +537,11 @@ 
 
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
         if (null !== ($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -570,9 +570,9 @@ 
      */
     public function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== ($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -599,7 +599,7 @@ 
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
@@ -622,16 +622,16 @@ 
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
 
-        $sql = 'SELECT COUNT(c.categoryid) FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql = 'SELECT COUNT(c.categoryid) FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         $result = $this->db->query($sql);
@@ -649,13 +649,13 @@ 
      */
     public function getSubCats($categories)
     {
-        $criteria = new CriteriaCompo(new Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')'), 'IN');
+        $criteria = new CriteriaCompo(new Criteria('parentid', '('.implode(',', array_keys($categories)).')'), 'IN');
         $ret      = [];
         if (!sf_userIsAdmin()) {
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $subcats = $this->getObjects($criteria, true);
         foreach ($subcats as $subcat_id => $subcat) {
@@ -673,9 +673,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== ($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -697,10 +697,10 @@ 
      **/
     public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_categories') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_categories').' SET '.$set_clause;
         if (null !== ($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->queryF($sql)) {
             return false;
@@ -726,7 +726,7 @@ 
     public function faqsCount($cat_id = 0, $status = '')
     {
         global $xoopsUser;
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $faqHandler = sf_gethandler('faq');
 

class/utility.php

Spacing +31 added lines, -31 removed lines

@@ -29,7 +29,7 @@ 
                 if (!mkdir($folder) && !is_dir($folder)) {
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 } else {
-                    file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                    file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
                 }
             }
         } catch (Exception $e) {
@@ -67,10 +67,10 @@ 
         //    @mkdir($dst);
         while (false !== ($file = readdir($dir))) {
             if (($file !== '.') && ($file !== '..')) {
-                if (is_dir($src . '/' . $file)) {
-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                if (is_dir($src.'/'.$file)) {
+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                 } else {
-                    copy($src . '/' . $file, $dst . '/' . $file);
+                    copy($src.'/'.$file, $dst.'/'.$file);
                 }
             }
         }
@@ -97,7 +97,7 @@ 
         $currentVer = substr(XOOPS_VERSION, 6); // get the numeric part of string
         $currArray  = explode('.', $currentVer);
         if (null === $requiredVer) {
-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
         }
         $reqArray = explode('.', $requiredVer);
         $success  = true;
@@ -112,7 +112,7 @@ 
                     break;
                 }
             } else {
-                if ((int)$v > 0) { // handles versions like x.x.x.0_RC2
+                if ((int) $v > 0) { // handles versions like x.x.x.0_RC2
                     $success = false;
                     break;
                 }
@@ -203,7 +203,7 @@ 
                 break;
 
             case 'inside':
-                return XOOPS_URL . '/modules/smartfaq/doc/';
+                return XOOPS_URL.'/modules/smartfaq/doc/';
                 break;
 
             case 'custom':
@@ -220,7 +220,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -243,11 +243,11 @@ 
             $spaces .= '--';
         }
 
-        $ret .= "<option value='" . $categoryObj->categoryid() . "'";
+        $ret .= "<option value='".$categoryObj->categoryid()."'";
         if ($selectedid == $categoryObj->categoryid()) {
             $ret .= ' selected';
         }
-        $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
+        $ret .= '>'.$spaces.$categoryObj->name()."</option>\n";
 
         $subCategoriesObj = $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
         if (count($subCategoriesObj) > 0) {
@@ -268,10 +268,10 @@ 
      */
     public static function sf_createCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true)
     {
-        $ret = '' . _MB_SF_SELECTCAT . "&nbsp;<select name='options[]'>";
+        $ret = ''._MB_SF_SELECTCAT."&nbsp;<select name='options[]'>";
         if ($allCatOption) {
             $ret .= "<option value='0'";
-            $ret .= '>' . _MB_SF_ALLCAT . "</option>\n";
+            $ret .= '>'._MB_SF_ALLCAT."</option>\n";
         }
 
         // Creating the category handler object
@@ -339,9 +339,9 @@ 
     {
         $smartModule = sf_getModuleInfo();
 
-        $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
+        $modfootertxt = 'Module '.$smartModule->getInfo('name').' - Version '.$smartModule->getInfo('version').'';
 
-        $modfooter = "<a href='" . $smartModule->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+        $modfooter = "<a href='".$smartModule->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/sfcssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
 
         return $modfooter;
     }
@@ -437,7 +437,7 @@ 
 
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $sql    = 'SELECT faqid FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE categoryid = '$categoryid' ";
+        $sql    = 'SELECT faqid FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE categoryid = '$categoryid' ";
         $result = $xoopsDB->queryF($sql);
 
         if (count($result) > 0) {
@@ -552,7 +552,7 @@ 
         $ret = [];
         global $xoopsDB;
 
-        $result = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE faqid = '$faqid'");
+        $result = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE faqid = '$faqid'");
         $ret    = $xoopsDB->fetcharray($result);
 
         return $ret;
@@ -571,26 +571,26 @@ 
     {
         global $xoopsUser, $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
         $adminLinks = '';
-        $modulePath = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/';
+        $modulePath = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/';
         $page       = $open ? 'question.php' : 'faq.php';
         if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
             // Edit button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=mod&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/edit.gif'" . " title='" . _MD_SF_EDIT . "' alt='" . _MD_SF_EDIT . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=mod&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/edit.gif'"." title='"._MD_SF_EDIT."' alt='"._MD_SF_EDIT."'></a>";
             $adminLinks .= ' ';
             // Delete button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=del&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/delete.gif'" . " title='" . _MD_SF_DELETE . "' alt='" . _MD_SF_DELETE . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=del&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/delete.gif'"." title='"._MD_SF_DELETE."' alt='"._MD_SF_DELETE."'></a>";
             $adminLinks .= ' ';
         }
         // Print button
-        $adminLinks .= "<a href='" . $modulePath . 'print.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/print.gif' title='" . _MD_SF_PRINT . "' alt='" . _MD_SF_PRINT . "'></a>";
+        $adminLinks .= "<a href='".$modulePath.'print.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/print.gif' title='"._MD_SF_PRINT."' alt='"._MD_SF_PRINT."'></a>";
         $adminLinks .= ' ';
         // Email button
-        $maillink   = 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . $modulePath . 'faq.php?faqid=' . $faqid;
-        $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'></a>";
+        $maillink = 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.$modulePath.'faq.php?faqid='.$faqid;
+        $adminLinks .= '<a href="'.$maillink."\"><img src='".$modulePath."assets/images/links/friend.gif' title='"._MD_SF_MAIL."' alt='"._MD_SF_MAIL."'></a>";
         $adminLinks .= ' ';
         // Submit New Answer button
         if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
-            $adminLinks .= "<a href='" . $modulePath . 'answer.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/newanswer.gif' title='" . _MD_SF_SUBMITANSWER . "' alt='" . _MD_SF_SUBMITANSWER . "'></a>";
+            $adminLinks .= "<a href='".$modulePath.'answer.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/newanswer.gif' title='"._MD_SF_SUBMITANSWER."' alt='"._MD_SF_SUBMITANSWER."'></a>";
             $adminLinks .= ' ';
         }
 
@@ -611,7 +611,7 @@ 
             return $userid;
         }
 
-        $userid = (int)$userid;
+        $userid = (int) $userid;
         if ($userid > 0) {
             if ($users == []) {
                 //fetching users
@@ -621,7 +621,7 @@ 
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
 
             if (is_object($user)) {
@@ -635,9 +635,9 @@ 
                     $fullname = $user->getVar('name');
                 }
                 if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
                 } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
                 }
 
                 return $linkeduser;
@@ -719,7 +719,7 @@ 
             //-->
         </script>
         <?php
-        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
+        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('".$tablename."'); toggleIcon('".$iconname."');\">";
     }
 
     /**
@@ -732,16 +732,16 @@ 
         static $handlers;
         $name = strtolower(trim($name));
         if (!isset($handlers[$name])) {
-            if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/modules/smartfaq/class/' . $name . '.php')) {
+            if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/modules/smartfaq/class/'.$name.'.php')) {
                 require_once $hnd_file;
             }
-            $class = 'sf' . ucfirst($name) . 'Handler';
+            $class = 'sf'.ucfirst($name).'Handler';
             if (class_exists($class)) {
                 $handlers[$name] = new $class($GLOBALS['xoopsDB']);
             }
         }
         if (!$optional && !isset($handlers[$name])) {
-            trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+            trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
         }
         $false = false;