mambax7 / smartfaq

smartfaq/admin/main.php

Switch Indentation +6 added lines, -6 removed lines

@@ -182,13 +182,13 @@
 }
 
 switch ($ordersel) {
-    case 'ASC':
-    $ordertxtasc = "selected='selected'";
-    break;
+        case 'ASC':
+        $ordertxtasc = "selected='selected'";
+        break;
 
-    default :
-    $ordertxtdesc = "selected='selected'";
-    break;
+        default :
+        $ordertxtdesc = "selected='selected'";
+        break;
 }
 
 switch ($statussel) {

Spacing +103 added lines, -103 removed lines

@@ -7,56 +7,56 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 $myts = &MyTextSanitizer::getInstance();
 
-$faqid = isset($_POST['faqid'])? intval($_POST['faqid']) : 0;
+$faqid = isset($_POST['faqid']) ? intval($_POST['faqid']) : 0;
 
 //$pick = isset($_GET['pick'])? intval($_GET['pick']) : 0;
 //$pick = isset($_POST['pick'])? intval($_POST['pick']) : $_GET['pick'];
 
-$statussel = isset($_GET['statussel'])? intval($_GET['statussel']) : _SF_STATUS_ALL;
-$statussel = isset($_POST['statussel'])? intval($_POST['statussel']) : $statussel;
+$statussel = isset($_GET['statussel']) ? intval($_GET['statussel']) : _SF_STATUS_ALL;
+$statussel = isset($_POST['statussel']) ? intval($_POST['statussel']) : $statussel;
 
-$sortsel = isset($_GET['sortsel'])? $_GET['sortsel'] : 'faqid';
-$sortsel = isset($_POST['sortsel'])? $_POST['sortsel'] : $sortsel;
+$sortsel = isset($_GET['sortsel']) ? $_GET['sortsel'] : 'faqid';
+$sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $sortsel;
 
-$ordersel = isset($_GET['ordersel'])? $_GET['ordersel'] : 'DESC';
-$ordersel = isset($_POST['ordersel'])? $_POST['ordersel'] :$ordersel;
+$ordersel = isset($_GET['ordersel']) ? $_GET['ordersel'] : 'DESC';
+$ordersel = isset($_POST['ordersel']) ? $_POST['ordersel'] : $ordersel;
 
 $module_id = $xoopsModule->getVar('mid');
 $gperm_handler = &xoops_gethandler('groupperm');
-$groups = ($xoopsUser)? ($xoopsUser->getGroups()) : XOOPS_GROUP_ANONYMOUS;
+$groups = ($xoopsUser) ? ($xoopsUser->getGroups()) : XOOPS_GROUP_ANONYMOUS;
 
 function buildTable()
 {
     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
-$category_handler =& sf_gethandler('category');
+$category_handler = & sf_gethandler('category');
 
 // Creating the FAQ handler object
-$faq_handler =& sf_gethandler('faq');
+$faq_handler = & sf_gethandler('faq');
 
-$startentry = isset($_GET['startentry'])? intval($_GET['startentry']) : 0;
+$startentry = isset($_GET['startentry']) ? intval($_GET['startentry']) : 0;
 
 $indexAdmin = new ModuleAdmin();
 xoops_cp_header();
@@ -75,31 +75,31 @@ 
 $totalfaqbystatus = $faq_handler->getFaqsCountByStatus();
 
 // Total asked FAQs
-$totalasked = isset($totalfaqbystatus[_SF_STATUS_ASKED])? $totalfaqbystatus[_SF_STATUS_ASKED] : 0;
+$totalasked = isset($totalfaqbystatus[_SF_STATUS_ASKED]) ? $totalfaqbystatus[_SF_STATUS_ASKED] : 0;
 
 // Total opened FAQs
-$totalopened = isset($totalfaqbystatus[_SF_STATUS_OPENED])? $totalfaqbystatus[_SF_STATUS_OPENED] : 0;
+$totalopened = isset($totalfaqbystatus[_SF_STATUS_OPENED]) ? $totalfaqbystatus[_SF_STATUS_OPENED] : 0;
 
 // Total answered FAQs
-$totalanswered = isset($totalfaqbystatus[_SF_STATUS_ANSWERED])? $totalfaqbystatus[_SF_STATUS_ANSWERED] : 0;
+$totalanswered = isset($totalfaqbystatus[_SF_STATUS_ANSWERED]) ? $totalfaqbystatus[_SF_STATUS_ANSWERED] : 0;
 
 // Total submitted FAQs
-$totalsubmitted = isset($totalfaqbystatus[_SF_STATUS_SUBMITTED])? $totalfaqbystatus[_SF_STATUS_SUBMITTED] : 0;
+$totalsubmitted = isset($totalfaqbystatus[_SF_STATUS_SUBMITTED]) ? $totalfaqbystatus[_SF_STATUS_SUBMITTED] : 0;
 
 // Total published FAQs
-$totalpublished = isset($totalfaqbystatus[_SF_STATUS_PUBLISHED])? $totalfaqbystatus[_SF_STATUS_PUBLISHED] : 0;
+$totalpublished = isset($totalfaqbystatus[_SF_STATUS_PUBLISHED]) ? $totalfaqbystatus[_SF_STATUS_PUBLISHED] : 0;
 
 // Total offline FAQs
-$totaloffline = isset($totalfaqbystatus[_SF_STATUS_OFFLINE])? $totalfaqbystatus[_SF_STATUS_OFFLINE] : 0;
+$totaloffline = isset($totalfaqbystatus[_SF_STATUS_OFFLINE]) ? $totalfaqbystatus[_SF_STATUS_OFFLINE] : 0;
 
 // Total rejected question
-$totalrejectedquestion = isset($totalfaqbystatus[_SF_STATUS_REJECTED_QUESTION])? $totalfaqbystatus[_SF_STATUS_REJECTED_QUESTION] : 0;
+$totalrejectedquestion = isset($totalfaqbystatus[_SF_STATUS_REJECTED_QUESTION]) ? $totalfaqbystatus[_SF_STATUS_REJECTED_QUESTION] : 0;
 
 // Total rejected smartfaq
-$totalrejectedsmartfaq = isset($totalfaqbystatus[_SF_STATUS_REJECTED_SMARTFAQ])? $totalfaqbystatus[_SF_STATUS_REJECTED_SMARTFAQ] : 0;
+$totalrejectedsmartfaq = isset($totalfaqbystatus[_SF_STATUS_REJECTED_SMARTFAQ]) ? $totalfaqbystatus[_SF_STATUS_REJECTED_SMARTFAQ] : 0;
 
 // Total Q&A with new answers
-$totalnewanswers = isset($totalfaqbystatus[_SF_STATUS_NEW_ANSWER])? $totalfaqbystatus[_SF_STATUS_NEW_ANSWER] : 0;
+$totalnewanswers = isset($totalfaqbystatus[_SF_STATUS_NEW_ANSWER]) ? $totalfaqbystatus[_SF_STATUS_NEW_ANSWER] : 0;
 
 // -- //
 //sf_collapsableBar('toptable', 'toptableicon');
@@ -117,9 +117,9 @@ 
 //echo "<br />";
 
 //$indexAdmin = new ModuleAdmin();
-$indexAdmin->addItemButton(_AM_SF_CATEGORY_CREATE, 'category.php?op=mod', 'add' , '');
-$indexAdmin->addItemButton(_AM_SF_CREATEART, 'faq.php?op=mod', 'add' , '');
-$indexAdmin->addItemButton(_AM_SF_CREATEQUESTION, 'question.php?op=mod', 'add' , '');
+$indexAdmin->addItemButton(_AM_SF_CATEGORY_CREATE, 'category.php?op=mod', 'add', '');
+$indexAdmin->addItemButton(_AM_SF_CREATEART, 'faq.php?op=mod', 'add', '');
+$indexAdmin->addItemButton(_AM_SF_CREATEQUESTION, 'question.php?op=mod', 'add', '');
 echo $indexAdmin->renderButton('left', '');
 
 //echo "<form><div style=\"margin-bottom: 24px;\">";
@@ -131,9 +131,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 = '';
@@ -156,8 +156,8 @@ 
 $sorttxtweight = "";
 $sorttxtfaqid = "";
 
-$ordertxtasc='';
-$ordertxtdesc='';
+$ordertxtasc = '';
+$ordertxtdesc = '';
 
 switch ($sortsel) {
     case 'faq.question':
@@ -202,98 +202,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>
@@ -301,8 +301,8 @@ 
     </form>";
 
 // Get number of entries in the selected state
-$numrows = ($statussel == 0)? $totalfaqs : $totalfaqbystatus[$statussel];
-$statusSelected = ($statussel == 0)? _SF_STATUS_ALL : $statussel;
+$numrows = ($statussel == 0) ? $totalfaqs : $totalfaqbystatus[$statussel];
+$statusSelected = ($statussel == 0) ? _SF_STATUS_ALL : $statussel;
 
 // creating the Q&As objects
 $faqsObj = $faq_handler->getFaqsAdminSide($xoopsModuleConfig['perpage'], $startentry, $statusSelected, -1, $sortsel, $ordersel);
@@ -319,9 +319,9 @@ 
     //$answer_handler =& sf_gethandler('answer');
     //$answer_arr = $answer_handler->getCountByFAQ($answer_criteria);
 
-    foreach ( array_keys($faqsObj) as $i ) {
+    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];
@@ -331,65 +331,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" :
@@ -403,18 +403,18 @@ 
         //$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
 
-        $answer_handler =& sf_gethandler('answer');
+        $answer_handler = & sf_gethandler('answer');
 
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('faqid', $faqsObj[$i]->faqid()));
@@ -434,20 +434,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";
@@ -455,9 +455,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>";
@@ -465,4 +465,4 @@ 
 echo "</div>";
 echo "</div>";
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

smartfaq/admin/admin.php

Spacing +18 added lines, -18 removed lines

@@ -36,8 +36,8 @@ 
 if (isset($HTTP_GET_VARS['fct'])) {
     $fct = trim($HTTP_GET_VARS['fct']);
 }
-if (empty($fct)) $fct = 'preferences' ;
-include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
+if (empty($fct)) $fct = 'preferences';
+include dirname(dirname(dirname(__DIR__))).'/mainfile.php';
 include XOOPS_ROOT_PATH."/include/cp_functions.php";
 
 include_once XOOPS_ROOT_PATH."/kernel/module.php";
@@ -45,14 +45,14 @@ 
 $admintest = 0;
 
 if (is_object($xoopsUser)) {
-    $xoopsModule =& XoopsModule::getByDirname("system");
-    if ( !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
-        redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+    $xoopsModule = & XoopsModule::getByDirname("system");
+    if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
+        redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
         exit();
     }
-    $admintest=1;
+    $admintest = 1;
 } else {
-    redirect_header(XOOPS_URL.'/user.php',3,_NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
     exit();
 }
 
@@ -63,7 +63,7 @@ 
     if (isset($fct) && $fct != '') {
         if (file_exists(XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php")) {
 
-            include_once( XOOPS_ROOT_PATH."/modules/system/language/" . $xoopsConfig['language'] . "/admin.php" ) ;
+            include_once(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin.php");
 
             if (file_exists(XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php")) {
                 include XOOPS_ROOT_PATH."/modules/system/language/".$xoopsConfig['language']."/admin/".$fct.".php";
@@ -71,14 +71,14 @@ 
                 include XOOPS_ROOT_PATH."/modules/system/language/english/admin/".$fct.".php";
             }
             include XOOPS_ROOT_PATH."/modules/system/admin/".$fct."/xoops_version.php";
-            $sysperm_handler =& xoops_gethandler('groupperm');
-            $category = !empty($modversion['category'])? intval($modversion['category']) : 0;
+            $sysperm_handler = & xoops_gethandler('groupperm');
+            $category = !empty($modversion['category']) ? intval($modversion['category']) : 0;
             unset($modversion);
             if ($category > 0) {
-                $groups =& $xoopsUser->getGroups();
+                $groups = & $xoopsUser->getGroups();
                 if (in_array(XOOPS_GROUP_ADMIN, $groups) || false != $sysperm_handler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))) {
                     if (file_exists("../include/{$fct}.inc.php")) {
-                        include_once "../include/{$fct}.inc.php" ;
+                        include_once "../include/{$fct}.inc.php";
                     } else {
                         $error = true;
                     }
@@ -110,8 +110,8 @@ 
     $groups = $xoopsUser->getGroups();
     $all_ok = false;
     if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
-        $sysperm_handler =& xoops_gethandler('groupperm');
-        $ok_syscats =& $sysperm_handler->getItemIds('system_admin', $groups);
+        $sysperm_handler = & xoops_gethandler('groupperm');
+        $ok_syscats = & $sysperm_handler->getItemIds('system_admin', $groups);
     } else {
         $all_ok = true;
     }
@@ -123,13 +123,13 @@ 
         if (strtolower($file) != 'cvs' && !preg_match("/[.]/", $file) && is_dir($admin_dir.'/'.$file)) {
             include $admin_dir.'/'.$file.'/xoops_version.php';
             if ($modversion['hasAdmin']) {
-                $category = isset($modversion['category'])? intval($modversion['category']) : 0;
+                $category = isset($modversion['category']) ? intval($modversion['category']) : 0;
                 if (false != $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     echo "<td class='$class' align='center' valign='bottom' width='19%'>";
-                    echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>" .trim($modversion['name'])."</b></a>\n";
+                    echo "<a href='".XOOPS_URL."/modules/system/admin.php?fct=".$file."'><b>".trim($modversion['name'])."</b></a>\n";
                     echo "</td>";
                     ++$counter;
-                    $class = ($class == 'even')? 'odd' : 'even';
+                    $class = ($class == 'even') ? 'odd' : 'even';
                 }
                 if ($counter > 4) {
                     $counter = 0;
@@ -142,7 +142,7 @@ 
     }
     while ($counter < 5) {
         echo '<td class="'.$class.'">&nbsp;</td>';
-        $class = ($class == 'even')? 'odd' : 'even';
+        $class = ($class == 'even') ? 'odd' : 'even';
         ++$counter;
     }
     echo '</tr></table>';

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 if (isset($HTTP_GET_VARS['fct'])) {
     $fct = trim($HTTP_GET_VARS['fct']);
 }
-if (empty($fct)) $fct = 'preferences' ;
+if (empty($fct)) {
+    $fct = 'preferences' ;
+}
 include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
 include XOOPS_ROOT_PATH."/include/cp_functions.php";
 

smartfaq/admin/permissions.php

Switch Indentation +28 added lines, -28 removed lines

@@ -26,39 +26,39 @@
 }
 
 switch ($op) {
-    case "default":
-    default:
-        global $xoopsDB, $xoopsModule;
+        case "default":
+        default:
+            global $xoopsDB, $xoopsModule;
 
-        $indexAdmin = new ModuleAdmin();
-        xoops_cp_header();
-        echo $indexAdmin->addNavigation('permissions.php');
-        //sf_adminMenu(4, _AM_SF_PERMISSIONS);
-        // View Categories permissions
-        $item_list_view = array();
-        $block_view = array();
-        // echo "<h3 style='color: #2F5376; '>"._AM_SF_PERMISSIONSADMIN."</h3>\n" ;
-        sf_collapsableBar('toptable', 'toptableicon');
+            $indexAdmin = new ModuleAdmin();
+            xoops_cp_header();
+            echo $indexAdmin->addNavigation('permissions.php');
+            //sf_adminMenu(4, _AM_SF_PERMISSIONS);
+            // View Categories permissions
+            $item_list_view = array();
+            $block_view = array();
+            // echo "<h3 style='color: #2F5376; '>"._AM_SF_PERMISSIONSADMIN."</h3>\n" ;
+            sf_collapsableBar('toptable', 'toptableicon');
 
-        $result_view = $xoopsDB->query("SELECT categoryid, name FROM " . $xoopsDB->prefix("smartfaq_categories") . " ");
-        if ($xoopsDB->getRowsNum($result_view)) {
-            while ($myrow_view = $xoopsDB->fetcharray($result_view)) {
-                $item_list_view['cid'] = $myrow_view['categoryid'];
-                $item_list_view['title'] = $myrow_view['name'];
-                $form_view = new XoopsGroupPermForm("", $xoopsModule->getVar('mid'), "category_read", "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_VIEW_CATS . "</span>",'admin/permissions.php');
-                $block_view[] = $item_list_view;
-                foreach ($block_view as $itemlists) {
-                    $form_view->addItem($itemlists['cid'], $myts->displayTarea($itemlists['title']));
+            $result_view = $xoopsDB->query("SELECT categoryid, name FROM " . $xoopsDB->prefix("smartfaq_categories") . " ");
+            if ($xoopsDB->getRowsNum($result_view)) {
+                while ($myrow_view = $xoopsDB->fetcharray($result_view)) {
+                    $item_list_view['cid'] = $myrow_view['categoryid'];
+                    $item_list_view['title'] = $myrow_view['name'];
+                    $form_view = new XoopsGroupPermForm("", $xoopsModule->getVar('mid'), "category_read", "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_VIEW_CATS . "</span>",'admin/permissions.php');
+                    $block_view[] = $item_list_view;
+                    foreach ($block_view as $itemlists) {
+                        $form_view->addItem($itemlists['cid'], $myts->displayTarea($itemlists['title']));
+                    }
                 }
-            }
-            echo $form_view->render();
-        } else {
-            echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_NOPERMSSET . "</span>";
+                echo $form_view->render();
+            } else {
+                echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_NOPERMSSET . "</span>";
 
-        }
-        echo "</div>";
+            }
+            echo "</div>";
 
-        echo "<br />\n";
+            echo "<br />\n";
 }
 
 include_once __DIR__ . '/admin_footer.php';

Spacing +6 added lines, -6 removed lines

@@ -7,8 +7,8 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/admin_header.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
+include_once __DIR__.'/admin_header.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
 
 if (!sf_userIsAdmin()) {
     redirect_header("javascript:history.go(-1)", 1, _NOPERM);
@@ -40,12 +40,12 @@ 
         // echo "<h3 style='color: #2F5376; '>"._AM_SF_PERMISSIONSADMIN."</h3>\n" ;
         sf_collapsableBar('toptable', 'toptableicon');
 
-        $result_view = $xoopsDB->query("SELECT categoryid, name FROM " . $xoopsDB->prefix("smartfaq_categories") . " ");
+        $result_view = $xoopsDB->query("SELECT categoryid, name FROM ".$xoopsDB->prefix("smartfaq_categories")." ");
         if ($xoopsDB->getRowsNum($result_view)) {
             while ($myrow_view = $xoopsDB->fetcharray($result_view)) {
                 $item_list_view['cid'] = $myrow_view['categoryid'];
                 $item_list_view['title'] = $myrow_view['name'];
-                $form_view = new XoopsGroupPermForm("", $xoopsModule->getVar('mid'), "category_read", "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_VIEW_CATS . "</span>",'admin/permissions.php');
+                $form_view = new XoopsGroupPermForm("", $xoopsModule->getVar('mid'), "category_read", "<img id='toptableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_PERMISSIONSVIEWMAN."</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"._AM_SF_VIEW_CATS."</span>", 'admin/permissions.php');
                 $block_view[] = $item_list_view;
                 foreach ($block_view as $itemlists) {
                     $form_view->addItem($itemlists['cid'], $myts->displayTarea($itemlists['title']));
@@ -53,7 +53,7 @@ 
             }
             echo $form_view->render();
         } else {
-            echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_PERMISSIONSVIEWMAN . "</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_NOPERMSSET . "</span>";
+            echo "<img id='toptableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_PERMISSIONSVIEWMAN."</h3><div id='toptable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"._AM_SF_NOPERMSSET."</span>";
 
         }
         echo "</div>";
@@ -61,4 +61,4 @@ 
         echo "<br />\n";
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

smartfaq/admin/question.php

Indentation +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
             exit();
         }
     } else {
-          $uid = $xoopsUser->uid();
+            $uid = $xoopsUser->uid();
     }
 
     $faqid = (isset($_POST['faqid']))? intval($_POST['faqid']) : -1;

Spacing +53 added lines, -53 removed lines

@@ -7,26 +7,26 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 // Creating the faq handler object
-$faq_handler =& sf_gethandler('faq');
+$faq_handler = & sf_gethandler('faq');
 
 // Creating the category handler object
-$category_handler =& sf_gethandler('category');
+$category_handler = & sf_gethandler('category');
 
 $op = '';
 if (isset($_GET['op'])) $op = $_GET['op'];
 if (isset($_POST['op'])) $op = $_POST['op'];
 
 // Where shall we start?
-$startfaq = isset($_GET['startfaq'])? intval($_GET['startfaq']) : 0;
+$startfaq = isset($_GET['startfaq']) ? intval($_GET['startfaq']) : 0;
 
 function editfaq($showmenu = false, $faqid = -1)
 {
     global $faq_handler, $category_handler, $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';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if ($faqid != -1) {
         // Creating the FAQ object
@@ -39,7 +39,7 @@ 
         switch ($faqObj->status()) {
 
             case _SF_STATUS_ASKED :
-            $breadcrumb_action =    _AM_SF_APPROVING;
+            $breadcrumb_action = _AM_SF_APPROVING;
             $collapsableBar_title = _AM_SF_QUESTION_APPROVING;
             $collapsableBar_info = _AM_SF_QUESTION_APPROVING_INFO;
             $button_caption = _AM_SF_QUEUE;
@@ -47,7 +47,7 @@ 
 
             case "default" :
             default :
-            $breadcrumb_action =    _AM_SF_EDITING;
+            $breadcrumb_action = _AM_SF_EDITING;
             $collapsableBar_title = _AM_SF_EDITQUES;
             $collapsableBar_info = _AM_SF_EDITING_INFO;
             $button_caption = _AM_SF_MODIFY;
@@ -55,7 +55,7 @@ 
         }
 
         // Creating the category of this FAQ
-        $categoryObj =& $category_handler->get($faqObj->categoryid());
+        $categoryObj = & $category_handler->get($faqObj->categoryid());
 
         if ($showmenu) {
             //sf_adminMenu(3, _AM_SF_OPEN_QUESTIONS . " > " . $breadcrumb_action);
@@ -63,14 +63,14 @@ 
 
         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;" . $collapsableBar_title . "</h3>";
+        echo "<img id='bottomtableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".$collapsableBar_title."</h3>";
         echo "<div id='bottomtable'>";
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $collapsableBar_info . "</span>";
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$collapsableBar_info."</span>";
     } else {
         // there's no parameter, so we're adding a faq
-        $faqObj =& $faq_handler->create();
+        $faqObj = & $faq_handler->create();
         $faqObj->setVar('uid', $xoopsUser->getVar('uid'));
-        $categoryObj =& $category_handler->create();
+        $categoryObj = & $category_handler->create();
 
         $breadcrumb_action = _AM_SF_CREATINGNEW;
         $button_caption = _AM_SF_CREATE;
@@ -78,7 +78,7 @@ 
             //sf_adminMenu(3, _AM_SF_OPEN_QUESTIONS . " > " . $breadcrumb_action);
         }
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CREATEQUESTION . "</h3>";
+        echo "<img id='bottomtableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CREATEQUESTION."</h3>";
         echo "<div id='bottomtable'>";
     }
     $sform = new XoopsThemeForm(_AM_SF_OPEN_QUESTION, "op", xoops_getenv('PHP_SELF'));
@@ -95,7 +95,7 @@ 
     * Last one is not set as we do not have sub menus in Smartfaq
     */
 
-    $mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid" , "parentid");
+    $mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid", "parentid");
     ob_start();
     $mytree->makeMySelBox("name", "weight", $categoryObj->categoryid());
     $sform->addElement(new XoopsFormLabel(_AM_SF_CATEGORY_QUESTION, ob_get_contents()));
@@ -152,7 +152,7 @@ 
         $button_tray->addElement($butt_create);
 
         $butt_edit = new XoopsFormButton('', '', _AM_SF_OPEN_QUESTION_EDIT, 'button');
-        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=" . $faqid . "'\"");
+        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=".$faqid."'\"");
         $button_tray->addElement($butt_edit);
 
         $butt_cancel = new XoopsFormButton('', '', _AM_SF_CANCEL, 'button');
@@ -171,7 +171,7 @@ 
     case "mod":
 
     Global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts;
-    $faqid = (isset($_GET['faqid']))? $_GET['faqid'] : -1;
+    $faqid = (isset($_GET['faqid'])) ? $_GET['faqid'] : -1;
 
     if ($faqid == -1) {
         $totalcategories = $category_handler->getCategoriesCount(-1);
@@ -185,7 +185,7 @@ 
     xoops_cp_header();
 
     echo $indexAdmin->addNavigation('question.php');
-    include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
 
     editfaq(true, $faqid);
     break;
@@ -204,7 +204,7 @@ 
           $uid = $xoopsUser->uid();
     }
 
-    $faqid = (isset($_POST['faqid']))? intval($_POST['faqid']) : -1;
+    $faqid = (isset($_POST['faqid'])) ? intval($_POST['faqid']) : -1;
 
     // Creating the FAQ
     if ($faqid != -1) {
@@ -214,10 +214,10 @@ 
     }
 
     // Putting the values in the FAQ object
-    $faqObj->setGroups_read(isset($_POST['groups'])? $_POST['groups'] : array());
-    $faqObj->setVar('categoryid', (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0);
+    $faqObj->setGroups_read(isset($_POST['groups']) ? $_POST['groups'] : array());
+    $faqObj->setVar('categoryid', (isset($_POST['categoryid'])) ? intval($_POST['categoryid']) : 0);
     $faqObj->setVar('question', $_POST['question']);
-    $faqObj->setVar('status', (isset($_POST['status']))? intval($_POST['status']) : _SF_STATUS_ASKED);
+    $faqObj->setVar('status', (isset($_POST['status'])) ? intval($_POST['status']) : _SF_STATUS_ASKED);
 
     $notifToDo = null;
 
@@ -248,8 +248,8 @@ 
     $faqObj->setVar('status', $status);
 
     // Storing the FAQ
-    if ( !$faqObj->store() ) {
-        redirect_header("javascript:history.go(-1)", 3, _AM_SF_ERROR . sf_formatErrors($faqObj->getErrors()));
+    if (!$faqObj->store()) {
+        redirect_header("javascript:history.go(-1)", 3, _AM_SF_ERROR.sf_formatErrors($faqObj->getErrors()));
         exit;
     }
 
@@ -269,16 +269,16 @@ 
     $module_id = $xoopsModule->getVar('mid');
     $gperm_handler = &xoops_gethandler('groupperm');
 
-    $faqid = (isset($_POST['faqid']))? intval($_POST['faqid']) : 0;
-    $faqid = (isset($_GET['faqid']))? intval($_GET['faqid']) : $faqid;
+    $faqid = (isset($_POST['faqid'])) ? intval($_POST['faqid']) : 0;
+    $faqid = (isset($_GET['faqid'])) ? intval($_GET['faqid']) : $faqid;
 
     $faqObj = new sfFaq($faqid);
 
-    $confirm = (isset($_POST['confirm']))? $_POST['confirm'] : 0;
-    $question = (isset($_POST['question']))? $_POST['question'] : '';
+    $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
+    $question = (isset($_POST['question'])) ? $_POST['question'] : '';
 
     if ($confirm) {
-        if ( !$faq_handler->delete($faqObj)) {
+        if (!$faq_handler->delete($faqObj)) {
             redirect_header("question.php", 2, _AM_SF_FAQ_DELETE_ERROR);
             exit;
         }
@@ -287,9 +287,9 @@ 
         exit();
     } else {
         // no confirm: show deletion condition
-        $faqid = (isset($_GET['faqid']))? intval($_GET['faqid']) : 0;
+        $faqid = (isset($_GET['faqid'])) ? intval($_GET['faqid']) : 0;
         xoops_cp_header();
-        xoops_confirm(array('op' => 'del', 'faqid' => $faqObj->faqid(), 'confirm' => 1, 'name' => $faqObj->question()), 'question.php', _AM_SF_DELETETHISQUESTION . " <br />'" . $faqObj->question() . "'. <br /> <br />", _AM_SF_DELETE);
+        xoops_confirm(array('op' => 'del', 'faqid' => $faqObj->faqid(), 'confirm' => 1, 'name' => $faqObj->question()), 'question.php', _AM_SF_DELETETHISQUESTION." <br />'".$faqObj->question()."'. <br /> <br />", _AM_SF_DELETE);
         xoops_cp_footer();
     }
 
@@ -304,8 +304,8 @@ 
 
     //sf_adminMenu(3, _AM_SF_OPEN_QUESTIONS);
 
-    include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
-    include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+    include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+    include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
     global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $smartModuleConfig;
 
@@ -313,9 +313,9 @@ 
 
     sf_collapsableBar('toptable', 'toptableicon');
 
-    echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_OPENED_TITLE . "</h3>";
+    echo "<img id='toptableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_OPENED_TITLE."</h3>";
     echo "<div id='toptable'>";
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_OPENED_DSC . "</span>";
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_OPENED_DSC."</span>";
 
     // Get the total number of published FAQs
     $totalfaqs = $faq_handler->getFaqsCount(-1, array(_SF_STATUS_OPENED));
@@ -325,48 +325,48 @@ 
     $allcats = $category_handler->getObjects(null, true);
     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_ARTID . "</b></td>";
-    echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . "</b></td>";
-    echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . "</b></td>";
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID."</b></td>";
+    echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME."</b></td>";
+    echo "<th class='bg3' align='left'><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_ASKED."</b></td>";
 
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . "</b></td>";
-    echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . "</b></td>";
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED."</b></td>";
+    echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION."</b></td>";
     echo "</tr>";
     //var_dump( $faqsObj);
     if ($totalfaqs > 0) {
         global $pathIcon16;
-        foreach ( array_keys($faqsObj) as $i) {
-            $categoryObj =& $allcats[$faqsObj[$i]->categoryid()];
+        foreach (array_keys($faqsObj) as $i) {
+            $categoryObj = & $allcats[$faqsObj[$i]->categoryid()];
 
-            $modify = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='". $pathIcon16 .'/edit.png'."' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_EDITART . "'></a>";
-            $delete = "<a href='question.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='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_EDITART."'></a>";
+            $delete = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
 
-            $requester= sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
+            $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
 
             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'><a href='" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/answer.php?faqid=" . $faqsObj[$i]->faqid() . "'>" . $faqsObj[$i]->question(100) . "</a></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'><a href='".XOOPS_URL."/modules/".$xoopsModule->dirname()."/answer.php?faqid=".$faqsObj[$i]->faqid()."'>".$faqsObj[$i]->question(100)."</a></td>";
 
-            echo "<td class='even' align='center'>" . $requester . "</td>";
+            echo "<td class='even' align='center'>".$requester."</td>";
 
-            echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . "</td>";
+            echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s')."</td>";
             echo "<td class='even' align='center'> $modify $delete </td>";
             echo "</tr>";
         }
     } else {
         $faqid = -1;
         echo "<tr>";
-        echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOQUEUED . "</td>";
+        echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOQUEUED."</td>";
         echo "</tr>";
     }
     echo "</table>\n";
     echo "<br />\n";
 
     $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq');
-    echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+    echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
     echo "</div>";
 
     $totalcategories = $category_handler->getCategoriesCount(-1);
@@ -377,4 +377,4 @@ 
     break;
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

Braces +6 added lines, -2 removed lines

@@ -16,8 +16,12 @@
 $category_handler =& sf_gethandler('category');
 
 $op = '';
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
+if (isset($_GET['op'])) {
+    $op = $_GET['op'];
+}
+if (isset($_POST['op'])) {
+    $op = $_POST['op'];
+}
 
 // Where shall we start?
 $startfaq = isset($_GET['startfaq'])? intval($_GET['startfaq']) : 0;

smartfaq/admin/wffaq.php

Spacing +60 added lines, -60 removed lines

@@ -11,7 +11,7 @@ 
 *
 */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'WF-FAQ';
 $scriptname = 'wffaq.php';
@@ -26,61 +26,61 @@ 
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     xoops_cp_header();
     //sf_adminMenu(-1, _AM_SF_IMPORT);
-    $result = $xoopsDB->query ("select count(*) from ".$xoopsDB->prefix("faqcategories"));
-    list ($totalCat) = $xoopsDB->fetchRow ($result);
+    $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"));
-        list ($totalFAQ) = $xoopsDB->fetchRow ($result);
+        $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");
-            while (list ($cid, $cat_title, $count) = $xoopsDB->fetchRow ($result)) {
-                $cat_cbox->addOption ($cid, "$cat_title ($count)<br\>");
+            $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");
+            while (list ($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
+                $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
             }
-            $form->addElement ($cat_cbox);
+            $form->addElement($cat_cbox);
 
             // SmartFAQ parent category
             $mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid", "parentid");
             ob_start();
-            $mytree->makeMySelBox("name", "weight", $preset_id=0, $none=1, $sel_name="parent_category");
+            $mytree->makeMySelBox("name", "weight", $preset_id = 0, $none = 1, $sel_name = "parent_category");
             $form->addElement(new XoopsFormLabel(_AM_SF_IMPORT_PARENT_CATEGORY, ob_get_contents()));
             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
-            $member_handler =& xoops_gethandler ('member');
-            $user_select = new XoopsFormSelect (_AM_SF_IMPORTED_USER, 'uid', 0);
-            $user_select->addOption (0, '----');
+            $member_handler = & xoops_gethandler('member');
+            $user_select = new XoopsFormSelect(_AM_SF_IMPORTED_USER, 'uid', 0);
+            $user_select->addOption(0, '----');
             //$criteria = new CriteriaCompo ();
             //$criteria->setSort ('uname');
             //$criteria->setOrder ('ASC');
-            $user_select->addOptionArray ($member_handler->getUserList());
-            $form->addElement ($user_select);
+            $user_select->addOptionArray($member_handler->getUserList());
+            $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 = &$member_handler->getGroupList();
-            $groups_selected = array ();
+            $groups_selected = array();
             $groups_checkbox = new XoopsFormCheckBox(_AM_SF_IMPORT_PERMISSIONS, 'groups_read');
             foreach ($group_list as $group_id => $group_name) {
                 if ($group_id != XOOPS_GROUP_ADMIN) {
@@ -88,11 +88,11 @@ 
                     $groups_checkbox->addOption($group_id, $group_name);
                 }
             }
-            $groups_checkbox->setValue ($groups_selected);
+            $groups_checkbox->setValue($groups_selected);
             $form->addElement($groups_checkbox);
 
-            $form->addElement (new XoopsFormHidden('op', 'go'));
-            $form->addElement (new XoopsFormButton ('', 'import', _AM_SF_IMPORT, 'submit'));
+            $form->addElement(new XoopsFormHidden('op', 'go'));
+            $form->addElement(new XoopsFormButton('', 'import', _AM_SF_IMPORT, 'submit'));
 
             $form->display();
         }
@@ -102,39 +102,39 @@ 
 }
 
 if ($op == 'go') {
-    $import_category = (isset($_POST['import_category'])? ($_POST['import_category']) : null);
+    $import_category = (isset($_POST['import_category']) ? ($_POST['import_category']) : null);
     if (!$import_category) {
         redirect_header($scriptname, 2, _AM_SF_NOCATSELECTED);
         exit;
     }
 
-    include_once __DIR__ . '/admin_header.php';
+    include_once __DIR__.'/admin_header.php';
     xoops_cp_header();
     //sf_adminMenu(-1, _AM_SF_IMPORT);
 
     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;
 
     $parentId = $_POST['parent_category'];
-    $groups_read = isset($_POST['groups_read'])? $_POST['groups_read'] : array();
-    $uid = !empty($_POST['uid'])? $_POST['uid'] : 0;
+    $groups_read = isset($_POST['groups_read']) ? $_POST['groups_read'] : array();
+    $uid = !empty($_POST['uid']) ? $_POST['uid'] : 0;
     $cancomment = $_POST['cancomment'];
     $autoaprove = $_POST['autoaprove'];
 
-    if (is_array ($_POST['import_category'])) {
-        $import_category_list = implode (',', $_POST['import_category']);
+    if (is_array($_POST['import_category'])) {
+        $import_category_list = implode(',', $_POST['import_category']);
     } else {
         $import_category_list = $_POST['import_category'];
     }
 
-    $category_handler =& sf_gethandler('category');
-    $faq_handler      =& sf_gethandler('faq');
-    $answer_handler   =& sf_gethandler('answer');
+    $category_handler = & sf_gethandler('category');
+    $faq_handler      = & sf_gethandler('faq');
+    $answer_handler   = & sf_gethandler('answer');
 
     /*echo "Parent Category ID: $parentId<br/>";
     echo "Groups Read: " . implode (",", $groups_read) . "<br/>";
@@ -143,22 +143,22 @@ 
     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');
+    while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
+        extract($arrCat, EXTR_PREFIX_ALL, 'wfc');
 
         // insert category into SmartFAQ
         $categoryObj = $category_handler->create();
 
-        $categoryObj->setVar ('parentid', $parentId);
-        $categoryObj->setVar ('weight', $wfc_weight);
-        $categoryObj->setGroups_read (explode (" ", trim ($wfc_groupid)));
-        $categoryObj->setVar ('name', $wfc_name);
-        $categoryObj->setVar ('description', $wfc_description);
+        $categoryObj->setVar('parentid', $parentId);
+        $categoryObj->setVar('weight', $wfc_weight);
+        $categoryObj->setGroups_read(explode(" ", trim($wfc_groupid)));
+        $categoryObj->setVar('name', $wfc_name);
+        $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;
         }
 
@@ -166,11 +166,11 @@ 
 
         ++$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");
-        while ($arrFAQ = $xoopsDB->fetchArray ($resultFAQ)) {
-            extract ($arrFAQ, EXTR_PREFIX_ALL, 'wft');
+        $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');
 
             if ($autoaprove) {
                 if ($wft_submit) {
@@ -183,10 +183,10 @@ 
             }
 
             // insert question into SmartFAQ
-            $faqObj =& $faq_handler->create();
-            $answerObj =& $answer_handler->create();
+            $faqObj = & $faq_handler->create();
+            $answerObj = & $answer_handler->create();
 
-            $faqObj->setGroups_read (explode (" ", trim ($wft_groupid)));
+            $faqObj->setGroups_read(explode(" ", trim($wft_groupid)));
             $faqObj->setVar('categoryid', $categoryObj->categoryid());
             $faqObj->setVar('question', $wft_question);
             $faqObj->setVar('uid', $wft_uid);
@@ -200,7 +200,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());
@@ -209,10 +209,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;
                 }
             }
@@ -222,8 +222,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 ();
 }

smartfaq/admin/category.php

Switch Indentation +117 added lines, -117 removed lines

@@ -211,155 +211,155 @@
 }
 
 switch ($op) {
-    case "mod":
-    $categoryid = isset($_GET['categoryid'])? intval($_GET['categoryid']) : 0 ;
-    $destList = isset($_POST['destList'])? $_POST['destList'] : '';
-    $indexAdmin = new ModuleAdmin();
-    xoops_cp_header();
+        case "mod":
+        $categoryid = isset($_GET['categoryid'])? intval($_GET['categoryid']) : 0 ;
+        $destList = isset($_POST['destList'])? $_POST['destList'] : '';
+        $indexAdmin = new ModuleAdmin();
+        xoops_cp_header();
 
-    echo $indexAdmin->addNavigation('category.php');
-    editcat(true, $categoryid);
-    break;
+        echo $indexAdmin->addNavigation('category.php');
+        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']))? intval($_POST['categoryid']) : 0;
+        $categoryid = (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0;
 
-    if ($categoryid != 0) {
-        $categoryObj = new sfCategory($categoryid);
-    } else {
-        $categoryObj = $category_handler->create();
-    }
+        if ($categoryid != 0) {
+            $categoryObj = new sfCategory($categoryid);
+        } else {
+            $categoryObj = $category_handler->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']))? intval($_POST['parentid']) : 0);
-    $applyall = (isset($_POST['applyall']))? intval($_POST['applyall']) : 0;
-    $categoryObj->setVar('weight', (isset($_POST['weight']))? intval($_POST['weight']) : 1);
+        $categoryObj->setVar('parentid', (isset($_POST['parentid']))? intval($_POST['parentid']) : 0);
+        $applyall = (isset($_POST['applyall']))? intval($_POST['applyall']) : 0;
+        $categoryObj->setVar('weight', (isset($_POST['weight']))? intval($_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']);
+        // 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';
+        }
 
-    $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()));
+            exit;
+        }
+        // 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');
 
-    if ( !$categoryObj->store() ) {
-        redirect_header("javascript:history.go(-1)", 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
-        exit;
-    }
-    // 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');
+        if ($applyall) {
+            // TODO : put this function in the category class
+            sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
+        }
 
-    if ($applyall) {
-        // TODO : put this function in the category class
-        sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
-    }
+        redirect_header($redirect_to, 2, $redirect_msg);
 
-    redirect_header($redirect_to, 2, $redirect_msg);
+        exit();
+        break;
 
-    exit();
-    break;
+        case "del":
+        global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
 
-    case "del":
-    global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
+        $module_id = $xoopsModule->getVar('mid');
+        $gperm_handler = &xoops_gethandler('groupperm');
 
-    $module_id = $xoopsModule->getVar('mid');
-    $gperm_handler = &xoops_gethandler('groupperm');
+        $categoryid = (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0;
+        $categoryid = (isset($_GET['categoryid']))? intval($_GET['categoryid']) : $categoryid;
 
-    $categoryid = (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0;
-    $categoryid = (isset($_GET['categoryid']))? intval($_GET['categoryid']) : $categoryid;
+        $categoryObj = new sfCategory($categoryid);
 
-    $categoryObj = new sfCategory($categoryid);
+        $confirm = (isset($_POST['confirm']))? $_POST['confirm'] : 0;
+        $name = (isset($_POST['name']))? $_POST['name'] : '';
 
-    $confirm = (isset($_POST['confirm']))? $_POST['confirm'] : 0;
-    $name = (isset($_POST['name']))? $_POST['name'] : '';
+        if ($confirm) {
+            if ( !$category_handler->delete($categoryObj)) {
+                redirect_header("category.php", 1, _AM_SF_DELETE_CAT_ERROR);
+                exit;
+            }
 
-    if ($confirm) {
-        if ( !$category_handler->delete($categoryObj)) {
-            redirect_header("category.php", 1, _AM_SF_DELETE_CAT_ERROR);
-            exit;
+            redirect_header("category.php", 1, sprintf(_AM_SF_COLISDELETED, $name));
+            exit();
+        } else {
+            // no confirm: show deletion condition
+            $categoryid = (isset($_GET['categoryid']))? intval($_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));
         exit();
-    } else {
-        // no confirm: show deletion condition
-        $categoryid = (isset($_GET['categoryid']))? intval($_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();
-    }
-    exit();
-    break;
-
-    case "cancel":
-    redirect_header("category.php", 1, sprintf(_AM_SF_BACK2IDX, ''));
-    exit();
+        break;
 
-    case "default":
-    default:
+        case "cancel":
+        redirect_header("category.php", 1, sprintf(_AM_SF_BACK2IDX, ''));
+        exit();
 
-    $indexAdmin = new ModuleAdmin();
-    xoops_cp_header();
+        case "default":
+        default:
 
-    echo $indexAdmin->addNavigation('category.php');
-    //sf_adminMenu(1, _AM_SF_CATEGORIES);
+        $indexAdmin = new ModuleAdmin();
+        xoops_cp_header();
 
-    echo "<br />\n";
+        echo $indexAdmin->addNavigation('category.php');
+        //sf_adminMenu(1, _AM_SF_CATEGORIES);
 
-    // Creating the objects for top categories
-    $categoriesObj = $category_handler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
+        echo "<br />\n";
 
-    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>";
+        // Creating the objects for top categories
+        $categoriesObj = $category_handler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
 
-    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 = $category_handler->getCategoriesCount(0);
-    if (count($categoriesObj) > 0) {
-        foreach ($categoriesObj as $key => $thiscat) {
-            displayCategory($thiscat);
+        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>";
 
-        }
-    } else {
+        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 = $category_handler->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 +45 added lines, -45 removed lines

@@ -7,10 +7,10 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/admin_header.php';
+include_once __DIR__.'/admin_header.php';
 
 // Creating the category handler object
-$category_handler =& sf_gethandler('category');
+$category_handler = & sf_gethandler('category');
 
 $op = '';
 
@@ -18,7 +18,7 @@ 
 if (isset($_POST['op'])) $op = $_POST['op'];
 
 // Where do we start?
-$startcategory = isset($_GET['startcategory'])? intval($_GET['startcategory']) : 0;
+$startcategory = isset($_GET['startcategory']) ? intval($_GET['startcategory']) : 0;
 
 function displayCategory($categoryObj, $level = 0)
 {
@@ -26,11 +26,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) {
@@ -38,9 +38,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 = $category_handler->getCategories(0, 0, $categoryObj->categoryid());
@@ -57,12 +57,12 @@ 
 {
     //$moderators = array(); // just to define the variable
     //$allmods = array();
-    $startfaq = isset($_GET['startfaq'])? intval($_GET['startfaq']) : 0;
+    $startfaq = isset($_GET['startfaq']) ? intval($_GET['startfaq']) : 0;
     Global $category_handler, $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
-    $faq_handler =& sf_gethandler('faq');
+    $faq_handler = & sf_gethandler('faq');
 
     echo "<script type=\"text/javascript\" src=\"funcs.js\"></script>";
     echo "<style>";
@@ -85,7 +85,7 @@ 
             exit();
         }
         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 = $category_handler->create();
@@ -94,7 +94,7 @@ 
         }
         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
@@ -105,12 +105,12 @@ 
     $sform->addElement(new XoopsFormText(_AM_SF_CATEGORY, 'name', 50, 255, $categoryObj->name('e')), true);
 
     // Parent Category
-    $mytree = new XoopsTree( $xoopsDB -> prefix( "smartfaq_categories" ), "categoryid", "parentid" );
+    $mytree = new XoopsTree($xoopsDB -> prefix("smartfaq_categories"), "categoryid", "parentid");
     ob_start();
-    $mytree -> makeMySelBox( "name", "weight", $categoryObj->parentid(), 1, 'parentid' );
+    $mytree -> makeMySelBox("name", "weight", $categoryObj->parentid(), 1, 'parentid');
 
     //makeMySelBox($title,$order="",$preset_id=0, $none=0, $sel_name="", $onchange="")
-    $sform -> addElement( new XoopsFormLabel( _AM_SF_PARENT_CATEGORY_EXP, ob_get_contents() ) );
+    $sform -> addElement(new XoopsFormLabel(_AM_SF_PARENT_CATEGORY_EXP, ob_get_contents()));
     ob_end_clean();
 
 /*	$mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid" , "parentid");
@@ -139,7 +139,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, '');
@@ -162,7 +162,7 @@ 
 
     $sform->addElement($moderators_tray);
     */
-    $sform -> addElement( new XoopsFormHidden( 'categoryid', $categoryid ) );
+    $sform -> addElement(new XoopsFormHidden('categoryid', $categoryid));
 
     // Action buttons tray
     $button_tray = new XoopsFormElementTray('', '');
@@ -204,7 +204,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);
@@ -212,8 +212,8 @@ 
 
 switch ($op) {
     case "mod":
-    $categoryid = isset($_GET['categoryid'])? intval($_GET['categoryid']) : 0 ;
-    $destList = isset($_POST['destList'])? $_POST['destList'] : '';
+    $categoryid = isset($_GET['categoryid']) ? intval($_GET['categoryid']) : 0;
+    $destList = isset($_POST['destList']) ? $_POST['destList'] : '';
     $indexAdmin = new ModuleAdmin();
     xoops_cp_header();
 
@@ -224,7 +224,7 @@ 
     case "addcategory":
     global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-    $categoryid = (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0;
+    $categoryid = (isset($_POST['categoryid'])) ? intval($_POST['categoryid']) : 0;
 
     if ($categoryid != 0) {
         $categoryObj = new sfCategory($categoryid);
@@ -235,9 +235,9 @@ 
     //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
     //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
 
-    $categoryObj->setVar('parentid', (isset($_POST['parentid']))? intval($_POST['parentid']) : 0);
-    $applyall = (isset($_POST['applyall']))? intval($_POST['applyall']) : 0;
-    $categoryObj->setVar('weight', (isset($_POST['weight']))? intval($_POST['weight']) : 1);
+    $categoryObj->setVar('parentid', (isset($_POST['parentid'])) ? intval($_POST['parentid']) : 0);
+    $applyall = (isset($_POST['applyall'])) ? intval($_POST['applyall']) : 0;
+    $categoryObj->setVar('weight', (isset($_POST['weight'])) ? intval($_POST['weight']) : 1);
 
     // Groups and permissions
     if (isset($_POST['groups_read'])) {
@@ -259,8 +259,8 @@ 
         $redirect_to = 'category.php';
     }
 
-    if ( !$categoryObj->store() ) {
-        redirect_header("javascript:history.go(-1)", 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
+    if (!$categoryObj->store()) {
+        redirect_header("javascript:history.go(-1)", 3, _AM_SF_CATEGORY_SAVE_ERROR.sf_formatErrors($categoryObj->getErrors()));
         exit;
     }
     // TODO : put this function in the category class
@@ -283,16 +283,16 @@ 
     $module_id = $xoopsModule->getVar('mid');
     $gperm_handler = &xoops_gethandler('groupperm');
 
-    $categoryid = (isset($_POST['categoryid']))? intval($_POST['categoryid']) : 0;
-    $categoryid = (isset($_GET['categoryid']))? intval($_GET['categoryid']) : $categoryid;
+    $categoryid = (isset($_POST['categoryid'])) ? intval($_POST['categoryid']) : 0;
+    $categoryid = (isset($_GET['categoryid'])) ? intval($_GET['categoryid']) : $categoryid;
 
     $categoryObj = new sfCategory($categoryid);
 
-    $confirm = (isset($_POST['confirm']))? $_POST['confirm'] : 0;
-    $name = (isset($_POST['name']))? $_POST['name'] : '';
+    $confirm = (isset($_POST['confirm'])) ? $_POST['confirm'] : 0;
+    $name = (isset($_POST['name'])) ? $_POST['name'] : '';
 
     if ($confirm) {
-        if ( !$category_handler->delete($categoryObj)) {
+        if (!$category_handler->delete($categoryObj)) {
             redirect_header("category.php", 1, _AM_SF_DELETE_CAT_ERROR);
             exit;
         }
@@ -301,9 +301,9 @@ 
         exit();
     } else {
         // no confirm: show deletion condition
-        $categoryid = (isset($_GET['categoryid']))? intval($_GET['categoryid']) : 0;
+        $categoryid = (isset($_GET['categoryid'])) ? intval($_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();
@@ -328,16 +328,16 @@ 
     $categoriesObj = $category_handler->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 = $category_handler->getCategoriesCount(0);
     if (count($categoriesObj) > 0) {
@@ -347,14 +347,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);
@@ -362,4 +362,4 @@ 
     break;
 }
 
-include_once __DIR__ . '/admin_footer.php';
+include_once __DIR__.'/admin_footer.php';

Braces +6 added lines, -2 removed lines

@@ -14,8 +14,12 @@
 
 $op = '';
 
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
+if (isset($_GET['op'])) {
+    $op = $_GET['op'];
+}
+if (isset($_POST['op'])) {
+    $op = $_POST['op'];
+}
 
 // Where do we start?
 $startcategory = isset($_GET['startcategory'])? intval($_GET['startcategory']) : 0;

smartfaq/admin/admin_footer.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
     ."  <div style='text-align: center;'>\n"
     ."    <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
     ."  </div>\n"
-    ."  " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
+    ."  "._AM_MODULEADMIN_ADMIN_FOOTER."\n"
     ."</div>";
 
 xoops_cp_footer();

smartfaq/admin/myblocksadmin.php

Spacing +60 added lines, -60 removed lines

@@ -13,7 +13,7 @@ 
 //                          GIJOE <http://www.peak.ne.jp/>                   //
 // ------------------------------------------------------------------------- //
 
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 include_once 'mygrouppermform.php';
 include_once(XOOPS_ROOT_PATH."/class/xoopsblock.php");
 include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/include/functions.php";
@@ -21,44 +21,44 @@ 
 $xoops_system_path = XOOPS_ROOT_PATH."/modules/system";
 
 // language files
-$language = $xoopsConfig['language'] ;
+$language = $xoopsConfig['language'];
 if (!file_exists("$xoops_system_path/language/$language/admin/blocksadmin.php")) $language = 'english';
 
 // to prevent from notice that constants already defined
 $error_reporting_level = error_reporting(0);
-include_once( "$xoops_system_path/constants.php" ) ;
-include_once( "$xoops_system_path/language/$language/admin.php" ) ;
-include_once( "$xoops_system_path/language/$language/admin/blocksadmin.php" ) ;
-include_once XOOPS_ROOT_PATH . "/modules/smartfaq/include/functions.php";
-error_reporting( $error_reporting_level ) ;
+include_once("$xoops_system_path/constants.php");
+include_once("$xoops_system_path/language/$language/admin.php");
+include_once("$xoops_system_path/language/$language/admin/blocksadmin.php");
+include_once XOOPS_ROOT_PATH."/modules/smartfaq/include/functions.php";
+error_reporting($error_reporting_level);
 
-$group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ;
+$group_defs = file("$xoops_system_path/language/$language/admin/groups.php");
 foreach ($group_defs as $def) {
-    if ( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ;
+    if (strstr($def, '_AM_ACCESSRIGHTS') || strstr($def, '_AM_ACTIVERIGHTS')) eval($def);
 }
 
 // check $xoopsModule
-if ( ! is_object( $xoopsModule ) ) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+if (!is_object($xoopsModule)) redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 
 // check access right (needs system_admin of BLOCK)
-$sysperm_handler =& xoops_gethandler('groupperm');
-if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+$sysperm_handler = & xoops_gethandler('groupperm');
+if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 
 // get blocks owned by the module
-$block_arr =& XoopsBlock::getByModule( $xoopsModule->mid() ) ;
+$block_arr = & XoopsBlock::getByModule($xoopsModule->mid());
 
 function list_blocks()
 {
-    global $block_arr, $xoopsModule ;
+    global $block_arr, $xoopsModule;
 
     // cachetime options
     $cachetimes = array('0' => _NOCACHE, '30' => sprintf(_SECONDS, 30), '60' => _MINUTE, '300' => sprintf(_MINUTES, 5), '1800' => sprintf(_MINUTES, 30), '3600' => _HOUR, '18000' => sprintf(_HOURS, 5), '86400' => _DAY, '259200' => sprintf(_DAYS, 3), '604800' => _WEEK, '2592000' => _MONTH);
 
     // displaying TH
     sf_collapsableBar('toptable', 'toptableicon');
-    echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_BLOCKS . "</h3>";
+    echo "<img id='toptableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_BLOCKS."</h3>";
     echo "<div id='toptable'>";
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_BLOCKSTXT . "</span>";
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_BLOCKSTXT."</span>";
 
     echo "
     <form action='admin.php' name='blockadmin' method='post'>
@@ -73,69 +73,69 @@ 
         </tr>\n" ;
 
     // blocks displaying loop
-    $class = 'even' ;
-    foreach ( array_keys( $block_arr ) as $i ) {
+    $class = 'even';
+    foreach (array_keys($block_arr) as $i) {
         $sseln = $ssel0 = $ssel1 = $ssel2 = $ssel3 = $ssel4 = "";
 
-        $weight = $block_arr[$i]->getVar("weight") ;
-        $title = $block_arr[$i]->getVar("title") ;
-        $name = $block_arr[$i]->getVar("name") ;
-        $bcachetime = $block_arr[$i]->getVar("bcachetime") ;
-        $bid = $block_arr[$i]->getVar("bid") ;
+        $weight = $block_arr[$i]->getVar("weight");
+        $title = $block_arr[$i]->getVar("title");
+        $name = $block_arr[$i]->getVar("name");
+        $bcachetime = $block_arr[$i]->getVar("bcachetime");
+        $bid = $block_arr[$i]->getVar("bid");
 
         // visible and side
-        if ( $block_arr[$i]->getVar("visible") != 1 ) {
+        if ($block_arr[$i]->getVar("visible") != 1) {
             $sseln = " checked='checked' style='background-color:#FF0000;'";
-        } else switch ( $block_arr[$i]->getVar("side") ) {
+        } else switch ($block_arr[$i]->getVar("side")) {
             default :
             case XOOPS_SIDEBLOCK_LEFT :
             $ssel0 = " checked='checked' style='background-color:#00FF00;'";
-            break ;
+            break;
             case XOOPS_SIDEBLOCK_RIGHT :
             $ssel1 = " checked='checked' style='background-color:#00FF00;'";
-            break ;
+            break;
             case XOOPS_CENTERBLOCK_LEFT :
             $ssel2 = " checked='checked' style='background-color:#00FF00;'";
-            break ;
+            break;
             case XOOPS_CENTERBLOCK_RIGHT :
             $ssel4 = " checked='checked' style='background-color:#00FF00;'";
-            break ;
+            break;
             case XOOPS_CENTERBLOCK_CENTER :
             $ssel3 = " checked='checked' style='background-color:#00FF00;'";
-            break ;
+            break;
         }
 
         // bcachetime
-        $cachetime_options = '' ;
+        $cachetime_options = '';
         foreach ($cachetimes as $cachetime => $cachetime_name) {
             if ($bcachetime == $cachetime) {
-                $cachetime_options .= "<option value='$cachetime' selected='selected'>$cachetime_name</option>\n" ;
+                $cachetime_options .= "<option value='$cachetime' selected='selected'>$cachetime_name</option>\n";
             } else {
-                $cachetime_options .= "<option value='$cachetime'>$cachetime_name</option>\n" ;
+                $cachetime_options .= "<option value='$cachetime'>$cachetime_name</option>\n";
             }
         }
 
         // target modules
-        $db =& XoopsDatabaseFactory::getDatabaseConnection();
-        $result = $db->query( "SELECT module_id FROM ".$db->prefix('block_module_link')." WHERE block_id='$bid'" ) ;
+        $db = & XoopsDatabaseFactory::getDatabaseConnection();
+        $result = $db->query("SELECT module_id FROM ".$db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = array();
-        while ( list( $selected_mid ) = $db->fetchRow( $result ) ) {
-            $selected_mids[] = intval( $selected_mid ) ;
+        while (list($selected_mid) = $db->fetchRow($result)) {
+            $selected_mids[] = intval($selected_mid);
         }
-        $module_handler =& xoops_gethandler('module');
+        $module_handler = & xoops_gethandler('module');
         $criteria = new CriteriaCompo(new Criteria('hasmain', 1));
         $criteria->add(new Criteria('isactive', 1));
-        $module_list =& $module_handler->getList($criteria);
+        $module_list = & $module_handler->getList($criteria);
         $module_list[-1] = _AM_TOPPAGE;
         $module_list[0] = _AM_ALLPAGES;
         ksort($module_list);
-        $module_options = '' ;
+        $module_options = '';
         $myts = &MyTextSanitizer::getInstance();
         foreach ($module_list as $mid => $mname) {
-            if ( in_array( $mid , $selected_mids ) ) {
-                $module_options .= "<option value='$mid' selected='selected'>" . $myts->displayTarea($mname) . "</option>\n" ;
+            if (in_array($mid, $selected_mids)) {
+                $module_options .= "<option value='$mid' selected='selected'>".$myts->displayTarea($mname)."</option>\n";
             } else {
-                $module_options .= "<option value='$mid'>" . $myts->displayTarea($mname) . "</option>\n" ;
+                $module_options .= "<option value='$mid'>".$myts->displayTarea($mname)."</option>\n";
             }
         }
 
@@ -171,9 +171,9 @@ 
                 <a href='admin.php?fct=blocksadmin&amp;op=edit&amp;bid=$bid'>"._EDIT."</a>
                 <input type='hidden' name='bid[$bid]' value='$bid' />
             </td>
-        </tr>\n" ;
+        </tr>\n";
 
-        $class = ( $class == 'even' )? 'odd' : 'even' ;
+        $class = ($class == 'even') ? 'odd' : 'even';
     }
 
     echo "
@@ -191,35 +191,35 @@ 
 
 function list_groups()
 {
-    global $xoopsModule , $block_arr ;
+    global $xoopsModule, $block_arr;
     $myts = &MyTextSanitizer::getInstance();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
 
-    foreach ( array_keys( $block_arr ) as $i ) {
-        $item_list[ $block_arr[$i]->getVar("bid") ] = $block_arr[$i]->getVar("title") ;
+    foreach (array_keys($block_arr) as $i) {
+        $item_list[$block_arr[$i]->getVar("bid")] = $block_arr[$i]->getVar("title");
     }
 
-    $form = new MyXoopsGroupPermForm('' , 1 , 'block_read' , "<img id='bottomtableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_GROUPS . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">" . _AM_SF_GROUPSINFO . "</span>") ;
-    $form->addAppendix('module_admin',$xoopsModule->mid(),$xoopsModule->name().' '._AM_ACTIVERIGHTS);
-    $form->addAppendix('module_read',$xoopsModule->mid(),$xoopsModule->name().' '._AM_ACCESSRIGHTS);
+    $form = new MyXoopsGroupPermForm('', 1, 'block_read', "<img id='bottomtableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_GROUPS."</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"._AM_SF_GROUPSINFO."</span>");
+    $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACTIVERIGHTS);
+    $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACCESSRIGHTS);
     foreach ($item_list as $item_id => $item_name) {
-        $form->addItem( $item_id , $myts->displayTarea($item_name) ) ;
+        $form->addItem($item_id, $myts->displayTarea($item_name));
     }
-    echo $form->render() ;
+    echo $form->render();
     echo "</div>";
 }
 
 if (!empty($_POST['submit'])) {
-    include __DIR__ . '/mygroupperm.php' ;
-    include_once( "$xoops_system_path/language/$language/admin.php" ) ;
-    redirect_header( XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php" , 1 , _AM_DBUPDATED );
+    include __DIR__.'/mygroupperm.php';
+    include_once("$xoops_system_path/language/$language/admin.php");
+    redirect_header(XOOPS_URL."/modules/".$xoopsModule->dirname()."/admin/myblocksadmin.php", 1, _AM_DBUPDATED);
 }
 
-xoops_cp_header() ;
+xoops_cp_header();
 if (file_exists('./mymenu.php')) include('./mymenu.php');
 //sf_adminMenu(5, _AM_SF_BLOCKSANDGROUPS);
 
-list_blocks() ;
-list_groups() ;
-xoops_cp_footer() ;
+list_blocks();
+list_groups();
+xoops_cp_footer();

Braces +19 added lines, -7 removed lines

@@ -22,7 +22,9 @@ 
 
 // language files
 $language = $xoopsConfig['language'] ;
-if (!file_exists("$xoops_system_path/language/$language/admin/blocksadmin.php")) $language = 'english';
+if (!file_exists("$xoops_system_path/language/$language/admin/blocksadmin.php")) {
+    $language = 'english';
+}
 
 // to prevent from notice that constants already defined
 $error_reporting_level = error_reporting(0);
@@ -34,15 +36,21 @@ 
 
 $group_defs = file( "$xoops_system_path/language/$language/admin/groups.php" ) ;
 foreach ($group_defs as $def) {
-    if ( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) eval( $def ) ;
-}
+    if ( strstr( $def , '_AM_ACCESSRIGHTS' ) || strstr( $def , '_AM_ACTIVERIGHTS' ) ) {
+        eval( $def ) ;
+    }
+    }
 
 // check $xoopsModule
-if ( ! is_object( $xoopsModule ) ) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+if ( ! is_object( $xoopsModule ) ) {
+    redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+}
 
 // check access right (needs system_admin of BLOCK)
 $sysperm_handler =& xoops_gethandler('groupperm');
-if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+if (!$sysperm_handler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) {
+    redirect_header( XOOPS_URL.'/user.php' , 1 , _NOPERM ) ;
+}
 
 // get blocks owned by the module
 $block_arr =& XoopsBlock::getByModule( $xoopsModule->mid() ) ;
@@ -86,10 +94,12 @@ 
         // visible and side
         if ( $block_arr[$i]->getVar("visible") != 1 ) {
             $sseln = " checked='checked' style='background-color:#FF0000;'";
-        } else switch ( $block_arr[$i]->getVar("side") ) {
+        } else {
+            switch ( $block_arr[$i]->getVar("side") ) {
             default :
             case XOOPS_SIDEBLOCK_LEFT :
             $ssel0 = " checked='checked' style='background-color:#00FF00;'";
+        }
             break ;
             case XOOPS_SIDEBLOCK_RIGHT :
             $ssel1 = " checked='checked' style='background-color:#00FF00;'";
@@ -217,7 +227,9 @@ 
 }
 
 xoops_cp_header() ;
-if (file_exists('./mymenu.php')) include('./mymenu.php');
+if (file_exists('./mymenu.php')) {
+    include('./mymenu.php');
+}
 //sf_adminMenu(5, _AM_SF_BLOCKSANDGROUPS);
 
 list_blocks() ;

smartfaq/admin/docbook_export.php

Spacing +26 added lines, -26 removed lines

@@ -7,9 +7,9 @@ 
 * 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'];
@@ -18,9 +18,9 @@ 
 if ($op == 'start') {
     include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    xoops_cp_header ();
+    xoops_cp_header();
 
-    xoops_cp_footer ();
+    xoops_cp_footer();
     exit ();
 }
 
@@ -45,48 +45,48 @@ 
 
     echo "  <title>{module title}</title>\r\n";
 
-    $resultC = $xoopsDB->query ("select * from ".$xoopsDB->prefix("smartfaq_categories"));
-    while ($arrC = $xoopsDB->fetchArray ($resultC)) {
-        extract ($arrC, EXTR_PREFIX_ALL, 'c');
+    $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");
-        while ($arrQ = $xoopsDB->fetchArray ($resultQ)) {
-            extract ($arrQ, EXTR_PREFIX_ALL, 'q');
+        $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");
-            while ($arrA = $xoopsDB->fetchArray ($resultA)) {
-                extract ($arrA, EXTR_PREFIX_ALL, 'a');
+            $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";
             }
-            mysql_free_result ($resultA);
+            mysql_free_result($resultA);
 
             echo "    </qandaentry>\r\n";
         }
-        mysql_free_result ($resultQ);
+        mysql_free_result($resultQ);
 
         echo "  </qandadiv>\r\n";
     }
@@ -96,12 +96,12 @@ 
     exit();
 }
 
-function encodeText ( $text )
+function encodeText($text)
 {
-    return utf8_encode (htmlspecialchars ($text));
+    return utf8_encode(htmlspecialchars($text));
 }
 
-function getUserFullName ( $uid )
+function getUserFullName($uid)
 {
     global $xoopsDB;