mambax7 / smartfaq

class/Answer.php

Doc Comments +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 
     /**
      * constructor
-     * @param null $id
+     * @param integer $id
      */
     public function __construct($id = null)
     {

Spacing +19 added lines, -19 removed lines

@@ -85,9 +85,9 @@ 
         if (!$attach_key) {
             return false;
         }
-        $this->attachment_array[(string)$attach_key]['num_download']++;
+        $this->attachment_array[(string) $attach_key]['num_download']++;
 
-        return $this->attachment_array[(string)$attach_key]['num_download'];
+        return $this->attachment_array[(string) $attach_key]['num_download'];
     }
 
     /**
@@ -100,7 +100,7 @@ 
             $attachment_save = base64_encode(serialize($this->attachment_array));
         }
         $this->setVar('attachment', $attachment_save);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('smartfaq_answers') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachment_save) . ' WHERE post_id = ' . $this->getVar('answerid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('smartfaq_answers').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachment_save).' WHERE post_id = '.$this->getVar('answerid');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS["xoopsDB"]->error());
             return false;
@@ -132,8 +132,8 @@ 
 
         foreach ($attach_old as $key => $attach) {
             if (in_array($key, $attach_array)) {
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attach['name_saved']);
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/thumbs/' . $attach['name_saved']); // delete thumbnails
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attach['name_saved']);
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/thumbs/'.$attach['name_saved']); // delete thumbnails
                 continue;
             }
             $this->attachment_array[$key] = $attach;
@@ -159,12 +159,12 @@ 
         static $counter = 0;
         $this->attachment_array = $this->getAttachment();
         if ($name_saved) {
-            $key                          = (string)(time() + ($counter++));
+            $key                          = (string) (time()+($counter++));
             $this->attachment_array[$key] = [
                 'name_saved'   => $name_saved,
                 'name_display' => isset($name_display) ? $name_display : $name_saved,
                 'mimetype'     => $mimetype,
-                'num_download' => isset($num_download) ? (int)$num_download : 0
+                'num_download' => isset($num_download) ? (int) $num_download : 0
             ];
         }
         $attachment_save = null;
@@ -190,24 +190,24 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = sf_getIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/include/functions.image.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/include/functions.image.php';
             $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade"><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists(XOOPS_ROOT_PATH . '/' . $mime_path . '/' . $filetype . '.gif')) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists(XOOPS_ROOT_PATH.'/'.$mime_path.'/'.$filetype.'.gif')) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $att['name_saved']);
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$att['name_saved']);
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if ($xoopsModuleConfig['media_allowed'] && in_array(strtolower($file_extension), $image_extensions)) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '"><strong>&nbsp; ' . $att['name_display'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . sf_attachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'"><strong>&nbsp; '.$att['name_display'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.sf_attachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     global $xoopsUser;
                     if (empty($xoopsModuleConfig['show_userattach'])) {
@@ -364,9 +364,9 @@ 
         $tags                  = [];
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $faqObj->question();
-        $tags['FAQ_URL']       = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $faqObj->faqid();
+        $tags['FAQ_URL']       = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$faqObj->faqid();
         $tags['CATEGORY_NAME'] = $faqObj->getCategoryName();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $faqObj->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$faqObj->categoryid();
         $tags['FAQ_QUESTION']  = $faqObj->question();
 
         // TODO : Not sure about the 'formpreview' ...

class/AnswerHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
      * create a new answer
      *
      * @param  bool $isNew flag the new objects as "new"?
-     * @return object Answer
+     * @return Answer Answer
      */
     public function create($isNew = true)
     {
@@ -69,7 +69,7 @@ 
     /**
      * insert a new answer in the database
      *
-     * @param \XoopsObject $answerObj reference to the <a href='psi_element://sfAnswer'>sfAnswer</a> object
+     * @param Answer $answerObj reference to the <a href='psi_element://sfAnswer'>sfAnswer</a> object
      * @param  bool        $force
      * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
      */

Spacing +20 added lines, -20 removed lines

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

class/Category.php

Doc Comments +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function parentid()
     {

Spacing +5 added lines, -5 removed lines

@@ -166,7 +166,7 @@ 
             $filename = 'open_category.php';
         }
         if ($withAllLink) {
-            $ret = "<a href='" . XOOPS_URL . '/modules/smartfaq/' . $filename . '?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $ret = "<a href='".XOOPS_URL.'/modules/smartfaq/'.$filename.'?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
             $ret = $this->name();
         }
@@ -179,7 +179,7 @@ 
                 exit;
             }
             $parentid = $parentObj->parentid();
-            $ret      = $parentObj->getCategoryPath(true, $open) . ' > ' . $ret;
+            $ret      = $parentObj->getCategoryPath(true, $open).' > '.$ret;
         }
 
         return $ret;
@@ -236,7 +236,7 @@ 
         $tags                  = [];
         $tags['MODULE_NAME']   = $myts->htmlSpecialChars($smartModule->getVar('name'));
         $tags['CATEGORY_NAME'] = $this->name();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
 
         $notificationHandler = xoops_getHandler('notification');
         $notificationHandler->triggerEvent('global_faq', 0, 'category_created', $tags);
@@ -252,9 +252,9 @@ 
         $category['categoryid'] = $this->categoryid();
         $category['name']       = $this->name();
         if (false !== $open) {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/open_category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/open_category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         }
         $category['total']       = $this->getVar('faqcount');
         $category['description'] = $this->description();

class/CategoryHandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
      * create a new category
      *
      * @param  bool $isNew flag the new objects as "new"?
-     * @return object Smartfaq\Category
+     * @return Category Smartfaq\Category
      */
     public function create($isNew = true)
     {
@@ -67,7 +67,7 @@ 
     /**
      * insert a new category in the database
      *
-     * @param \XoopsObject $category reference to the {@link Smartfaq\Category}
+     * @param Category $category reference to the {@link Smartfaq\Category}
      *                               object
      * @param  bool        $force
      * @return bool        FALSE if failed, TRUE if already present and unchanged or successful

Indentation +2 added lines, -2 removed lines

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

Spacing +25 added lines, -25 removed lines

@@ -46,8 +46,8 @@ 
     public function get($id)
     {
         $false = false;
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return $false;
             }
@@ -149,7 +149,7 @@ 
         }
 
         // Deleteing the sub categories
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
+        $subcats = & $this->getCategories(0, 0, $category->categoryid());
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -186,11 +186,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -247,7 +247,7 @@ 
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $criteria->setStart($start);
         $criteria->setLimit($limit);
@@ -286,7 +286,7 @@ 
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
 
         $criteria->add(new \Criteria('f.status', Constants::SF_STATUS_OPENED));
@@ -295,11 +295,11 @@ 
 
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -328,9 +328,9 @@ 
      */
     public function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -358,7 +358,7 @@ 
                 $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
@@ -382,16 +382,16 @@ 
                 $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
         $criteria->add(new \Criteria('f.status', Constants::SF_STATUS_OPENED));
 
-        $sql = 'SELECT COUNT(c.categoryid) FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql = 'SELECT COUNT(c.categoryid) FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         $result = $this->db->query($sql);
@@ -409,16 +409,16 @@ 
      */
     public function getSubCats($categories)
     {
-        $criteria = new \CriteriaCompo(new \Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')'), 'IN');
+        $criteria = new \CriteriaCompo(new \Criteria('parentid', '('.implode(',', array_keys($categories)).')'), 'IN');
         $ret      = [];
         if (!Smartfaq\Utility::userIsAdmin()) {
             /** @var \XoopsModules\Smartfaq\PermissionHandler $smartPermHandler */
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
-        $subcats =& $this->getObjects($criteria, true);
+        $subcats = & $this->getObjects($criteria, true);
         foreach ($subcats as $subcat_id => $subcat) {
             $ret[$subcat->getVar('parentid')][$subcat->getVar('categoryid')] = $subcat;
         }
@@ -434,9 +434,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -458,10 +458,10 @@ 
      **/
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_categories') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_categories').' SET '.$set_clause;
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->queryF($sql)) {
             return false;

class/Faq.php

Doc Comments +1 added lines, -1 removed lines

@@ -226,7 +226,7 @@
     }
 
     /**
-     * @return mixed
+     * @return integer
      */
     public function uid()
     {

Spacing +14 added lines, -14 removed lines

@@ -187,7 +187,7 @@ 
         if (0 != $maxLength) {
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
-                    $ret = substr($ret, 0, $maxLength - 1) . '...';
+                    $ret = substr($ret, 0, $maxLength-1).'...';
                 }
             }
         }
@@ -379,14 +379,14 @@ 
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), Constants::SF_AN_STATUS_APPROVED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case Constants::SF_STATUS_ANSWERED:
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), Constants::SF_AN_STATUS_PROPOSED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case Constants::SF_STATUS_PUBLISHED:
@@ -472,7 +472,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)) {
@@ -484,7 +484,7 @@ 
         foreach ($notifications as $notification) {
             switch ($notification) {
                 case Constants::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);
@@ -492,20 +492,20 @@ 
                     break;
 
                 case Constants::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 Constants::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 Constants::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;
@@ -515,7 +515,7 @@ 
                     break;
 
                 case Constants::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;
@@ -629,7 +629,7 @@ 
             $text = _MD_SF_FAQCOMEFROM;
         }
 
-        return $text . $xoopsConfig['sitename'] . ' : <a href=' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '>' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '</a>';
+        return $text.$xoopsConfig['sitename'].' : <a href='.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'>'.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'</a>';
     }
 
     /**
@@ -641,16 +641,16 @@ 
     public function toArray($faq = [], $category = null, $linkInQuestion = true)
     {
         global $xoopsModuleConfig;
-        $lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
+        $lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
 
         $faq['id']         = $this->faqid();
         $faq['categoryid'] = $this->categoryid();
         $faq['question']   = $this->question();
         $page              = (Constants::SF_STATUS_OPENED == $this->status()) ? '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();
         }
@@ -666,7 +666,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;

class/FaqHandler.php

Doc Comments +3 added lines, -3 removed lines

@@ -68,7 +68,7 @@ 
     /**
      * insert a new faq in the database
      *
-     * @param \XoopsObject $faq reference to the {@link Smartfaq\Faq}
+     * @param Faq $faq reference to the {@link Smartfaq\Faq}
      *                          object
      * @param  bool        $force
      * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
@@ -518,7 +518,7 @@ 
      * @param  string $order
      * @param  string $notNullFields
      * @param  bool   $asobject
-     * @param  null   $otherCriteria
+     * @param  null|\CriteriaCompo   $otherCriteria
      * @return array
      */
     public function getFaqs(
@@ -1035,7 +1035,7 @@ 
 
     /**
      * @param  int   $cat_id
-     * @param        $status
+     * @param        string $status
      * @return array
      */
     public function getCountsByCat($cat_id = 0, $status)

Indentation +1 added lines, -1 removed lines

@@ -94,7 +94,7 @@
         if ($faq->isNew()) {
             $sql = sprintf(
                 'INSERT INTO %s (faqid, categoryid, question, howdoi, diduno, uid, datesub, `status`, counter, weight, html, smiley, xcodes, cancomment, comments, notifypub, modulelink, contextpage, exacturl, partialview) VALUES (NULL, %u, %s, %s, %s, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %s, %s, %u, %u)',
-                           $this->db->prefix('smartfaq_faq'),
+                            $this->db->prefix('smartfaq_faq'),
                 $categoryid,
                 $this->db->quoteString($question),
                 $this->db->quoteString($howdoi),

Spacing +68 added lines, -68 removed lines

@@ -47,8 +47,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;
             }
@@ -164,7 +164,7 @@ 
 //            $faq->setError($this->db->error());
 
 
-            trigger_error('Class ' . $faq . ' could not be saved ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
+            trigger_error('Class '.$faq.' could not be saved '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
 
             return false;
         }
@@ -230,26 +230,26 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq');
 
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         } elseif (!empty($notNullFields)) {
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -268,9 +268,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -310,26 +310,26 @@ 
                             faq.modulelink AS modulelink,
                             faq.contextpage AS contextpage,
                             faq.exacturl AS exacturl
-                FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_categories') . ' AS category ON faq.categoryid = category.categoryid ';
+                FROM ' . $this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_categories').' AS category ON faq.categoryid = category.categoryid ';
 
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         } elseif (!empty($notNullFields)) {
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -347,9 +347,9 @@ 
             $faq->assignVars($myrow);
 
             if (!$id_as_key) {
-                $ret[] =& $faq;
+                $ret[] = & $faq;
             } else {
-                $ret[$myrow['faqid']] =& $faq;
+                $ret[$myrow['faqid']] = & $faq;
             }
             unset($faq);
         }
@@ -379,19 +379,19 @@ 
      */
     public function getCount($criteria = null, $notNullFields = '')
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_faq');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if (!empty($notNullFields)) {
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
                 }
             } elseif (!empty($notNullFields)) {
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
             }
         } elseif (!empty($notNullFields)) {
-            $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
+            $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
         }
 
         //echo "<br>" . $sql . "<br>";
@@ -425,11 +425,11 @@ 
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
 
             $faqsGranted = $smartPermHandler->getPermissions('item');
             $grantedFaq  = new \CriteriaCompo();
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
             // If user is anonymous, check if the FAQ allow partialview
             if (!is_object($xoopsUser)) {
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -476,7 +476,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 [];
@@ -546,11 +546,11 @@ 
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
 
             $faqsGranted = $smartPermHandler->getPermissions('item');
             $grantedFaq  = new \CriteriaCompo();
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
             // If user is anonymous, check if the FAQ allow partialview
             if (!is_object($xoopsUser)) {
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -559,9 +559,9 @@ 
 
         if (isset($categoryid) && (-1 != $categoryid)) {
             if (is_array($categoryid)) {
-                $criteriaCategory = new \Criteria('categoryid', '(' . implode(',', $categoryid) . ')', 'IN');
+                $criteriaCategory = new \Criteria('categoryid', '('.implode(',', $categoryid).')', 'IN');
             } else {
-                $criteriaCategory = new \Criteria('categoryid', (int)$categoryid);
+                $criteriaCategory = new \Criteria('categoryid', (int) $categoryid);
             }
         }
 
@@ -602,7 +602,7 @@ 
         $criteria->setStart($start);
         $criteria->setSort($sort);
         $criteria->setOrder($order);
-        $ret =& $this->getObjects($criteria, false, $notNullFields);
+        $ret = & $this->getObjects($criteria, false, $notNullFields);
 
         return $ret;
     }
@@ -687,11 +687,11 @@ 
 
         if ($totalFaqs > 0) {
             --$totalFaqs;
-            mt_srand((double)microtime() * 1000000);
+            mt_srand((double) microtime() * 1000000);
             $entrynumber = mt_rand(0, $totalFaqs);
             $faq         = $this->getFaqs(1, $entrynumber, $status, -1, 'datesub', 'DESC', $notNullFields);
             if ($faq) {
-                $ret =& $faq[0];
+                $ret = & $faq[0];
             }
         }
 
@@ -722,10 +722,10 @@ 
                 $httphost    = $_SERVER['HTTP_HOST'];
                 $querystring = $_SERVER['QUERY_STRING'];
                 if ('' != $querystring) {
-                    $querystring = '?' . $querystring;
+                    $querystring = '?'.$querystring;
                 }
-                $currenturl     = $http . $httphost . $phpself . $querystring;
-                $fullcontexturl = XOOPS_URL . '/' . $iValue->contextpage();
+                $currenturl     = $http.$httphost.$phpself.$querystring;
+                $fullcontexturl = XOOPS_URL.'/'.$iValue->contextpage();
                 switch ($iValue->modulelink()) {
                     case '':
                         $display = false;
@@ -744,7 +744,7 @@ 
                         }
                         break;
                     default:
-                        if (false === strpos($currenturl, XOOPS_URL . '/modules/')) {
+                        if (false === strpos($currenturl, XOOPS_URL.'/modules/')) {
                             $display = false;
                         } else {
                             if (false === strpos($currenturl, $iValue->modulelink())) {
@@ -756,19 +756,19 @@ 
                         break;
                 }
                 if ($display) {
-                    $randomFaqs[] =& $faqsObj[$i];
+                    $randomFaqs[] = & $faqsObj[$i];
                 }
             }
         }
 
         if (count($randomFaqs) > $limit) {
-            mt_srand((float)microtime() * 10000000);
+            mt_srand((float) microtime() * 10000000);
             $rand_keys = array_rand($randomFaqs, $limit);
             for ($j = 0, $jMax = count($rand_keys); $j < $jMax; ++$j) {
-                $ret[] =& $randomFaqs[$rand_keys[$j]];
+                $ret[] = & $randomFaqs[$rand_keys[$j]];
             }
         } else {
-            $ret =& $randomFaqs;
+            $ret = & $randomFaqs;
         }
 
         return $ret;
@@ -786,14 +786,14 @@ 
             /** @var \XoopsModules\Smartfaq\PermissionHandler $smartPermHandler */
             $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
             $items            = $smartPermHandler->getPermissions('item');
-            $faqclause        = ' AND faqid IN (' . implode(',', $items) . ')';
+            $faqclause        = ' AND faqid IN ('.implode(',', $items).')';
         }
 
         $sql  = "CREATE TEMPORARY TABLE tmp (categoryid INT(8) UNSIGNED NOT NULL,datesub INT(11) DEFAULT '0' NOT NULL);";
-        $sql2 = ' LOCK TABLES ' . $this->db->prefix('smartfaq_faq') . ' READ;';
-        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE status IN (' . implode(',', $status) . ") $faqclause GROUP BY categoryid;";
-        $sql4 = ' SELECT ' . $this->db->prefix('smartfaq_faq') . '.categoryid, faqid, question, uid, ' . $this->db->prefix('smartfaq_faq') . '.datesub FROM ' . $this->db->prefix('smartfaq_faq') . ', tmp
-                              WHERE ' . $this->db->prefix('smartfaq_faq') . '.categoryid=tmp.categoryid AND ' . $this->db->prefix('smartfaq_faq') . '.datesub=tmp.datesub;';
+        $sql2 = ' LOCK TABLES '.$this->db->prefix('smartfaq_faq').' READ;';
+        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM '.$this->db->prefix('smartfaq_faq').' WHERE status IN ('.implode(',', $status).") $faqclause GROUP BY categoryid;";
+        $sql4 = ' SELECT '.$this->db->prefix('smartfaq_faq').'.categoryid, faqid, question, uid, '.$this->db->prefix('smartfaq_faq').'.datesub FROM '.$this->db->prefix('smartfaq_faq').', tmp
+                              WHERE ' . $this->db->prefix('smartfaq_faq').'.categoryid=tmp.categoryid AND '.$this->db->prefix('smartfaq_faq').'.datesub=tmp.datesub;';
         /*
         //Old implementation
         $sql = "SELECT categoryid, faqid, question, uid, MAX(datesub) AS datesub FROM ".$this->db->prefix("smartfaq_faq")."
@@ -808,14 +808,14 @@ 
         $this->db->queryF('UNLOCK TABLES;');
         $this->db->queryF('DROP TABLE tmp;');
         if (!$result) {
-            trigger_error('Error in getLastPublishedByCat SQL: ' . $error);
+            trigger_error('Error in getLastPublishedByCat SQL: '.$error);
 
             return $ret;
         }
         while ($row = $this->db->fetchArray($result)) {
             $faq = new Smartfaq\Faq();
             $faq->assignVars($row);
-            $ret[$row['categoryid']] =& $faq;
+            $ret[$row['categoryid']] = & $faq;
             unset($faq);
         }
 
@@ -830,9 +830,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;
@@ -853,10 +853,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;
@@ -871,7 +871,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 {
@@ -927,8 +927,8 @@ 
             $criteriaKeywords = new \CriteriaCompo();
             foreach ($queryarray as $iValue) {
                 $criteriaKeyword = new \CriteriaCompo();
-                $criteriaKeyword->add(new \Criteria('faq.question', '%' . $iValue . '%', 'LIKE'), 'OR');
-                $criteriaKeyword->add(new \Criteria('answer.answer', '%' . $iValue . '%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new \Criteria('faq.question', '%'.$iValue.'%', 'LIKE'), 'OR');
+                $criteriaKeyword->add(new \Criteria('answer.answer', '%'.$iValue.'%', 'LIKE'), 'OR');
                 $criteriaKeywords->add($criteriaKeyword, $andor);
                 unset($criteriaKeyword);
             }
@@ -947,9 +947,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');
@@ -995,15 +995,15 @@ 
         $criteria->setSort('faq.datesub');
         $criteria->setOrder('DESC');
 
-        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_answers') . ' AS answer ON faq.faqid = answer.faqid';
+        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM '.$this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_answers').' AS answer ON faq.faqid = answer.faqid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
             $whereClause = $criteria->renderWhere();
 
             if ('WHERE ()' !== $whereClause) {
-                $sql .= ' ' . $criteria->renderWhere();
+                $sql .= ' '.$criteria->renderWhere();
                 if ('' != $criteria->getSort()) {
-                    $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                    $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
                 }
                 $limit = $criteria->getLimit();
                 $start = $criteria->getStart();
@@ -1026,7 +1026,7 @@ 
         while (false !== ($myrow = $this->db->fetchArray($result))) {
             $faq = new Smartfaq\Faq();
             $faq->assignVars($myrow);
-            $ret[] =& $faq;
+            $ret[] = & $faq;
             unset($faq);
         }
 
@@ -1042,20 +1042,20 @@ 
     {
         global $xoopsUser;
         $ret = [];
-        $sql = 'SELECT categoryid, COUNT(*) AS count FROM ' . $this->db->prefix('smartfaq_faq');
-        if ((int)$cat_id > 0) {
-            $sql .= ' WHERE categoryid = ' . (int)$cat_id;
-            $sql .= ' AND status IN (' . implode(',', $status) . ')';
+        $sql = 'SELECT categoryid, COUNT(*) AS count FROM '.$this->db->prefix('smartfaq_faq');
+        if ((int) $cat_id > 0) {
+            $sql .= ' WHERE categoryid = '.(int) $cat_id;
+            $sql .= ' AND status IN ('.implode(',', $status).')';
         } else {
-            $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
+            $sql .= ' WHERE status IN ('.implode(',', $status).')';
             if (!Smartfaq\Utility::userIsAdmin()) {
                 /** @var \XoopsModules\Smartfaq\PermissionHandler $smartPermHandler */
                 $smartPermHandler = \XoopsModules\Smartfaq\Helper::getInstance()->getHandler('Permission');
                 $items            = $smartPermHandler->getPermissions('item');
                 if (is_object($xoopsUser)) {
-                    $sql .= ' AND faqid IN (' . implode(',', $items) . ')';
+                    $sql .= ' AND faqid IN ('.implode(',', $items).')';
                 } else {
-                    $sql .= ' AND (faqid IN (' . implode(',', $items) . ') OR partialview = 1)';
+                    $sql .= ' AND (faqid IN ('.implode(',', $items).') OR partialview = 1)';
                 }
             }
         }
@@ -1068,7 +1068,7 @@ 
             return $ret;
         }
         while ($row = $this->db->fetchArray($result)) {
-            $ret[$row['categoryid']] = (int)$row['count'];
+            $ret[$row['categoryid']] = (int) $row['count'];
         }
 
         return $ret;

class/GroupFormCheckBox.php

Doc Comments +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     /**
      * Constructor
      * @param      $caption
-     * @param      $name
+     * @param      string $name
      * @param      $groupId
      * @param null $values
      */

Indentation +14 added lines, -14 removed lines

@@ -201,20 +201,20 @@
             $tree .= ' checked';
         }
         $tree .= '>'
-                 . $option['name']
-                 . '<input type="hidden" name="'
-                 . $this->getName()
-                 . '[parents]['
-                 . $option['id']
-                 . ']" value="'
-                 . implode(':', $parentIds)
-                 . '"><input type="hidden" name="'
-                 . $this->getName()
-                 . '[itemname]['
-                 . $option['id']
-                 . ']" value="'
-                 . htmlspecialchars($option['name'], ENT_QUOTES)
-                 . "\"><br>\n";
+                    . $option['name']
+                    . '<input type="hidden" name="'
+                    . $this->getName()
+                    . '[parents]['
+                    . $option['id']
+                    . ']" value="'
+                    . implode(':', $parentIds)
+                    . '"><input type="hidden" name="'
+                    . $this->getName()
+                    . '[itemname]['
+                    . $option['id']
+                    . ']" value="'
+                    . htmlspecialchars($option['name'], ENT_QUOTES)
+                    . "\"><br>\n";
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);

Spacing +20 added lines, -20 removed lines

@@ -27,12 +27,12 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
 
 /**
  * Renders checkbox options for a group permission form
@@ -109,7 +109,7 @@ 
      */
     public function setOptionTree(&$optionTree)
     {
-        $this->_optionTree =& $optionTree;
+        $this->_optionTree = & $optionTree;
     }
 
     /**
@@ -134,34 +134,34 @@ 
         $ret = '';
 
         if (count($this->_appendix) > 0) {
-            $ret  .= '<table class="outer"><tr>';
+            $ret .= '<table class="outer"><tr>';
             $cols = 1;
             foreach ($this->_appendix as $append) {
                 if ($cols > 4) {
-                    $ret  .= '</tr><tr>';
+                    $ret .= '</tr><tr>';
                     $cols = 1;
                 }
                 $checked = $append['selected'] ? 'checked' : '';
-                $name    = 'perms[' . $append['permname'] . ']';
+                $name    = 'perms['.$append['permname'].']';
                 $itemid  = $append['itemid'];
                 $itemid  = $append['itemid'];
-                $ret     .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
                 ++$cols;
             }
             $ret .= '</tr></table>';
         }
 
-        $ret  .= '<table class="outer"><tr>';
+        $ret .= '<table class="outer"><tr>';
         $cols = 1;
         foreach ($this->_optionTree[0]['children'] as $topitem) {
             if ($cols > 4) {
-                $ret  .= '</tr><tr>';
+                $ret .= '</tr><tr>';
                 $cols = 1;
             }
             $tree   = '<td class="odd">';
             $prefix = '';
             $this->renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
-            $ret .= $tree . '</td>';
+            $ret .= $tree.'</td>';
             ++$cols;
         }
         $ret .= '</tr></table>';
@@ -180,21 +180,21 @@ 
      */
     private function renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
-        $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+        $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
         foreach ($parentIds as $pid) {
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-            $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
         }
         // If there are child elements, add javascript that will
         // make them unchecked when this element is unchecked to make
         // sure permissions to child items are not added when there
         // is no permission to this item.
         foreach ($option['allchild'] as $cid) {
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-            $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
         }
         $tree .= '" value="1"';
         if (null !== $this->_value && in_array($option['id'], $this->_value)) {
@@ -218,7 +218,7 @@ 
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);
-                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }

class/SmartDbTable.php

Doc Comments +1 added lines, -1 removed lines

@@ -178,7 +178,7 @@
     }
 
     /**
-     * @param $field
+     * @param string $field
      * @return bool
      */
     public function fieldExists($field)

Spacing +19 added lines, -19 removed lines

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

class/Utility.php

Doc Comments +1 added lines, -1 removed lines

@@ -519,7 +519,7 @@
 
     /**
      * @param  string $url
-     * @return mixed|string
+     * @return string
      */
     public static function getXoopslink($url = '')
     {

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace XoopsModules\Smartfaq;
 
-use Xmf\Request;
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Common;
 

Spacing +27 added lines, -27 removed lines

@@ -71,7 +71,7 @@ 
                 break;
 
             case 'inside':
-                return XOOPS_URL . '/modules/smartfaq/doc/';
+                return XOOPS_URL.'/modules/smartfaq/doc/';
                 break;
 
             case 'custom':
@@ -88,7 +88,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -112,13 +112,13 @@ 
             $spaces .= '--';
         }
 
-        $ret .= "<option value='" . $categoryObj->categoryid() . "'";
+        $ret .= "<option value='".$categoryObj->categoryid()."'";
         if ($selectedid == $categoryObj->categoryid()) {
             $ret .= ' selected';
         }
-        $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
+        $ret .= '>'.$spaces.$categoryObj->name()."</option>\n";
 
-        $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
+        $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
         if (count($subCategoriesObj) > 0) {
             ++$level;
             foreach ($subCategoriesObj as $catID => $subCategoryObj) {
@@ -137,10 +137,10 @@ 
      */
     public static function createCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true)
     {
-        $ret = '' . _MB_SF_SELECTCAT . "&nbsp;<select name='options[]'>";
+        $ret = ''._MB_SF_SELECTCAT."&nbsp;<select name='options[]'>";
         if ($allCatOption) {
             $ret .= "<option value='0'";
-            $ret .= '>' . _MB_SF_ALLCAT . "</option>\n";
+            $ret .= '>'._MB_SF_ALLCAT."</option>\n";
         }
 
         // Creating the category handler object
@@ -209,9 +209,9 @@ 
     {
         $smartModule = self::getModuleInfo();
 
-        $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
+        $modfootertxt = 'Module '.$smartModule->getInfo('name').' - Version '.$smartModule->getInfo('version').'';
 
-        $modfooter = "<a href='" . $smartModule->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+        $modfooter = "<a href='".$smartModule->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/sfcssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
 
         return $modfooter;
     }
@@ -233,7 +233,7 @@ 
         $module_id   = $smartModule->getVar('mid');
 
         if (!empty($xoopsUser)) {
-            $groups =& $xoopsUser->getGroups();
+            $groups = & $xoopsUser->getGroups();
             $result = in_array(XOOPS_GROUP_ADMIN, $groups) || $xoopsUser->isAdmin($module_id);
         }
 
@@ -307,7 +307,7 @@ 
 
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $sql    = 'SELECT faqid FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE categoryid = '$categoryid' ";
+        $sql    = 'SELECT faqid FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE categoryid = '$categoryid' ";
         $result = $xoopsDB->queryF($sql);
 
         if ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
@@ -422,7 +422,7 @@ 
         $ret = [];
         global $xoopsDB;
 
-        $result = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE faqid = '$faqid'");
+        $result = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE faqid = '$faqid'");
         $ret    = $xoopsDB->fetchArray($result);
 
         return $ret;
@@ -441,26 +441,26 @@ 
     {
         global $xoopsUser, $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
         $adminLinks = '';
-        $modulePath = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/';
+        $modulePath = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/';
         $page       = $open ? 'question.php' : 'faq.php';
         if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
             // Edit button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=mod&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/edit.gif'" . " title='" . _MD_SF_EDIT . "' alt='" . _MD_SF_EDIT . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=mod&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/edit.gif'"." title='"._MD_SF_EDIT."' alt='"._MD_SF_EDIT."'></a>";
             $adminLinks .= ' ';
             // Delete button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=del&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/delete.gif'" . " title='" . _MD_SF_DELETE . "' alt='" . _MD_SF_DELETE . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=del&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/delete.gif'"." title='"._MD_SF_DELETE."' alt='"._MD_SF_DELETE."'></a>";
             $adminLinks .= ' ';
         }
         // Print button
-        $adminLinks .= "<a href='" . $modulePath . 'print.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/print.gif' title='" . _MD_SF_PRINT . "' alt='" . _MD_SF_PRINT . "'></a>";
+        $adminLinks .= "<a href='".$modulePath.'print.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/print.gif' title='"._MD_SF_PRINT."' alt='"._MD_SF_PRINT."'></a>";
         $adminLinks .= ' ';
         // Email button
-        $maillink   = 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . $modulePath . 'faq.php?faqid=' . $faqid;
-        $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'></a>";
+        $maillink = 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.$modulePath.'faq.php?faqid='.$faqid;
+        $adminLinks .= '<a href="'.$maillink."\"><img src='".$modulePath."assets/images/links/friend.gif' title='"._MD_SF_MAIL."' alt='"._MD_SF_MAIL."'></a>";
         $adminLinks .= ' ';
         // Submit New Answer button
         if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
-            $adminLinks .= "<a href='" . $modulePath . 'answer.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/newanswer.gif' title='" . _MD_SF_SUBMITANSWER . "' alt='" . _MD_SF_SUBMITANSWER . "'></a>";
+            $adminLinks .= "<a href='".$modulePath.'answer.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/newanswer.gif' title='"._MD_SF_SUBMITANSWER."' alt='"._MD_SF_SUBMITANSWER."'></a>";
             $adminLinks .= ' ';
         }
 
@@ -481,7 +481,7 @@ 
             return $userid;
         }
 
-        $userid = (int)$userid;
+        $userid = (int) $userid;
         if ($userid > 0) {
             if ($users == []) {
                 //fetching users
@@ -491,7 +491,7 @@ 
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
 
             if (is_object($user)) {
@@ -505,9 +505,9 @@ 
                     $fullname = $user->getVar('name');
                 }
                 if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
                 } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
                 }
 
                 return $linkeduser;
@@ -589,7 +589,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."');\">";
     }
 
     /**
@@ -602,16 +602,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;