mambax7 / smartfaq

footer.php

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/mygroupperm.php

Spacing +7 added lines, -7 removed lines

@@ -22,7 +22,7 @@ 
             $criteria->add(new \Criteria('gperm_itemid', (int)$gperm_itemid));
         }
     }
-    $sql = 'DELETE FROM ' . $db->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$db->prefix('group_permission').' '.$criteria->renderWhere();
     if (!$result = $db->query($sql)) {
         return false;
     }
@@ -34,16 +34,16 @@ 
 $modid = isset($_POST['modid']) ? (int)$_POST['modid'] : 1;
 // we dont want system module permissions to be changed here ( 1 -> 0 GIJ)
 if ($modid <= 0 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 /** @var XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $module        = $moduleHandler->get($modid);
 if (!is_object($module) || !$module->getVar('isactive')) {
-    redirect_header(XOOPS_URL . '/admin.php', 1, _MODULENOEXIST);
+    redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
 }
 $memberHandler = xoops_getHandler('member');
-$group_list    =& $memberHandler->getGroupList();
+$group_list    = & $memberHandler->getGroupList();
 if (is_array($_POST['perms']) && !empty($_POST['perms'])) {
     $gpermHandler = xoops_getHandler('groupperm');
     foreach ($_POST['perms'] as $perm_name => $perm_data) {
@@ -66,7 +66,7 @@ 
                             foreach ($parent_ids as $pid) {
                                 if (0 != $pid && !in_array($pid, array_keys($item_ids))) {
                                     // one of the parent items were not selected, so skip this item
-                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>') . ' (' . _MD_AM_PERMADDNGP . ')';
+                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>').' ('._MD_AM_PERMADDNGP.')';
                                     continue 2;
                                 }
                             }
@@ -77,9 +77,9 @@ 
                         $gperm->setVar('gperm_modid', $modid);
                         $gperm->setVar('gperm_itemid', $item_id);
                         if (!$gpermHandler->insert($gperm)) {
-                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         } else {
-                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         }
                         unset($gperm);
                     }

include/blocksadmin.inc.php

Spacing +20 added lines, -20 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($_POST)) {
@@ -49,9 +49,9 @@ 
 
 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->caching= 0;
+    $xoopsTpl->caching = 0;
     if (isset($bid)) {
         $block['bid']        = $bid;
         $block['form_title'] = _AM_EDITBLOCK;
@@ -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';
+    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 ('previewpopup' === $op) {
-    $file = str_replace('..', '', XOOPS_CACHE_PATH . '/' . trim($_GET['file']));
+    $file = str_replace('..', '', XOOPS_CACHE_PATH.'/'.trim($_GET['file']));
     if (file_exists($file)) {
         include $file;
         @unlink($file);
@@ -254,24 +254,24 @@ 
             $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->caching= 2;
+        $xoopsTpl->caching = 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 +

class/Utility.php

Spacing +23 added lines, -23 removed lines

@@ -71,7 +71,7 @@ 
                 break;
 
             case 'inside':
-                return XOOPS_URL . '/modules/smartfaq/doc/';
+                return XOOPS_URL.'/modules/smartfaq/doc/';
                 break;
 
             case 'custom':
@@ -88,7 +88,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -112,13 +112,13 @@ 
             $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());
+        $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
         if (count($subCategoriesObj) > 0) {
             ++$level;
             foreach ($subCategoriesObj as $catID => $subCategoryObj) {
@@ -137,10 +137,10 @@ 
      */
     public static function 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
@@ -209,9 +209,9 @@ 
     {
         $smartModule = self::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;
     }
@@ -233,7 +233,7 @@ 
         $module_id   = $smartModule->getVar('mid');
 
         if (!empty($xoopsUser)) {
-            $groups =& $xoopsUser->getGroups();
+            $groups = & $xoopsUser->getGroups();
             $result = in_array(XOOPS_GROUP_ADMIN, $groups) || $xoopsUser->isAdmin($module_id);
         }
 
@@ -307,7 +307,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 ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
@@ -422,7 +422,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;
@@ -441,26 +441,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 .= ' ';
         }
 
@@ -491,7 +491,7 @@ 
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
 
             if (is_object($user)) {
@@ -505,9 +505,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;
@@ -589,6 +589,6 @@ 
             //-->
         </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."');\">";
     }
 }

class/Tree.php

Spacing +18 added lines, -18 removed lines

@@ -69,7 +69,7 @@ 
     {
         $selectId = (int)$selectId;
         $arr      = [];
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -96,7 +96,7 @@ 
     {
         $selectId = (int)$selectId;
         $idarray  = [];
-        $result   = $this->db->query('SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '');
+        $result   = $this->db->query('SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'');
         $count    = $this->db->getRowsNum($result);
         if (0 == $count) {
             return $idarray;
@@ -120,7 +120,7 @@ 
     public function getAllChildId($selectId, $order = '', array $idarray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
+        $sql      = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -149,7 +149,7 @@ 
     public function getAllParentId($selectId, $order = '', array $idarray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $selectId . '';
+        $sql      = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -176,14 +176,14 @@ 
     public function getPathFromId($selectId, $title, $path = '')
     {
         $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $result   = $this->db->query('SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
         }
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = \MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = '/' . $name . $path . '';
+        $path = '/'.$name.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -209,12 +209,12 @@ 
             $sel_name = $this->id;
         }
         $myts = \MyTextSanitizer::getInstance();
-        echo "<select name='" . $sel_name . "'";
+        echo "<select name='".$sel_name."'";
         if ('' !== $onchange) {
-            echo " onchange='" . $onchange . "'";
+            echo " onchange='".$onchange."'";
         }
         echo ">\n";
-        $sql = 'SELECT ' . $this->id . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=0';
+        $sql = 'SELECT '.$this->id.', '.$title.' FROM '.$this->table.' WHERE '.$this->pid.'=0';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -232,11 +232,11 @@ 
             $arr = $this->getChildTreeArray($catid, $order);
             foreach ($arr as $option) {
                 $option['prefix'] = str_replace('.', '--', $option['prefix']);
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlspecialchars($option[$title]);
+                $catpath          = $option['prefix'].'&nbsp;'.$myts->htmlspecialchars($option[$title]);
                 if ($option[$this->id] == $preset_id) {
                     $sel = " selected='selected'";
                 }
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
+                echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
                 $sel = '';
             }
         }
@@ -257,7 +257,7 @@ 
     {
         $path     = !empty($path) ? $path : '';
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId";
+        $sql      = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId";
         $result   = $this->db->query($sql);
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
@@ -265,7 +265,7 @@ 
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = \MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = "<li><a href='" . $funcURL . '&amp;' . $this->id . '=' . $selectId . "'>" . $name . '</a></li>' . $path . '';
+        $path = "<li><a href='".$funcURL.'&amp;'.$this->id.'='.$selectId."'>".$name.'</a></li>'.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -285,12 +285,12 @@ 
     public function getIdPathFromId($selectId, $path = '')
     {
         $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $result   = $this->db->query('SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
         }
         list($parentid) = $this->db->fetchRow($result);
-        $path = '/' . $selectId . $path . '';
+        $path = '/'.$selectId.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -311,7 +311,7 @@ 
     public function getAllChild($selectId = 0, $order = '', array $parray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -341,7 +341,7 @@ 
     public function getChildTreeArray($selectId = 0, $order = '', array $parray = [], $r_prefix = '')
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -351,7 +351,7 @@ 
             return $parray;
         }
         while (false !== ($row = $this->db->fetchArray($result))) {
-            $row['prefix'] = $r_prefix . '.';
+            $row['prefix'] = $r_prefix.'.';
             array_push($parray, $row);
             $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
         }

class/CategoryHandler.php

Spacing +25 added lines, -25 removed lines

@@ -47,7 +47,7 @@ 
     {
         $false = false;
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return $false;
             }
@@ -149,7 +149,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);
         }
@@ -186,11 +186,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();
@@ -247,7 +247,7 @@ 
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $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);
@@ -283,10 +283,10 @@ 
         }
         if (!Smartfaq\Utility::userIsAdmin()) {
             /** @var Smartfaq\PermissionHandler $smartPermHandler */
-            $smartPermHandler =Smartfaq\Helper::getInstance()->getHandler('Permission');
+            $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $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', Constants::SF_STATUS_OPENED));
@@ -295,11 +295,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();
@@ -328,9 +328,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) {
@@ -358,7 +358,7 @@ 
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
@@ -382,16 +382,16 @@ 
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $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', Constants::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);
@@ -409,16 +409,16 @@ 
      */
     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 (!Smartfaq\Utility::userIsAdmin()) {
             /** @var Smartfaq\PermissionHandler $smartPermHandler */
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $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);
+        $subcats = & $this->getObjects($criteria, true);
         foreach ($subcats as $subcat_id => $subcat) {
             $ret[$subcat->getVar('parentid')][$subcat->getVar('categoryid')] = $subcat;
         }
@@ -434,9 +434,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;
@@ -458,10 +458,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;

class/SmartDbTable.php

Spacing +19 added lines, -19 removed lines

@@ -22,7 +22,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
         if ($m_table == $realname) {
@@ -163,14 +163,14 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->queryF('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->queryF('SHOW COLUMNS FROM '.$this->name());
         while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ('YES' !== $existing_field['Null']) {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
         }
 
@@ -246,9 +246,9 @@ 
             $query = sprintf('INSERT INTO `%s` VALUES ("%s")', $this->name(), $data);
             $ret   = $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -413,9 +413,9 @@ 
 
         $ret = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).'<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -434,11 +434,11 @@ 
         $query = sprintf('DROP TABLE `%s`', $this->name());
         $ret   = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -462,9 +462,9 @@ 
             $ret = $ret && $xoopsDB->queryF($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).'<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -488,9 +488,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -513,9 +513,9 @@ 
             $query = sprintf('UPDATE `%s` SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -538,9 +538,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -564,9 +564,9 @@ 
 
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }
 

class/AnswerHandler.php

Spacing +19 added lines, -19 removed lines

@@ -49,7 +49,7 @@ 
     public function get($id = null, $fields = null)
     {
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers') . ' WHERE answerid=' . $id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers').' WHERE answerid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -177,11 +177,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($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();
@@ -195,7 +195,7 @@ 
             $answer = new Smartfaq\Answer();
             $answer->assignVars($myrow);
             if (!$id_as_key) {
-                $ret[] =& $answer;
+                $ret[] = & $answer;
             } else {
                 $ret[$myrow['answerid']] = $answer;
             }
@@ -265,7 +265,7 @@ 
         $criteria->setOrder($order);
         $criteria->setLimit($limit);
         $criteria->setStart($start);
-        $ret =& $this->getObjects($criteria);
+        $ret = & $this->getObjects($criteria);
 
         return $ret;
     }
@@ -278,9 +278,9 @@ 
      */
     public function getCount(\CriteriaElement $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -299,10 +299,10 @@ 
      */
     public function getCountByFAQ($criteria = null)
     {
-        $sql = 'SELECT faqid, COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'SELECT faqid, COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            $sql .= ' ' . $criteria->getGroupby();
+            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' '.$criteria->getGroupby();
         }
 
         //echo "<br>$sql<br>";
@@ -329,9 +329,9 @@ 
      */
     public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -351,10 +351,10 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_answers') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_answers').' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         //echo "<br>" . $sql . "<br>";
         if (!$this->db->queryF($sql)) {
@@ -371,8 +371,8 @@ 
     public function getLastPublishedByFaq($faqids)
     {
         $ret    = [];
-        $sql    = 'SELECT faqid, answer, uid, datesub FROM ' . $this->db->prefix('smartfaq_answers') . '
-               WHERE faqid IN (' . implode(',', $faqids) . ') AND status = ' . Constants::SF_AN_STATUS_APPROVED . ' GROUP BY faqid';
+        $sql    = 'SELECT faqid, answer, uid, datesub FROM '.$this->db->prefix('smartfaq_answers').'
+               WHERE faqid IN (' . implode(',', $faqids).') AND status = '.Constants::SF_AN_STATUS_APPROVED.' GROUP BY faqid';
         $result = $this->db->query($sql);
         if (!$result) {
             return $ret;
@@ -380,7 +380,7 @@ 
         while (false !== ($row = $this->db->fetchArray($result))) {
             $answer = new Smartfaq\Answer();
             $answer->assignVars($row);
-            $ret[$row['faqid']] =& $answer;
+            $ret[$row['faqid']] = & $answer;
             unset($answer);
         }
 

class/FaqHandler.php

Spacing +63 added lines, -63 removed lines

@@ -48,7 +48,7 @@ 
     public function get($id)
     {
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE faqid=' . $id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq').' WHERE faqid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -162,7 +162,7 @@ 
 //            $faq->setError($this->db->error());
 
 
-            trigger_error('Class ' . $faq . ' could not be saved ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+            trigger_error('Class '.$faq.' could not be saved '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
             return false;
         }
@@ -228,26 +228,26 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq');
 
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         } elseif (!empty($notNullFields)) {
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -266,9 +266,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -308,26 +308,26 @@ 
                             faq.modulelink AS modulelink,
                             faq.contextpage AS contextpage,
                             faq.exacturl AS exacturl
-                FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_categories') . ' AS category ON faq.categoryid = category.categoryid ';
+                FROM ' . $this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_categories').' AS category ON faq.categoryid = category.categoryid ';
 
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         } elseif (!empty($notNullFields)) {
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -345,9 +345,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -377,19 +377,19 @@ 
      */
     public function getCount($criteria = null, $notNullFields = '')
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_faq');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
         } elseif (!empty($notNullFields)) {
-            $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -423,11 +423,11 @@ 
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
 
             $faqsGranted = $smartPermHandler->getPermissions('item');
             $grantedFaq  = new \CriteriaCompo();
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
             // If user is anonymous, check if the FAQ allow partialview
             if (!is_object($xoopsUser)) {
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -474,7 +474,7 @@ 
      */
     public function getFaqsCountByStatus()
     {
-        $sql    = 'SELECT status, COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq') . ' GROUP BY status';
+        $sql    = 'SELECT status, COUNT(*) FROM '.$this->db->prefix('smartfaq_faq').' GROUP BY status';
         $result = $this->db->query($sql);
         if (!$result) {
             return [];
@@ -544,11 +544,11 @@ 
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
 
             $faqsGranted = $smartPermHandler->getPermissions('item');
             $grantedFaq  = new \CriteriaCompo();
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
             // If user is anonymous, check if the FAQ allow partialview
             if (!is_object($xoopsUser)) {
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -557,7 +557,7 @@ 
 
         if (isset($categoryid) && (-1 != $categoryid)) {
             if (is_array($categoryid)) {
-                $criteriaCategory = new \Criteria('categoryid', '(' . implode(',', $categoryid) . ')', 'IN');
+                $criteriaCategory = new \Criteria('categoryid', '('.implode(',', $categoryid).')', 'IN');
             } else {
                 $criteriaCategory = new \Criteria('categoryid', (int)$categoryid);
             }
@@ -600,7 +600,7 @@ 
         $criteria->setStart($start);
         $criteria->setSort($sort);
         $criteria->setOrder($order);
-        $ret =& $this->getObjects($criteria, false, $notNullFields);
+        $ret = & $this->getObjects($criteria, false, $notNullFields);
 
         return $ret;
     }
@@ -689,7 +689,7 @@ 
             $entrynumber = mt_rand(0, $totalFaqs);
             $faq         = $this->getFaqs(1, $entrynumber, $status, -1, 'datesub', 'DESC', $notNullFields);
             if ($faq) {
-                $ret =& $faq[0];
+                $ret = & $faq[0];
             }
         }
 
@@ -720,10 +720,10 @@ 
                 $httphost    = $_SERVER['HTTP_HOST'];
                 $querystring = $_SERVER['QUERY_STRING'];
                 if ('' != $querystring) {
-                    $querystring = '?' . $querystring;
+                    $querystring = '?'.$querystring;
                 }
-                $currenturl     = $http . $httphost . $phpself . $querystring;
-                $fullcontexturl = XOOPS_URL . '/' . $iValue->contextpage();
+                $currenturl     = $http.$httphost.$phpself.$querystring;
+                $fullcontexturl = XOOPS_URL.'/'.$iValue->contextpage();
                 switch ($iValue->modulelink()) {
                     case '':
                         $display = false;
@@ -742,7 +742,7 @@ 
                         }
                         break;
                     default:
-                        if (false === strpos($currenturl, XOOPS_URL . '/modules/')) {
+                        if (false === strpos($currenturl, XOOPS_URL.'/modules/')) {
                             $display = false;
                         } else {
                             if (false === strpos($currenturl, $iValue->modulelink())) {
@@ -754,7 +754,7 @@ 
                         break;
                 }
                 if ($display) {
-                    $randomFaqs[] =& $faqsObj[$i];
+                    $randomFaqs[] = & $faqsObj[$i];
                 }
             }
         }
@@ -763,10 +763,10 @@ 
             mt_srand((float)microtime() * 10000000);
             $rand_keys = array_rand($randomFaqs, $limit);
             for ($j = 0, $jMax = count($rand_keys); $j < $jMax; ++$j) {
-                $ret[] =& $randomFaqs[$rand_keys[$j]];
+                $ret[] = & $randomFaqs[$rand_keys[$j]];
             }
         } else {
-            $ret =& $randomFaqs;
+            $ret = & $randomFaqs;
         }
 
         return $ret;
@@ -784,14 +784,14 @@ 
             /** @var Smartfaq\PermissionHandler $smartPermHandler */
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
             $items            = $smartPermHandler->getPermissions('item');
-            $faqclause        = ' AND faqid IN (' . implode(',', $items) . ')';
+            $faqclause        = ' AND faqid IN ('.implode(',', $items).')';
         }
 
         $sql  = "CREATE TEMPORARY TABLE tmp (categoryid INT(8) UNSIGNED NOT NULL,datesub INT(11) DEFAULT '0' NOT NULL);";
-        $sql2 = ' LOCK TABLES ' . $this->db->prefix('smartfaq_faq') . ' READ;';
-        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE status IN (' . implode(',', $status) . ") $faqclause GROUP BY categoryid;";
-        $sql4 = ' SELECT ' . $this->db->prefix('smartfaq_faq') . '.categoryid, faqid, question, uid, ' . $this->db->prefix('smartfaq_faq') . '.datesub FROM ' . $this->db->prefix('smartfaq_faq') . ', tmp
-                              WHERE ' . $this->db->prefix('smartfaq_faq') . '.categoryid=tmp.categoryid AND ' . $this->db->prefix('smartfaq_faq') . '.datesub=tmp.datesub;';
+        $sql2 = ' LOCK TABLES '.$this->db->prefix('smartfaq_faq').' READ;';
+        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM '.$this->db->prefix('smartfaq_faq').' WHERE status IN ('.implode(',', $status).") $faqclause GROUP BY categoryid;";
+        $sql4 = ' SELECT '.$this->db->prefix('smartfaq_faq').'.categoryid, faqid, question, uid, '.$this->db->prefix('smartfaq_faq').'.datesub FROM '.$this->db->prefix('smartfaq_faq').', tmp
+                              WHERE ' . $this->db->prefix('smartfaq_faq').'.categoryid=tmp.categoryid AND '.$this->db->prefix('smartfaq_faq').'.datesub=tmp.datesub;';
         /*
         //Old implementation
         $sql = "SELECT categoryid, faqid, question, uid, MAX(datesub) AS datesub FROM ".$this->db->prefix("smartfaq_faq")."
@@ -806,14 +806,14 @@ 
         $this->db->queryF('UNLOCK TABLES;');
         $this->db->queryF('DROP TABLE tmp;');
         if (!$result) {
-            trigger_error('Error in getLastPublishedByCat SQL: ' . $error);
+            trigger_error('Error in getLastPublishedByCat SQL: '.$error);
 
             return $ret;
         }
         while (false !== ($row = $this->db->fetchArray($result))) {
             $faq = new Smartfaq\Faq();
             $faq->assignVars($row);
-            $ret[$row['categoryid']] =& $faq;
+            $ret[$row['categoryid']] = & $faq;
             unset($faq);
         }
 
@@ -828,9 +828,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_faq');
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -851,10 +851,10 @@ 
      **/
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->queryF($sql)) {
             return false;
@@ -869,7 +869,7 @@ 
      */
     public function updateCounter($faqid)
     {
-        $sql = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET counter=counter+1 WHERE faqid = ' . $faqid;
+        $sql = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET counter=counter+1 WHERE faqid = '.$faqid;
         if ($this->db->queryF($sql)) {
             return true;
         } else {
@@ -921,12 +921,12 @@ 
             $criteriaUser->add(new \Criteria('answer.uid', $userid), 'OR');
         }
 
-        if (! empty($queryarray)) {
+        if (!empty($queryarray)) {
             $criteriaKeywords = new \CriteriaCompo();
             foreach ($queryarray as $iValue) {
                 $criteriaKeyword = new \CriteriaCompo();
-                $criteriaKeyword->add(new \Criteria('faq.question', '%' . $iValue . '%', 'LIKE'), 'OR');
-                $criteriaKeyword->add(new \Criteria('answer.answer', '%' . $iValue . '%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new \Criteria('faq.question', '%'.$iValue.'%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new \Criteria('answer.answer', '%'.$iValue.'%', 'LIKE'), 'OR');
                 $criteriaKeywords->add($criteriaKeyword, $andor);
                 unset($criteriaKeyword);
             }
@@ -945,9 +945,9 @@ 
             if (empty($faqsGranted)) {
                 return $ret;
             }
-            $grantedCategories = new \Criteria('faq.categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new \Criteria('faq.categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
             $grantedFaq        = new \CriteriaCompo();
-            $grantedFaq->add(new \Criteria('faq.faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
+            $grantedFaq->add(new \Criteria('faq.faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
             // If user is anonymous, check if the FAQ allow partialview
             if (!is_object($xoopsUser)) {
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -993,15 +993,15 @@ 
         $criteria->setSort('faq.datesub');
         $criteria->setOrder('DESC');
 
-        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_answers') . ' AS answer ON faq.faqid = answer.faqid';
+        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM '.$this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_answers').' AS answer ON faq.faqid = answer.faqid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $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();
@@ -1024,7 +1024,7 @@ 
         while (false !== ($myrow = $this->db->fetchArray($result))) {
             $faq = new Smartfaq\Faq();
             $faq->assignVars($myrow);
-            $ret[] =& $faq;
+            $ret[] = & $faq;
             unset($faq);
         }
 
@@ -1040,20 +1040,20 @@ 
     {
         global $xoopsUser;
         $ret = [];
-        $sql = 'SELECT categoryid, COUNT(*) AS count FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql = 'SELECT categoryid, COUNT(*) AS count FROM '.$this->db->prefix('smartfaq_faq');
         if ((int)$cat_id > 0) {
-            $sql .= ' WHERE categoryid = ' . (int)$cat_id;
-            $sql .= ' AND status IN (' . implode(',', $status) . ')';
+            $sql .= ' WHERE categoryid = '.(int)$cat_id;
+            $sql .= ' AND status IN ('.implode(',', $status).')';
         } else {
-            $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
+            $sql .= ' WHERE status IN ('.implode(',', $status).')';
             if (!Smartfaq\Utility::userIsAdmin()) {
                 /** @var Smartfaq\PermissionHandler $smartPermHandler */
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
                 $items            = $smartPermHandler->getPermissions('item');
                 if (is_object($xoopsUser)) {
-                    $sql .= ' AND faqid IN (' . implode(',', $items) . ')';
+                    $sql .= ' AND faqid IN ('.implode(',', $items).')';
                 } else {
-                    $sql .= ' AND (faqid IN (' . implode(',', $items) . ') OR partialview = 1)';
+                    $sql .= ' AND (faqid IN ('.implode(',', $items).') OR partialview = 1)';
                 }
             }
         }