mambax7 / smartfaq

class/SmartDbTable.php

Spacing +19 added lines, -19 removed lines

@@ -22,7 +22,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (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/CategoryHandler.php

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,

class/Tree.php

Spacing +18 added lines, -18 removed lines

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

class/FaqHandler.php

Indentation +1 added lines, -1 removed lines

@@ -93,7 +93,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),

class/SmartobjectDbupdater.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
         $query = sprintf('ALTER TABLE `%s` RENAME %s', $from, $to);
         $ret   = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }

include/blocksadmin.inc.php

Spacing +20 added lines, -20 removed lines

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

submit.php

Switch Indentation +134 added lines, -134 removed lines

@@ -52,153 +52,153 @@ 
 }
 
 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 (1 == $xoopsModuleConfig['anonpost']) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $xoopsModuleConfig['anonpost']) {
+                    $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', Constants::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', Constants::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';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
+            require_once XOOPS_ROOT_PATH . '/header.php';
+            require_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);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+            require_once __DIR__ . '/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+            require_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 (1 == $xoopsModuleConfig['anonpost']) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $xoopsModuleConfig['anonpost']) {
+                    $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 = Smartfaq\Utility::userIsAdmin();
-        if ($isAdmin) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
-        } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
-        } else {
-            $newFaqObj->setVar('status', Constants::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 = Smartfaq\Utility::userIsAdmin();
+            if ($isAdmin) {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
+            } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
+            } else {
+                $newFaqObj->setVar('status', Constants::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', Constants::SF_AN_STATUS_APPROVED);
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
-        $newAnswerObj->setVar('answer', $_POST['answer']);
-        $newAnswerObj->setVar('uid', $uid);
-
-        //====================================================================================
-        //TODO post Attachment
-        $attachments_tmp = [];
-        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', Constants::SF_AN_STATUS_APPROVED);
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
+            $newAnswerObj->setVar('answer', $_POST['answer']);
+            $newAnswerObj->setVar('uid', $uid);
+
+            //====================================================================================
+            //TODO post Attachment
+            $attachments_tmp = [];
+            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 Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+                $uploader = new Smartfaq\Uploader($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;
@@ -208,7 +208,7 @@ 
                     default:
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
                         break;
-                }
+                    }
             } else {
                 $uploader->setCheckMediaTypeByExt();
 
@@ -271,30 +271,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.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
+            require_once XOOPS_ROOT_PATH . '/header.php';
+            require_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);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+            require_once __DIR__ . '/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
-        break;
+            require_once XOOPS_ROOT_PATH . '/footer.php';
+            break;
 }

Spacing +21 added lines, -21 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -89,12 +89,12 @@ 
         global $xoopsUser, $myts;
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/header.php';
+        require_once __DIR__.'/footer.php';
 
         $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();
@@ -107,11 +107,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);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+        require_once __DIR__.'/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/footer.php';
 
         exit();
         break;
@@ -175,14 +175,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]);
                 }
             }
@@ -191,7 +191,7 @@ 
 
         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;
 
@@ -213,19 +213,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();
                 }
             }
         }
@@ -258,7 +258,7 @@ 
         } else {
             // Subscribe the user to On Published notification, if requested
             if (1 == $notifypub) {
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                 $notificationHandler = xoops_getHandler('notification');
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
             }
@@ -281,20 +281,20 @@ 
         $categoryObj = $categoryHandler->create();
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/header.php';
+        require_once __DIR__.'/footer.php';
 
         $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);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+        require_once __DIR__.'/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }