mambax7 / smartfaq

admin/about.php

Spacing +2 added lines, -2 removed lines

@@ -17,11 +17,11 @@
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
 \Xmf\Module\Admin::setPaypal('6KJ7RW5DR3VTJ');
 $adminObject->displayAbout(false);
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/about2.php

Indentation +6 added lines, -6 removed lines

@@ -41,12 +41,12 @@
 // Left headings...
 echo "<img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $versioninfo->getInfo('image') . "' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px;'/></a>";
 echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>"
-     . $versioninfo->getInfo('name')
-     . ' version '
-     . $versioninfo->getInfo('version')
-     . ' ('
-     . $versioninfo->getInfo('status_version')
-     . ')</div>';
+        . $versioninfo->getInfo('name')
+        . ' version '
+        . $versioninfo->getInfo('version')
+        . ' ('
+        . $versioninfo->getInfo('status_version')
+        . ')</div>';
 if ($versioninfo->getInfo('author_realname') != '') {
     $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
 } else {

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';
 $myts = MyTextSanitizer::getInstance();
 
 global $xoopsModule;
@@ -39,7 +39,7 @@ 
 echo "</table>";
 */
 // Left headings...
-echo "<img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/' . $versioninfo->getInfo('image') . "' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px;'/></a>";
+echo "<img src='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/'.$versioninfo->getInfo('image')."' alt='' hspace='0' vspace='0' align='left' style='margin-right: 10px;'/></a>";
 echo "<div style='margin-top: 10px; color: #33538e; margin-bottom: 4px; font-size: 18px; line-height: 18px; font-weight: bold; display: block;'>"
      . $versioninfo->getInfo('name')
      . ' version '
@@ -48,43 +48,43 @@ 
      . $versioninfo->getInfo('status_version')
      . ')</div>';
 if ($versioninfo->getInfo('author_realname') != '') {
-    $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+    $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')';
 } else {
     $author_name = $versioninfo->getInfo('author');
 }
 
-echo "<div style = 'line-height: 16px; font-weight: bold; display: block;'>" . _AM_SF_BY . ' ' . $author_name;
+echo "<div style = 'line-height: 16px; font-weight: bold; display: block;'>"._AM_SF_BY.' '.$author_name;
 echo '</div>';
-echo "<div style = 'line-height: 16px; display: block;'>" . $versioninfo->getInfo('license') . "</div>\n";
+echo "<div style = 'line-height: 16px; display: block;'>".$versioninfo->getInfo('license')."</div>\n";
 
 // Developers Information
 echo "<br><table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
 echo '<tr>';
-echo "<td colspan='2' class='bg3' align='left'><b>" . _MI_SF_AUTHOR_INFO . '</b></td>';
+echo "<td colspan='2' class='bg3' align='left'><b>"._MI_SF_AUTHOR_INFO.'</b></td>';
 echo '</tr>';
 
 if ($versioninfo->getInfo('developer_lead') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_LEAD . '</td>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('developer_lead') . '</td>';
+    echo "<td class='head' width = '150px' align='left'>"._MI_SF_DEVELOPER_LEAD.'</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('developer_lead').'</td>';
     echo '</tr>';
 }
 if ($versioninfo->getInfo('developer_contributor') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_CONTRIBUTOR . '</td>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('developer_contributor') . '</td>';
+    echo "<td class='head' width = '150px' align='left'>"._MI_SF_DEVELOPER_CONTRIBUTOR.'</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('developer_contributor').'</td>';
     echo '</tr>';
 }
 if ($versioninfo->getInfo('developer_website_url') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_WEBSITE . '</td>';
-    echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('developer_website_url') . "' target='blank'>" . $versioninfo->getInfo('developer_website_name') . '</a></td>';
+    echo "<td class='head' width = '150px' align='left'>"._MI_SF_DEVELOPER_WEBSITE.'</td>';
+    echo "<td class='even' align='left'><a href='".$versioninfo->getInfo('developer_website_url')."' target='blank'>".$versioninfo->getInfo('developer_website_name').'</a></td>';
     echo '</tr>';
 }
 if ($versioninfo->getInfo('developer_email') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '150px' align='left'>" . _MI_SF_DEVELOPER_EMAIL . '</td>';
-    echo "<td class='even' align='left'><a href='mailto:" . $versioninfo->getInfo('developer_email') . "'>" . $versioninfo->getInfo('developer_email') . '</a></td>';
+    echo "<td class='head' width = '150px' align='left'>"._MI_SF_DEVELOPER_EMAIL.'</td>';
+    echo "<td class='even' align='left'><a href='mailto:".$versioninfo->getInfo('developer_email')."'>".$versioninfo->getInfo('developer_email').'</a></td>';
     echo '</tr>';
 }
 
@@ -93,47 +93,47 @@ 
 // Module Developpment information
 echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
 echo '<tr>';
-echo "<td colspan='2' class='bg3' align='left'><b>" . _MI_SF_MODULE_INFO . '</b></td>';
+echo "<td colspan='2' class='bg3' align='left'><b>"._MI_SF_MODULE_INFO.'</b></td>';
 echo '</tr>';
 
 if ($versioninfo->getInfo('date') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '200' align='left'>" . _MI_SF_MODULE_RELEASE_DATE . '</td>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('date') . '</td>';
+    echo "<td class='head' width = '200' align='left'>"._MI_SF_MODULE_RELEASE_DATE.'</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('date').'</td>';
     echo '</tr>';
 }
 
 if ($versioninfo->getInfo('status') != '') {
     echo '<tr>';
-    echo "<td class='head' width = '200' align='left'>" . _MI_SF_MODULE_STATUS . '</td>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('status') . '</td>';
+    echo "<td class='head' width = '200' align='left'>"._MI_SF_MODULE_STATUS.'</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('status').'</td>';
     echo '</tr>';
 }
 
 if ($versioninfo->getInfo('demo_site_url') != '') {
     echo '<tr>';
-    echo "<td class='head' align='left'>" . _MI_SF_MODULE_DEMO . '</td>';
-    echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('demo_site_url') . "' target='blank'>" . $versioninfo->getInfo('demo_site_name') . '</a></td>';
+    echo "<td class='head' align='left'>"._MI_SF_MODULE_DEMO.'</td>';
+    echo "<td class='even' align='left'><a href='".$versioninfo->getInfo('demo_site_url')."' target='blank'>".$versioninfo->getInfo('demo_site_name').'</a></td>';
     echo '</tr>';
 }
 
 if ($versioninfo->getInfo('support_site_url') != '') {
     echo '<tr>';
-    echo "<td class='head' align='left'>" . _MI_SF_MODULE_SUPPORT . '</td>';
-    echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('support_site_url') . "' target='blank'>" . $versioninfo->getInfo('support_site_name') . '</a></td>';
+    echo "<td class='head' align='left'>"._MI_SF_MODULE_SUPPORT.'</td>';
+    echo "<td class='even' align='left'><a href='".$versioninfo->getInfo('support_site_url')."' target='blank'>".$versioninfo->getInfo('support_site_name').'</a></td>';
     echo '</tr>';
 }
 
 if ($versioninfo->getInfo('submit_bug') != '') {
     echo '<tr>';
-    echo "<td class='head' align='left'>" . _MI_SF_MODULE_BUG . '</td>';
-    echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_bug') . "' target='blank'>" . 'Submit a Bug in SmartFAQ Bug Tracker' . '</a></td>';
+    echo "<td class='head' align='left'>"._MI_SF_MODULE_BUG.'</td>';
+    echo "<td class='even' align='left'><a href='".$versioninfo->getInfo('submit_bug')."' target='blank'>".'Submit a Bug in SmartFAQ Bug Tracker'.'</a></td>';
     echo '</tr>';
 }
 if ($versioninfo->getInfo('submit_feature') != '') {
     echo '<tr>';
-    echo "<td class='head' align='left'>" . _MI_SF_MODULE_FEATURE . '</td>';
-    echo "<td class='even' align='left'><a href='" . $versioninfo->getInfo('submit_feature') . "' target='blank'>" . 'Request a feature in the SmartFAQ Feature Tracker' . '</a></td>';
+    echo "<td class='head' align='left'>"._MI_SF_MODULE_FEATURE.'</td>';
+    echo "<td class='even' align='left'><a href='".$versioninfo->getInfo('submit_feature')."' target='blank'>".'Request a feature in the SmartFAQ Feature Tracker'.'</a></td>';
     echo '</tr>';
 }
 
@@ -143,11 +143,11 @@ 
     echo "<br>\n";
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
     echo '<tr>';
-    echo "<td class='bg3' align='left'><b>" . _MI_SF_MODULE_DISCLAIMER . '</b></td>';
+    echo "<td class='bg3' align='left'><b>"._MI_SF_MODULE_DISCLAIMER.'</b></td>';
     echo '</tr>';
 
     echo '<tr>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('warning') . '</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('warning').'</td>';
     echo '</tr>';
 
     echo '</table>';
@@ -157,11 +157,11 @@ 
     echo "<br>\n";
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
     echo '<tr>';
-    echo "<td class='bg3' align='left'><b>" . _MI_SF_AUTHOR_WORD . '</b></td>';
+    echo "<td class='bg3' align='left'><b>"._MI_SF_AUTHOR_WORD.'</b></td>';
     echo '</tr>';
 
     echo '<tr>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('author_word') . '</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('author_word').'</td>';
     echo '</tr>';
 
     echo '</table>';
@@ -172,11 +172,11 @@ 
     echo "<br>\n";
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
     echo '<tr>';
-    echo "<td class='bg3' align='left'><b>" . _MI_SF_VERSION_HISTORY . '</b></td>';
+    echo "<td class='bg3' align='left'><b>"._MI_SF_VERSION_HISTORY.'</b></td>';
     echo '</tr>';
 
     echo '<tr>';
-    echo "<td class='even' align='left'>" . $versioninfo->getInfo('version_history') . '</td>';
+    echo "<td class='even' align='left'>".$versioninfo->getInfo('version_history').'</td>';
     echo '</tr>';
 
     echo '</table>';
@@ -186,4 +186,4 @@ 
 //$modfooter = sf_modFooter();
 //echo "<div align='center'>" . $modfooter . "</div>";
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/category.php

Indentation +35 added lines, -35 removed lines

@@ -37,25 +37,25 @@ 
         }
     }
     $modify = "<a href='category.php?op=mod&categoryid="
-              . $categoryObj->categoryid()
-              . "'><img src='"
-              . $pathIcon16
-              . '/edit.png'
-              . "' title='"
-              . _AM_SF_EDITCOL
-              . "' alt='"
-              . _AM_SF_EDITCOL
-              . "' /></a>";
+                . $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>";
+                . $categoryObj->categoryid()
+                . "'><img src='"
+                . $pathIcon16
+                . '/delete.png'
+                . "' title='"
+                . _AM_SF_DELETECOL
+                . "' alt='"
+                . _AM_SF_DELETECOL
+                . "' /></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -64,18 +64,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>";
@@ -332,11 +332,11 @@ 
             $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
             xoops_cp_header();
             xoops_confirm(array(
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                                '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

@@ -245,149 +245,149 @@
 }
 
 switch ($op) {
-    case 'mod':
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
-        $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
-        $adminObject  = \Xmf\Module\Admin::getInstance();
-        xoops_cp_header();
+        case 'mod':
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
+            $adminObject  = \Xmf\Module\Admin::getInstance();
+            xoops_cp_header();
 
-        $adminObject->displayNavigation(basename(__FILE__));
-        editcat(true, $categoryid);
-        break;
+            $adminObject->displayNavigation(basename(__FILE__));
+            editcat(true, $categoryid);
+            break;
 
-    case 'addcategory':
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
+        case 'addcategory':
+            global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
 
-        if ($categoryid != 0) {
-            $categoryObj = new sfCategory($categoryid);
-        } else {
-            $categoryObj = $categoryHandler->create();
-        }
+            if ($categoryid != 0) {
+                $categoryObj = new sfCategory($categoryid);
+            } else {
+                $categoryObj = $categoryHandler->create();
+            }
 
-        //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
-        //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
+            //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
+            //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
 
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
+            $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
+            $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
+            $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
 
-        // Groups and permissions
-        if (isset($_POST['groups_read'])) {
-            $categoryObj->setGroups_read($_POST['groups_read']);
-        } else {
-            $categoryObj->setGroups_read();
-        }
-        //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
-        //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
-
-        $categoryObj->setVar('name', $_POST['name']);
-
-        $categoryObj->setVar('description', $_POST['description']);
-        if ($categoryObj->isNew()) {
-            $redirect_msg = _AM_SF_CATCREATED;
-            $redirect_to  = 'category.php?op=mod';
-        } else {
-            $redirect_msg = _AM_SF_COLMODIFIED;
-            $redirect_to  = 'category.php';
-        }
-
-        if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
-        }
-        // TODO : put this function in the category class
-        sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
-        //sf_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
+            // Groups and permissions
+            if (isset($_POST['groups_read'])) {
+                $categoryObj->setGroups_read($_POST['groups_read']);
+            } else {
+                $categoryObj->setGroups_read();
+            }
+            //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
+            //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
+
+            $categoryObj->setVar('name', $_POST['name']);
+
+            $categoryObj->setVar('description', $_POST['description']);
+            if ($categoryObj->isNew()) {
+                $redirect_msg = _AM_SF_CATCREATED;
+                $redirect_to  = 'category.php?op=mod';
+            } else {
+                $redirect_msg = _AM_SF_COLMODIFIED;
+                $redirect_to  = 'category.php';
+            }
 
-        if ($applyall) {
+            if (!$categoryObj->store()) {
+                redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
+            }
             // TODO : put this function in the category class
-            sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
-        }
+            sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
+            //sf_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
 
-        redirect_header($redirect_to, 2, $redirect_msg);
-        break;
+            if ($applyall) {
+                // TODO : put this function in the category class
+                sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
+            }
 
-    case 'del':
-        global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
+            redirect_header($redirect_to, 2, $redirect_msg);
+            break;
 
-        $module_id    = $xoopsModule->getVar('mid');
-        $gpermHandler = xoops_getHandler('groupperm');
+        case 'del':
+            global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
 
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
+            $module_id    = $xoopsModule->getVar('mid');
+            $gpermHandler = xoops_getHandler('groupperm');
 
-        $categoryObj = new sfCategory($categoryid);
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
 
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
-        $name    = isset($_POST['name']) ? $_POST['name'] : '';
+            $categoryObj = new sfCategory($categoryid);
 
-        if ($confirm) {
-            if (!$categoryHandler->delete($categoryObj)) {
-                redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+            $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
+            $name    = isset($_POST['name']) ? $_POST['name'] : '';
+
+            if ($confirm) {
+                if (!$categoryHandler->delete($categoryObj)) {
+                    redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
+                }
+                redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
+            } else {
+                // no confirm: show deletion condition
+                $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+                xoops_cp_header();
+                xoops_confirm(array(
+                                  'op'         => 'del',
+                                  'categoryid' => $categoryObj->categoryid(),
+                                  'confirm'    => 1,
+                                  'name'       => $categoryObj->name()
+                              ), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                xoops_cp_footer();
             }
-            redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
-        } else {
-            // no confirm: show deletion condition
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
+            exit();
+            break;
+
+        case 'cancel':
+            redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
+            break;
+        case 'default':
+        default:
+            $adminObject  = \Xmf\Module\Admin::getInstance();
             xoops_cp_header();
-            xoops_confirm(array(
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
-            xoops_cp_footer();
-        }
-        exit();
-        break;
-
-    case 'cancel':
-        redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
-        break;
-    case 'default':
-    default:
-        $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";
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo '</div>';
+            $totalCategories = $categoryHandler->getCategoriesCount(0);
+            if (count($categoriesObj) > 0) {
+                foreach ($categoriesObj as $key => $thiscat) {
+                    displayCategory($thiscat);
+                }
+            } else {
+                echo '<tr>';
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+                echo '</tr>';
+                $categoryid = '0';
+            }
+            echo "</table>\n";
+            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
+            echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+            echo '</div>';
 
-        editcat(false);
+            editcat(false);
 
-        break;
+            break;
 }
 
 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,7 +33,7 @@ 
     $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="
@@ -76,8 +76,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());
@@ -98,9 +98,9 @@ 
 {
     //$moderators = array(); // just to define the variable
     //$allmods = array();
-    $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
+    $startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the faq handler object
     $faqHandler = sf_gethandler('faq');
@@ -122,13 +122,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
@@ -173,7 +173,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, '');
@@ -238,7 +238,7 @@ 
     echo '</div>';
 
     if ($categoryid) {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
     }
 
     unset($hidden);
@@ -246,9 +246,9 @@ 
 
 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();
+        $adminObject = \Xmf\Module\Admin::getInstance();
         xoops_cp_header();
 
         $adminObject->displayNavigation(basename(__FILE__));
@@ -258,7 +258,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);
@@ -269,9 +269,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'])) {
@@ -294,7 +294,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');
@@ -314,8 +314,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);
 
@@ -329,14 +329,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(array(
                               'op'         => 'del',
                               'categoryid' => $categoryObj->categoryid(),
                               'confirm'    => 1,
                               'name'       => $categoryObj->name()
-                          ), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                          ), 'category.php', _AM_SF_DELETECOL." '".$categoryObj->name()."'. <br> <br>"._AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
             xoops_cp_footer();
         }
         exit();
@@ -347,7 +347,7 @@ 
         break;
     case 'default':
     default:
-        $adminObject  = \Xmf\Module\Admin::getInstance();
+        $adminObject = \Xmf\Module\Admin::getInstance();
         xoops_cp_header();
 
         $adminObject->displayNavigation(basename(__FILE__));
@@ -357,16 +357,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) {
@@ -375,14 +375,14 @@ 
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
             echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '</div>';
 
         editcat(false);
@@ -390,4 +390,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/xoopsfaq.php

Indentation +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
             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>';
+                    . 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);
 

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,32 +24,32 @@ 
 
 if ($op === 'start') {
     xoops_cp_header();
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
-    $result = $xoopsDB->query('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_categories'));
+    $result = $xoopsDB->query('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_categories'));
     list($totalCat) = $xoopsDB->fetchRow($result);
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM,
-                                                                                                                                                                $importFromModuleName) . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM,
+                                                                                                                                                                $importFromModuleName).'</h3>';
     echo "<div id='bottomtable'>";
 
     if ($totalCat == 0) {
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_IMPORT_NO_CATEGORY.'</span>';
     } else {
-        include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('SELECT count(*) FROM ' . $xoopsDB->prefix('xoopsfaq_contents'));
+        $result = $xoopsDB->query('SELECT count(*) FROM '.$xoopsDB->prefix('xoopsfaq_contents'));
         list($totalFAQ) = $xoopsDB->fetchRow($result);
 
         if ($totalFAQ == 0) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
         } else {
             echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'
                  . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ)
                  . '</span>';
 
-            $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);
@@ -72,7 +72,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');
@@ -85,7 +85,7 @@ 
             $form->addElement($user_select);
 
             // Q&As can be commented?
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
 
             $group_list      = $memberHandler->getGroupList();
             $groups_selected = array();
@@ -109,7 +109,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) {
@@ -119,10 +119,10 @@ 
     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;
@@ -150,7 +150,7 @@ 
     echo "Can Comment: $cancomment<br>";
     echo "Auto aprove: $autoaprove<br>";*/
 
-    $resultCat = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_categories') . " where category_id in ($import_category_list) order by category_order");
+    $resultCat = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_categories')." where category_id in ($import_category_list) order by category_order");
 
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
         extract($arrCat, EXTR_PREFIX_ALL, 'xcat');
@@ -164,7 +164,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;
         }
 
@@ -172,9 +172,9 @@ 
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
 
-        $resultFAQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_contents') . " where category_id=$xcat_category_id order by contents_order");
+        $resultFAQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_contents')." where category_id=$xcat_category_id order by contents_order");
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
             extract($arrFAQ, EXTR_PREFIX_ALL, 'xfaq');
 
@@ -202,7 +202,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());
@@ -211,10 +211,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;
                 }
             }
@@ -224,8 +224,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/main.php

Indentation +168 added lines, -168 removed lines

@@ -330,104 +330,104 @@ 
             case _SF_STATUS_ASKED:
                 $statustxt = _AM_SF_ASKED;
                 $approve   = "<a href='question.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/on.png'
-                             . "'  title='"
-                             . _AM_SF_QUESTION_MODERATE
-                             . "'  alt='"
-                             . _AM_SF_QUESTION_MODERATE
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/on.png'
+                                . "'  title='"
+                                . _AM_SF_QUESTION_MODERATE
+                                . "'  alt='"
+                                . _AM_SF_QUESTION_MODERATE
+                                . "' /></a>&nbsp;";
                 $modify    = '';
                 $delete    = "<a href='question.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' alt='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' alt='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_OPENED:
                 $statustxt = _AM_SF_OPENED;
                 $approve   = '';
                 $modify    = "<a href='question.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/edit.png'
-                             . "' title='"
-                             . _AM_SF_QUESTION_EDIT
-                             . "' alt='"
-                             . _AM_SF_QUESTION_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/edit.png'
+                                . "' title='"
+                                . _AM_SF_QUESTION_EDIT
+                                . "' alt='"
+                                . _AM_SF_QUESTION_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='question.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' alt='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' alt='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_ANSWERED:
                 $statustxt = _AM_SF_ANSWERED;
                 $approve   = "<a href='answer.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/approve.gif' title='"
-                             . _AM_SF_ANSWERED_MODERATE
-                             . "' alt='"
-                             . _AM_SF_ANSWERED_MODERATE
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/approve.gif' title='"
+                                . _AM_SF_ANSWERED_MODERATE
+                                . "' alt='"
+                                . _AM_SF_ANSWERED_MODERATE
+                                . "' /></a>&nbsp;";
                 $modify    = '';
                 $delete    = "<a href='question.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/delete.gif' title='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' alt='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/delete.gif' title='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' alt='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_SUBMITTED:
                 $statustxt = _AM_SF_SUBMITTED;
                 $approve   = "<a href='faq.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/approve.gif' title='"
-                             . _AM_SF_SUBMISSION_MODERATE
-                             . "' alt='"
-                             . _AM_SF_SUBMISSION_MODERATE
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/approve.gif' title='"
+                                . _AM_SF_SUBMISSION_MODERATE
+                                . "' alt='"
+                                . _AM_SF_SUBMISSION_MODERATE
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='faq.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/delete.gif' title='"
-                             . _AM_SF_DELETEART
-                             . "' alt='"
-                             . _AM_SF_DELETEART
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/delete.gif' title='"
+                                . _AM_SF_DELETEART
+                                . "' alt='"
+                                . _AM_SF_DELETEART
+                                . "' /></a>";
                 $modify    = '';
                 break;
 
@@ -435,51 +435,51 @@ 
                 $statustxt = _AM_SF_PUBLISHED;
                 $approve   = '';
                 $modify    = "<a href='faq.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/edit.png'
-                             . "' title='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' alt='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/edit.png'
+                                . "' title='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' alt='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='faq.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEART
-                             . "' alt='"
-                             . _AM_SF_DELETEART
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEART
+                                . "' alt='"
+                                . _AM_SF_DELETEART
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_NEW_ANSWER:
                 $statustxt = _AM_SF_NEWANSWER;
                 $approve   = "<a href='answer.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/approve.gif' title='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' alt='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/approve.gif' title='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' alt='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='faq.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . XOOPS_URL
-                             . '/modules/'
-                             . $xoopsModule->dirname()
-                             . "/assets/images/icon/delete.gif' title='"
-                             . _AM_SF_DELETEART
-                             . "' alt='"
-                             . _AM_SF_DELETEART
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . XOOPS_URL
+                                . '/modules/'
+                                . $xoopsModule->dirname()
+                                . "/assets/images/icon/delete.gif' title='"
+                                . _AM_SF_DELETEART
+                                . "' alt='"
+                                . _AM_SF_DELETEART
+                                . "' /></a>";
                 $modify    = '';
                 break;
 
@@ -487,75 +487,75 @@ 
                 $statustxt = _AM_SF_OFFLINE;
                 $approve   = '';
                 $modify    = "<a href='faq.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/edit.png'
-                             . "' title='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' alt='"
-                             . _AM_SF_FAQ_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/edit.png'
+                                . "' title='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' alt='"
+                                . _AM_SF_FAQ_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='faq.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEART
-                             . "' alt='"
-                             . _AM_SF_DELETEART
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEART
+                                . "' alt='"
+                                . _AM_SF_DELETEART
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_REJECTED_QUESTION:
                 $statustxt = _AM_SF_REJECTED_QUESTION;
                 $approve   = '';
                 $modify    = "<a href='faq.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/edit.png'
-                             . "' title='"
-                             . _AM_SF_REJECTED_EDIT
-                             . "' alt='"
-                             . _AM_SF_REJECTED_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/edit.png'
+                                . "' title='"
+                                . _AM_SF_REJECTED_EDIT
+                                . "' alt='"
+                                . _AM_SF_REJECTED_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='question.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' alt='"
-                             . _AM_SF_DELETEQUESTION
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' alt='"
+                                . _AM_SF_DELETEQUESTION
+                                . "' /></a>";
                 break;
 
             case _SF_STATUS_REJECTED_SMARTFAQ:
                 $statustxt = _AM_SF_REJECTED_SMARTFAQ;
                 $approve   = '';
                 $modify    = "<a href='faq.php?op=mod&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/edit.png'
-                             . "' title='"
-                             . _AM_SF_REJECTED_EDIT
-                             . "' alt='"
-                             . _AM_SF_REJECTED_EDIT
-                             . "' /></a>&nbsp;";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/edit.png'
+                                . "' title='"
+                                . _AM_SF_REJECTED_EDIT
+                                . "' alt='"
+                                . _AM_SF_REJECTED_EDIT
+                                . "' /></a>&nbsp;";
                 $delete    = "<a href='faq.php?op=del&amp;faqid="
-                             . $faqsObj[$i]->faqid()
-                             . "'><img src='"
-                             . $pathIcon16
-                             . '/delete.png'
-                             . "' title='"
-                             . _AM_SF_DELETEART
-                             . "' alt='"
-                             . _AM_SF_DELETEART
-                             . "' /></a>";
+                                . $faqsObj[$i]->faqid()
+                                . "'><img src='"
+                                . $pathIcon16
+                                . '/delete.png'
+                                . "' title='"
+                                . _AM_SF_DELETEART
+                                . "' alt='"
+                                . _AM_SF_DELETEART
+                                . "' /></a>";
                 break;
 
             case 'default':

Spacing +69 added lines, -69 removed lines

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

admin/answer.php

Indentation +45 added lines, -45 removed lines

@@ -111,55 +111,55 @@
     foreach ($proposed_answers as $proposed_answer) {
         if ($faqObj->status() == _SF_STATUS_NEW_ANSWER) {
             $merge   = "<a href='faq.php?op=merge&amp;faqid="
-                       . $faqObj->faqid()
-                       . '&amp;answerid='
-                       . $proposed_answer->answerid()
-                       . "'><img src='"
-                       . XOOPS_URL
-                       . '/modules/'
-                       . $xoopsModule->dirname()
-                       . "/assets/images/icon/merge.gif' title='"
-                       . _AM_SF_FAQ_MERGE
-                       . "' alt='"
-                       . _AM_SF_FAQ_MERGE
-                       . "' /></a>&nbsp;";
+                        . $faqObj->faqid()
+                        . '&amp;answerid='
+                        . $proposed_answer->answerid()
+                        . "'><img src='"
+                        . XOOPS_URL
+                        . '/modules/'
+                        . $xoopsModule->dirname()
+                        . "/assets/images/icon/merge.gif' title='"
+                        . _AM_SF_FAQ_MERGE
+                        . "' alt='"
+                        . _AM_SF_FAQ_MERGE
+                        . "' /></a>&nbsp;";
             $approve = "<a href='answer.php?op=selectanswer&amp;faqid="
-                       . $faqid
-                       . '&amp;answerid='
-                       . $proposed_answer->answerid()
-                       . "'><img src='"
-                       . $pathIcon16
-                       . '/on.png'
-                       . "' title='"
-                       . _AM_SF_FAQ_APPROVE_NEW_ANSWER
-                       . "' alt='"
-                       . _AM_SF_APPROVESUB
-                       . "' /></a>";
+                        . $faqid
+                        . '&amp;answerid='
+                        . $proposed_answer->answerid()
+                        . "'><img src='"
+                        . $pathIcon16
+                        . '/on.png'
+                        . "' title='"
+                        . _AM_SF_FAQ_APPROVE_NEW_ANSWER
+                        . "' alt='"
+                        . _AM_SF_APPROVESUB
+                        . "' /></a>";
         }
         $modify = "<a href='faq.php?op=mod&amp;faqid="
-                  . $faqObj->faqid()
-                  . '&amp;answerid='
-                  . $proposed_answer->answerid()
-                  . "'><img src='"
-                  . $pathIcon16
-                  . '/edit.png'
-                  . "' title='"
-                  . _AM_SF_FAQ_REVIEW
-                  . "' alt='"
-                  . _AM_SF_FAQ_REVIEW
-                  . "' /></a>&nbsp;";
+                    . $faqObj->faqid()
+                    . '&amp;answerid='
+                    . $proposed_answer->answerid()
+                    . "'><img src='"
+                    . $pathIcon16
+                    . '/edit.png'
+                    . "' title='"
+                    . _AM_SF_FAQ_REVIEW
+                    . "' alt='"
+                    . _AM_SF_FAQ_REVIEW
+                    . "' /></a>&nbsp;";
         $delete = "<a href='answer.php?op=del&amp;faqid="
-                  . $faqObj->faqid()
-                  . '&amp;answerid='
-                  . $proposed_answer->answerid()
-                  . "'><img src='"
-                  . $pathIcon16
-                  . '/delete.png'
-                  . "' title='"
-                  . _AM_SF_DELETESUBM
-                  . "' alt='"
-                  . _AM_SF_DELETESUBM
-                  . "' /></a>";
+                    . $faqObj->faqid()
+                    . '&amp;answerid='
+                    . $proposed_answer->answerid()
+                    . "'><img src='"
+                    . $pathIcon16
+                    . '/delete.png'
+                    . "' title='"
+                    . _AM_SF_DELETESUBM
+                    . "' alt='"
+                    . _AM_SF_DELETESUBM
+                    . "' /></a>";
         echo '<tr>';
         echo "<td class='head' align='center'>" . $proposed_answer->answerid() . '</td>';
         echo "<td class='even' align='left'>" . $proposed_answer->answer() . '</td>';

Spacing +32 added lines, -32 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $op = '';
 
@@ -28,7 +28,7 @@ 
 {
     global $answerHandler, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts, $pathIcon16, $smartModuleConfig;
 
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the FAQ object
     $faqObj = new sfFaq($faqid);
@@ -66,9 +66,9 @@ 
     $official_answer = $faqObj->answer();
 
     sf_collapsableBar('bottomtable', 'bottomtableicon');
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_SUBMITTED_ANSWER . '</h3>';
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_SUBMITTED_ANSWER.'</h3>';
     echo "<div id='bottomtable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_SUBMITTED_ANSWER_INFO . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_SUBMITTED_ANSWER_INFO.'</span>';
 
     $proposed_answers = $answerHandler->getAllAnswers($faqid, _SF_AN_STATUS_PROPOSED);
 
@@ -78,31 +78,31 @@ 
 
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_CATEGORY . "</td>
-              <td class='even'>" . $categoryObj->name() . "</td>
+              <td class='head' width='100px'>" . _AM_SF_CATEGORY."</td>
+              <td class='even'>" . $categoryObj->name()."</td>
             </tr>
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_QUESTION . "</td>
-              <td class='even'>" . $faqObj->question() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_QUESTION."</td>
+              <td class='even'>" . $faqObj->question().'</td>
             </tr>';
     if ($official_answer) {
         echo "
             <tr>
-              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL . "</td>
-              <td class='even'>" . $official_answer->answer() . '</td>
+              <td class='head' width='100px'>" . _AM_SF_ANSWER_OFFICIAL."</td>
+              <td class='even'>" . $official_answer->answer().'</td>
             </tr>';
     }
     echo "</table><br>\n";
 
     echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
     echo '<tr>';
-    echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
-    echo "<th class='bg3' class='bg3' align='center'><b>" . _AM_SF_ANSWER . '</b></td>';
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+    echo "<th class='bg3' class='bg3' align='center'><b>"._AM_SF_ANSWER.'</b></td>';
 
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
 
-    echo "<th width='180' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-    echo "<th width='120' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+    echo "<th width='180' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+    echo "<th width='120' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
     echo '</tr>';
 
     $merge   = '';
@@ -110,7 +110,7 @@ 
     $approve = '';
     foreach ($proposed_answers as $proposed_answer) {
         if ($faqObj->status() == _SF_STATUS_NEW_ANSWER) {
-            $merge   = "<a href='faq.php?op=merge&amp;faqid="
+            $merge = "<a href='faq.php?op=merge&amp;faqid="
                        . $faqObj->faqid()
                        . '&amp;answerid='
                        . $proposed_answer->answerid()
@@ -161,14 +161,14 @@ 
                   . _AM_SF_DELETESUBM
                   . "' /></a>";
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $proposed_answer->answerid() . '</td>';
-        echo "<td class='even' align='left'>" . $proposed_answer->answer() . '</td>';
+        echo "<td class='head' align='center'>".$proposed_answer->answerid().'</td>';
+        echo "<td class='even' align='left'>".$proposed_answer->answer().'</td>';
 
         //show name of the answer submitter
         $submitter = sf_getLinkedUnameFromId($proposed_answer->uid(), $smartModuleConfig['userealname']);
-        echo "<td class='even' align='center'>" . $submitter . '</td>';
+        echo "<td class='even' align='center'>".$submitter.'</td>';
 
-        echo "<td class='even' align='center'>" . $proposed_answer->datesub() . '</td>';
+        echo "<td class='even' align='center'>".$proposed_answer->datesub().'</td>';
         echo "<td class='even' align='center'> $merge $modify $approve $delete </td>";
         echo '</tr>';
     }
@@ -180,17 +180,17 @@ 
 switch ($op) {
     case 'mod':
         xoops_cp_header();
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $modify, $myts;
-        $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
+        $faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
         editfaq($faqid);
         break;
 
     case 'selectanswer':
         global $xoopsUser, $_GET, $xoopsModuleConfig;
 
-        $faqid    = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
-        $answerid = isset($_GET['answerid']) ? (int)$_GET['answerid'] : 0;
+        $faqid    = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
+        $answerid = isset($_GET['answerid']) ? (int) $_GET['answerid'] : 0;
 
         // Creating the FAQ object
         $faqObj = new sfFaq($faqid);
@@ -264,11 +264,11 @@ 
     case 'del':
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB;
 
-        $faqid     = isset($_POST['faqid']) ? (int)$_POST['faqid'] : 0;
-        $faqid     = isset($_GET['faqid']) ? (int)$_GET['faqid'] : $faqid;
-        $answerid  = isset($_POST['answerid']) ? (int)$_POST['answerid'] : 0;
-        $answerid  = isset($_GET['answerid']) ? (int)$_GET['answerid'] : $answerid;
-        $confirm   = isset($_POST['confirm']) ? (int)$_POST['confirm'] : 0;
+        $faqid     = isset($_POST['faqid']) ? (int) $_POST['faqid'] : 0;
+        $faqid     = isset($_GET['faqid']) ? (int) $_GET['faqid'] : $faqid;
+        $answerid  = isset($_POST['answerid']) ? (int) $_POST['answerid'] : 0;
+        $answerid  = isset($_GET['answerid']) ? (int) $_GET['answerid'] : $answerid;
+        $confirm   = isset($_POST['confirm']) ? (int) $_POST['confirm'] : 0;
         $faqObj    = new sfFaq($faqid);
         $answerObj = new sfAnswer($answerid);
         if ($confirm) {
@@ -287,7 +287,7 @@ 
                     $proposed_answers = $answerHandler->getAllAnswers($faqid, _SF_AN_STATUS_PROPOSED);
                     if (count($proposed_answers) > 0) {
                         // This question has other proposed answer
-                        $redirect_page = 'answer.php?op=mod&faqid=' . $faqid;
+                        $redirect_page = 'answer.php?op=mod&faqid='.$faqid;
                         $redirect_msg  = _AM_SF_ANSWER_REJECTED;
                     } else {
                         // The question has no other proposed answer
@@ -311,11 +311,11 @@ 
     default:
         xoops_cp_header();
 
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule;
 
         editfaq();
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/myblocksadmin.php

Indentation +22 added lines, -22 removed lines

@@ -171,22 +171,22 @@ 
             </td>
             <td class='$class' align='center' nowrap='nowrap'>
                 <input type='radio' name='side[$bid]' value='"
-             . XOOPS_SIDEBLOCK_LEFT
-             . "'$ssel0 />-<input type='radio' name='side[$bid]' value='"
-             . XOOPS_CENTERBLOCK_LEFT
-             . "'$ssel2 /><input type='radio' name='side[$bid]' value='"
-             . XOOPS_CENTERBLOCK_CENTER
-             . "'$ssel3 /><input type='radio' name='side[$bid]' value='"
-             . XOOPS_CENTERBLOCK_RIGHT
-             . "'$ssel4 />-<input type='radio' name='side[$bid]' value='"
-             . XOOPS_SIDEBLOCK_RIGHT
-             . "'$ssel1 />
+                . XOOPS_SIDEBLOCK_LEFT
+                . "'$ssel0 />-<input type='radio' name='side[$bid]' value='"
+                . XOOPS_CENTERBLOCK_LEFT
+                . "'$ssel2 /><input type='radio' name='side[$bid]' value='"
+                . XOOPS_CENTERBLOCK_CENTER
+                . "'$ssel3 /><input type='radio' name='side[$bid]' value='"
+                . XOOPS_CENTERBLOCK_RIGHT
+                . "'$ssel4 />-<input type='radio' name='side[$bid]' value='"
+                . XOOPS_SIDEBLOCK_RIGHT
+                . "'$ssel1 />
                 <br>
                 <br>
                 <input type='radio' name='side[$bid]' value='-1'$sseln />
                 "
-             . _NONE
-             . "
+                . _NONE
+                . "
             </td>
             <td class='$class' align='center'>
                 <input type='text' name=weight[$bid] value='$weight' size='5' maxlength='5' style='text-align:right;' />
@@ -203,8 +203,8 @@ 
             </td>
             <td class='$class' align='center'>
                 <a href='admin.php?fct=blocksadmin&amp;op=edit&amp;bid=$bid'>"
-             . _EDIT
-             . "</a>
+                . _EDIT
+                . "</a>
                 <input type='hidden' name='bid[$bid]' value='$bid' />
             </td>
         </tr>\n";
@@ -237,14 +237,14 @@ 
     }
 
     $form = new MyXoopsGroupPermForm('', 1, 'block_read', "<img id='bottomtableicon' src="
-                                                          . XOOPS_URL
-                                                          . '/modules/'
-                                                          . $xoopsModule->dirname()
-                                                          . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;"
-                                                          . _AM_SF_GROUPS
-                                                          . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
-                                                          . _AM_SF_GROUPSINFO
-                                                          . '</span>');
+                                                            . XOOPS_URL
+                                                            . '/modules/'
+                                                            . $xoopsModule->dirname()
+                                                            . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;"
+                                                            . _AM_SF_GROUPS
+                                                            . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
+                                                            . _AM_SF_GROUPSINFO
+                                                            . '</span>');
     $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACTIVERIGHTS);
     $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACCESSRIGHTS);
     foreach ($item_list as $item_id => $item_name) {

Spacing +29 added lines, -29 removed lines

@@ -12,12 +12,12 @@ 
 //                          GIJOE <http://www.peak.ne.jp/>                   //
 // ------------------------------------------------------------------------- //
 
-include_once __DIR__ . '/../../../include/cp_header.php';
-include_once __DIR__ . '/mygrouppermform.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/include/functions.php';
+include_once __DIR__.'/../../../include/cp_header.php';
+include_once __DIR__.'/mygrouppermform.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include_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);
-include_once __DIR__ . '/../../system/constants.php';
-include_once __DIR__ . "/../../language/$language/admin.php";
-include_once __DIR__ . "/../../language/$language/admin/blocksadmin.php";
-include_once __DIR__ . '/../include/functions.php';
+include_once __DIR__.'/../../system/constants.php';
+include_once __DIR__."/../../language/$language/admin.php";
+include_once __DIR__."/../../language/$language/admin/blocksadmin.php";
+include_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 = array();
         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';
     include_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/admin_header2.php

Spacing +11 added lines, -11 removed lines

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

admin/index.php

Spacing +16 added lines, -16 removed lines

@@ -17,12 +17,12 @@ 
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
-$adminObject  = \Xmf\Module\Admin::getInstance();
+$adminObject = \Xmf\Module\Admin::getInstance();
 
 //----------------------
 
@@ -72,34 +72,34 @@ 
 $adminObject->addInfoBox(_AM_SF_INVENTORY);
 
 if ($totalcategories > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="category.php">' . _AM_SF_TOTALCAT . '</a><b>' . '</infolabel>', $totalcategories), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="category.php">'._AM_SF_TOTALCAT.'</a><b>'.'</infolabel>', $totalcategories), '', 'Green');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALCAT . '</infolabel>', $totalcategories), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALCAT.'</infolabel>', $totalcategories), '', 'Green');
 }
 if ($totalasked > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="main.php">' . _AM_SF_TOTALASKED . '</a><b>' . '</infolabel>', $totalasked), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="main.php">'._AM_SF_TOTALASKED.'</a><b>'.'</infolabel>', $totalasked), '', 'Green');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALASKED . '</infolabel>', $totalasked), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALASKED.'</infolabel>', $totalasked), '', 'Green');
 }
 if ($totalopened > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="question.php">' . _AM_SF_TOTALOPENED . '</a><b>' . '</infolabel>', $totalopened), '', 'Red');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="question.php">'._AM_SF_TOTALOPENED.'</a><b>'.'</infolabel>', $totalopened), '', 'Red');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALOPENED . '</infolabel>', $totalopened), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALOPENED.'</infolabel>', $totalopened), '', 'Green');
 }
 if ($totalsubmitted > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="category.php">' . _AM_SF_TOTALSUBMITTED . '</a><b>' . '</infolabel>', $totalsubmitted), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="category.php">'._AM_SF_TOTALSUBMITTED.'</a><b>'.'</infolabel>', $totalsubmitted), '', 'Green');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALSUBMITTED . '</infolabel>', $totalsubmitted), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALSUBMITTED.'</infolabel>', $totalsubmitted), '', 'Green');
 }
 if ($totalpublished > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="faq.php">' . _AM_SF_TOTALPUBLISHED . '</a><b>' . '</infolabel>', $totalpublished), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="faq.php">'._AM_SF_TOTALPUBLISHED.'</a><b>'.'</infolabel>', $totalpublished), '', 'Green');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALPUBLISHED . '</infolabel>', $totalpublished), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALPUBLISHED.'</infolabel>', $totalpublished), '', 'Green');
 }
 if ($totalnewanswers > 0) {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . '<a href="main.php">' . _AM_SF_TOTALNEWANSWERS . '</a><b>' . '</infolabel>', $totalnewanswers), '', 'Red');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'.'<a href="main.php">'._AM_SF_TOTALNEWANSWERS.'</a><b>'.'</infolabel>', $totalnewanswers), '', 'Red');
 } else {
-    $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_SF_TOTALNEWANSWERS . '</infolabel>', $totalnewanswers), '', 'Green');
+    $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_SF_TOTALNEWANSWERS.'</infolabel>', $totalnewanswers), '', 'Green');
 }
 
 //----------------------
@@ -107,4 +107,4 @@ 
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject->displayIndex();
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';