mambax7 / smartfaq

class/uploader.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+require_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
 /**
  * Class sfUploader

class/faq.php

Indentation +4 added lines, -4 removed lines

@@ -769,7 +769,7 @@ 
         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'),
+                            $this->db->prefix('smartfaq_faq'),
                 $categoryid,
                 $this->db->quoteString($question),
                 $this->db->quoteString($howdoi),
@@ -785,7 +785,7 @@ 
                 $cancomment,
                 $comments,
                 $notifypub,
-                           $this->db->quoteString($modulelink),
+                            $this->db->quoteString($modulelink),
                 $this->db->quoteString($contextpage),
                 $exacturl,
                 $partialview
@@ -793,7 +793,7 @@ 
         } 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'),
+                            $this->db->prefix('smartfaq_faq'),
                 $categoryid,
                 $this->db->quoteString($question),
                 $this->db->quoteString($howdoi),
@@ -809,7 +809,7 @@ 
                 $cancomment,
                 $comments,
                 $notifypub,
-                           $this->db->quoteString($modulelink),
+                            $this->db->quoteString($modulelink),
                 $this->db->quoteString($contextpage),
                 $exacturl,
                 $partialview,

Spacing +85 added lines, -85 removed lines

@@ -8,7 +8,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/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 = [], $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;
             }
@@ -886,26 +886,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 ($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>";
@@ -923,9 +923,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -965,26 +965,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>";
@@ -1002,9 +1002,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -1034,19 +1034,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>";
@@ -1079,11 +1079,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');
@@ -1130,7 +1130,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 [];
@@ -1187,7 +1187,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();
@@ -1199,11 +1199,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');
@@ -1212,9 +1212,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);
             }
         }
 
@@ -1281,7 +1281,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();
 
@@ -1340,11 +1340,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];
             }
         }
 
@@ -1375,10 +1375,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;
@@ -1397,7 +1397,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) {
@@ -1409,19 +1409,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;
@@ -1438,14 +1438,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")."
@@ -1460,14 +1460,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);
         }
 
@@ -1482,9 +1482,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;
@@ -1505,10 +1505,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;
@@ -1523,7 +1523,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 {
@@ -1579,8 +1579,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);
             }
@@ -1598,9 +1598,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');
@@ -1646,15 +1646,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();
@@ -1677,7 +1677,7 @@ 
         while ($myrow = $this->db->fetchArray($result)) {
             $faq = new sfFaq();
             $faq->assignVars($myrow);
-            $ret[] =& $faq;
+            $ret[] = & $faq;
             unset($faq);
         }
 
@@ -1693,19 +1693,19 @@ 
     {
         global $xoopsUser;
         $ret = [];
-        $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)';
                 }
             }
         }
@@ -1718,7 +1718,7 @@ 
             return $ret;
         }
         while ($row = $this->db->fetchArray($result)) {
-            $ret[$row['categoryid']] = (int)$row['count'];
+            $ret[$row['categoryid']] = (int) $row['count'];
         }
 
         return $ret;

footer.php

Indentation +6 added lines, -6 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -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([
@@ -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'>");

blocks/faqs_random_how.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 function b_faqs_random_how_show()
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
 

blocks/faqs_recent_questions.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 
 function b_faqs_recent_questions_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
 
@@ -60,44 +60,44 @@ 
  */
 function b_faqs_recent_questions_edit($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $form = sf_createCategorySelect($options[0]);
 
-    $form .= '&nbsp;<br>' . _MB_SF_ORDER . "&nbsp;<select name='options[]'>";
+    $form .= '&nbsp;<br>'._MB_SF_ORDER."&nbsp;<select name='options[]'>";
 
     $form .= "<option value='datesub'";
     if ($options[1] === 'datesub') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_DATE . "</option>\n";
+    $form .= '>'._MB_SF_DATE."</option>\n";
 
     $form .= "<option value='counter'";
     if ($options[1] === 'counter') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_HITS . "</option>\n";
+    $form .= '>'._MB_SF_HITS."</option>\n";
 
     $form .= "<option value='weight'";
     if ($options[1] === 'weight') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_WEIGHT . "</option>\n";
+    $form .= '>'._MB_SF_WEIGHT."</option>\n";
 
     $form .= "</select>\n";
 
-    $form .= '&nbsp;' . _MB_SF_DISP . "&nbsp;<input type='text' name='options[]' value='" . $options[2] . "'>&nbsp;" . _MB_SF_QUESTIONS . '';
-    $form .= '&nbsp;<br>' . _MB_SF_CHARS . "&nbsp;<input type='text' name='options[]' value='" . $options[3] . "'>&nbsp;" . _MB_SF_LENGTH . '';
+    $form .= '&nbsp;'._MB_SF_DISP."&nbsp;<input type='text' name='options[]' value='".$options[2]."'>&nbsp;"._MB_SF_QUESTIONS.'';
+    $form .= '&nbsp;<br>'._MB_SF_CHARS."&nbsp;<input type='text' name='options[]' value='".$options[3]."'>&nbsp;"._MB_SF_LENGTH.'';
 
-    $form .= '<br>' . _MB_SF_SHOW_DATE . "&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
+    $form .= '<br>'._MB_SF_SHOW_DATE."&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
     if ($options[4] == 1) {
         $form .= ' checked';
     }
-    $form .= '>&nbsp;' . _YES . "<input type='radio' id='options[]' name='options[]' value='0'";
+    $form .= '>&nbsp;'._YES."<input type='radio' id='options[]' name='options[]' value='0'";
     if ($options[4] == 0) {
         $form .= ' checked';
     }
-    $form .= '>&nbsp;' . _NO . '';
+    $form .= '>&nbsp;'._NO.'';
 
     return $form;
 }

blocks/faqs_new.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 
 function b_faqs_new_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
 
@@ -57,44 +57,44 @@ 
 function b_faqs_new_edit($options)
 {
     global $xoopsDB, $xoopsModule, $xoopsUser;
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $form = sf_createCategorySelect($options[0]);
 
-    $form .= '&nbsp;<br>' . _MB_SF_ORDER . "&nbsp;<select name='options[]'>";
+    $form .= '&nbsp;<br>'._MB_SF_ORDER."&nbsp;<select name='options[]'>";
 
     $form .= "<option value='datesub'";
     if ($options[1] === 'datesub') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_DATE . "</option>\n";
+    $form .= '>'._MB_SF_DATE."</option>\n";
 
     $form .= "<option value='counter'";
     if ($options[1] === 'counter') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_HITS . "</option>\n";
+    $form .= '>'._MB_SF_HITS."</option>\n";
 
     $form .= "<option value='weight'";
     if ($options[1] === 'weight') {
         $form .= ' selected';
     }
-    $form .= '>' . _MB_SF_WEIGHT . "</option>\n";
+    $form .= '>'._MB_SF_WEIGHT."</option>\n";
 
     $form .= "</select>\n";
 
-    $form .= '&nbsp;' . _MB_SF_DISP . "&nbsp;<input type='text' name='options[]' value='" . $options[2] . "'>&nbsp;" . _MB_SF_FAQS . '';
-    $form .= '&nbsp;<br>' . _MB_SF_CHARS . "&nbsp;<input type='text' name='options[]' value='" . $options[3] . "'>&nbsp;" . _MB_SF_LENGTH . '';
+    $form .= '&nbsp;'._MB_SF_DISP."&nbsp;<input type='text' name='options[]' value='".$options[2]."'>&nbsp;"._MB_SF_FAQS.'';
+    $form .= '&nbsp;<br>'._MB_SF_CHARS."&nbsp;<input type='text' name='options[]' value='".$options[3]."'>&nbsp;"._MB_SF_LENGTH.'';
 
-    $form .= '<br>' . _MB_SF_SHOW_DATE . "&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
+    $form .= '<br>'._MB_SF_SHOW_DATE."&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
     if ($options[4] == 1) {
         $form .= ' checked';
     }
-    $form .= '>&nbsp;' . _YES . "<input type='radio' id='options[]' name='options[]' value='0'";
+    $form .= '>&nbsp;'._YES."<input type='radio' id='options[]' name='options[]' value='0'";
     if ($options[4] == 0) {
         $form .= ' checked';
     }
-    $form .= '>&nbsp;' . _NO . '';
+    $form .= '>&nbsp;'._NO.'';
 
     return $form;
 }

blocks/faqs_random_diduno.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 
 function b_faqs_random_diduno_show()
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
 

blocks/faqs_most_viewed.php

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
 
 function b_faqs_most_viewed_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
     if ($options[0] == 0) {
@@ -48,12 +48,12 @@ 
 function b_faqs_most_viewed_edit($options)
 {
     global $xoopsDB, $xoopsModule, $xoopsUser;
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $form = sf_createCategorySelect($options[0]);
 
-    $form .= '&nbsp;<br>' . _MB_SF_DISP . "&nbsp;<input type='text' name='options[]' value='" . $options[1] . "'>&nbsp;" . _MB_SF_FAQS . '';
-    $form .= '&nbsp;<br>' . _MB_SF_CHARS . "&nbsp;<input type='text' name='options[]' value='" . $options[2] . "'>&nbsp;" . _MB_SF_LENGTH . '';
+    $form .= '&nbsp;<br>'._MB_SF_DISP."&nbsp;<input type='text' name='options[]' value='".$options[1]."'>&nbsp;"._MB_SF_FAQS.'';
+    $form .= '&nbsp;<br>'._MB_SF_CHARS."&nbsp;<input type='text' name='options[]' value='".$options[2]."'>&nbsp;"._MB_SF_LENGTH.'';
 
     return $form;
 }

blocks/faqs_context.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
 
 function b_faqs_context_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
     $block = [];
 
@@ -48,8 +48,8 @@ 
  */
 function b_faqs_context_edit($options)
 {
-    $form = '' . _MB_SF_DISP . ' ';
-    $form .= "<input type='text' name='options[]' value='" . $options[0] . "'>&nbsp;" . _MB_SF_FAQS . '';
+    $form = ''._MB_SF_DISP.'&nbsp;';
+    $form .= "<input type='text' name='options[]' value='".$options[0]."'>&nbsp;"._MB_SF_FAQS.'';
 
     return $form;
 }