mambax7 / smartfaq

open_category.php

Spacing +17 added lines, -17 removed lines

@@ -6,16 +6,16 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.tpl';
 
-require_once XOOPS_ROOT_PATH . '/header.php';
-require_once __DIR__ . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+require_once __DIR__.'/footer.php';
 
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
 
 // Creating the category object for the selected category
 $categoryObj = new sfCategory($categoryid);
@@ -34,7 +34,7 @@ 
 $categoryHandler = sf_gethandler('category');
 
 // At which record shall we start
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 // Creating the faq handler object
 $faqHandler = sf_gethandler('faq');
@@ -58,7 +58,7 @@ 
 $last_qnaObj = $faqHandler->getLastPublishedByCat([_SF_STATUS_OPENED]);
 if (isset($last_qnaObj[$categoryid])) {
     $categoryObj->setVar('last_faqid', $last_qnaObj[$categoryid]->getVar('faqid'));
-    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$categoryid]->getVar('faqid') . "'>" . $last_qnaObj[$categoryid]->question(50) . '</a>');
+    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$categoryid]->getVar('faqid')."'>".$last_qnaObj[$categoryid]->question(50).'</a>');
 }
 // Populating the smarty variables with informations related to the selected category
 $category                 = $categoryObj->toArray(null, true);
@@ -77,16 +77,16 @@ 
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
             if (isset($last_qnaObj[$subcat_id])) {
                 $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
-                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question(50) . '</a>');
+                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question(50).'</a>');
             }
             $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
             $subcats[$subcat_id] = $subcat->toArray(null, true);
-            $catQnasWithSub      += $subcats[$subcat_id]['total'];
+            $catQnasWithSub += $subcats[$subcat_id]['total'];
         }
     }
     $xoopsTpl->assign('subcats', $subcats);
 }
-$category['total'] = $catQnasWithSub + $totalQnas[$categoryid];
+$category['total'] = $catQnasWithSub+$totalQnas[$categoryid];
 if ($faqsObj) {
     $userids = [];
     foreach ($faqsObj as $key => $thisfaq) {
@@ -95,7 +95,7 @@ 
     }
 
     $memberHandler = xoops_getHandler('member');
-    $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
+    $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
     for ($i = 0; $i < $totalQnasOnPage; ++$i) {
         $faq = $faqsObj[$i]->toArray(null, $allcategories);
 
@@ -107,7 +107,7 @@ 
     }
 }
 // Language constants
-$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name')) . " > <a href='open_index.php'>" . _MD_SF_OPEN_SECTION . '</a>');
+$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name'))." > <a href='open_index.php'>"._MD_SF_OPEN_SECTION.'</a>');
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());
 
 $xoopsTpl->assign('displaylastfaqs', true);
@@ -124,19 +124,19 @@ 
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
 
 // The Navigation Bar
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>';
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>';
 } else {
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 }
 
 $xoopsTpl->assign('category', $category);
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
 // End Page Title Hack by marcan
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

admin/category.php

Indentation +17 added lines, -17 removed lines

@@ -46,18 +46,18 @@ 
 
     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>';
+            . $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>";
@@ -314,11 +314,11 @@ 
             $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);
+                                '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();

Switch Indentation +120 added lines, -120 removed lines

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

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Creating the category handler object
 $categoryHandler = sf_gethandler('category');
@@ -21,7 +21,7 @@ 
 }
 
 // Where do we start?
-$startcategory = isset($_GET['startcategory']) ? (int)$_GET['startcategory'] : 0;
+$startcategory = isset($_GET['startcategory']) ? (int) $_GET['startcategory'] : 0;
 
 /**
  * @param XoopsObject $categoryObj
@@ -33,11 +33,11 @@ 
     $description = $categoryObj->description();
     if (!XOOPS_USE_MULTIBYTES) {
         if (strlen($description) >= 100) {
-            $description = substr($description, 0, 100 - 1) . '...';
+            $description = substr($description, 0, 100-1).'...';
         }
     }
-    $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITCOL . "' alt='" . _AM_SF_EDITCOL . "'></a>";
-    $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETECOL . "' alt='" . _AM_SF_DELETECOL . "'></a>";
+    $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITCOL."' alt='"._AM_SF_EDITCOL."'></a>";
+    $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETECOL."' alt='"._AM_SF_DELETECOL."'></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -58,8 +58,8 @@ 
          . "/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());
@@ -80,9 +80,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
     $faqHandler = sf_gethandler('faq');
@@ -104,13 +104,13 @@ 
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
         }
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
         echo "<div id='bottomtable'>";
     } else {
         $categoryObj = $categoryHandler->create();
         echo "<br>\n";
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
         echo "<div id='bottomtable'>";
     }
     // Start category form
@@ -155,7 +155,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, '');
@@ -220,7 +220,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);
@@ -228,7 +228,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();
@@ -240,7 +240,7 @@ 
     case 'addcategory':
         global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
 
         if ($categoryid != 0) {
             $categoryObj = new sfCategory($categoryid);
@@ -251,9 +251,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'])) {
@@ -276,7 +276,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.sf_formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -296,8 +296,8 @@ 
         $module_id    = $xoopsModule->getVar('mid');
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : $categoryid;
 
         $categoryObj = new sfCategory($categoryid);
 
@@ -311,14 +311,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();
@@ -339,16 +339,16 @@ 
         $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
 
         sf_collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_CATEGORIES_DSC.'</span>';
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         $totalCategories = $categoryHandler->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -357,14 +357,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);
@@ -372,4 +372,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/xoopsfaq.php

Spacing +25 added lines, -25 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'XoopsFAQ';
 $scriptname           = 'xoopsfaq.php';
@@ -24,33 +24,33 @@ 
 
 if ($op === 'start') {
     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);
 
     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 {
-        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 ($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->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\>");
@@ -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 = [];
@@ -102,7 +102,7 @@ 
 }
 
 if ($op === 'go') {
-    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) {
@@ -112,9 +112,9 @@ 
     xoops_cp_header();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_RESULT . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -142,7 +142,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->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');
@@ -156,7 +156,7 @@ 
         $categoryObj->setVar('name', $xcat_category_title);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br>';
             continue;
         }
 
@@ -164,9 +164,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
 
-        $resultFAQ = $xoopsDB->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');
 
@@ -194,7 +194,7 @@ 
             $faqObj->setVar('cancomment', $cancomment);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title) . '<br>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title).'<br>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -203,10 +203,10 @@ 
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
 
                 if (!$answerObj->store()) {
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br>';
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br>';
                     continue;
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br>';
                     ++$cnt_imported_faq;
                 }
             }
@@ -216,8 +216,8 @@ 
     }
 
     echo 'Done.<br>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br>';
 
     exit();
 }

admin/question.php

Indentation +5 added lines, -5 removed lines

@@ -284,11 +284,11 @@
             $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);
+                                '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();
         }
 

Spacing +36 added lines, -36 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Creating the faq handler object
 $faqHandler = sf_gethandler('faq');
@@ -23,7 +23,7 @@ 
 }
 
 // Where shall we start?
-$startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+$startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
 
 /**
  * @param bool $showmenu
@@ -33,7 +33,7 @@ 
 {
     global $faqHandler, $categoryHandler, $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';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if ($faqid != -1) {
         // Creating the FAQ object
@@ -65,9 +65,9 @@ 
 
         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 = $faqHandler->create();
@@ -78,7 +78,7 @@ 
         $button_caption    = _AM_SF_CREATE;
 
         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'), 'post', true);
@@ -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');
@@ -184,7 +184,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;
@@ -202,7 +202,7 @@ 
             $uid = $xoopsUser->uid();
         }
 
-        $faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : -1;
+        $faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : -1;
 
         // Creating the FAQ
         if ($faqid != -1) {
@@ -213,9 +213,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'] : _SF_STATUS_ASKED);
+        $faqObj->setVar('status', isset($_POST['status']) ? (int) $_POST['status'] : _SF_STATUS_ASKED);
 
         $notifToDo = null;
 
@@ -247,7 +247,7 @@ 
 
         // Storing the FAQ
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR . sf_formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR.sf_formatErrors($faqObj->getErrors()));
         }
 
         // Send notifications
@@ -265,8 +265,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 sfFaq($faqid);
 
@@ -281,14 +281,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();
         }
 
@@ -301,8 +301,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 $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $smartModuleConfig;
 
@@ -310,9 +310,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 = $faqHandler->getFaqsCount(-1, [_SF_STATUS_OPENED]);
@@ -322,14 +322,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) {
@@ -337,33 +337,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 = 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 = $categoryHandler->getCategoriesCount(-1);
@@ -374,4 +374,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/permissions.php

Switch Indentation +42 added lines, -42 removed lines

@@ -24,53 +24,53 @@
 }
 
 switch ($op) {
-    case 'default':
-    default:
-        global $xoopsDB, $xoopsModule;
+        case 'default':
+        default:
+            global $xoopsDB, $xoopsModule;
 
-        $adminObject = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
-        // View Categories permissions
-        $item_list_view = [];
-        $block_view     = [];
-        // echo "<h3 style='color: #2F5376; '>"._AM_SF_PERMISSIONSADMIN."</h3>\n" ;
-        sf_collapsableBar('toptable', 'toptableicon');
+            $adminObject = \Xmf\Module\Admin::getInstance();
+            xoops_cp_header();
+            $adminObject->displayNavigation(basename(__FILE__));
+            // View Categories permissions
+            $item_list_view = [];
+            $block_view     = [];
+            // 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";
 }
 
 require_once __DIR__ . '/admin_footer.php';

admin/myblocksadmin.php

Spacing +29 added lines, -29 removed lines

@@ -12,12 +12,12 @@ 
 //                          GIJOE <http://www.peak.ne.jp>                   //
 // ------------------------------------------------------------------------- //
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/mygrouppermform.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/include/functions.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/mygrouppermform.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->dirname().'/include/functions.php';
 
-$xoops_system_path = XOOPS_ROOT_PATH . '/modules/system';
+$xoops_system_path = XOOPS_ROOT_PATH.'/modules/system';
 
 // language files
 $language = $xoopsConfig['language'];
@@ -27,10 +27,10 @@ 
 
 // to prevent from notice that constants already defined
 $error_reporting_level = error_reporting(0);
-require_once __DIR__ . '/../../system/constants.php';
-require_once __DIR__ . "/../../language/$language/admin.php";
-require_once __DIR__ . "/../../language/$language/admin/blocksadmin.php";
-require_once __DIR__ . '/../include/functions.php';
+require_once __DIR__.'/../../system/constants.php';
+require_once __DIR__."/../../language/$language/admin.php";
+require_once __DIR__."/../../language/$language/admin/blocksadmin.php";
+require_once __DIR__.'/../include/functions.php';
 error_reporting($error_reporting_level);
 
 $group_defs = file("$xoops_system_path/language/$language/admin/groups.php");
@@ -42,13 +42,13 @@ 
 
 // check $xoopsModule
 if (!is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // check access right (needs system_admin of BLOCK)
 $syspermHandler = xoops_getHandler('groupperm');
 if (!$syspermHandler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // get blocks owned by the module
@@ -75,20 +75,20 @@ 
 
     // 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'>
         <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'>
-            <th>" . _AM_TITLE . "</th>
-            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION . "</th>
-            <th align='center'>" . _AM_WEIGHT . "</th>
-            <th align='center'>" . _AM_VISIBLEIN . "</th>
-            <th align='center'>" . _AM_BCACHETIME . "</th>
-            <th align='center'>" . _AM_ACTION . "</th>
+            <th>" . _AM_TITLE."</th>
+            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION."</th>
+            <th align='center'>" . _AM_WEIGHT."</th>
+            <th align='center'>" . _AM_VISIBLEIN."</th>
+            <th align='center'>" . _AM_BCACHETIME."</th>
+            <th align='center'>" . _AM_ACTION."</th>
         </tr>\n";
 
     // blocks displaying loop
@@ -138,10 +138,10 @@ 
 
         // target modules
         $db            = XoopsDatabaseFactory::getDatabaseConnection();
-        $result        = $db->query('SELECT module_id FROM ' . $db->prefix('block_module_link') . " WHERE block_id='$bid'");
+        $result        = $db->query('SELECT module_id FROM '.$db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = [];
         while (list($selected_mid) = $db->fetchRow($result)) {
-            $selected_mids[] = (int)$selected_mid;
+            $selected_mids[] = (int) $selected_mid;
         }
         /** @var XoopsModuleHandler $moduleHandler */
         $moduleHandler = xoops_getHandler('module');
@@ -155,9 +155,9 @@ 
         $myts           = MyTextSanitizer::getInstance();
         foreach ($module_list as $mid => $mname) {
             if (in_array($mid, $selected_mids)) {
-                $module_options .= "<option value='$mid' selected>" . $myts->displayTarea($mname) . "</option>\n";
+                $module_options .= "<option value='$mid' 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";
             }
         }
 
@@ -217,7 +217,7 @@ 
             <td class='foot' align='center' colspan='6'>
                 <input type='hidden' name='fct' value='blocksadmin'>
                 <input type='hidden' name='op' value='order'>
-                <input type='submit' name='submit' value='" . _SUBMIT . "'>
+                <input type='submit' name='submit' value='" . _SUBMIT."'>
             </td>
         </tr>
         </table>
@@ -245,8 +245,8 @@ 
                                                           . "</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->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));
     }
@@ -255,14 +255,14 @@ 
 }
 
 if (!empty($_POST['submit'])) {
-    include __DIR__ . '/mygroupperm.php';
+    include __DIR__.'/mygroupperm.php';
     require_once "$xoops_system_path/language/$language/admin.php";
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
 }
 
 xoops_cp_header();
 if (file_exists('./mymenu.php')) {
-    include __DIR__ . '/mymenu.php';
+    include __DIR__.'/mymenu.php';
 }
 
 list_blocks();

admin/faq.php

Indentation +5 added lines, -5 removed lines

@@ -548,11 +548,11 @@
             $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
             xoops_cp_header();
             xoops_confirm([
-                              'op'      => 'del',
-                              'faqid'   => $faqObj->faqid(),
-                              'confirm' => 1,
-                              'name'    => $faqObj->question()
-                          ], 'faq.php', _AM_SF_DELETETHISARTICLE . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                                'op'      => 'del',
+                                'faqid'   => $faqObj->faqid(),
+                                'confirm' => 1,
+                                'name'    => $faqObj->question()
+                            ], 'faq.php', _AM_SF_DELETETHISARTICLE . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 

Spacing +34 added lines, -34 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Creating the faq handler object
 $faqHandler = sf_gethandler('faq');
@@ -26,7 +26,7 @@ 
 }
 
 // Where shall we start?
-$startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+$startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
 
 /**
  * @param bool $showmenu
@@ -38,7 +38,7 @@ 
 {
     global $answerHandler, $faqHandler, $categoryHandler, $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';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if ($faqid != -1) {
         // Creating the FAQ object
@@ -140,9 +140,9 @@ 
 
         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 = $faqHandler->create();
@@ -156,7 +156,7 @@ 
         $button_caption     = _AM_SF_CREATE;
 
         sf_collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CREATESMARTFAQ . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CREATESMARTFAQ.'</h3>';
         echo "<div id='bottomtable'>";
     }
     $sform = new XoopsThemeForm(_AM_SF_SMARTFAQ, 'op', xoops_getenv('PHP_SELF'), 'post', true);
@@ -187,7 +187,7 @@ 
 
     // ANSWER
     if ($merge) {
-        $theanswer = $originalAnswerObj->answer('e') . "\n\n" . sprintf(_AM_SF_NEW_CONTRIBUTION, sf_getLinkedUnameFromId($answerObj->uid(), $xoopsModuleConfig['userealname']), $answerObj->datesub(), $answerObj->answer('e'));
+        $theanswer = $originalAnswerObj->answer('e')."\n\n".sprintf(_AM_SF_NEW_CONTRIBUTION, sf_getLinkedUnameFromId($answerObj->uid(), $xoopsModuleConfig['userealname']), $answerObj->datesub(), $answerObj->answer('e'));
     } else {
         $theanswer = $answerObj->answer('e');
     }
@@ -236,14 +236,14 @@ 
     $sform->addElement(new XoopsFormText(_AM_SF_SPECIFIC_URL, 'contextpage', 50, 60, $faqObj->contextpage()), false);
 
     // EXACT URL?
-    $excaturl_radio = new XoopsFormRadioYN(_AM_SF_EXACTURL, 'exacturl', $faqObj->exacturl(), ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+    $excaturl_radio = new XoopsFormRadioYN(_AM_SF_EXACTURL, 'exacturl', $faqObj->exacturl(), ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
     $sform->addElement($excaturl_radio);
     // WEIGHT
     $sform->addElement(new XoopsFormText(_AM_SF_WEIGHT, 'weight', 5, 5, $faqObj->weight()), true);
 
     // COMMENTS
     // Code to allow comments
-    $addcomments_radio = new XoopsFormRadioYN(_AM_SF_ALLOWCOMMENTS, 'cancomment', $faqObj->cancomment(), ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+    $addcomments_radio = new XoopsFormRadioYN(_AM_SF_ALLOWCOMMENTS, 'cancomment', $faqObj->cancomment(), ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
     $sform->addElement($addcomments_radio);
 
     // PER ITEM PERMISSIONS
@@ -257,7 +257,7 @@ 
     }
     $sform->addElement($groups_checkbox);
 
-    $partial_view = new XoopsFormRadioYN(_AM_SF_PARTIALVIEW, 'partialview', $faqObj->partialview(), ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+    $partial_view = new XoopsFormRadioYN(_AM_SF_PARTIALVIEW, 'partialview', $faqObj->partialview(), ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
     $sform->addElement($partial_view);
 
     // VARIOUS OPTIONS
@@ -280,7 +280,7 @@ 
     // OFFLINE
     if ($faqObj->status() == _SF_STATUS_OFFLINE) {
         // Back OnLine
-        $offline_radio = new XoopsFormRadioYN(_AM_SF_OFFLINE_FIELD, 'offline', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
+        $offline_radio = new XoopsFormRadioYN(_AM_SF_OFFLINE_FIELD, 'offline', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
         $sform->addElement($offline_radio);
     }
 
@@ -354,7 +354,7 @@ 
         }
 
         xoops_cp_header();
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         editfaq(true, $faqid, $answerid, true);
         break;
@@ -375,7 +375,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, $answerid);
         break;
@@ -383,9 +383,9 @@ 
     case 'addfaq':
         global $xoopsUser;
 
-        $faqid         = isset($_POST['faqid']) ? (int)$_POST['faqid'] : -1;
-        $requester_uid = isset($_POST['requester_uid']) ? (int)$_POST['requester_uid'] : 0;
-        $answerer_uid  = isset($_POST['answerer_uid']) ? (int)$_POST['answerer_uid'] : 0;
+        $faqid         = isset($_POST['faqid']) ? (int) $_POST['faqid'] : -1;
+        $requester_uid = isset($_POST['requester_uid']) ? (int) $_POST['requester_uid'] : 0;
+        $answerer_uid  = isset($_POST['answerer_uid']) ? (int) $_POST['answerer_uid'] : 0;
 
         // Creating the FAQ and answer objects
         if ($faqid != -1) {
@@ -406,23 +406,23 @@ 
         } else {
             $faqObj->setGroups_read();
         }
-        $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('howdoi', $_POST['howdoi']);
         $faqObj->setVar('diduno', $_POST['diduno']);
 
-        $faqObj->setVar('status', isset($_POST['status']) ? (int)$_POST['status'] : _SF_STATUS_ASKED);
+        $faqObj->setVar('status', isset($_POST['status']) ? (int) $_POST['status'] : _SF_STATUS_ASKED);
 
         // If this SmartFAQ is offline and the user set this option to No
         $offline = isset($_POST['offline']) ? $_POST['offline'] : 1;
         if ((0 == $offline) && ($faqObj->status() == _SF_STATUS_OFFLINE)) {
             $faqObj->setVar('status', _SF_STATUS_PUBLISHED);
         }
-        $faqObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : $faqObj->weight());
-        $faqObj->setVar('html', isset($_POST['html']) ? (int)$_POST['html'] : 0);
-        $faqObj->setVar('smiley', isset($_POST['smiley']) ? (int)$_POST['smiley'] : 0);
-        $faqObj->setVar('xcodes', isset($_POST['xcodes']) ? (int)$_POST['xcodes'] : 0);
-        $faqObj->setVar('cancomment', isset($_POST['cancomment']) ? (int)$_POST['cancomment'] : 0);
+        $faqObj->setVar('weight', isset($_POST['weight']) ? (int) $_POST['weight'] : $faqObj->weight());
+        $faqObj->setVar('html', isset($_POST['html']) ? (int) $_POST['html'] : 0);
+        $faqObj->setVar('smiley', isset($_POST['smiley']) ? (int) $_POST['smiley'] : 0);
+        $faqObj->setVar('xcodes', isset($_POST['xcodes']) ? (int) $_POST['xcodes'] : 0);
+        $faqObj->setVar('cancomment', isset($_POST['cancomment']) ? (int) $_POST['cancomment'] : 0);
         $faqObj->setVar('modulelink', $_POST['modulelink']);
         $faqObj->setVar('contextpage', $_POST['contextpage']);
         $faqObj->setVar('exacturl', $_POST['exacturl']);
@@ -506,13 +506,13 @@ 
 
         // Storing the FAQ
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, $error_msg . sf_formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, $error_msg.sf_formatErrors($faqObj->getErrors()));
         }
 
         // Storing the answer
         $answerObj->setVar('faqid', $faqObj->faqid());
         if (!$answerObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, $error_msg . sf_formatErrors($answerObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, $error_msg.sf_formatErrors($answerObj->getErrors()));
         }
 
         // Send notifications
@@ -529,8 +529,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 sfFaq($faqid);
 
@@ -539,20 +539,20 @@ 
 
         if ($confirm) {
             if (!$faqHandler->delete($faqObj)) {
-                redirect_header('faq.php', 2, _AM_SF_FAQ_DELETE_ERROR . sf_formatErrors($faqObj->getErrors()));
+                redirect_header('faq.php', 2, _AM_SF_FAQ_DELETE_ERROR.sf_formatErrors($faqObj->getErrors()));
             }
 
             redirect_header('faq.php', 2, sprintf(_AM_SF_ARTISDELETED, $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()
-                          ], 'faq.php', _AM_SF_DELETETHISARTICLE . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                          ], 'faq.php', _AM_SF_DELETETHISARTICLE." <br>'".$faqObj->question()."'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 
@@ -566,10 +566,10 @@ 
 
         $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';
 
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
 
         $totalcategories = $categoryHandler->getCategoriesCount(-1);
         if ($totalcategories > 0) {
@@ -579,4 +579,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/mygrouppermform.php

Spacing +29 added lines, -29 removed lines

@@ -24,12 +24,12 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('Restricted access.');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
 
 /**
  * Renders a form for setting module specific group permissions
@@ -80,7 +80,7 @@ 
     {
         //      $this->XoopsForm($title, 'groupperm_form', XOOPS_URL.'/modules/system/admin/groupperm.php', 'post'); GIJ
         parent::__construct($title, 'groupperm_form', '', 'post');
-        $this->_modid    = (int)$modid;
+        $this->_modid    = (int) $modid;
         $this->_permName = $permname;
         $this->_permDesc = $permdesc;
         $this->addElement(new XoopsFormHidden('modid', $this->_modid));
@@ -159,11 +159,11 @@ 
         }
         $gpermHandler  = xoops_getHandler('groupperm');
         $memberHandler = xoops_getHandler('member');
-        $glist         =& $memberHandler->getGroupList();
+        $glist         = & $memberHandler->getGroupList();
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new MyXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new MyXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
 
             foreach ($this->_appendix as $key => $append) {
@@ -190,18 +190,18 @@ 
         $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $this->addElement($tray);
 
-        $ret      = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $ret      = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
                 if ($elements[$i]->getDescription() != '') {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $ret .= $elements[$i]->render();
             }
@@ -287,7 +287,7 @@ 
      */
     public function setOptionTree(&$optionTree)
     {
-        $this->_optionTree =& $optionTree;
+        $this->_optionTree = & $optionTree;
     }
 
     /**
@@ -312,34 +312,34 @@ 
         $ret = '';
 
         if (count($this->_appendix) > 0) {
-            $ret  .= '<table class="outer"><tr>';
+            $ret .= '<table class="outer"><tr>';
             $cols = 1;
             foreach ($this->_appendix as $append) {
                 if ($cols > 4) {
-                    $ret  .= '</tr><tr>';
+                    $ret .= '</tr><tr>';
                     $cols = 1;
                 }
                 $checked = $append['selected'] ? 'checked' : '';
-                $name    = 'perms[' . $append['permname'] . ']';
+                $name    = 'perms['.$append['permname'].']';
                 $itemid  = $append['itemid'];
                 $itemid  = $append['itemid'];
-                $ret     .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
+                $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked>{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\"><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\"><br></td>";
                 ++$cols;
             }
             $ret .= '</tr></table>';
         }
 
-        $ret  .= '<table class="outer"><tr>';
+        $ret .= '<table class="outer"><tr>';
         $cols = 1;
         foreach ($this->_optionTree[0]['children'] as $topitem) {
             if ($cols > 4) {
-                $ret  .= '</tr><tr>';
+                $ret .= '</tr><tr>';
                 $cols = 1;
             }
             $tree   = '<td class="odd">';
             $prefix = '';
             $this->renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
-            $ret .= $tree . '</td>';
+            $ret .= $tree.'</td>';
             ++$cols;
         }
         $ret .= '</tr></table>';
@@ -358,21 +358,21 @@ 
      */
     private function renderOptionTree(&$tree, $option, $prefix, $parentIds = [])
     {
-        $tree .= $prefix . '<input type="checkbox" name="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" id="' . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . ']" onclick="';
+        $tree .= $prefix.'<input type="checkbox" name="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" id="'.$this->getName().'[groups]['.$this->_groupId.']['.$option['id'].']" onclick="';
         // If there are parent elements, add javascript that will
         // make them selecteded when this element is checked to make
         // sure permissions to parent items are added as well.
         foreach ($parentIds as $pid) {
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
-            $tree       .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked !== true) {ele.checked = this.checked;}";
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked !== true) {ele.checked = this.checked;}";
         }
         // If there are child elements, add javascript that will
         // make them unchecked when this element is unchecked to make
         // sure permissions to child items are not added when there
         // is no permission to this item.
         foreach ($option['allchild'] as $cid) {
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
-            $tree      .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked !== true) {ele.checked = false;}";
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked !== true) {ele.checked = false;}";
         }
         $tree .= '" value="1"';
         if (null !== $this->_value && in_array($option['id'], $this->_value)) {
@@ -396,7 +396,7 @@ 
         if (isset($option['children'])) {
             foreach ($option['children'] as $child) {
                 array_push($parentIds, $option['id']);
-                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
+                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
             }
         }
     }

admin/wffaq.php

Spacing +25 added lines, -25 removed lines

@@ -10,7 +10,7 @@ 
  *
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $importFromModuleName = 'WF-FAQ';
 $scriptname           = 'wffaq.php';
@@ -22,33 +22,33 @@ 
 }
 
 if ($op === 'start') {
-    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);
 
     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 {
-        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 ($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->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\>");
             }
@@ -62,7 +62,7 @@ 
             ob_end_clean();
 
             // Auto-Approve
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             // Submitted and answered by
             $memberHandler = xoops_getHandler('member');
@@ -75,7 +75,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = [];
             $groups_checkbox = new XoopsFormCheckBox(_AM_SF_IMPORT_PERMISSIONS, 'groups_read');
@@ -104,13 +104,13 @@ 
         redirect_header($scriptname, 2, _AM_SF_NOCATSELECTED);
     }
 
-    require_once __DIR__ . '/admin_header.php';
+    require_once __DIR__.'/admin_header.php';
     xoops_cp_header();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_RESULT . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_RESULT.'</span>';
 
     $cnt_imported_cat = 0;
     $cnt_imported_faq = 0;
@@ -138,7 +138,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->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');
@@ -153,7 +153,7 @@ 
         $categoryObj->setVar('description', $wfc_description);
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br>';
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br>';
             continue;
         }
 
@@ -161,9 +161,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name)."<br\>";
 
-        $resultFAQ = $xoopsDB->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');
 
@@ -195,7 +195,7 @@ 
             $faqObj->setVar('exacturl', 0);
 
             if (!$faqObj->store(false)) {
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $wft_question) . '<br>';
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $wft_question).'<br>';
                 continue;
             } else {
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -204,10 +204,10 @@ 
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
 
                 if (!$answerObj->store()) {
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br>';
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br>';
                     continue;
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br>';
                     ++$cnt_imported_faq;
                 }
             }
@@ -217,8 +217,8 @@ 
     }
 
     echo 'Done.<br>';
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br>';
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br>';
 
     exit();
 }