mambax7 / smartfaq

class/faq.php

Doc Comments +3 added lines, -3 removed lines

@@ -243,7 +243,7 @@ 
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function uid()
     {
@@ -754,7 +754,7 @@ 
     /**
      * insert a new faq in the database
      *
-     * @param  XoopsObject $faq reference to the {@link sfFaq} object
+     * @param  sfFaq $faq reference to the {@link sfFaq} object
      * @param  bool        $force
      * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
      */
@@ -1143,7 +1143,7 @@ 
      * @param  string $order
      * @param  string $notNullFields
      * @param  bool   $asobject
-     * @param  null   $otherCriteria
+     * @param  null|CriteriaCompo   $otherCriteria
      * @return array
      */
     public function getFaqs(

Indentation +20 added lines, -20 removed lines

@@ -647,16 +647,16 @@ 
         }
 
         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>';
+                . $xoopsConfig['sitename']
+                . ' : <a href='
+                . XOOPS_URL
+                . '/modules/smartfaq/faq.php?faqid='
+                . $this->faqid()
+                . '>'
+                . XOOPS_URL
+                . '/modules/smartfaq/faq.php?faqid='
+                . $this->faqid()
+                . '</a>';
     }
 
     /**
@@ -778,14 +778,14 @@ 
 
         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);
@@ -1618,10 +1618,10 @@ 
         $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';
+                . $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();

Spacing +70 added lines, -70 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);
@@ -128,7 +128,7 @@ 
      */
     public function checkPermission()
     {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_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).'...';
                 }
             }
         }
@@ -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;
@@ -668,16 +668,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();
         }
@@ -693,7 +693,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;
@@ -733,8 +733,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;
             }
@@ -857,26 +857,26 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq');
 
         if (isset($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>";
@@ -936,26 +936,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 (isset($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>";
@@ -1005,19 +1005,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 (isset($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>";
@@ -1050,11 +1050,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');
@@ -1101,7 +1101,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();
@@ -1158,7 +1158,7 @@ 
         $otherCriteria = null
     ) {
         global $xoopsUser;
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         //if ( ($categoryid == -1) && (empty($status) || ($status == -1)) && ($limit == 0) && ($start ==0) ) {
         //  return $this->getObjects();
@@ -1170,11 +1170,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');
@@ -1183,9 +1183,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);
             }
         }
 
@@ -1252,7 +1252,7 @@ 
         $asobject = true,
         $otherCriteria = null
     ) {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $smartModule = sf_getModuleInfo();
 
@@ -1311,7 +1311,7 @@ 
 
         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) {
@@ -1346,10 +1346,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;
@@ -1368,7 +1368,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) {
@@ -1386,7 +1386,7 @@ 
         }
 
         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]];
@@ -1409,14 +1409,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")."
@@ -1431,7 +1431,7 @@ 
         $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;
         }
@@ -1453,9 +1453,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;
@@ -1476,10 +1476,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;
@@ -1494,7 +1494,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 {
@@ -1550,8 +1550,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);
             }
@@ -1569,9 +1569,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');
@@ -1627,9 +1627,9 @@ 
             $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();
@@ -1668,19 +1668,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)';
                 }
             }
         }
@@ -1693,7 +1693,7 @@ 
             return $ret;
         }
         while ($row = $this->db->fetchArray($result)) {
-            $ret[$row['categoryid']] = (int)$row['count'];
+            $ret[$row['categoryid']] = (int) $row['count'];
         }
 
         return $ret;

open_category.php

Spacing +17 added lines, -17 removed lines

@@ -6,16 +6,16 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.tpl';
 
-include_once XOOPS_ROOT_PATH . '/header.php';
-include_once __DIR__ . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
+include_once __DIR__.'/footer.php';
 
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
 
 // Creating the category object for the selected category
 $categoryObj = new sfCategory($categoryid);
@@ -34,7 +34,7 @@ 
 $categoryHandler = sf_gethandler('category');
 
 // At which record shall we start
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 // Creating the faq handler object
 $faqHandler = sf_gethandler('faq');
@@ -58,7 +58,7 @@ 
 $last_qnaObj = $faqHandler->getLastPublishedByCat(array(_SF_STATUS_OPENED));
 if (isset($last_qnaObj[$categoryid])) {
     $categoryObj->setVar('last_faqid', $last_qnaObj[$categoryid]->getVar('faqid'));
-    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$categoryid]->getVar('faqid') . "'>" . $last_qnaObj[$categoryid]->question(50) . '</a>');
+    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$categoryid]->getVar('faqid')."'>".$last_qnaObj[$categoryid]->question(50).'</a>');
 }
 // Populating the smarty variables with informations related to the selected category
 $category                 = $categoryObj->toArray(null, true);
@@ -77,16 +77,16 @@ 
         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]);
             $subcats[$subcat_id] = $subcat->toArray(null, true);
-            $catQnasWithSub      += $subcats[$subcat_id]['total'];
+            $catQnasWithSub += $subcats[$subcat_id]['total'];
         }
     }
     $xoopsTpl->assign('subcats', $subcats);
 }
-$category['total'] = $catQnasWithSub + $totalQnas[$categoryid];
+$category['total'] = $catQnasWithSub+$totalQnas[$categoryid];
 if ($faqsObj) {
     $userids = array();
     foreach ($faqsObj as $key => $thisfaq) {
@@ -95,7 +95,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);
 
@@ -107,7 +107,7 @@ 
     }
 }
 // Language constants
-$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name')) . " > <a href='open_index.php'>" . _MD_SF_OPEN_SECTION . '</a>');
+$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name'))." > <a href='open_index.php'>"._MD_SF_OPEN_SECTION.'</a>');
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());
 
 $xoopsTpl->assign('displaylastfaqs', true);
@@ -124,19 +124,19 @@ 
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
 
 // The Navigation Bar
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>';
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>';
 } else {
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 }
 
 $xoopsTpl->assign('category', $category);
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
 // End Page Title Hack by marcan
 
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';

open_index.php

Indentation +7 added lines, -7 removed lines

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

Spacing +18 added lines, -18 removed lines

@@ -6,15 +6,15 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
+include_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';
 
-include_once XOOPS_ROOT_PATH . '/header.php';
-include_once __DIR__ . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
+include_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
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_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
 
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';

footer.php

Indentation +6 added lines, -6 removed lines

@@ -15,12 +15,12 @@
 $xoopsTpl->assign('isAdmin', $isAdmin);
 
 $xoopsTpl->assign(array(
-                      '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(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'/>");

header.php

Spacing +5 added lines, -5 removed lines

@@ -6,11 +6,11 @@
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
+include __DIR__.'/../../mainfile.php';
 
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/faq.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/answer.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/faq.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/answer.php';
 
 $myts = MyTextSanitizer::getInstance();

category.php

Indentation +4 added lines, -4 removed lines

@@ -136,10 +136,10 @@
     if (isset($last_qnaObj) && $last_qnaObj) {
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
         $category['last_question_link'] = "<a href='faq.php?faqid="
-                                          . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')
-                                          . "'>"
-                                          . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize)
-                                          . '</a>';
+                                            . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')
+                                            . "'>"
+                                            . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize)
+                                            . '</a>';
     }
 }
 

Spacing +18 added lines, -18 removed lines

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

submit.php

Switch Indentation +135 added lines, -135 removed lines

@@ -47,154 +47,154 @@ 
 }
 
 switch ($op) {
-    case 'preview':
+        case 'preview':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
 
-        $faqObj      = $faqHandler->create();
-        $answerObj   = $answerHandler->create();
-        $categoryObj = $categoryHandler->get($_POST['categoryid']);
+            $faqObj      = $faqHandler->create();
+            $answerObj   = $answerHandler->create();
+            $categoryObj = $categoryHandler->get($_POST['categoryid']);
 
-        if (!$xoopsUser) {
-            if ($xoopsModuleConfig['anonpost'] == 1) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if ($xoopsModuleConfig['anonpost'] == 1) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
 
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
 
-        // Putting the values about the FAQ in the FAQ object
-        $faqObj->setVar('categoryid', $_POST['categoryid']);
-        $faqObj->setVar('uid', $uid);
-        $faqObj->setVar('question', $_POST['question']);
-        $faqObj->setVar('howdoi', $_POST['howdoi']);
-        $faqObj->setVar('diduno', $_POST['diduno']);
-        $faqObj->setVar('datesub', time());
+            // Putting the values about the FAQ in the FAQ object
+            $faqObj->setVar('categoryid', $_POST['categoryid']);
+            $faqObj->setVar('uid', $uid);
+            $faqObj->setVar('question', $_POST['question']);
+            $faqObj->setVar('howdoi', $_POST['howdoi']);
+            $faqObj->setVar('diduno', $_POST['diduno']);
+            $faqObj->setVar('datesub', time());
 
-        // Putting the values in the answer object
-        $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
-        $answerObj->setVar('faqid', $faqObj->faqid());
-        $answerObj->setVar('answer', $_POST['answer']);
-        $answerObj->setVar('uid', $uid);
+            // Putting the values in the answer object
+            $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
+            $answerObj->setVar('faqid', $faqObj->faqid());
+            $answerObj->setVar('answer', $_POST['answer']);
+            $answerObj->setVar('uid', $uid);
 
-        global $xoopsUser, $myts;
+            global $xoopsUser, $myts;
 
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
+            include_once XOOPS_ROOT_PATH . '/header.php';
+            include_once __DIR__ . '/footer.php';
 
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
-        $faq                 = $faqObj->toArray(null, $categoryObj, false);
-        $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
-        $faq['answer']       = $answerObj->answer();
-        $faq['who_when']     = $faqObj->getWhoAndWhen();
+            $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $faq                 = $faqObj->toArray(null, $categoryObj, false);
+            $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
+            $faq['answer']       = $answerObj->answer();
+            $faq['who_when']     = $faqObj->getWhoAndWhen();
 
-        $faq['comments'] = -1;
-        $xoopsTpl->assign('faq', $faq);
-        $xoopsTpl->assign('op', 'preview');
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
+            $faq['comments'] = -1;
+            $xoopsTpl->assign('faq', $faq);
+            $xoopsTpl->assign('op', 'preview');
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
 
-        include_once __DIR__ . '/include/submit.inc.php';
+            include_once __DIR__ . '/include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+            include_once XOOPS_ROOT_PATH . '/footer.php';
 
-        exit();
-        break;
+            exit();
+            break;
 
-    case 'post':
+        case 'post':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
 
-        $newFaqObj    = $faqHandler->create();
-        $newAnswerObj = $answerHandler->create();
+            $newFaqObj    = $faqHandler->create();
+            $newAnswerObj = $answerHandler->create();
 
-        if (!$xoopsUser) {
-            if ($xoopsModuleConfig['anonpost'] == 1) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if ($xoopsModuleConfig['anonpost'] == 1) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
-
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
-
-        // Putting the values about the FAQ in the FAQ object
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
-        $newFaqObj->setVar('uid', $uid);
-        $newFaqObj->setVar('question', $_POST['question']);
-        $newFaqObj->setVar('howdoi', $_POST['howdoi']);
-        $newFaqObj->setVar('diduno', $_POST['diduno']);
-        $newFaqObj->setVar('notifypub', $notifypub);
-        //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
-        //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
 
-        // Setting the status of the FAQ
-
-        // if user is admin, FAQ are automatically published
-        $isAdmin = sf_userIsAdmin();
-        if ($isAdmin) {
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
-        } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
-        } else {
-            $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
-        }
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
+
+            // Putting the values about the FAQ in the FAQ object
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
+            $newFaqObj->setVar('uid', $uid);
+            $newFaqObj->setVar('question', $_POST['question']);
+            $newFaqObj->setVar('howdoi', $_POST['howdoi']);
+            $newFaqObj->setVar('diduno', $_POST['diduno']);
+            $newFaqObj->setVar('notifypub', $notifypub);
+            //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
+            //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
+
+            // Setting the status of the FAQ
+
+            // if user is admin, FAQ are automatically published
+            $isAdmin = sf_userIsAdmin();
+            if ($isAdmin) {
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
+            } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
+            } else {
+                $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
+            }
 
-        // Storing the FAQ object in the database
-        if (!$newFaqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
-        }
+            // Storing the FAQ object in the database
+            if (!$newFaqObj->store()) {
+                redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
+            }
 
-        // Putting the values in the answer object
-        $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
-        $newAnswerObj->setVar('answer', $_POST['answer']);
-        $newAnswerObj->setVar('uid', $uid);
-
-        //====================================================================================
-        //TODO post Attachment
-        $attachments_tmp = array();
-        if (!empty($_POST['attachments_tmp'])) {
-            $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
-            if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
-                foreach ($_POST['delete_tmp'] as $key) {
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
-                    unset($attachments_tmp[$key]);
+            // Putting the values in the answer object
+            $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
+            $newAnswerObj->setVar('answer', $_POST['answer']);
+            $newAnswerObj->setVar('uid', $uid);
+
+            //====================================================================================
+            //TODO post Attachment
+            $attachments_tmp = array();
+            if (!empty($_POST['attachments_tmp'])) {
+                $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
+                if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
+                    foreach ($_POST['delete_tmp'] as $key) {
+                        unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
+                        unset($attachments_tmp[$key]);
+                    }
                 }
             }
-        }
-        if (count($attachments_tmp)) {
-            foreach ($attachments_tmp as $key => $attach) {
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
-                    $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
+            if (count($attachments_tmp)) {
+                foreach ($attachments_tmp as $key => $attach) {
+                    if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
+                        $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
+                    }
                 }
             }
-        }
-        $error_upload = '';
+            $error_upload = '';
 
-        if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
-            && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')
-        ) {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
-            $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
-            $uploaddir   = XOOPS_CACHE_PATH;
+            if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
+                && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')
+            ) {
+                require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
+                $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
+                $uploaddir   = XOOPS_CACHE_PATH;
 
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+                $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
 
-            if ($_FILES['userfile']['error'] > 0) {
-                switch ($_FILES['userfile']['error']) {
+                if ($_FILES['userfile']['error'] > 0) {
+                    switch ($_FILES['userfile']['error']) {
                     case 1:
                         $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
                         break;
@@ -204,7 +204,7 @@ 
                     default:
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
                         break;
-                }
+                    }
             } else {
                 $uploader->setCheckMediaTypeByExt();
 
@@ -267,30 +267,30 @@ 
         redirect_header('index.php', 2, $redirect_msg);
         break;
 
-    case 'form':
-    default:
+        case 'form':
+        default:
 
-        global $xoopsUser, $myts;
+            global $xoopsUser, $myts;
 
-        $faqObj      = $faqHandler->create();
-        $answerObj   = $answerHandler->create();
-        $categoryObj = $categoryHandler->create();
+            $faqObj      = $faqHandler->create();
+            $answerObj   = $answerHandler->create();
+            $categoryObj = $categoryHandler->create();
 
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
+            include_once XOOPS_ROOT_PATH . '/header.php';
+            include_once __DIR__ . '/footer.php';
 
-        $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
-        $notifypub  = 1;
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
+            $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $notifypub  = 1;
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
 
-        include_once __DIR__ . '/include/submit.inc.php';
+            include_once __DIR__ . '/include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
-        break;
+            include_once XOOPS_ROOT_PATH . '/footer.php';
+            break;
 }

Spacing +22 added lines, -22 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -84,12 +84,12 @@ 
         global $xoopsUser, $myts;
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/header.php';
+        include_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
         $faq['answer']       = $answerObj->answer();
@@ -102,11 +102,11 @@ 
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
-        include_once __DIR__ . '/include/submit.inc.php';
+        include_once __DIR__.'/include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
 
         exit();
         break;
@@ -170,14 +170,14 @@ 
             $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
             if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
                 foreach ($_POST['delete_tmp'] as $key) {
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
+                    unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0]);
                     unset($attachments_tmp[$key]);
                 }
             }
         }
         if (count($attachments_tmp)) {
             foreach ($attachments_tmp as $key => $attach) {
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
+                if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0])) {
                     $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
                 }
             }
@@ -187,11 +187,11 @@ 
         if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
             && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')
         ) {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
             $uploaddir   = XOOPS_CACHE_PATH;
 
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int) $maxfilesize, (int) $xoopsModuleConfig['max_img_width'], (int) $xoopsModuleConfig['max_img_height']);
 
             if ($_FILES['userfile']['error'] > 0) {
                 switch ($_FILES['userfile']['error']) {
@@ -209,19 +209,19 @@ 
                 $uploader->setCheckMediaTypeByExt();
 
                 if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid() . '_' : 'newbb_';
+                    $prefix = is_object($xoopsUser) ? (string) $xoopsUser->uid().'_' : 'newbb_';
                     $uploader->setPrefix($prefix);
                     if (!$uploader->upload()) {
-                        $error_message[] = $error_upload =& $uploader->getErrors();
+                        $error_message[] = $error_upload = & $uploader->getErrors();
                     } else {
                         if (is_file($uploader->getSavedDestination())) {
-                            if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $uploader->getSavedFileName())) {
+                            if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$uploader->getSavedFileName())) {
                                 $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
                             }
                         }
                     }
                 } else {
-                    $error_message[] = $error_upload =& $uploader->getErrors();
+                    $error_message[] = $error_upload = & $uploader->getErrors();
                 }
             }
         }
@@ -254,7 +254,7 @@ 
         } else {
             // Subscribe the user to On Published notification, if requested
             if ($notifypub == 1) {
-                include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                 $notificationHandler = xoops_getHandler('notification');
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
             }
@@ -277,20 +277,20 @@ 
         $categoryObj = $categoryHandler->create();
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/header.php';
+        include_once __DIR__.'/footer.php';
 
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
         $notifypub  = 1;
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
-        include_once __DIR__ . '/include/submit.inc.php';
+        include_once __DIR__.'/include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }

include/functions.php

Indentation +57 added lines, -57 removed lines

@@ -202,14 +202,14 @@ 
     $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
 
     $modfooter = "<a href='"
-                 . $smartModule->getInfo('support_site_url')
-                 . "' target='_blank'><img src='"
-                 . XOOPS_URL
-                 . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='"
-                 . $modfootertxt
-                 . "' alt='"
-                 . $modfootertxt
-                 . "'/></a>";
+                    . $smartModule->getInfo('support_site_url')
+                    . "' target='_blank'><img src='"
+                    . XOOPS_URL
+                    . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='"
+                    . $modfootertxt
+                    . "' alt='"
+                    . $modfootertxt
+                    . "'/></a>";
 
     return $modfooter;
 }
@@ -444,70 +444,70 @@ 
     if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
         // Edit button
         $adminLinks .= "<a href='"
-                       . $modulePath
-                       . "admin/$page?op=mod&amp;faqid="
-                       . $faqid
-                       . "'><img src='"
-                       . $modulePath
-                       . "assets/images/links/edit.gif'"
-                       . " title='"
-                       . _MD_SF_EDIT
-                       . "' alt='"
-                       . _MD_SF_EDIT
-                       . "'/></a>";
+                        . $modulePath
+                        . "admin/$page?op=mod&amp;faqid="
+                        . $faqid
+                        . "'><img src='"
+                        . $modulePath
+                        . "assets/images/links/edit.gif'"
+                        . " title='"
+                        . _MD_SF_EDIT
+                        . "' alt='"
+                        . _MD_SF_EDIT
+                        . "'/></a>";
         $adminLinks .= ' ';
         // Delete button
         $adminLinks .= "<a href='"
-                       . $modulePath
-                       . "admin/$page?op=del&amp;faqid="
-                       . $faqid
-                       . "'><img src='"
-                       . $modulePath
-                       . "assets/images/links/delete.gif'"
-                       . " title='"
-                       . _MD_SF_DELETE
-                       . "' alt='"
-                       . _MD_SF_DELETE
-                       . "'/></a>";
+                        . $modulePath
+                        . "admin/$page?op=del&amp;faqid="
+                        . $faqid
+                        . "'><img src='"
+                        . $modulePath
+                        . "assets/images/links/delete.gif'"
+                        . " title='"
+                        . _MD_SF_DELETE
+                        . "' alt='"
+                        . _MD_SF_DELETE
+                        . "'/></a>";
         $adminLinks .= ' ';
     }
     // Print button
     $adminLinks .= "<a href='"
-                   . $modulePath
-                   . 'print.php?faqid='
-                   . $faqid
-                   . "'><img src='"
-                   . $modulePath
-                   . "assets/images/links/print.gif' title='"
-                   . _MD_SF_PRINT
-                   . "' alt='"
-                   . _MD_SF_PRINT
-                   . "'/></a>";
+                    . $modulePath
+                    . 'print.php?faqid='
+                    . $faqid
+                    . "'><img src='"
+                    . $modulePath
+                    . "assets/images/links/print.gif' title='"
+                    . _MD_SF_PRINT
+                    . "' alt='"
+                    . _MD_SF_PRINT
+                    . "'/></a>";
     $adminLinks .= ' ';
     // Email button
     $maillink   = 'mailto:?subject='
-                  . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename'])
-                  . '&amp;body='
-                  . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename'])
-                  . ':  '
-                  . $modulePath
-                  . 'faq.php?faqid='
-                  . $faqid;
+                    . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename'])
+                    . '&amp;body='
+                    . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename'])
+                    . ':  '
+                    . $modulePath
+                    . 'faq.php?faqid='
+                    . $faqid;
     $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'/></a>";
     $adminLinks .= ' ';
     // Submit New Answer button
     if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
         $adminLinks .= "<a href='"
-                       . $modulePath
-                       . 'answer.php?faqid='
-                       . $faqid
-                       . "'><img src='"
-                       . $modulePath
-                       . "assets/images/links/newanswer.gif' title='"
-                       . _MD_SF_SUBMITANSWER
-                       . "' alt='"
-                       . _MD_SF_SUBMITANSWER
-                       . "'/></a>";
+                        . $modulePath
+                        . 'answer.php?faqid='
+                        . $faqid
+                        . "'><img src='"
+                        . $modulePath
+                        . "assets/images/links/newanswer.gif' title='"
+                        . _MD_SF_SUBMITANSWER
+                        . "' alt='"
+                        . _MD_SF_SUBMITANSWER
+                        . "'/></a>";
         $adminLinks .= ' ';
     }
 

Spacing +23 added lines, -23 removed lines

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

include/blocksadmin.inc.php

Indentation +12 added lines, -12 removed lines

@@ -71,18 +71,18 @@
     $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
     $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
     $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='
-                 . _CHARSET
-                 . '" /><meta http-equiv="content-language" content="'
-                 . _LANGCODE
-                 . '" /><title>'
-                 . $xoopsConfig['sitename']
-                 . '</title><link rel="stylesheet" type="text/css" media="all" href="'
-                 . getcss($xoopsConfig['theme_set'])
-                 . '" /></head><body><table><tr><th>'
-                 . $myblock->getVar('title')
-                 . '</th></tr><tr><td>'
-                 . $myblock->getContent('S', $bctype)
-                 . '</td></tr></table></body></html>';
+                    . _CHARSET
+                    . '" /><meta http-equiv="content-language" content="'
+                    . _LANGCODE
+                    . '" /><title>'
+                    . $xoopsConfig['sitename']
+                    . '</title><link rel="stylesheet" type="text/css" media="all" href="'
+                    . getcss($xoopsConfig['theme_set'])
+                    . '" /></head><body><table><tr><th>'
+                    . $myblock->getVar('title')
+                    . '</th></tr><tr><td>'
+                    . $myblock->getContent('S', $bctype)
+                    . '</td></tr></table></body></html>';
 
     $dummyfile = '_dummyfile_' . time() . '.html';
     $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');

Spacing +22 added lines, -22 removed lines

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