mambax7 / smartfaq

admin/menu.php

Spacing +12 added lines, -12 removed lines

@@ -9,17 +9,17 @@ 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 $path = dirname(dirname(dirname(__DIR__)));
-include_once $path . '/mainfile.php';
+include_once $path.'/mainfile.php';
 
 $dirname         = basename(dirname(__DIR__));
 $moduleHandler   = xoops_getHandler('module');
 $module          = $moduleHandler->getByDirname($dirname);
 $pathIcon32      = $module->getInfo('icons32');
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
-$pathLanguage    = $path . $pathModuleAdmin;
+$pathLanguage    = $path.$pathModuleAdmin;
 
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+if (!file_exists($fileinc = $pathLanguage.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
+    $fileinc = $pathLanguage.'/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -28,36 +28,36 @@ 
 $i                      = 0;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_HOME;
 $adminmenu[$i]['link']  = 'admin/index.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU1;
 $adminmenu[$i]['link']  = 'admin/main.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/manage.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/manage.png';
 
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU2;
 $adminmenu[$i]['link']  = 'admin/category.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/category.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/category.png';
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU3;
 $adminmenu[$i]['link']  = 'admin/faq.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/search.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/search.png';
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU4;
 $adminmenu[$i]['link']  = 'admin/question.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/faq.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/faq.png';
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU5;
 $adminmenu[$i]['link']  = 'admin/permissions.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/permissions.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/permissions.png';
 ++$i;
 $adminmenu[$i]['title'] = _MI_SF_ADMENU8;
 $adminmenu[$i]['link']  = 'admin/import.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/download.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/download.png';
 ++$i;
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 $adminmenu[$i]['link']  = 'admin/about.php';
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';
 //++$i;
 //$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
 //$adminmenu[$i]["link"]  = "admin/about2.php";

admin/admin_header2.php

Spacing +11 added lines, -11 removed lines

@@ -6,17 +6,17 @@
  * Licence: GNU
  */
 
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/kernel/module.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+include_once XOOPS_ROOT_PATH.'/kernel/module.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/faq.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/answer.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/faq.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/answer.php';
 
 $myts = MyTextSanitizer::getInstance();

admin/docbook_export.php

Spacing +14 added lines, -14 removed lines

@@ -6,16 +6,16 @@ 
  * Licence: GNU
  */
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 
-$op = 'go';//'start';
+$op = 'go'; //'start';
 
 if (isset($HTTP_POST_VARS['op']) && ($HTTP_POST_VARS['op'] === 'go')) {
     $op = $HTTP_POST_VARS['op'];
 }
 
 if ($op === 'start') {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     xoops_cp_header();
 
@@ -44,41 +44,41 @@ 
 
     echo "  <title>{module title}</title>\r\n";
 
-    $resultC = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_categories'));
+    $resultC = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_categories'));
     while ($arrC = $xoopsDB->fetchArray($resultC)) {
         extract($arrC, EXTR_PREFIX_ALL, 'c');
 
         echo "  <qandadiv ID=\"c$c_categoryid\" Revision=\"$c_created\">\r\n";
-        echo '    <title>' . encodeText($c_name) . "</title>\r\n";
-        echo '    <para>' . encodeText($c_description) . "</para>\r\n";
+        echo '    <title>'.encodeText($c_name)."</title>\r\n";
+        echo '    <para>'.encodeText($c_description)."</para>\r\n";
 
-        $resultQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_faq') . " where categoryid=$c_categoryid");
+        $resultQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_faq')." where categoryid=$c_categoryid");
         while ($arrQ = $xoopsDB->fetchArray($resultQ)) {
             extract($arrQ, EXTR_PREFIX_ALL, 'q');
 
-            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"" . getUserFullName($q_uid) . "\">\r\n";
+            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"".getUserFullName($q_uid)."\">\r\n";
             echo "      <question>\r\n";
-            echo '        <para>' . encodeText($q_question) . "</para>\r\n";
+            echo '        <para>'.encodeText($q_question)."</para>\r\n";
             if (!empty($q_howdoi)) {
                 echo "        <note Conformance=\"howdoi\">\r\n";
                 echo "          <title>{'How do I' from language file}</title>\r\n";
-                echo '          <para>' . encodeText($q_howdoi) . "</para>\r\n";
+                echo '          <para>'.encodeText($q_howdoi)."</para>\r\n";
                 echo "        </note>\r\n";
             }
             if (!empty($q_diduno)) {
                 echo "        <note Conformance=\"diduno\">\r\n";
                 echo "          <title>{'Did you know' from language file}</title>\r\n";
-                echo '          <para>' . encodeText($q_diduno) . "</para>\r\n";
+                echo '          <para>'.encodeText($q_diduno)."</para>\r\n";
                 echo "        </note>\r\n";
             }
             echo "      </question>\r\n";
 
-            $resultA = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_answers') . " where answerid=$q_answerid");
+            $resultA = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_answers')." where answerid=$q_answerid");
             while ($arrA = $xoopsDB->fetchArray($resultA)) {
                 extract($arrA, EXTR_PREFIX_ALL, 'a');
 
-                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"" . getUserFullName($a_uid) . "\">\r\n";
-                echo '        <para>' . encodeText($a_answer) . "</para>\r\n";
+                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"".getUserFullName($a_uid)."\">\r\n";
+                echo '        <para>'.encodeText($a_answer)."</para>\r\n";
                 echo "      </answer>\r\n";
             }
             mysqli_free_result($resultA);

admin/main.php

Spacing +78 added lines, -78 removed lines

@@ -6,16 +6,16 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 $myts = MyTextSanitizer::getInstance();
 
-$faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : 0;
+$faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : 0;
 
 //$pick = isset($_GET['pick'])? (int)($_GET['pick']) : 0;
 //$pick = isset($_POST['pick'])? (int)($_POST['pick']) : $_GET['pick'];
 
-$statussel = isset($_GET['statussel']) ? (int)$_GET['statussel'] : _SF_STATUS_ALL;
-$statussel = isset($_POST['statussel']) ? (int)$_POST['statussel'] : $statussel;
+$statussel = isset($_GET['statussel']) ? (int) $_GET['statussel'] : _SF_STATUS_ALL;
+$statussel = isset($_POST['statussel']) ? (int) $_POST['statussel'] : $statussel;
 
 $sortsel = isset($_GET['sortsel']) ? $_GET['sortsel'] : 'faqid';
 $sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $sortsel;
@@ -32,23 +32,23 @@ 
     global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
     echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
     echo '<tr>';
-    echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_FAQID . '</b></td>';
-    echo "<th width='20%' class='bg3' align='center'><b>" . _AM_SF_FAQCAT . '</b></td>';
-    echo "<th class='bg3' align='center'><b>" . _AM_SF_QUESTION . '</b></td>';
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_FAQID.'</b></td>';
+    echo "<th width='20%' class='bg3' align='center'><b>"._AM_SF_FAQCAT.'</b></td>';
+    echo "<th class='bg3' align='center'><b>"._AM_SF_QUESTION.'</b></td>';
 
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
 
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_STATUS . '</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_STATUS.'</b></td>';
     //echo "<td width='30' class='bg3' align='center'><b>" . _AM_SF_ANSWERS . "</b></td>";
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
     echo '</tr>';
 }
 
 // Code for the page
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
 // Creating the category handler object
 $categoryHandler = sf_gethandler('category');
@@ -56,7 +56,7 @@ 
 // Creating the FAQ handler object
 $faqHandler = sf_gethandler('faq');
 
-$startentry = isset($_GET['startentry']) ? (int)$_GET['startentry'] : 0;
+$startentry = isset($_GET['startentry']) ? (int) $_GET['startentry'] : 0;
 
 $indexAdmin = new ModuleAdmin();
 xoops_cp_header();
@@ -129,9 +129,9 @@ 
 
 // Construction of lower table
 sf_collapsableBar('bottomtable', 'bottomtableicon');
-echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_ALLFAQS . '</h3>';
+echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_ALLFAQS.'</h3>';
 echo "<div id='bottomtable'>";
-echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">" . _AM_SF_ALLFAQSMSG . '</span>';
+echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">"._AM_SF_ALLFAQSMSG.'</span>';
 
 $showingtxt    = '';
 $selectedtxt   = '';
@@ -200,98 +200,98 @@ 
     case _SF_STATUS_ASKED:
         $selectedtxt1        = "selected='selected'";
         $caption             = _AM_SF_ASKED;
-        $cond                = ' WHERE status = ' . _SF_STATUS_ASKED . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_ASKED.' ';
         $status_explaination = _AM_SF_ASKED_EXP;
         break;
 
     case _SF_STATUS_OPENED:
         $selectedtxt2        = "selected='selected'";
         $caption             = _AM_SF_OPENED;
-        $cond                = ' WHERE status = ' . _SF_STATUS_OPENED . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_OPENED.' ';
         $status_explaination = _AM_SF_OPENED_EXP;
         break;
 
     case _SF_STATUS_ANSWERED:
         $selectedtxt3        = "selected='selected'";
         $caption             = _AM_SF_ANSWERED;
-        $cond                = ' WHERE status = ' . _SF_STATUS_ANSWERED . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_ANSWERED.' ';
         $status_explaination = _AM_SF_ANSWERED_EXP;
         break;
 
     case _SF_STATUS_SUBMITTED:
         $selectedtxt4        = "selected='selected'";
         $caption             = _AM_SF_SUBMITTED;
-        $cond                = ' WHERE status = ' . _SF_STATUS_SUBMITTED . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_SUBMITTED.' ';
         $status_explaination = _AM_SF_SUBMITTED_EXP;
         break;
 
     case _SF_STATUS_PUBLISHED:
         $selectedtxt5        = "selected='selected'";
         $caption             = _AM_SF_PUBLISHED;
-        $cond                = ' WHERE status = ' . _SF_STATUS_PUBLISHED . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_PUBLISHED.' ';
         $status_explaination = _AM_SF_PUBLISHED_EXP;
         break;
 
     case _SF_STATUS_NEW_ANSWER:
         $selectedtxt6        = "selected='selected'";
         $caption             = _AM_SF_NEW_ANSWER;
-        $cond                = ' WHERE status = ' . _SF_STATUS_NEW_ANSWER . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_NEW_ANSWER.' ';
         $status_explaination = _AM_SF_NEW_ANSWER_EXP;
         break;
 
     case _SF_STATUS_OFFLINE:
         $selectedtxt7        = "selected='selected'";
         $caption             = _AM_SF_OFFLINE;
-        $cond                = ' WHERE status = ' . _SF_STATUS_OFFLINE . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_OFFLINE.' ';
         $status_explaination = _AM_SF_OFFLINE_EXP;
         break;
 
     case _SF_STATUS_REJECTED_QUESTION:
         $selectedtxt8        = "selected='selected'";
         $caption             = _AM_SF_REJECTED_QUESTION;
-        $cond                = ' WHERE status = ' . _SF_STATUS_REJECTED_QUESTION . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_REJECTED_QUESTION.' ';
         $status_explaination = _AM_SF_REJECTED_QUESTION_EXP;
         break;
 
     case _SF_STATUS_REJECTED_SMARTFAQ:
         $selectedtxt9        = "selected='selected'";
         $caption             = _AM_SF_REJECTED_SMARTFAQ;
-        $cond                = ' WHERE status = ' . _SF_STATUS_REJECTED_SMARTFAQ . ' ';
+        $cond                = ' WHERE status = '._SF_STATUS_REJECTED_SMARTFAQ.' ';
         $status_explaination = _AM_SF_REJECTED_SMARTFAQ_EXP;
         break;
 }
 
 /* -- Code to show selected terms -- */
-echo "<form name='pick' id='pick' action='" . $_SERVER['PHP_SELF'] . "' method='POST' style='margin: 0;'>";
+echo "<form name='pick' id='pick' action='".$_SERVER['PHP_SELF']."' method='POST' style='margin: 0;'>";
 
 echo "
     <table width='100%' cellspacing='1' cellpadding='2' border='0' style='border-left: 1px solid silver; border-top: 1px solid silver; border-right: 1px solid silver;'>
         <tr>
-            <td><span style='font-weight: bold; font-size: 12px; font-variant: small-caps;'>" . _AM_SF_SHOWING . ' ' . $caption . "</span></td>
-            <td align='right'>" . _AM_SF_SELECT_SORT . "
+            <td><span style='font-weight: bold; font-size: 12px; font-variant: small-caps;'>" . _AM_SF_SHOWING.' '.$caption."</span></td>
+            <td align='right'>" . _AM_SF_SELECT_SORT."
                 <select name='sortsel' onchange='submit()'>
-                    <option value='faq.faqid' $sorttxtfaqid>" . _AM_SF_ID . "</option>
-                    <option value='category.name' $sorttxtcategory>" . _AM_SF_CATEGORY . "</option>
-                    <option value='faq.question' $sorttxtquestion>" . _AM_SF_QUESTION . "</option>
-                    <option value='faq.datesub' $sorttxtcreated>" . _AM_SF_CREATED . "</option>
-                    <option value='faq.weight' $sorttxtweight>" . _AM_SF_WEIGHT . "</option>
+                    <option value='faq.faqid' $sorttxtfaqid>"._AM_SF_ID."</option>
+                    <option value='category.name' $sorttxtcategory>"._AM_SF_CATEGORY."</option>
+                    <option value='faq.question' $sorttxtquestion>"._AM_SF_QUESTION."</option>
+                    <option value='faq.datesub' $sorttxtcreated>"._AM_SF_CREATED."</option>
+                    <option value='faq.weight' $sorttxtweight>"._AM_SF_WEIGHT."</option>
                 </select>
                 <select name='ordersel' onchange='submit()'>
-                    <option value='ASC' $ordertxtasc>" . _AM_SF_ASC . "</option>
-                    <option value='DESC' $ordertxtdesc>" . _AM_SF_DESC . '</option>
+                    <option value='ASC' $ordertxtasc>"._AM_SF_ASC."</option>
+                    <option value='DESC' $ordertxtdesc>"._AM_SF_DESC.'</option>
                 </select>
-            ' . _AM_SF_SELECT_STATUS . " :
+            ' . _AM_SF_SELECT_STATUS." :
                 <select name='statussel' onchange='submit()'>
-                    <option value='0' $selectedtxt0>" . _AM_SF_ALL . " [$totalfaqs]</option>
-                    <option value='1' $selectedtxt1>" . _AM_SF_ASKED . " [$totalasked]</option>
-                    <option value='2' $selectedtxt2>" . _AM_SF_OPENED . " [$totalopened]</option>
-                    <option value='3' $selectedtxt3>" . _AM_SF_ANSWERED . " [$totalanswered]</option>
-                    <option value='4' $selectedtxt4>" . _AM_SF_SUBMITTED . " [$totalsubmitted]</option>
-                    <option value='5' $selectedtxt5>" . _AM_SF_PUBLISHED . " [$totalpublished]</option>
-                    <option value='6' $selectedtxt6>" . _AM_SF_NEWANSWER . " [$totalnewanswers]</option>
-                    <option value='7' $selectedtxt7>" . _AM_SF_OFFLINE . " [$totaloffline]</option>
-                    <option value='8' $selectedtxt8>" . _AM_SF_REJECTED_QUESTION . " [$totalrejectedquestion]</option>
-                    <option value='9' $selectedtxt9>" . _AM_SF_REJECTED_SMARTFAQ . " [$totalrejectedsmartfaq]</option>
+                    <option value='0' $selectedtxt0>"._AM_SF_ALL." [$totalfaqs]</option>
+                    <option value='1' $selectedtxt1>"._AM_SF_ASKED." [$totalasked]</option>
+                    <option value='2' $selectedtxt2>"._AM_SF_OPENED." [$totalopened]</option>
+                    <option value='3' $selectedtxt3>"._AM_SF_ANSWERED." [$totalanswered]</option>
+                    <option value='4' $selectedtxt4>"._AM_SF_SUBMITTED." [$totalsubmitted]</option>
+                    <option value='5' $selectedtxt5>"._AM_SF_PUBLISHED." [$totalpublished]</option>
+                    <option value='6' $selectedtxt6>"._AM_SF_NEWANSWER." [$totalnewanswers]</option>
+                    <option value='7' $selectedtxt7>"._AM_SF_OFFLINE." [$totaloffline]</option>
+                    <option value='8' $selectedtxt8>"._AM_SF_REJECTED_QUESTION." [$totalrejectedquestion]</option>
+                    <option value='9' $selectedtxt9>"._AM_SF_REJECTED_SMARTFAQ." [$totalrejectedsmartfaq]</option>
                 </select>
             </td>
         </tr>
@@ -319,7 +319,7 @@ 
 
     foreach (array_keys($faqsObj) as $i) {
         // Creating the category object to which this faq is linked
-        $categoryObj =& $allcats[$faqsObj[$i]->categoryid()];
+        $categoryObj = & $allcats[$faqsObj[$i]->categoryid()];
         global $pathIcon16, $smartModuleConfig;
 
         //$answers = $answer_arr[$i];
@@ -329,65 +329,65 @@ 
         switch ($faqsObj[$i]->status()) {
             case _SF_STATUS_ASKED:
                 $statustxt = _AM_SF_ASKED;
-                $approve   = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/on.png' . "'  title='" . _AM_SF_QUESTION_MODERATE . "'  alt='" . _AM_SF_QUESTION_MODERATE . "' /></a>&nbsp;";
+                $approve   = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/on.png'."'  title='"._AM_SF_QUESTION_MODERATE."'  alt='"._AM_SF_QUESTION_MODERATE."' /></a>&nbsp;";
                 $modify    = '';
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "' /></a>";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."' /></a>";
                 break;
 
             case _SF_STATUS_OPENED:
                 $statustxt = _AM_SF_OPENED;
                 $approve   = '';
-                $modify    = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_QUESTION_EDIT . "' alt='" . _AM_SF_QUESTION_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "' /></a>";
+                $modify    = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_QUESTION_EDIT."' alt='"._AM_SF_QUESTION_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."' /></a>";
                 break;
 
             case _SF_STATUS_ANSWERED:
                 $statustxt = _AM_SF_ANSWERED;
-                $approve   = "<a href='answer.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_ANSWERED_MODERATE . "' alt='" . _AM_SF_ANSWERED_MODERATE . "' /></a>&nbsp;";
+                $approve   = "<a href='answer.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_ANSWERED_MODERATE."' alt='"._AM_SF_ANSWERED_MODERATE."' /></a>&nbsp;";
                 $modify    = '';
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "' /></a>";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."' /></a>";
                 break;
 
             case _SF_STATUS_SUBMITTED:
                 $statustxt = _AM_SF_SUBMITTED;
-                $approve   = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_SUBMISSION_MODERATE . "' alt='" . _AM_SF_SUBMISSION_MODERATE . "' /></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "' /></a>";
+                $approve   = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_SUBMISSION_MODERATE."' alt='"._AM_SF_SUBMISSION_MODERATE."' /></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."' /></a>";
                 $modify    = '';
                 break;
 
             case _SF_STATUS_PUBLISHED:
                 $statustxt = _AM_SF_PUBLISHED;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "' /></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."' /></a>";
                 break;
 
             case _SF_STATUS_NEW_ANSWER:
                 $statustxt = _AM_SF_NEWANSWER;
-                $approve   = "<a href='answer.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "' /></a>";
+                $approve   = "<a href='answer.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."' /></a>";
                 $modify    = '';
                 break;
 
             case _SF_STATUS_OFFLINE:
                 $statustxt = _AM_SF_OFFLINE;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "' /></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."' /></a>";
                 break;
 
             case _SF_STATUS_REJECTED_QUESTION:
                 $statustxt = _AM_SF_REJECTED_QUESTION;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_REJECTED_EDIT . "' alt='" . _AM_SF_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "' /></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_REJECTED_EDIT."' alt='"._AM_SF_REJECTED_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."' /></a>";
                 break;
 
             case _SF_STATUS_REJECTED_SMARTFAQ:
                 $statustxt = _AM_SF_REJECTED_SMARTFAQ;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_REJECTED_EDIT . "' alt='" . _AM_SF_REJECTED_EDIT . "' /></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "' /></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_REJECTED_EDIT."' alt='"._AM_SF_REJECTED_EDIT."' /></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."' /></a>";
                 break;
 
             case 'default':
@@ -401,14 +401,14 @@ 
         //$modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqid . "'><img src='" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/edit.gif' alt='" . _AM_SF_EDITART . "' /></a>&nbsp;";
 
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
-        echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
-        echo "<td class='even' align='left'>" . $faqsObj[$i]->question(100) . '</td>';
+        echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
+        echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
+        echo "<td class='even' align='left'>".$faqsObj[$i]->question(100).'</td>';
 
         //mb---------------------------------------
         //adding name of the Question Submitter
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
-        echo "<td class='even' align='center'>" . $requester . '</td>';
+        echo "<td class='even' align='center'>".$requester.'</td>';
 
         //adding name of the Answer Submitter
 
@@ -431,20 +431,20 @@ 
         } else {
             $answerSubmitter = '--------';
         }
-        echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
+        echo "<td class='even' align='center'>".$answerSubmitter.'</td>';
 
         //mb---------------------------------------
 
-        echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
-        echo "<td class='even' align='center'>" . $statustxt . '</td>';
+        echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
+        echo "<td class='even' align='center'>".$statustxt.'</td>';
         //echo "<td class='even' align='center'>" . $answers . "</td>";
-        echo "<td class='even' align='center'> " . $approve . $modify . $delete . '</td>';
+        echo "<td class='even' align='center'> ".$approve.$modify.$delete.'</td>';
         echo '</tr>';
     }
 } else {
     // that is, $numrows = 0, there's no entries yet
     echo '<tr>';
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOFAQSSEL . '</td>';
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQSSEL.'</td>';
     echo '</tr>';
 }
 echo "</table>\n";
@@ -452,9 +452,9 @@ 
 $pagenav = new XoopsPageNav($numrows, $xoopsModuleConfig['perpage'], $startentry, 'startentry', "statussel=$statussel&amp;sortsel=$sortsel&amp;ordersel=$ordersel");
 
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderImageNav() . '</div>';
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderImageNav().'</div>';
 } else {
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderNav() . '</div>';
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderNav().'</div>';
 }
 // ENDs code to show active entries
 echo '</div>';
@@ -462,4 +462,4 @@ 
 echo '</div>';
 echo '</div>';
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/import.php

Spacing +9 added lines, -9 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $op = 'none';
 
@@ -23,7 +23,7 @@ 
     case 'importExecute':
 
         $importfile      = isset($_POST['importfile']) ? $_POST['importfile'] : 'nonselected';
-        $importfile_path = XOOPS_ROOT_PATH . '/modules/smartfaq/admin/' . $importfile . '.php';
+        $importfile_path = XOOPS_ROOT_PATH.'/modules/smartfaq/admin/'.$importfile.'.php';
         if (!file_exists($importfile_path)) {
             $errs[] = sprintf(_AM_SF_IMPORT_FILE_NOT_FOUND, $importfile_path);
             $error  = true;
@@ -31,7 +31,7 @@ 
             include_once($importfile_path);
         }
         foreach ($msgs as $m) {
-            echo $m . '<br />';
+            echo $m.'<br />';
         }
         echo '<br />';
         $endMsg = _AM_SF_IMPORT_SUCCESS;
@@ -41,7 +41,7 @@ 
 
         echo $endMsg;
         echo '<br /><br />';
-        echo "<a href='import.php'>" . _AM_SF_IMPORT_BACK . '</a>';
+        echo "<a href='import.php'>"._AM_SF_IMPORT_BACK.'</a>';
         echo '<br /><br />';
         break;
 
@@ -53,13 +53,13 @@ 
         xoops_cp_header();
 
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_IMPORT_TITLE . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_IMPORT_TITLE.'</h3>';
         echo "<div id='bottomtable'>";
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_INFO . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_INFO.'</span>';
 
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts;
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         $moduleHandler = xoops_getHandler('module');
         if ($moduleHandler->getByDirname('xoopsfaq')) {
@@ -98,7 +98,7 @@ 
             $sform->display();
             unset($hidden);
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_MODULE . '</span>';
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_MODULE.'</span>';
         }
 
         // End of collapsable bar
@@ -107,4 +107,4 @@ 
         break;
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/category.php

Switch Indentation +115 added lines, -115 removed lines

@@ -215,144 +215,144 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
-        $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
-        $indexAdmin = new ModuleAdmin();
-        xoops_cp_header();
+        case 'mod':
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
+            $indexAdmin = new ModuleAdmin();
+            xoops_cp_header();
 
-        echo $indexAdmin->addNavigation(basename(__FILE__));
-        editcat(true, $categoryid);
-        break;
+            echo $indexAdmin->addNavigation(basename(__FILE__));
+            editcat(true, $categoryid);
+            break;
 
-    case 'addcategory':
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
+        case 'addcategory':
+            global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
 
-        if ($categoryid != 0) {
-            $categoryObj = new sfCategory($categoryid);
-        } else {
-            $categoryObj = $categoryHandler->create();
-        }
+            if ($categoryid != 0) {
+                $categoryObj = new sfCategory($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 = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+            $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
+            $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
+            $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 . sf_formatErrors($categoryObj->getErrors()));
-        }
-        // TODO : put this function in the category class
-        sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
-        //sf_saveCategory_Permissions($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 . sf_formatErrors($categoryObj->getErrors()));
+            }
             // TODO : put this function in the category class
-            sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
-        }
+            sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
+            //sf_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
 
-        redirect_header($redirect_to, 2, $redirect_msg);
-        break;
+            if ($applyall) {
+                // TODO : put this function in the category class
+                sf_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 = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+            $module_id    = $xoopsModule->getVar('mid');
+            $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryObj = new sfCategory($categoryid);
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
 
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
-        $name    = isset($_POST['name']) ? $_POST['name'] : '';
+            $categoryObj = new sfCategory($categoryid);
 
-        if ($confirm) {
-            if (!$categoryHandler->delete($categoryObj)) {
-                redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+            $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
+            $name    = isset($_POST['name']) ? $_POST['name'] : '';
+
+            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 = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+                xoops_cp_header();
+                xoops_confirm(array('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 = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            exit();
+            break;
+
+        case 'cancel':
+            redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
+            break;
+        case 'default':
+        default:
+            $indexAdmin = new ModuleAdmin();
             xoops_cp_header();
-            xoops_confirm(array('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:
-        $indexAdmin = new ModuleAdmin();
-        xoops_cp_header();
-
-        echo $indexAdmin->addNavigation(basename(__FILE__));
-        echo "<br />\n";
 
-        // Creating the objects for top categories
-        $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
-
-        sf_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 {
+            echo $indexAdmin->addNavigation(basename(__FILE__));
+            echo "<br />\n";
+
+            // Creating the objects for top categories
+            $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
+
+            sf_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";
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['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";
+            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
+            echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+            echo '</div>';
 
-        editcat(false);
+            editcat(false);
 
-        break;
+            break;
 }
 
 include_once __DIR__ . '/admin_footer.php';

Spacing +34 added lines, -34 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 // Creating the category handler object
 $categoryHandler = sf_gethandler('category');
@@ -21,7 +21,7 @@ 
 }
 
 // Where do we start?
-$startcategory = isset($_GET['startcategory']) ? (int)$_GET['startcategory'] : 0;
+$startcategory = isset($_GET['startcategory']) ? (int) $_GET['startcategory'] : 0;
 
 /**
  * @param     $categoryObj
@@ -33,11 +33,11 @@ 
     $description = $categoryObj->description();
     if (!XOOPS_USE_MULTIBYTES) {
         if (strlen($description) >= 100) {
-            $description = substr($description, 0, 100 - 1) . '...';
+            $description = substr($description, 0, 100-1).'...';
         }
     }
-    $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITCOL . "' alt='" . _AM_SF_EDITCOL . "' /></a>";
-    $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETECOL . "' alt='" . _AM_SF_DELETECOL . "' /></a>";
+    $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITCOL."' alt='"._AM_SF_EDITCOL."' /></a>";
+    $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETECOL."' alt='"._AM_SF_DELETECOL."' /></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -45,9 +45,9 @@ 
     }
 
     echo '<tr>';
-    echo "<td class='even' align='lefet'>" . $spaces . "<a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/category.php?categoryid=' . $categoryObj->categoryid() . "'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/icon/subcat.gif' alt='' />&nbsp;" . $categoryObj->name() . '</a></td>';
-    echo "<td class='even' align='left'>" . $description . '</td>';
-    echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
+    echo "<td class='even' align='lefet'>".$spaces."<a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/category.php?categoryid='.$categoryObj->categoryid()."'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/icon/subcat.gif' alt='' />&nbsp;".$categoryObj->name().'</a></td>';
+    echo "<td class='even' align='left'>".$description.'</td>';
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo '</tr>';
     $subCategoriesObj = $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
@@ -68,9 +68,9 @@ 
 {
     //$moderators = array(); // just to define the variable
     //$allmods = array();
-    $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+    $startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the faq handler object
     $faqHandler = sf_gethandler('faq');
@@ -92,13 +92,13 @@ 
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
         }
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
         echo "<div id='bottomtable'>";
     } else {
         $categoryObj = $categoryHandler->create();
         echo "<br />\n";
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
         echo "<div id='bottomtable'>";
     }
     // Start category form
@@ -143,7 +143,7 @@ 
     }
     $sform->addElement($groups_read_checkbox);
     // Apply permissions on all faqs
-    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
     $sform->addElement($addapplyall_radio);
     // MODERATORS
     //$moderators_tray = new XoopsFormElementTray(_AM_SF_MODERATORS_DEF, '');
@@ -208,7 +208,7 @@ 
     echo '</div>';
 
     if ($categoryid) {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
     }
 
     unset($hidden);
@@ -216,7 +216,7 @@ 
 
 switch ($op) {
     case 'mod':
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
         $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
         $indexAdmin = new ModuleAdmin();
         xoops_cp_header();
@@ -228,7 +228,7 @@ 
     case 'addcategory':
         global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
 
         if ($categoryid != 0) {
             $categoryObj = new sfCategory($categoryid);
@@ -239,9 +239,9 @@ 
         //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 = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int) $_POST['parentid'] : 0);
+        $applyall = isset($_POST['applyall']) ? (int) $_POST['applyall'] : 0;
+        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int) $_POST['weight'] : 1);
 
         // Groups and permissions
         if (isset($_POST['groups_read'])) {
@@ -264,7 +264,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.sf_formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -284,8 +284,8 @@ 
         $module_id    = $xoopsModule->getVar('mid');
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : $categoryid;
 
         $categoryObj = new sfCategory($categoryid);
 
@@ -299,9 +299,9 @@ 
             redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
         } else {
             // no confirm: show deletion condition
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
             xoops_cp_header();
-            xoops_confirm(array('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_confirm(array('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();
@@ -322,16 +322,16 @@ 
         $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
 
         sf_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 "<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 "<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 "<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) {
@@ -340,14 +340,14 @@ 
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
             echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '</div>';
 
         editcat(false);
@@ -355,4 +355,4 @@ 
         break;
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

admin/xoopsfaq.php

Spacing +25 added lines, -25 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'XoopsFAQ';
 $scriptname           = 'xoopsfaq.php';
@@ -24,33 +24,33 @@ 
 
 if ($op === 'start') {
     xoops_cp_header();
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('xoopsfaq_categories'));
+    $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('xoopsfaq_categories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_CATEGORY.'</span>';
     } else {
-        include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('xoopsfaq_contents'));
+        $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('xoopsfaq_contents'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if ($totalFAQ == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ) . '</span>';
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ).'</span>';
 
-            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL . '/modules/smartfaq/admin/' . $scriptname);
+            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL.'/modules/smartfaq/admin/'.$scriptname);
 
             // Categories to be imported
             $cat_cbox = new XoopsFormCheckBox(sprintf(_AM_SF_IMPORT_CATEGORIES, $importFromModuleName), 'import_category', -1);
-            $result   = $xoopsDB->query('select c.category_id, c.category_title, count(q.contents_id) from ' . $xoopsDB->prefix('xoopsfaq_categories') . ' as c, ' . $xoopsDB->prefix('xoopsfaq_contents') . ' as q where c.category_id=q.category_id group by c.category_id order by category_order');
+            $result   = $xoopsDB->query('select c.category_id, c.category_title, count(q.contents_id) from '.$xoopsDB->prefix('xoopsfaq_categories').' as c, '.$xoopsDB->prefix('xoopsfaq_contents').' as q where c.category_id=q.category_id group by c.category_id order by category_order');
 
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
@@ -65,7 +65,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -78,7 +78,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = array();
@@ -102,7 +102,7 @@ 
 }
 
 if ($op === 'go') {
-    include_once __DIR__ . '/admin_header.php';
+    include_once __DIR__.'/admin_header.php';
 
     $import_category = (isset($_POST['import_category']) ? $_POST['import_category'] : null);
     if (!$import_category) {
@@ -112,9 +112,9 @@ 
     xoops_cp_header();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_RESULT . '</span>';
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -142,7 +142,7 @@ 
     echo "Can Comment: $cancomment<br/>";
     echo "Auto aprove: $autoaprove<br/>";*/
 
-    $resultCat = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_categories') . " where category_id in ($import_category_list) order by category_order");
+    $resultCat = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_categories')." where category_id in ($import_category_list) order by category_order");
 
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
         extract($arrCat, EXTR_PREFIX_ALL, 'xcat');
@@ -156,7 +156,7 @@ 
         $categoryObj->setVar('name', $xcat_category_title);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br/>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br/>';
             continue;
         }
 
@@ -164,9 +164,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
 
-        $resultFAQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_contents') . " where category_id=$xcat_category_id order by contents_order");
+        $resultFAQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_contents')." where category_id=$xcat_category_id order by contents_order");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'xfaq');
 
@@ -194,7 +194,7 @@ 
             $faqObj->setVar('cancomment', $cancomment);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title) . '<br/>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title).'<br/>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -203,10 +203,10 @@ 
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
 
                 if (!$answerObj->store()) {
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br/>';
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br/>';
                     continue;
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br />';
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br />';
                     ++$cnt_imported_faq;
                 }
             }
@@ -216,8 +216,8 @@ 
     }
 
     echo 'Done.<br/>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br/>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br/>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br/>';
 
     exit();
 }

admin/wffaq.php

Spacing +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
  *
  */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'WF-FAQ';
 $scriptname           = 'wffaq.php';
@@ -22,33 +22,33 @@ 
 }
 
 if ($op === 'start') {
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     xoops_cp_header();
-    $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('faqcategories'));
+    $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('faqcategories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
 
     if ($totalCat == 0) {
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_CATEGORY.'</span>';
     } else {
-        include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('faqtopics'));
+        $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('faqtopics'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if ($totalFAQ == 0) {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
         } else {
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ) . '</span>';
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ).'</span>';
 
-            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL . '/modules/smartfaq/admin/' . $scriptname);
+            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL.'/modules/smartfaq/admin/'.$scriptname);
 
             // Categories to be imported
             $cat_cbox = new XoopsFormCheckBox(sprintf(_AM_SF_IMPORT_CATEGORIES, $importFromModuleName), 'import_category', -1);
-            $result   = $xoopsDB->query('select c.catID, c.name, count(t.topicID) from ' . $xoopsDB->prefix('faqcategories') . ' as c, ' . $xoopsDB->prefix('faqtopics') . ' as t where c.catID=t.catID group by t.catID order by c.weight');
+            $result   = $xoopsDB->query('select c.catID, c.name, count(t.topicID) from '.$xoopsDB->prefix('faqcategories').' as c, '.$xoopsDB->prefix('faqtopics').' as t where c.catID=t.catID group by t.catID order by c.weight');
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
             }
@@ -62,7 +62,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -75,7 +75,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = array();
             $groups_checkbox = new XoopsFormCheckBox(_AM_SF_IMPORT_PERMISSIONS, 'groups_read');
@@ -104,13 +104,13 @@ 
         redirect_header($scriptname, 2, _AM_SF_NOCATSELECTED);
     }
 
-    include_once __DIR__ . '/admin_header.php';
+    include_once __DIR__.'/admin_header.php';
     xoops_cp_header();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_RESULT . '</span>';
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -138,7 +138,7 @@ 
     echo "Can Comment: $cancomment<br/>";
     echo "Auto aprove: $autoaprove<br/>";*/
 
-    $resultCat = $xoopsDB->query('select * from ' . $xoopsDB->prefix('faqcategories') . " where catID in ($import_category_list) order by weight");
+    $resultCat = $xoopsDB->query('select * from '.$xoopsDB->prefix('faqcategories')." where catID in ($import_category_list) order by weight");
 
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
         extract($arrCat, EXTR_PREFIX_ALL, 'wfc');
@@ -153,7 +153,7 @@ 
         $categoryObj->setVar('description', $wfc_description);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br/>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br/>';
             continue;
         }
 
@@ -161,9 +161,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name)."<br\>";
 
-        $resultFAQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('faqtopics') . " where catID=$wfc_catID order by weight");
+        $resultFAQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('faqtopics')." where catID=$wfc_catID order by weight");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'wft');
 
@@ -195,7 +195,7 @@ 
             $faqObj->setVar('exacturl', 0);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $wft_question) . '<br/>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $wft_question).'<br/>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -204,10 +204,10 @@ 
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
 
                 if (!$answerObj->store()) {
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br/>';
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br/>';
                     continue;
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br />';
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br />';
                     ++$cnt_imported_faq;
                 }
             }
@@ -217,8 +217,8 @@ 
     }
 
     echo 'Done.<br/>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br/>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br/>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br/>';
 
     exit();
 }

submit.php

Switch Indentation +133 added lines, -133 removed lines

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

Spacing +19 added lines, -19 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -79,12 +79,12 @@ 
         global $xoopsUser, $myts;
 
         $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
-        include_once(XOOPS_ROOT_PATH . '/header.php');
-        include_once __DIR__ . '/footer.php';
+        include_once(XOOPS_ROOT_PATH.'/header.php');
+        include_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
         $faq['answer']       = $answerObj->answer();
@@ -97,11 +97,11 @@ 
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
         include_once 'include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
 
         exit();
         break;
@@ -165,14 +165,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]);
                 }
             }
@@ -180,11 +180,11 @@ 
         $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';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
             $uploaddir   = XOOPS_CACHE_PATH;
 
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int) $maxfilesize, (int) $xoopsModuleConfig['max_img_width'], (int) $xoopsModuleConfig['max_img_height']);
 
             if ($_FILES['userfile']['error'] > 0) {
                 switch ($_FILES['userfile']['error']) {
@@ -202,13 +202,13 @@ 
                 $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();
                     } 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());
                             }
                         }
@@ -227,7 +227,7 @@ 
         }
 
         // Get the cateopry object related to that FAQ
-        $categoryObj =& $newFaqObj->category();
+        $categoryObj = & $newFaqObj->category();
 
         // If autoapprove_submitted_faq
         if ($isAdmin) {
@@ -247,7 +247,7 @@ 
         } else {
             // Subscribe the user to On Published notification, if requested
             if ($notifypub == 1) {
-                include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                 $notificationHandler = xoops_getHandler('notification');
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
             }
@@ -270,20 +270,20 @@ 
         $categoryObj = $categoryHandler->create();
 
         $xoopsOption['template_main'] = 'smartfaq_submit.html';
-        include_once(XOOPS_ROOT_PATH . '/header.php');
-        include_once __DIR__ . '/footer.php';
+        include_once(XOOPS_ROOT_PATH.'/header.php');
+        include_once __DIR__.'/footer.php';
 
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
         $notifypub  = 1;
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
         include_once 'include/submit.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }