mambax7 / smartfaq

submit.php

Switch Indentation +134 added lines, -134 removed lines

@@ -54,153 +54,153 @@ 
 }
 
 switch ($op) {
-    case 'preview':
+        case 'preview':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule,  $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule,  $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 == $helper->getConfig('anonpost')) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $helper->getConfig('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 = \Xmf\Request::getInt('notifypub', 0, POST);
+            $notifypub = \Xmf\Request::getInt('notifypub', 0, POST);
 
-        // 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,  $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule,  $xoopsDB;
 
-        $newFaqObj    = $faqHandler->create();
-        $newAnswerObj = $answerHandler->create();
+            $newFaqObj    = $faqHandler->create();
+            $newAnswerObj = $answerHandler->create();
 
-        if (!$xoopsUser) {
-            if (1 == $helper->getConfig('anonpost')) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $helper->getConfig('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 = \Xmf\Request::getInt('notifypub', 0, POST);
-
-        // 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 == $helper->getConfig('autoapprove_submitted_faq')) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
-        } else {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_SUBMITTED);
-        }
+            $notifypub = \Xmf\Request::getInt('notifypub', 0, POST);
+
+            // 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 == $helper->getConfig('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 . '/' . $helper->getConfig('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 . '/' . $helper->getConfig('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 . '/' . $helper->getConfig('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 . '/' . $helper->getConfig('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)$helper->getConfig('max_img_width'), (int)$helper->getConfig('max_img_height'));
+                $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$helper->getConfig('max_img_width'), (int)$helper->getConfig('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;
@@ -210,7 +210,7 @@ 
                     default:
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
                         break;
-                }
+                    }
             } else {
                 $uploader->setCheckMediaTypeByExt();
 
@@ -273,30 +273,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;
 }

admin/category.php

Switch Indentation +120 added lines, -120 removed lines

@@ -236,149 +236,149 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryid  = \Xmf\Request::getInt('categoryid', 0, 'GET');
-        $destList    = \Xmf\Request::getString('destList', '', 'POST');
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
+        case 'mod':
+            $categoryid  = \Xmf\Request::getInt('categoryid', 0, 'GET');
+            $destList    = \Xmf\Request::getString('destList', '', 'POST');
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            xoops_cp_header();
 
-        $adminObject->displayNavigation(basename(__FILE__));
-        editcat(true, $categoryid);
-        break;
+            $adminObject->displayNavigation(basename(__FILE__));
+            editcat(true, $categoryid);
+            break;
 
-    case 'addcategory':
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule,  $modify, $myts, $categoryid;
+        case 'addcategory':
+            global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule,  $modify, $myts, $categoryid;
 
-        $categoryid = \Xmf\Request::getInt('categoryid', 0, 'POST');
+            $categoryid = \Xmf\Request::getInt('categoryid', 0, 'POST');
 
-        if (0 != $categoryid) {
-            $categoryObj = new Smartfaq\Category($categoryid);
-        } else {
-            $categoryObj = $categoryHandler->create();
-        }
+            if (0 != $categoryid) {
+                $categoryObj = new Smartfaq\Category($categoryid);
+            } else {
+                $categoryObj = $categoryHandler->create();
+            }
 
-        //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
-        //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
+            //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
+            //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
 
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
-        $applyall = \Xmf\Request::getInt('applyall', 0, 'POST');
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+            $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
+            $applyall = \Xmf\Request::getInt('applyall', 0, 'POST');
+            $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
 
-        // Groups and permissions
-        if (isset($_POST['groups_read'])) {
-            $categoryObj->setGroups_read($_POST['groups_read']);
-        } else {
-            $categoryObj->setGroups_read();
-        }
-        //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
-        //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
-
-        $categoryObj->setVar('name', $_POST['name']);
-
-        $categoryObj->setVar('description', $_POST['description']);
-        if ($categoryObj->isNew()) {
-            $redirect_msg = _AM_SF_CATCREATED;
-            $redirect_to  = 'category.php?op=mod';
-        } else {
-            $redirect_msg = _AM_SF_COLMODIFIED;
-            $redirect_to  = 'category.php';
-        }
-
-        if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
-        }
-        // TODO : put this function in the category class
-        Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
-        //Smartfaq\Utility::saveCategoryPermissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
+            // Groups and permissions
+            if (isset($_POST['groups_read'])) {
+                $categoryObj->setGroups_read($_POST['groups_read']);
+            } else {
+                $categoryObj->setGroups_read();
+            }
+            //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
+            //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
+
+            $categoryObj->setVar('name', $_POST['name']);
+
+            $categoryObj->setVar('description', $_POST['description']);
+            if ($categoryObj->isNew()) {
+                $redirect_msg = _AM_SF_CATCREATED;
+                $redirect_to  = 'category.php?op=mod';
+            } else {
+                $redirect_msg = _AM_SF_COLMODIFIED;
+                $redirect_to  = 'category.php';
+            }
 
-        if ($applyall) {
+            if (!$categoryObj->store()) {
+                redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
+            }
             // TODO : put this function in the category class
-            Smartfaq\Utility::overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
-        }
+            Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
+            //Smartfaq\Utility::saveCategoryPermissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
 
-        redirect_header($redirect_to, 2, $redirect_msg);
-        break;
+            if ($applyall) {
+                // TODO : put this function in the category class
+                Smartfaq\Utility::overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
+            }
 
-    case 'del':
-        global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
+            redirect_header($redirect_to, 2, $redirect_msg);
+            break;
 
-        $module_id    = $xoopsModule->getVar('mid');
-        $gpermHandler = xoops_getHandler('groupperm');
+        case 'del':
+            global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
 
-        $categoryid = \Xmf\Request::getInt('categoryid', 0, 'POST');
-        $categoryid = \Xmf\Request::getInt('categoryid', $categoryid, 'GET');
+            $module_id    = $xoopsModule->getVar('mid');
+            $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryObj = new Smartfaq\Category($categoryid);
+            $categoryid = \Xmf\Request::getInt('categoryid', 0, 'POST');
+            $categoryid = \Xmf\Request::getInt('categoryid', $categoryid, 'GET');
 
-        $confirm = \Xmf\Request::getInt('confirm', 0, POST);
-        $name    = \Xmf\Request::getString('name', '', 'POST');
+            $categoryObj = new Smartfaq\Category($categoryid);
 
-        if ($confirm) {
-            if (!$categoryHandler->delete($categoryObj)) {
-                redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+            $confirm = \Xmf\Request::getInt('confirm', 0, POST);
+            $name    = \Xmf\Request::getString('name', '', 'POST');
+
+            if ($confirm) {
+                if (!$categoryHandler->delete($categoryObj)) {
+                    redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+                }
+                redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
+            } else {
+                // no confirm: show deletion condition
+                $categoryid = \Xmf\Request::getInt('categoryid', 0, 'GET');
+                xoops_cp_header();
+                xoops_confirm([
+                                  'op'         => 'del',
+                                  'categoryid' => $categoryObj->categoryid(),
+                                  'confirm'    => 1,
+                                  'name'       => $categoryObj->name()
+                              ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                xoops_cp_footer();
             }
-            redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
-        } else {
-            // no confirm: show deletion condition
-            $categoryid = \Xmf\Request::getInt('categoryid', 0, 'GET');
+            exit();
+            break;
+
+        case 'cancel':
+            redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
+            break;
+        case 'default':
+        default:
+            $adminObject = \Xmf\Module\Admin::getInstance();
             xoops_cp_header();
-            xoops_confirm([
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
-            xoops_cp_footer();
-        }
-        exit();
-        break;
-
-    case 'cancel':
-        redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
-        break;
-    case 'default':
-    default:
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
-
-        $adminObject->displayNavigation(basename(__FILE__));
-        echo "<br>\n";
 
-        // Creating the objects for top categories
-        $categoriesObj =& $categoryHandler->getCategories($helper->getConfig('perpage'), $startcategory, 0);
-
-        Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
-        echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
-
-        echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
-        echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
-        echo '</tr>';
-        $totalCategories = $categoryHandler->getCategoriesCount(0);
-        if (count($categoriesObj) > 0) {
-            foreach ($categoriesObj as $key => $thiscat) {
-                displayCategory($thiscat);
-            }
-        } else {
+            $adminObject->displayNavigation(basename(__FILE__));
+            echo "<br>\n";
+
+            // Creating the objects for top categories
+            $categoriesObj =& $categoryHandler->getCategories($helper->getConfig('perpage'), $startcategory, 0);
+
+            Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
+            echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+            echo "<div id='toptable'>";
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+
+            echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
+            echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
+            echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
+            echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
             echo '</tr>';
-            $categoryid = '0';
-        }
-        echo "</table>\n";
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        $pagenav = new \XoopsPageNav($totalCategories, $helper->getConfig('perpage'), $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo '</div>';
+            $totalCategories = $categoryHandler->getCategoriesCount(0);
+            if (count($categoriesObj) > 0) {
+                foreach ($categoriesObj as $key => $thiscat) {
+                    displayCategory($thiscat);
+                }
+            } else {
+                echo '<tr>';
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+                echo '</tr>';
+                $categoryid = '0';
+            }
+            echo "</table>\n";
+            require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav = new \XoopsPageNav($totalCategories, $helper->getConfig('perpage'), $startcategory, 'startcategory');
+            echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+            echo '</div>';
 
-        editcat(false);
+            editcat(false);
 
-        break;
+            break;
 }
 
 require_once __DIR__ . '/admin_footer.php';

request.php

Switch Indentation +70 added lines, -70 removed lines

@@ -51,94 +51,94 @@
 }
 
 switch ($op) {
-    case 'post':
+        case 'post':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsDB;
 
-        $newFaqObj = $faqHandler->create();
+            $newFaqObj = $faqHandler->create();
 
-        if (!$xoopsUser) {
-            if (1 == $helper->getConfig('anonpost')) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $helper->getConfig('anonpost')) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
-
-        // Putting the values about the FAQ in the FAQ object
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
-        $newFaqObj->setVar('uid', $uid);
-        $newFaqObj->setVar('question', $_POST['question']);
-        $notifypub = \Xmf\Request::getInt('notifypub', 0, POST);
-        $newFaqObj->setVar('notifypub', $notifypub);
-
-        // Setting the status of the FAQ
-        if (1 == $helper->getConfig('autoapprove_request')) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_OPENED);
-        } else {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_ASKED);
-        }
-
-        // Storing the FAQ object in the database
-        if (!$newFaqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
-        }
-
-        // Get the cateopry object related to that FAQ
-        // If autoapprove_requested
-        if (1 == $helper->getConfig('autoapprove_request')) {
-            // We do not not subscribe user to notification on publish since we publish it right away
-
-            // Send notifications
-            $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_PUBLISHED]);
-
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
-        } else {
-            // Subscribe the user to On Published notification, if requested
-            if (1 == $notifypub) {
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-                $notificationHandler = xoops_getHandler('notification');
-                $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
+
+            // Putting the values about the FAQ in the FAQ object
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
+            $newFaqObj->setVar('uid', $uid);
+            $newFaqObj->setVar('question', $_POST['question']);
+            $notifypub = \Xmf\Request::getInt('notifypub', 0, POST);
+            $newFaqObj->setVar('notifypub', $notifypub);
+
+            // Setting the status of the FAQ
+            if (1 == $helper->getConfig('autoapprove_request')) {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_OPENED);
+            } else {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_ASKED);
+            }
+
+            // Storing the FAQ object in the database
+            if (!$newFaqObj->store()) {
+                redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . Smartfaq\Utility::formatErrors($newFaqObj->getErrors()));
             }
-            // Send notifications
-            $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_SUBMITTED]);
 
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
-        }
+            // Get the cateopry object related to that FAQ
+            // If autoapprove_requested
+            if (1 == $helper->getConfig('autoapprove_request')) {
+                // We do not not subscribe user to notification on publish since we publish it right away
+
+                // Send notifications
+                $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_PUBLISHED]);
+
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
+            } else {
+                // Subscribe the user to On Published notification, if requested
+                if (1 == $notifypub) {
+                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    $notificationHandler = xoops_getHandler('notification');
+                    $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
+                }
+                // Send notifications
+                $newFaqObj->sendNotifications([Constants::SF_NOT_QUESTION_SUBMITTED]);
+
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
+            }
 
-        //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
-        redirect_header('index.php', 2, $redirect_msg);
-        break;
+            //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
+            redirect_header('index.php', 2, $redirect_msg);
+            break;
 
-    case 'form':
-    default:
+        case 'form':
+        default:
 
-        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'));
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
 
-        $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($helper->getConfig('requestintromsg')));
+            $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($helper->getConfig('requestintromsg')));
 
-        require_once __DIR__ . '/include/request.inc.php';
+            require_once __DIR__ . '/include/request.inc.php';
 
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
+            $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
 
-        require_once __DIR__ . '/include/request.inc.php';
+            require_once __DIR__ . '/include/request.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+            require_once XOOPS_ROOT_PATH . '/footer.php';
 
-        break;
+            break;
 }