mambax7 / smartfaq

admin/answer.php

Indentation +12 added lines, -12 removed lines

@@ -114,18 +114,18 @@
     foreach ($proposed_answers as $proposed_answer) {
         if (Constants::SF_STATUS_NEW_ANSWER == $faqObj->status()) {
             $merge   = "<a href='faq.php?op=merge&amp;faqid="
-                       . $faqObj->faqid()
-                       . '&amp;answerid='
-                       . $proposed_answer->answerid()
-                       . "'><img src='"
-                       . XOOPS_URL
-                       . '/modules/'
-                       . $xoopsModule->dirname()
-                       . "/assets/images/icon/merge.gif' title='"
-                       . _AM_SF_FAQ_MERGE
-                       . "' alt='"
-                       . _AM_SF_FAQ_MERGE
-                       . "'></a>&nbsp;";
+                        . $faqObj->faqid()
+                        . '&amp;answerid='
+                        . $proposed_answer->answerid()
+                        . "'><img src='"
+                        . XOOPS_URL
+                        . '/modules/'
+                        . $xoopsModule->dirname()
+                        . "/assets/images/icon/merge.gif' title='"
+                        . _AM_SF_FAQ_MERGE
+                        . "' alt='"
+                        . _AM_SF_FAQ_MERGE
+                        . "'></a>&nbsp;";
             $approve = "<a href='answer.php?op=selectanswer&amp;faqid=" . $faqid . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/on.png' . "' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "'></a>";
         }
         $modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "'></a>&nbsp;";

Spacing +35 added lines, -35 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $op = '';
 
@@ -32,7 +32,7 @@ 
 {
     global $answerHandler, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts, $pathIcon16, $smartModuleConfig;
 
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the FAQ object
     $faqObj = new Smartfaq\Faq($faqid);
@@ -69,9 +69,9 @@ 
     $official_answer = $faqObj->answer();
 
     Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_SUBMITTED_ANSWER . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_SUBMITTED_ANSWER.'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_SUBMITTED_ANSWER_INFO . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_SUBMITTED_ANSWER_INFO.'</span>';
 
     $proposed_answers = $answerHandler->getAllAnswers($faqid, Constants::SF_AN_STATUS_PROPOSED);
 
@@ -81,31 +81,31 @@ 
 
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_CATEGORY . "</td>
-              <td class='even'>" . $categoryObj->name() . "</td>
+              <td class='head' width='100px'>" . _AM_SF_CATEGORY."</td>
+              <td class='even'>" . $categoryObj->name()."</td>
             </tr>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_QUESTION . "</td>
-              <td class='even'>" . $faqObj->question() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_QUESTION."</td>
+              <td class='even'>" . $faqObj->question().'</td>
             </tr>';
     if ($official_answer) {
         echo "
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL . "</td>
-              <td class='even'>" . $official_answer->answer() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL."</td>
+              <td class='even'>" . $official_answer->answer().'</td>
             </tr>';
     }
     echo "</table><br>\n";
 
     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 class='bg3' class='bg3' align='center'><b>" . _AM_SF_ANSWER . '</b></td>';
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+    echo "<th class='bg3' class='bg3' align='center'><b>"._AM_SF_ANSWER.'</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_ANSWERED.'</b></td>';
 
-    echo "<th width='180' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-    echo "<th width='120' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+    echo "<th width='180' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+    echo "<th width='120' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
     echo '</tr>';
 
     $merge   = '';
@@ -113,7 +113,7 @@ 
     $approve = '';
     foreach ($proposed_answers as $proposed_answer) {
         if (Constants::SF_STATUS_NEW_ANSWER == $faqObj->status()) {
-            $merge   = "<a href='faq.php?op=merge&amp;faqid="
+            $merge = "<a href='faq.php?op=merge&amp;faqid="
                        . $faqObj->faqid()
                        . '&amp;answerid='
                        . $proposed_answer->answerid()
@@ -126,19 +126,19 @@ 
                        . "' alt='"
                        . _AM_SF_FAQ_MERGE
                        . "'></a>&nbsp;";
-            $approve = "<a href='answer.php?op=selectanswer&amp;faqid=" . $faqid . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/on.png' . "' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "'></a>";
+            $approve = "<a href='answer.php?op=selectanswer&amp;faqid=".$faqid.'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/on.png'."' title='"._AM_SF_FAQ_APPROVE_NEW_ANSWER."' alt='"._AM_SF_APPROVESUB."'></a>";
         }
-        $modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "'></a>&nbsp;";
-        $delete = "<a href='answer.php?op=del&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETESUBM . "' alt='" . _AM_SF_DELETESUBM . "'></a>";
+        $modify = "<a href='faq.php?op=mod&amp;faqid=".$faqObj->faqid().'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_REVIEW."' alt='"._AM_SF_FAQ_REVIEW."'></a>&nbsp;";
+        $delete = "<a href='answer.php?op=del&amp;faqid=".$faqObj->faqid().'&amp;answerid='.$proposed_answer->answerid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETESUBM."' alt='"._AM_SF_DELETESUBM."'></a>";
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $proposed_answer->answerid() . '</td>';
-        echo "<td class='even' align='left'>" . $proposed_answer->answer() . '</td>';
+        echo "<td class='head' align='center'>".$proposed_answer->answerid().'</td>';
+        echo "<td class='even' align='left'>".$proposed_answer->answer().'</td>';
 
         //show name of the answer submitter
         $submitter = Smartfaq\Utility::getLinkedUnameFromId($proposed_answer->uid(), $smartModuleConfig['userealname']);
-        echo "<td class='even' align='center'>" . $submitter . '</td>';
+        echo "<td class='even' align='center'>".$submitter.'</td>';
 
-        echo "<td class='even' align='center'>" . $proposed_answer->datesub() . '</td>';
+        echo "<td class='even' align='center'>".$proposed_answer->datesub().'</td>';
         echo "<td class='even' align='center'> $merge $modify $approve $delete </td>";
         echo '</tr>';
     }
@@ -150,17 +150,17 @@ 
 switch ($op) {
     case 'mod':
         xoops_cp_header();
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts;
-        $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
+        $faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
         editfaq($faqid);
         break;
 
     case 'selectanswer':
         global $xoopsUser, $_GET, $xoopsModuleConfig;
 
-        $faqid    = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
-        $answerid = isset($_GET['answerid']) ? (int)$_GET['answerid'] : 0;
+        $faqid    = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
+        $answerid = isset($_GET['answerid']) ? (int) $_GET['answerid'] : 0;
 
         // Creating the FAQ object
         $faqObj = new Smartfaq\Faq($faqid);
@@ -234,11 +234,11 @@ 
     case 'del':
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB;
 
-        $faqid     = isset($_POST['faqid']) ? (int)$_POST['faqid'] : 0;
-        $faqid     = isset($_GET['faqid']) ? (int)$_GET['faqid'] : $faqid;
-        $answerid  = isset($_POST['answerid']) ? (int)$_POST['answerid'] : 0;
-        $answerid  = isset($_GET['answerid']) ? (int)$_GET['answerid'] : $answerid;
-        $confirm   = isset($_POST['confirm']) ? (int)$_POST['confirm'] : 0;
+        $faqid     = isset($_POST['faqid']) ? (int) $_POST['faqid'] : 0;
+        $faqid     = isset($_GET['faqid']) ? (int) $_GET['faqid'] : $faqid;
+        $answerid  = isset($_POST['answerid']) ? (int) $_POST['answerid'] : 0;
+        $answerid  = isset($_GET['answerid']) ? (int) $_GET['answerid'] : $answerid;
+        $confirm   = isset($_POST['confirm']) ? (int) $_POST['confirm'] : 0;
         $faqObj    = new Smartfaq\Faq($faqid);
         $answerObj = new Smartfaq\Answer($answerid);
         if ($confirm) {
@@ -257,7 +257,7 @@ 
                     $proposed_answers = $answerHandler->getAllAnswers($faqid, Constants::SF_AN_STATUS_PROPOSED);
                     if (count($proposed_answers) > 0) {
                         // This question has other proposed answer
-                        $redirect_page = 'answer.php?op=mod&faqid=' . $faqid;
+                        $redirect_page = 'answer.php?op=mod&faqid='.$faqid;
                         $redirect_msg  = _AM_SF_ANSWER_REJECTED;
                     } else {
                         // The question has no other proposed answer
@@ -281,11 +281,11 @@ 
     default:
         xoops_cp_header();
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 
         editfaq();
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/category.php

Switch Indentation +120 added lines, -120 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -8,7 +8,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Creating the category handler object
 /** @var \XoopsModules\Smartfaq\CategoryHandler $categoryHandler */
@@ -24,7 +24,7 @@ 
 }
 
 // Where do we start?
-$startcategory = isset($_GET['startcategory']) ? (int)$_GET['startcategory'] : 0;
+$startcategory = isset($_GET['startcategory']) ? (int) $_GET['startcategory'] : 0;
 
 /**
  * @param XoopsObject $categoryObj
@@ -36,11 +36,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) {
@@ -61,11 +61,11 @@ 
          . "/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='left'>".$description.'</td>';
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo '</tr>';
-    $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
+    $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
     if (count($subCategoriesObj) > 0) {
         ++$level;
         foreach ($subCategoriesObj as $key => $thiscat) {
@@ -83,9 +83,9 @@ 
 {
     //$moderators = array(); // just to define the variable
     //$allmods = array();
-    $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+    $startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the faq handler object
     /** @var \XoopsModules\Smartfaq\FaqHandler $faqHandler */
@@ -108,13 +108,13 @@ 
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
         }
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
         echo "<div id='bottomtable'>";
     } else {
         $categoryObj = $categoryHandler->create();
         echo "<br>\n";
         Smartfaq\Utility::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
@@ -159,7 +159,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, '');
@@ -224,7 +224,7 @@ 
     echo '</div>';
 
     if ($categoryid) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
     }
 
     unset($hidden);
@@ -232,7 +232,7 @@ 
 
 switch ($op) {
     case 'mod':
-        $categoryid  = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+        $categoryid  = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
         $destList    = isset($_POST['destList']) ? $_POST['destList'] : '';
         $adminObject = \Xmf\Module\Admin::getInstance();
         xoops_cp_header();
@@ -244,7 +244,7 @@ 
     case 'addcategory':
         global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
 
         if (0 != $categoryid) {
             $categoryObj = new Smartfaq\Category($categoryid);
@@ -255,9 +255,9 @@ 
         //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
         //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
 
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int) $_POST['parentid'] : 0);
+        $applyall = isset($_POST['applyall']) ? (int) $_POST['applyall'] : 0;
+        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int) $_POST['weight'] : 1);
 
         // Groups and permissions
         if (isset($_POST['groups_read'])) {
@@ -280,7 +280,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -300,8 +300,8 @@ 
         $module_id    = $xoopsModule->getVar('mid');
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : $categoryid;
 
         $categoryObj = new Smartfaq\Category($categoryid);
 
@@ -315,14 +315,14 @@ 
             redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
         } else {
             // no confirm: show deletion condition
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
             xoops_cp_header();
             xoops_confirm([
                               '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);
+                          ], 'category.php', _AM_SF_DELETECOL." '".$categoryObj->name()."'. <br> <br>"._AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
             xoops_cp_footer();
         }
         exit();
@@ -340,19 +340,19 @@ 
         echo "<br>\n";
 
         // Creating the objects for top categories
-        $categoriesObj =& $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
+        $categoriesObj = & $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_CATEGORIES_DSC.'</span>';
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         $totalCategories = $categoryHandler->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -361,14 +361,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";
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_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);
@@ -376,4 +376,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/xoopsfaq.php

Spacing +25 added lines, -25 removed lines

@@ -14,7 +14,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'XoopsFAQ';
 $scriptname           = 'xoopsfaq.php';
@@ -27,33 +27,33 @@ 
 
 if ('start' === $op) {
     xoops_cp_header();
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_categories'));
+    $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_categories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     Smartfaq\Utility::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 (0 == $totalCat) {
-        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 {
-        require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_contents'));
+        $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_contents'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if (0 == $totalFAQ) {
-            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->queryF('SELECT c.category_id, c.category_title, count(q.contents_id) FROM ' . $xoopsDB->prefix('xoopsfaq_categories') . ' AS c, ' . $xoopsDB->prefix('xoopsfaq_contents') . ' AS q WHERE c.category_id=q.category_id GROUP BY c.category_id ORDER BY category_order');
+            $result   = $xoopsDB->queryF('SELECT c.category_id, c.category_title, count(q.contents_id) FROM '.$xoopsDB->prefix('xoopsfaq_categories').' AS c, '.$xoopsDB->prefix('xoopsfaq_contents').' AS q WHERE c.category_id=q.category_id GROUP BY c.category_id ORDER BY category_order');
 
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
@@ -68,7 +68,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -81,7 +81,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = [];
@@ -105,7 +105,7 @@ 
 }
 
 if ('go' === $op) {
-    require_once __DIR__ . '/admin_header.php';
+    require_once __DIR__.'/admin_header.php';
 
     $import_category = (isset($_POST['import_category']) ? $_POST['import_category'] : null);
     if (!$import_category) {
@@ -115,9 +115,9 @@ 
     xoops_cp_header();
 
     Smartfaq\Utility::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;
@@ -146,7 +146,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('xoopsfaq_categories') . " where category_id in ($import_category_list) order by category_order");
+    $resultCat = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('xoopsfaq_categories')." where category_id in ($import_category_list) order by category_order");
 
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
         extract($arrCat, EXTR_PREFIX_ALL, 'xcat');
@@ -160,7 +160,7 @@ 
         $categoryObj->setVar('name', $xcat_category_title);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br>';
             continue;
         }
 
@@ -168,9 +168,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
 
-        $resultFAQ = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('xoopsfaq_contents') . " where category_id=$xcat_category_id order by contents_order");
+        $resultFAQ = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('xoopsfaq_contents')." where category_id=$xcat_category_id order by contents_order");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'xfaq');
 
@@ -198,7 +198,7 @@ 
             $faqObj->setVar('cancomment', $cancomment);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title) . '<br>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title).'<br>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -207,10 +207,10 @@ 
                 $answerObj->setVar('status', Constants::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;
                 }
             }
@@ -220,8 +220,8 @@ 
     }
 
     echo 'Done.<br>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br>';
 
     exit();
 }

admin/menu.php

Spacing +8 added lines, -8 removed lines

@@ -19,47 +19,47 @@
 $adminmenu[] = [
     'title' => _MI_SF_HOME,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU1,
     'link'  => 'admin/main.php',
-    'icon'  => $pathIcon32 . '/manage.png',
+    'icon'  => $pathIcon32.'/manage.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU2,
     'link'  => 'admin/category.php',
-    'icon'  => $pathIcon32 . '/category.png',
+    'icon'  => $pathIcon32.'/category.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU3,
     'link'  => 'admin/faq.php',
-    'icon'  => $pathIcon32 . '/search.png',
+    'icon'  => $pathIcon32.'/search.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU4,
     'link'  => 'admin/question.php',
-    'icon'  => $pathIcon32 . '/faq.png',
+    'icon'  => $pathIcon32.'/faq.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU5,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png',
+    'icon'  => $pathIcon32.'/permissions.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ADMENU8,
     'link'  => 'admin/import.php',
-    'icon'  => $pathIcon32 . '/download.png',
+    'icon'  => $pathIcon32.'/download.png',
 ];
 
 $adminmenu[] = [
     'title' => _MI_SF_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
 ];

admin/import.php

Spacing +9 added lines, -9 removed lines

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

admin/wffaq.php

Spacing +25 added lines, -25 removed lines

@@ -13,7 +13,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'WF-FAQ';
 $scriptname           = 'wffaq.php';
@@ -25,33 +25,33 @@ 
 }
 
 if ('start' === $op) {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     xoops_cp_header();
-    $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('faqcategories'));
+    $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('faqcategories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     Smartfaq\Utility::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 (0 == $totalCat) {
-        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 {
-        require_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->queryF('SELECT count(*) FROM ' . $xoopsDB->prefix('faqtopics'));
+        $result = $xoopsDB->queryF('SELECT count(*) FROM '.$xoopsDB->prefix('faqtopics'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if (0 == $totalFAQ) {
-            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->queryF('SELECT c.catID, c.name, count(t.topicID) FROM ' . $xoopsDB->prefix('faqcategories') . ' AS c, ' . $xoopsDB->prefix('faqtopics') . ' AS t WHERE c.catID=t.catID GROUP BY t.catID ORDER BY c.weight');
+            $result   = $xoopsDB->queryF('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\>");
             }
@@ -65,7 +65,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -78,7 +78,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new \XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = [];
             $groups_checkbox = new \XoopsFormCheckBox(_AM_SF_IMPORT_PERMISSIONS, 'groups_read');
@@ -107,13 +107,13 @@ 
         redirect_header($scriptname, 2, _AM_SF_NOCATSELECTED);
     }
 
-    require_once __DIR__ . '/admin_header.php';
+    require_once __DIR__.'/admin_header.php';
     xoops_cp_header();
 
     Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_RESULT . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -142,7 +142,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('faqcategories') . " where catID in ($import_category_list) order by weight");
+    $resultCat = $xoopsDB->queryF('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');
@@ -157,7 +157,7 @@ 
         $categoryObj->setVar('description', $wfc_description);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br>';
             continue;
         }
 
@@ -165,9 +165,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name)."<br\>";
 
-        $resultFAQ = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('faqtopics') . " where catID=$wfc_catID order by weight");
+        $resultFAQ = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('faqtopics')." where catID=$wfc_catID order by weight");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'wft');
 
@@ -199,7 +199,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());
@@ -208,10 +208,10 @@ 
                 $answerObj->setVar('status', Constants::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;
                 }
             }
@@ -221,8 +221,8 @@ 
     }
 
     echo 'Done.<br>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br>';
 
     exit();
 }

admin/mygroupperm.php

Spacing +10 added lines, -10 removed lines

@@ -15,14 +15,14 @@ 
 
 function myDeleteByModule(\XoopsDatabase $db, $gperm_modid, $gperm_name = null, $gperm_itemid = null)
 {
-    $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', (int)$gperm_modid));
+    $criteria = new \CriteriaCompo(new \Criteria('gperm_modid', (int) $gperm_modid));
     if (null !== $gperm_name) {
         $criteria->add(new \Criteria('gperm_name', $gperm_name));
         if (null !== $gperm_itemid) {
-            $criteria->add(new \Criteria('gperm_itemid', (int)$gperm_itemid));
+            $criteria->add(new \Criteria('gperm_itemid', (int) $gperm_itemid));
         }
     }
-    $sql = 'DELETE FROM ' . $db->prefix('group_permission') . ' ' . $criteria->renderWhere();
+    $sql = 'DELETE FROM '.$db->prefix('group_permission').' '.$criteria->renderWhere();
     if (!$result = $db->query($sql)) {
         return false;
     }
@@ -31,19 +31,19 @@ 
 }
 
 // require_once __DIR__ . '/../../../include/cp_header.php'; GIJ
-$modid = isset($HTTP_POST_VARS['modid']) ? (int)$HTTP_POST_VARS['modid'] : 1;
+$modid = isset($HTTP_POST_VARS['modid']) ? (int) $HTTP_POST_VARS['modid'] : 1;
 // we dont want system module permissions to be changed here ( 1 -> 0 GIJ)
 if ($modid <= 0 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 /** @var XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $module        = $moduleHandler->get($modid);
 if (!is_object($module) || !$module->getVar('isactive')) {
-    redirect_header(XOOPS_URL . '/admin.php', 1, _MODULENOEXIST);
+    redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
 }
 $memberHandler = xoops_getHandler('member');
-$group_list    =& $memberHandler->getGroupList();
+$group_list    = & $memberHandler->getGroupList();
 if (is_array($HTTP_POST_VARS['perms']) && !empty($HTTP_POST_VARS['perms'])) {
     $gpermHandler = xoops_getHandler('groupperm');
     foreach ($HTTP_POST_VARS['perms'] as $perm_name => $perm_data) {
@@ -66,7 +66,7 @@ 
                             foreach ($parent_ids as $pid) {
                                 if (0 != $pid && !in_array($pid, array_keys($item_ids))) {
                                     // one of the parent items were not selected, so skip this item
-                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>') . ' (' . _MD_AM_PERMADDNGP . ')';
+                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>').' ('._MD_AM_PERMADDNGP.')';
                                     continue 2;
                                 }
                             }
@@ -77,9 +77,9 @@ 
                         $gperm->setVar('gperm_modid', $modid);
                         $gperm->setVar('gperm_itemid', $item_id);
                         if (!$gpermHandler->insert($gperm)) {
-                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         } else {
-                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
+                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
                         }
                         unset($gperm);
                     }

admin/admin_header.php

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 // require_once __DIR__ . '/../class/Utility.php';
@@ -28,18 +28,18 @@ 
 $moduleDirName = basename(dirname(__DIR__));
 
 $path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/kernel/module.php';
-require_once $path . '/class/xoopstree.php';
-require_once $path . '/class/xoopslists.php';
-require_once $path . '/class/pagenav.php';
-require_once $path . '/class/xoopsformloader.php';
+require_once $path.'/kernel/module.php';
+require_once $path.'/class/xoopstree.php';
+require_once $path.'/class/xoopslists.php';
+require_once $path.'/class/pagenav.php';
+require_once $path.'/class/xoopsformloader.php';
 
 //require_once __DIR__ . '/../include/functions.php';
 // require_once __DIR__ . '/../class/category.php';
 // require_once __DIR__ . '/../class/faq.php';
 // require_once __DIR__ . '/../class/answer.php';
 // require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/../include/common.php';
+require_once __DIR__.'/../include/common.php';
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
 $adminObject = \Xmf\Module\Admin::getInstance();

admin/question.php

Spacing +36 added lines, -36 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 global $xoopsUser;
 
@@ -30,7 +30,7 @@ 
 }
 
 // Where shall we start?
-$startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+$startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
 
 /**
  * @param bool $showmenu
@@ -40,7 +40,7 @@ 
 {
     global $faqHandler, $categoryHandler, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts;
 
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if (-1 != $faqid) {
         // Creating the FAQ object
@@ -72,9 +72,9 @@ 
 
         echo "<br>\n";
         Smartfaq\Utility::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 = $faqHandler->create();
@@ -85,7 +85,7 @@ 
         $button_caption    = _AM_SF_CREATE;
 
         Smartfaq\Utility::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'), 'post', true);
@@ -159,7 +159,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');
@@ -191,7 +191,7 @@ 
         xoops_cp_header();
 
         $adminObject->displayNavigation(basename(__FILE__));
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         editfaq(true, $faqid);
         break;
@@ -207,7 +207,7 @@ 
             $uid = $xoopsUser->uid();
         }
 
-        $faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : -1;
+        $faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : -1;
 
         // Creating the FAQ
         if (-1 != $faqid) {
@@ -218,9 +218,9 @@ 
 
         // Putting the values in the FAQ object
         $faqObj->setGroups_read(isset($_POST['groups']) ? $_POST['groups'] : []);
-        $faqObj->setVar('categoryid', isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0);
+        $faqObj->setVar('categoryid', isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0);
         $faqObj->setVar('question', $_POST['question']);
-        $faqObj->setVar('status', isset($_POST['status']) ? (int)$_POST['status'] : Constants::SF_STATUS_ASKED);
+        $faqObj->setVar('status', isset($_POST['status']) ? (int) $_POST['status'] : Constants::SF_STATUS_ASKED);
 
         $notifToDo = null;
 
@@ -252,7 +252,7 @@ 
 
         // Storing the FAQ
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR . Smartfaq\Utility::formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR.Smartfaq\Utility::formatErrors($faqObj->getErrors()));
         }
 
         // Send notifications
@@ -270,8 +270,8 @@ 
         $module_id    = $xoopsModule->getVar('mid');
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : 0;
-        $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : $faqid;
+        $faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : 0;
+        $faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : $faqid;
 
         $faqObj = new Smartfaq\Faq($faqid);
 
@@ -286,14 +286,14 @@ 
             redirect_header('question.php', 2, sprintf(_AM_SF_QUESTIONISDELETED, $faqObj->question()));
         } else {
             // no confirm: show deletion condition
-            $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
+            $faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
             xoops_cp_header();
             xoops_confirm([
                               'op'      => 'del',
                               'faqid'   => $faqObj->faqid(),
                               'confirm' => 1,
                               'name'    => $faqObj->question()
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                          ], 'question.php', _AM_SF_DELETETHISQUESTION." <br>'".$faqObj->question()."'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 
@@ -306,8 +306,8 @@ 
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
         global  $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $smartModuleConfig;
 
@@ -315,9 +315,9 @@ 
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
 
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_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 = $faqHandler->getFaqsCount(-1, [Constants::SF_STATUS_OPENED]);
@@ -327,14 +327,14 @@ 
         $allCats         = $categoryHandler->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) {
@@ -342,33 +342,33 @@ 
             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 = Smartfaq\Utility::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 = $categoryHandler->getCategoriesCount(-1);
@@ -379,4 +379,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';