mambax7 / smartfaq

include/onupdate.inc.php

Spacing +5 added lines, -5 removed lines

@@ -9,9 +9,9 @@ 
 function xoops_module_update_smartfaq($module)
 {
     // Load SmartDbUpdater from the SmartObject Framework if present
-    $smartdbupdater = XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php';
+    $smartdbupdater = XOOPS_ROOT_PATH.'/modules/smartobject/class/smartdbupdater.php';
     if (!file_exists($smartdbupdater)) {
-        $smartdbupdater = XOOPS_ROOT_PATH . '/modules/smartfaq/class/smartdbupdater.php';
+        $smartdbupdater = XOOPS_ROOT_PATH.'/modules/smartfaq/class/smartdbupdater.php';
     }
     require_once $smartdbupdater;
 
@@ -19,7 +19,7 @@ 
 
     ob_start();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+    echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
     // Adding partialview field
     $table = new SmartDbTable('smartfaq_faq');
@@ -70,7 +70,7 @@ 
     /**
      * Check for items with categoryid=0
      */
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
     $smartfaq_faqHandler      = $answerHandler = sf_gethandler('faq');
     $smartfaq_categoryHandler = $answerHandler = sf_gethandler('category');
 
@@ -104,7 +104,7 @@ 
 {
     ob_start();
 
-    require_once XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname') . '/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname').'/include/functions.php';
 
     $feedback = ob_get_clean();
     if (method_exists($module, 'setMessage')) {

open_index.php

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(array(
                       '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';

footer.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 $uid     = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
 $isAdmin = (sf_userIsAdmin() || sf_moderator());
 
-$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(array(
@@ -34,4 +34,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'>");

class/faq.php

Indentation +4 added lines, -4 removed lines

@@ -768,12 +768,12 @@
 
         if ($faq->isNew()) {
             $sql = sprintf('INSERT INTO "%s" (faqid, categoryid, question, howdoi, diduno, uid, datesub, `status`, counter, weight, html, smiley, xcodes, cancomment, comments, notifypub, modulelink, contextpage, exacturl, partialview) VALUES (NULL, %u, %s, %s, %s, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %s, %s, %u, %u)',
-                           $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, time(), $status, $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub,
-                           $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl, $partialview);
+                            $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, time(), $status, $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub,
+                            $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl, $partialview);
         } else {
             $sql = sprintf('UPDATE "%s" SET categoryid = "%u", question = "%s", howdoi = "%s", diduno = "%s", uid = "%u", datesub = "%u", `status` = "%u", counter = "%u", weight = "%u", html = "%u", smiley = "%u", xcodes = "%u", cancomment = "%u", comments = "%u", notifypub = "%u", modulelink = "%s", contextpage = "%s", exacturl = "%u", partialview = "%u"  WHERE faqid = "%u"',
-                           $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, $datesub, $status, $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub,
-                           $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl, $partialview, $faqid);
+                            $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, $datesub, $status, $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub,
+                            $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl, $partialview, $faqid);
         }
         if (false !== $force) {
             $result = $this->db->queryF($sql);

Spacing +85 added lines, -85 removed lines

@@ -8,7 +8,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
 
 // FAQ status
 define('_SF_STATUS_NOTSET', -1);
@@ -104,7 +104,7 @@ 
 
         if (null !== $id) {
             $faqHandler = new sfFaqHandler($this->db);
-            $faq        =& $faqHandler->get($id);
+            $faq        = & $faqHandler->get($id);
             foreach ($faq->vars as $k => $v) {
                 $this->assignVar($k, $v['value']);
             }
@@ -128,7 +128,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) {
@@ -204,7 +204,7 @@ 
         if ($maxLength != 0) {
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
-                    $ret = substr($ret, 0, $maxLength - 1) . '...';
+                    $ret = substr($ret, 0, $maxLength-1).'...';
                 }
             }
         }
@@ -396,14 +396,14 @@ 
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), _SF_AN_STATUS_APPROVED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case _SF_STATUS_ANSWERED:
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), _SF_AN_STATUS_PROPOSED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case _SF_STATUS_PUBLISHED:
@@ -489,7 +489,7 @@ 
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $this->question();
         $tags['CATEGORY_NAME'] = $this->getCategoryName();
-        $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();
         $tags['FAQ_QUESTION']  = $this->question();
         $answerObj             = $this->answer();
         if (is_object($answerObj)) {
@@ -501,7 +501,7 @@ 
         foreach ($notifications as $notification) {
             switch ($notification) {
                 case _SF_NOT_FAQ_PUBLISHED:
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $this->faqid();
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$this->faqid();
 
                     $notificationHandler->triggerEvent('global_faq', 0, 'published', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'published', $tags);
@@ -509,20 +509,20 @@ 
                     break;
 
                 case _SF_NOT_FAQ_SUBMITTED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/faq.php?faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/faq.php?faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_faq', 0, 'submitted', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'submitted', $tags);
                     break;
 
                 case _SF_NOT_QUESTION_PUBLISHED:
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/answer.php?faqid=' . $this->faqid();
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/answer.php?faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_question', 0, 'published', $tags);
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'published', $tags);
                     $notificationHandler->triggerEvent('question', $this->faqid(), 'approved', $tags);
                     break;
 
                 case _SF_NOT_QUESTION_SUBMITTED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/question.php?op=mod&faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/question.php?op=mod&faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_question', 0, 'submitted', $tags);
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'submitted', $tags);
                     break;
@@ -532,7 +532,7 @@ 
                     break;
 
                 case _SF_NOT_NEW_ANSWER_PROPOSED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/answer.php?op=mod&faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/answer.php?op=mod&faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_faq', 0, 'answer_proposed', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'answer_proposed', $tags);
                     break;
@@ -646,7 +646,7 @@ 
             $text = _MD_SF_FAQCOMEFROM;
         }
 
-        return $text . $xoopsConfig['sitename'] . ' : <a href=' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '>' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '</a>';
+        return $text.$xoopsConfig['sitename'].' : <a href='.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'>'.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'</a>';
     }
 
     /**
@@ -658,16 +658,16 @@ 
     public function toArray($faq = array(), $category = null, $linkInQuestion = true)
     {
         global $xoopsModuleConfig;
-        $lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
+        $lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
 
         $faq['id']         = $this->faqid();
         $faq['categoryid'] = $this->categoryid();
         $faq['question']   = $this->question();
         $page              = ($this->status() == _SF_STATUS_OPENED) ? 'answer.php' : 'faq.php';
 
-        $faq['questionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question($lastfaqsize) . '</a>';
+        $faq['questionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question($lastfaqsize).'</a>';
         if ($linkInQuestion) {
-            $faq['fullquestionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question() . '</a>';
+            $faq['fullquestionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question().'</a>';
         } else {
             $faq['fullquestionlink'] = $this->question();
         }
@@ -683,7 +683,7 @@ 
                 $categoryObj = $category[$this->categoryid()];
             }
             $faq['categoryname'] = $categoryObj->getVar('name');
-            $faq['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $categoryObj->getVar('name') . '</a>';
+            $faq['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$categoryObj->getVar('name').'</a>';
         }
 
         return $faq;
@@ -723,8 +723,8 @@ 
      */
     public function get($id)
     {
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE faqid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq').' WHERE faqid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -845,26 +845,26 @@ 
     {
         $ret   = array();
         $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 ($whereClause !== 'WHERE ()') {
-                $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>";
@@ -882,9 +882,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -924,26 +924,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 ($whereClause !== 'WHERE ()') {
-                $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>";
@@ -961,9 +961,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -993,19 +993,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 ($whereClause !== 'WHERE ()') {
-                $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>";
@@ -1038,11 +1038,11 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $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');
@@ -1089,7 +1089,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 array();
@@ -1146,7 +1146,7 @@ 
         $otherCriteria = null
     ) {
         global $xoopsUser;
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         //if ( ($categoryid == -1) && (empty($status) || ($status == -1)) && ($limit == 0) && ($start ==0) ) {
         //  return $this->getObjects();
@@ -1158,11 +1158,11 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $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');
@@ -1171,9 +1171,9 @@ 
 
         if (isset($categoryid) && ($categoryid != -1)) {
             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);
+                $criteriaCategory = new Criteria('categoryid', (int) $categoryid);
             }
         }
 
@@ -1240,7 +1240,7 @@ 
         $asobject = true,
         $otherCriteria = null
     ) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $smartModule = sf_getModuleInfo();
 
@@ -1299,11 +1299,11 @@ 
 
         if ($totalFaqs > 0) {
             --$totalFaqs;
-            mt_srand((double)microtime() * 1000000);
+            mt_srand((double) microtime() * 1000000);
             $entrynumber = mt_rand(0, $totalFaqs);
             $faq         = $this->getFaqs(1, $entrynumber, $status, -1, 'datesub', 'DESC', $notNullFields);
             if ($faq) {
-                $ret =& $faq[0];
+                $ret = & $faq[0];
             }
         }
 
@@ -1334,10 +1334,10 @@ 
                 $httphost    = $_SERVER['HTTP_HOST'];
                 $querystring = $_SERVER['QUERY_STRING'];
                 if ($querystring != '') {
-                    $querystring = '?' . $querystring;
+                    $querystring = '?'.$querystring;
                 }
-                $currenturl     = $http . $httphost . $phpself . $querystring;
-                $fullcontexturl = XOOPS_URL . '/' . $faqsObj[$i]->contextpage();
+                $currenturl     = $http.$httphost.$phpself.$querystring;
+                $fullcontexturl = XOOPS_URL.'/'.$faqsObj[$i]->contextpage();
                 switch ($faqsObj[$i]->modulelink()) {
                     case '':
                         $display = false;
@@ -1356,7 +1356,7 @@ 
                         }
                         break;
                     default:
-                        if (strpos($currenturl, XOOPS_URL . '/modules/') === false) {
+                        if (strpos($currenturl, XOOPS_URL.'/modules/') === false) {
                             $display = false;
                         } else {
                             if (strpos($currenturl, $faqsObj[$i]->modulelink()) === false) {
@@ -1368,19 +1368,19 @@ 
                         break;
                 }
                 if ($display) {
-                    $randomFaqs[] =& $faqsObj[$i];
+                    $randomFaqs[] = & $faqsObj[$i];
                 }
             }
         }
 
         if (count($randomFaqs) > $limit) {
-            mt_srand((float)microtime() * 10000000);
+            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;
@@ -1397,14 +1397,14 @@ 
         if (!sf_userIsAdmin()) {
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
             $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")."
@@ -1419,14 +1419,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 ($row = $this->db->fetchArray($result)) {
             $faq = new sfFaq();
             $faq->assignVars($row);
-            $ret[$row['categoryid']] =& $faq;
+            $ret[$row['categoryid']] = & $faq;
             unset($faq);
         }
 
@@ -1441,9 +1441,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;
@@ -1464,10 +1464,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;
@@ -1482,7 +1482,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 {
@@ -1538,8 +1538,8 @@ 
             $criteriaKeywords = new CriteriaCompo();
             for ($i = 0, $iMax = count($queryarray); $i < $iMax; ++$i) {
                 $criteriaKeyword = new CriteriaCompo();
-                $criteriaKeyword->add(new Criteria('faq.question', '%' . $queryarray[$i] . '%', 'LIKE'), 'OR');
-                $criteriaKeyword->add(new Criteria('answer.answer', '%' . $queryarray[$i] . '%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new Criteria('faq.question', '%'.$queryarray[$i].'%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new Criteria('answer.answer', '%'.$queryarray[$i].'%', 'LIKE'), 'OR');
                 $criteriaKeywords->add($criteriaKeyword, $andor);
                 unset($criteriaKeyword);
             }
@@ -1557,9 +1557,9 @@ 
             if (!$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');
@@ -1605,15 +1605,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 ($whereClause !== 'WHERE ()') {
-                $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();
@@ -1636,7 +1636,7 @@ 
         while ($myrow = $this->db->fetchArray($result)) {
             $faq = new sfFaq();
             $faq->assignVars($myrow);
-            $ret[] =& $faq;
+            $ret[] = & $faq;
             unset($faq);
         }
 
@@ -1652,19 +1652,19 @@ 
     {
         global $xoopsUser;
         $ret = array();
-        $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 = '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).')';
         } else {
-            $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
+            $sql .= ' WHERE status IN ('.implode(',', $status).')';
             if (!sf_userIsAdmin()) {
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
                 $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)';
                 }
             }
         }
@@ -1677,7 +1677,7 @@ 
             return $ret;
         }
         while ($row = $this->db->fetchArray($result)) {
-            $ret[$row['categoryid']] = (int)$row['count'];
+            $ret[$row['categoryid']] = (int) $row['count'];
         }
 
         return $ret;

class/answer.php

Spacing +39 added lines, -39 removed lines

@@ -91,9 +91,9 @@ 
         if (!$attach_key) {
             return false;
         }
-        $this->attachment_array[(string)$attach_key]['num_download']++;
+        $this->attachment_array[(string) $attach_key]['num_download']++;
 
-        return $this->attachment_array[(string)$attach_key]['num_download'];
+        return $this->attachment_array[(string) $attach_key]['num_download'];
     }
 
     /**
@@ -106,7 +106,7 @@ 
             $attachment_save = base64_encode(serialize($this->attachment_array));
         }
         $this->setVar('attachment', $attachment_save);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('smartfaq_answers') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachment_save) . ' WHERE post_id = ' . $this->getVar('answerid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('smartfaq_answers').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachment_save).' WHERE post_id = '.$this->getVar('answerid');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS["xoopsDB"]->error());
             return false;
@@ -138,8 +138,8 @@ 
 
         foreach ($attach_old as $key => $attach) {
             if (in_array($key, $attach_array)) {
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attach['name_saved']);
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/thumbs/' . $attach['name_saved']); // delete thumbnails
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attach['name_saved']);
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/thumbs/'.$attach['name_saved']); // delete thumbnails
                 continue;
             }
             $this->attachment_array[$key] = $attach;
@@ -165,12 +165,12 @@ 
         static $counter = 0;
         $this->attachment_array = $this->getAttachment();
         if ($name_saved) {
-            $key                          = (string)(time() + ($counter++));
+            $key                          = (string) (time()+($counter++));
             $this->attachment_array[$key] = array(
                 'name_saved'   => $name_saved,
                 'name_display' => isset($name_display) ? $name_display : $name_saved,
                 'mimetype'     => $mimetype,
-                'num_download' => isset($num_download) ? (int)$num_download : 0
+                'num_download' => isset($num_download) ? (int) $num_download : 0
             );
         }
         $attachment_save = null;
@@ -196,24 +196,24 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = sf_getIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/include/functions.image.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/include/functions.image.php';
             $image_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp'); // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade"><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists(XOOPS_ROOT_PATH . '/' . $mime_path . '/' . $filetype . '.gif')) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists(XOOPS_ROOT_PATH.'/'.$mime_path.'/'.$filetype.'.gif')) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $att['name_saved']);
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$att['name_saved']);
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if ($xoopsModuleConfig['media_allowed'] && in_array(strtolower($file_extension), $image_extensions)) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '"><strong>&nbsp; ' . $att['name_display'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . sf_attachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'"><strong>&nbsp; '.$att['name_display'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.sf_attachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     global $xoopsUser;
                     if (empty($xoopsModuleConfig['show_userattach'])) {
@@ -370,9 +370,9 @@ 
         $tags                  = array();
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $faqObj->question();
-        $tags['FAQ_URL']       = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $faqObj->faqid();
+        $tags['FAQ_URL']       = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$faqObj->faqid();
         $tags['CATEGORY_NAME'] = $faqObj->getCategoryName();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $faqObj->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$faqObj->categoryid();
         $tags['FAQ_QUESTION']  = $faqObj->question();
 
         // TODO : Not sure about the 'formpreview' ...
@@ -429,8 +429,8 @@ 
      */
     public function get($id = null, $fields = null)
     {
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers') . ' WHERE answerid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers').' WHERE answerid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -558,11 +558,11 @@ 
     {
         $ret   = array();
         $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();
@@ -576,9 +576,9 @@ 
             $answer = new sfAnswer();
             $answer->assignVars($myrow);
             if (!$id_as_key) {
-                $ret[] =& $answer;
+                $ret[] = & $answer;
             } else {
-                $ret[$myrow['answerid']] =& $answer;
+                $ret[$myrow['answerid']] = & $answer;
             }
             unset($answer);
         }
@@ -659,9 +659,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) {
@@ -680,10 +680,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>";
@@ -710,9 +710,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;
@@ -732,10 +732,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)) {
@@ -752,8 +752,8 @@ 
     public function getLastPublishedByFaq($faqids)
     {
         $ret    = array();
-        $sql    = 'SELECT faqid, answer, uid, datesub FROM ' . $this->db->prefix('smartfaq_answers') . '
-               WHERE faqid IN (' . implode(',', $faqids) . ') AND status = ' . _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 = '._SF_AN_STATUS_APPROVED.' GROUP BY faqid';
         $result = $this->db->query($sql);
         if (!$result) {
             return $ret;
@@ -761,7 +761,7 @@ 
         while ($row = $this->db->fetchArray($result)) {
             $answer = new sfAnswer();
             $answer->assignVars($row);
-            $ret[$row['faqid']] =& $answer;
+            $ret[$row['faqid']] = & $answer;
             unset($answer);
         }
 

class/uploader.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * Class sfUploader

class/smartdbupdater.php

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,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 (list($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -53,9 +53,9 @@ 
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/english/smartdbupdater.php';
+    $common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/english/smartdbupdater.php';
 }
 
 include $common_file;
@@ -152,14 +152,14 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->queryF('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->queryF('SHOW COLUMNS FROM '.$this->name());
         while ($existing_field = $xoopsDB->fetchArray($result)) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ($existing_field['Null'] !== 'YES') {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
         }
 
@@ -235,9 +235,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>';
             }
         }
 
@@ -402,9 +402,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;
@@ -423,11 +423,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;
         }
@@ -451,9 +451,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>';
                 }
             }
         }
@@ -477,9 +477,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>';
             }
         }
 
@@ -502,9 +502,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>';
             }
         }
 
@@ -527,9 +527,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>';
             }
         }
 
@@ -553,9 +553,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>';
             }
         }
 
@@ -624,11 +624,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }

index.php

Spacing +17 added lines, -17 removed lines

@@ -5,13 +5,13 @@ 
  * Author: The SmartFactory <www.smartfactory.ca>
  * Licence: GNU
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 // 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 FAQ
-$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');
@@ -36,8 +36,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';
 
 // Creating the categories objects
 $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['catperpage'], $catstart);
@@ -60,7 +60,7 @@ 
     // Get the last smartfaq in each category
     $last_qnaObj = $faqHandler->getLastPublishedByCat();
 }
-$lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
+$lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
 $categories  = array();
 foreach ($categoriesObj as $cat_id => $category) {
     $total = 0;
@@ -70,7 +70,7 @@ 
             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($lastfaqsize) . '</a>');
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
                 }
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
                 if ($xoopsModuleConfig['displaysubcatonindex']) {
@@ -88,7 +88,7 @@ 
     if ($total > 0) {
         if (isset($last_qnaObj[$cat_id])) {
             $category->setVar('last_faqid', $last_qnaObj[$cat_id]->getVar('faqid'));
-            $category->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$cat_id]->getVar('faqid') . "'>" . $last_qnaObj[$cat_id]->question($lastfaqsize) . '</a>');
+            $category->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$cat_id]->getVar('faqid')."'>".$last_qnaObj[$cat_id]->question($lastfaqsize).'</a>');
         }
         $category->setVar('faqcount', $total);
         if (!isset($categories[$cat_id])) {
@@ -126,7 +126,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);
 
@@ -152,14 +152,14 @@ 
 }
 
 // Language constants
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign('whereInSection', $moduleName);
 $xoopsTpl->assign('displaysubcatonindex', $xoopsModuleConfig['displaysubcatonindex']);
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
 $xoopsTpl->assign('display_categoryname', true);
 $xoopsTpl->assign('displayFull', $xoopsModuleConfig['displaytype'] === 'full');
 
-$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD . ' ' . $moduleName);
+$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD.' '.$moduleName);
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['indexwelcomemsg'], 1));
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_SMARTFAQS);
 $xoopsTpl->assign('lang_home', _MD_SF_HOME);
@@ -178,20 +178,20 @@ 
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
 
 // 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
@@ -199,4 +199,4 @@ 
 $xoopsTpl->assign('xoops_pagetitle', $module_name);
 // End Page Title Hack by marcan
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

comment_new.php

Spacing +2 added lines, -2 removed lines

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