mambax7 / smartfaq

index.php

Spacing +15 added lines, -15 removed lines

@@ -11,7 +11,7 @@ 
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 // At which record shall we start for the Categories
 $catstart = \Xmf\Request::getInt('catstart', 0, 'GET');
@@ -44,11 +44,11 @@ 
 
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_index.tpl';
 
-require_once XOOPS_ROOT_PATH . '/header.php';
-require_once __DIR__ . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+require_once __DIR__.'/footer.php';
 
 // Creating the categories objects
-$categoriesObj =& $categoryHandler->getCategories($helper->getConfig('catperpage'), $catstart);
+$categoriesObj = & $categoryHandler->getCategories($helper->getConfig('catperpage'), $catstart);
 // If no categories are found, exit
 $totalCategoriesOnPage = count($categoriesObj);
 if (0 == $totalCategoriesOnPage) {
@@ -78,7 +78,7 @@ 
             if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
                 if (isset($last_qnaObj[$subcat_id])) {
                     $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
-                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
                 }
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
                 if ($helper->getConfig('displaysubcatonindex')) {
@@ -96,7 +96,7 @@ 
     if ($total > 0) {
         if (isset($last_qnaObj[$cat_id])) {
             $category->setVar('last_faqid', $last_qnaObj[$cat_id]->getVar('faqid'));
-            $category->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$cat_id]->getVar('faqid') . "'>" . $last_qnaObj[$cat_id]->question($lastfaqsize) . '</a>');
+            $category->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$cat_id]->getVar('faqid')."'>".$last_qnaObj[$cat_id]->question($lastfaqsize).'</a>');
         }
         $category->setVar('faqcount', $total);
         if (!isset($categories[$cat_id])) {
@@ -135,7 +135,7 @@ 
         }
 
         $memberHandler = xoops_getHandler('member');
-        $users         = $memberHandler->getUsers(new \Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
+        $users         = $memberHandler->getUsers(new \Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
         for ($i = 0; $i < $totalQnasOnPage; ++$i) {
             $faq = $faqsObj[$i]->toArray(null, $allcategories);
 
@@ -161,14 +161,14 @@ 
 }
 
 // Language constants
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
 $xoopsTpl->assign('whereInSection', $moduleName);
 $xoopsTpl->assign('displaysubcatonindex', $helper->getConfig('displaysubcatonindex'));
 $xoopsTpl->assign('displaylastfaqs', $helper->getConfig('displaylastfaqs'));
 $xoopsTpl->assign('display_categoryname', true);
 $xoopsTpl->assign('displayFull', 'full' === $helper->getConfig('displaytype'));
 
-$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD . ' ' . $moduleName);
+$xoopsTpl->assign('lang_mainhead', _MD_SF_MAINHEAD.' '.$moduleName);
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($helper->getConfig('indexwelcomemsg'), 1));
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_SMARTFAQS);
 $xoopsTpl->assign('lang_home', _MD_SF_HOME);
@@ -187,20 +187,20 @@ 
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
 
 // Category Navigation Bar
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 $pagenav = new \XoopsPageNav($totalCategories, $helper->getConfig('catperpage'), $catstart, 'catstart', '');
 if (1 == $helper->getConfig('useimagenavpage')) {
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
 } else {
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
 }
 
 // FAQ Navigation Bar
 $pagenav = new \XoopsPageNav($totalFaqs, $helper->getConfig('indexperpage'), $start, 'start', '');
 if (1 == $helper->getConfig('useimagenavpage')) {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
 } else {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
 }
 
 // Page Title Hack by marcan
@@ -208,4 +208,4 @@ 
 $xoopsTpl->assign('xoops_pagetitle', $module_name);
 // End Page Title Hack by marcan
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

answer.php

Spacing +12 added lines, -12 removed lines

@@ -12,7 +12,7 @@ 
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModule;
 
@@ -135,12 +135,12 @@ 
 
         // Storing the FAQ object in the database
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . Smartfaq\Utility::formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.Smartfaq\Utility::formatErrors($faqObj->getErrors()));
         }
 
         // Storing the answer object in the database
         if (!$newAnswerObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . Smartfaq\Utility::formatErrors($newAnswerObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.Smartfaq\Utility::formatErrors($newAnswerObj->getErrors()));
         }
 
         /** @var \XoopsNotificationHandler $notificationHandler */
@@ -157,7 +157,7 @@ 
             case 2:
                 // Answer for an open question submitted, auto-approved; became Q&A, need approbation
                 if (isset($_POST['notifypub']) && 1 == $_POST['notifypub']) {
-                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('faq', $faqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
                 // Send notifications
@@ -167,7 +167,7 @@ 
             case 3:
                 // Answer submitted, needs approbation
                 if (isset($_POST['notifypub']) && 1 == $_POST['notifypub']) {
-                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('question', $newAnswerObj->answerid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
                 // Send notifications
@@ -182,7 +182,7 @@ 
                 // New answer submitted for a published Q&A, need approbation
                 // Send notifications
                 if (isset($_POST['notifypub']) && 1 == $_POST['notifypub']) {
-                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('faq', $newAnswerObj->answerid(), 'answer_approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
 
@@ -218,20 +218,20 @@ 
         }
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/header.php';
+        require_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_SUBMITANSWER);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUBMITANSWERTO, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUBMITANSWER_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUBMITANSWER_INTRO);
 
-        require_once __DIR__ . '/include/answer.inc.php';
+        require_once __DIR__.'/include/answer.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }

class/Answer.php

Spacing +15 added lines, -15 removed lines

@@ -102,7 +102,7 @@ 
             $attachment_save = base64_encode(serialize($this->attachment_array));
         }
         $this->setVar('attachment', $attachment_save);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('smartfaq_answers') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachment_save) . ' WHERE post_id = ' . $this->getVar('answerid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('smartfaq_answers').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachment_save).' WHERE post_id = '.$this->getVar('answerid');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS["xoopsDB"]->error());
             return false;
@@ -135,8 +135,8 @@ 
 
         foreach ($attach_old as $key => $attach) {
             if (in_array($key, $attach_array)) {
-                @unlink(XOOPS_ROOT_PATH . '/' . $helper->getConfig('dir_attachments') . '/' . $attach['name_saved']);
-                @unlink(XOOPS_ROOT_PATH . '/' . $helper->getConfig('dir_attachments') . '/thumbs/' . $attach['name_saved']); // delete thumbnails
+                @unlink(XOOPS_ROOT_PATH.'/'.$helper->getConfig('dir_attachments').'/'.$attach['name_saved']);
+                @unlink(XOOPS_ROOT_PATH.'/'.$helper->getConfig('dir_attachments').'/thumbs/'.$attach['name_saved']); // delete thumbnails
                 continue;
             }
             $this->attachment_array[$key] = $attach;
@@ -195,24 +195,24 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = sf_getIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/include/functions.image.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/include/functions.image.php';
             $image_extensions = ['jpg', 'jpeg', 'gif', 'png', 'bmp']; // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade"><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists(XOOPS_ROOT_PATH . '/' . $mime_path . '/' . $filetype . '.gif')) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists(XOOPS_ROOT_PATH.'/'.$mime_path.'/'.$filetype.'.gif')) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize(XOOPS_ROOT_PATH . '/' . $helper->getConfig('dir_attachments') . '/' . $att['name_saved']);
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize(XOOPS_ROOT_PATH.'/'.$helper->getConfig('dir_attachments').'/'.$att['name_saved']);
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if ($helper->getConfig('media_allowed') && in_array(strtolower($file_extension), $image_extensions)) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '"><strong>&nbsp; ' . $att['name_display'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . sf_attachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'"><strong>&nbsp; '.$att['name_display'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.sf_attachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     global $xoopsUser;
                     if (empty($helper->getConfig('show_userattach'))) {
@@ -369,9 +369,9 @@ 
         $tags                  = [];
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $faqObj->question();
-        $tags['FAQ_URL']       = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $faqObj->faqid();
+        $tags['FAQ_URL']       = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$faqObj->faqid();
         $tags['CATEGORY_NAME'] = $faqObj->getCategoryName();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $faqObj->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$faqObj->categoryid();
         $tags['FAQ_QUESTION']  = $faqObj->question();
 
         // TODO : Not sure about the 'formpreview' ...

class/Utility.php

Spacing +24 added lines, -24 removed lines

@@ -71,7 +71,7 @@ 
                 break;
 
             case 'inside':
-                return XOOPS_URL . '/modules/smartfaq/doc/';
+                return XOOPS_URL.'/modules/smartfaq/doc/';
                 break;
 
             case 'custom':
@@ -88,7 +88,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -112,13 +112,13 @@ 
             $spaces .= '--';
         }
 
-        $ret .= "<option value='" . $categoryObj->categoryid() . "'";
+        $ret .= "<option value='".$categoryObj->categoryid()."'";
         if ($selectedid == $categoryObj->categoryid()) {
             $ret .= ' selected';
         }
-        $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
+        $ret .= '>'.$spaces.$categoryObj->name()."</option>\n";
 
-        $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
+        $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
         if (count($subCategoriesObj) > 0) {
             ++$level;
             foreach ($subCategoriesObj as $catID => $subCategoryObj) {
@@ -137,10 +137,10 @@ 
      */
     public static function createCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true)
     {
-        $ret = '' . _MB_SF_SELECTCAT . "&nbsp;<select name='options[]'>";
+        $ret = ''._MB_SF_SELECTCAT."&nbsp;<select name='options[]'>";
         if ($allCatOption) {
             $ret .= "<option value='0'";
-            $ret .= '>' . _MB_SF_ALLCAT . "</option>\n";
+            $ret .= '>'._MB_SF_ALLCAT."</option>\n";
         }
 
         // Creating the category handler object
@@ -209,9 +209,9 @@ 
     {
         $smartModule = self::getModuleInfo();
 
-        $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
+        $modfootertxt = 'Module '.$smartModule->getInfo('name').' - Version '.$smartModule->getInfo('version').'';
 
-        $modfooter = "<a href='" . $smartModule->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+        $modfooter = "<a href='".$smartModule->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/sfcssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
 
         return $modfooter;
     }
@@ -233,7 +233,7 @@ 
         $module_id   = $smartModule->getVar('mid');
 
         if (!empty($xoopsUser)) {
-            $groups =& $xoopsUser->getGroups();
+            $groups = & $xoopsUser->getGroups();
             $result = in_array(XOOPS_GROUP_ADMIN, $groups) || $xoopsUser->isAdmin($module_id);
         }
 
@@ -307,7 +307,7 @@ 
 
         $gpermHandler = xoops_getHandler('groupperm');
 
-        $sql    = 'SELECT faqid FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE categoryid = '$categoryid' ";
+        $sql    = 'SELECT faqid FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE categoryid = '$categoryid' ";
         $result = $xoopsDB->queryF($sql);
 
         if ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
@@ -422,7 +422,7 @@ 
         $ret = [];
         global $xoopsDB;
 
-        $result = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE faqid = '$faqid'");
+        $result = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE faqid = '$faqid'");
         $ret    = $xoopsDB->fetchArray($result);
 
         return $ret;
@@ -439,31 +439,31 @@ 
     // TODO : Move this to the Smartfaq\Faq class
     public static function getAdminLinks($faqid = 0, $open = false)
     {
-        global $xoopsUser, $xoopsModule,  $xoopsConfig;
+        global $xoopsUser, $xoopsModule, $xoopsConfig;
         /** @var Smartfaq\Helper $helper */
         $helper = Smartfaq\Helper::getInstance();
 
         $adminLinks = '';
-        $modulePath = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/';
+        $modulePath = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/';
         $page       = $open ? 'question.php' : 'faq.php';
         if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
             // Edit button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=mod&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/edit.gif'" . " title='" . _MD_SF_EDIT . "' alt='" . _MD_SF_EDIT . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=mod&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/edit.gif'"." title='"._MD_SF_EDIT."' alt='"._MD_SF_EDIT."'></a>";
             $adminLinks .= ' ';
             // Delete button
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=del&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/delete.gif'" . " title='" . _MD_SF_DELETE . "' alt='" . _MD_SF_DELETE . "'></a>";
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=del&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/delete.gif'"." title='"._MD_SF_DELETE."' alt='"._MD_SF_DELETE."'></a>";
             $adminLinks .= ' ';
         }
         // Print button
-        $adminLinks .= "<a href='" . $modulePath . 'print.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/print.gif' title='" . _MD_SF_PRINT . "' alt='" . _MD_SF_PRINT . "'></a>";
+        $adminLinks .= "<a href='".$modulePath.'print.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/print.gif' title='"._MD_SF_PRINT."' alt='"._MD_SF_PRINT."'></a>";
         $adminLinks .= ' ';
         // Email button
-        $maillink   = 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . $modulePath . 'faq.php?faqid=' . $faqid;
-        $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'></a>";
+        $maillink = 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.$modulePath.'faq.php?faqid='.$faqid;
+        $adminLinks .= '<a href="'.$maillink."\"><img src='".$modulePath."assets/images/links/friend.gif' title='"._MD_SF_MAIL."' alt='"._MD_SF_MAIL."'></a>";
         $adminLinks .= ' ';
         // Submit New Answer button
         if ($helper->getConfig('allownewanswer') && (is_object($xoopsUser) || $helper->getConfig('anonpost'))) {
-            $adminLinks .= "<a href='" . $modulePath . 'answer.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/newanswer.gif' title='" . _MD_SF_SUBMITANSWER . "' alt='" . _MD_SF_SUBMITANSWER . "'></a>";
+            $adminLinks .= "<a href='".$modulePath.'answer.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/newanswer.gif' title='"._MD_SF_SUBMITANSWER."' alt='"._MD_SF_SUBMITANSWER."'></a>";
             $adminLinks .= ' ';
         }
 
@@ -494,7 +494,7 @@ 
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
 
             if (is_object($user)) {
@@ -508,9 +508,9 @@ 
                     $fullname = $user->getVar('name');
                 }
                 if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
                 } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
                 }
 
                 return $linkeduser;
@@ -592,6 +592,6 @@ 
             //-->
         </script>
         <?php
-        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
+        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('".$tablename."'); toggleIcon('".$iconname."');\">";
     }
 }

admin/category.php

Indentation +17 added lines, -17 removed lines

@@ -52,18 +52,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>";
@@ -323,11 +323,11 @@ 
             $categoryid = \Xmf\Request::getInt('categoryid', 0, 'GET');
             xoops_cp_header();
             xoops_confirm([
-                              'op'         => 'del',
-                              'categoryid' => $categoryObj->categoryid(),
-                              'confirm'    => 1,
-                              'name'       => $categoryObj->name()
-                          ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
+                                'op'         => 'del',
+                                'categoryid' => $categoryObj->categoryid(),
+                                'confirm'    => 1,
+                                'name'       => $categoryObj->name()
+                            ], 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
             xoops_cp_footer();
         }
         exit();

Switch Indentation +120 added lines, -120 removed lines

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

@@ -8,7 +8,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
@@ -39,11 +39,11 @@ 
     $description = $categoryObj->description();
     if (!XOOPS_USE_MULTIBYTES) {
         if (strlen($description) >= 100) {
-            $description = substr($description, 0, 100 - 1) . '...';
+            $description = substr($description, 0, 100 - 1).'...';
         }
     }
-    $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITCOL . "' alt='" . _AM_SF_EDITCOL . "'></a>";
-    $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETECOL . "' alt='" . _AM_SF_DELETECOL . "'></a>";
+    $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITCOL."' alt='"._AM_SF_EDITCOL."'></a>";
+    $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETECOL."' alt='"._AM_SF_DELETECOL."'></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -64,11 +64,11 @@ 
          . "/modules/smartfaq/assets/images/icon/subcat.gif' alt=''>&nbsp;"
          . $categoryObj->name()
          . '</a></td>';
-    echo "<td class='even' align='left'>" . $description . '</td>';
-    echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
+    echo "<td class='even' align='left'>".$description.'</td>';
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo '</tr>';
-    $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
+    $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
     if (count($subCategoriesObj) > 0) {
         ++$level;
         foreach ($subCategoriesObj as $key => $thiscat) {
@@ -87,10 +87,10 @@ 
     //$moderators = array(); // just to define the variable
     //$allmods = array();
     $startfaq = \Xmf\Request::getInt('startfaq', 0, 'GET');
-    global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify,  $xoopsModule, $_GET;
+    global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModule, $_GET;
     /** @var Smartfaq\Helper $helper */
     $helper = Smartfaq\Helper::getInstance();
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     // Creating the faq handler object
     /** @var \XoopsModules\Smartfaq\FaqHandler $faqHandler */
@@ -113,13 +113,13 @@ 
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
         }
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
         echo "<div id='bottomtable'>";
     } else {
         $categoryObj = $categoryHandler->create();
         echo "<br>\n";
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
         echo "<div id='bottomtable'>";
     }
     // Start category form
@@ -164,7 +164,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, '');
@@ -229,7 +229,7 @@ 
     echo '</div>';
 
     if ($categoryid) {
-        require_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
     }
 
     unset($hidden);
@@ -247,7 +247,7 @@ 
         break;
 
     case 'addcategory':
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule,  $modify, $myts, $categoryid;
+        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $modify, $myts, $categoryid;
 
         $categoryid = \Xmf\Request::getInt('categoryid', 0, 'POST');
 
@@ -285,7 +285,7 @@ 
         }
 
         if (!$categoryObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.Smartfaq\Utility::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         Smartfaq\Utility::saveCategoryPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -327,7 +327,7 @@ 
                               '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();
@@ -345,19 +345,19 @@ 
         echo "<br>\n";
 
         // Creating the objects for top categories
-        $categoriesObj =& $categoryHandler->getCategories($helper->getConfig('perpage'), $startcategory, 0);
+        $categoriesObj = & $categoryHandler->getCategories($helper->getConfig('perpage'), $startcategory, 0);
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_CATEGORIES_DSC.'</span>';
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         $totalCategories = $categoryHandler->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -366,14 +366,14 @@ 
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
             echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $pagenav = new \XoopsPageNav($totalCategories, $helper->getConfig('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);
@@ -381,4 +381,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/mygroupperm.php

Spacing +7 added lines, -7 removed lines

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

admin/main.php

Spacing +76 added lines, -76 removed lines

@@ -11,7 +11,7 @@ 
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 $myts = \MyTextSanitizer::getInstance();
 
 $faqid = \Xmf\Request::getInt('faqid', 0, 'POST');
@@ -34,29 +34,29 @@ 
 
 function buildTable()
 {
-    global $xoopsConfig,  $xoopsModule;
+    global $xoopsConfig, $xoopsModule;
     /** @var Smartfaq\Helper $helper */
     $helper = Smartfaq\Helper::getInstance();
 
     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
-require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
 // Creating the category handler object
 /** @var \XoopsModules\Smartfaq\CategoryHandler $categoryHandler */
@@ -139,9 +139,9 @@ 
 
 // Construction of lower table
 Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_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   = '';
@@ -210,98 +210,98 @@ 
     case Constants::SF_STATUS_ASKED:
         $selectedtxt1        = 'selected';
         $caption             = _AM_SF_ASKED;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_ASKED . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_ASKED.' ';
         $status_explaination = _AM_SF_ASKED_EXP;
         break;
 
     case Constants::SF_STATUS_OPENED:
         $selectedtxt2        = 'selected';
         $caption             = _AM_SF_OPENED;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_OPENED . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_OPENED.' ';
         $status_explaination = _AM_SF_OPENED_EXP;
         break;
 
     case Constants::SF_STATUS_ANSWERED:
         $selectedtxt3        = 'selected';
         $caption             = _AM_SF_ANSWERED;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_ANSWERED . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_ANSWERED.' ';
         $status_explaination = _AM_SF_ANSWERED_EXP;
         break;
 
     case Constants::SF_STATUS_SUBMITTED:
         $selectedtxt4        = 'selected';
         $caption             = _AM_SF_SUBMITTED;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_SUBMITTED . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_SUBMITTED.' ';
         $status_explaination = _AM_SF_SUBMITTED_EXP;
         break;
 
     case Constants::SF_STATUS_PUBLISHED:
         $selectedtxt5        = 'selected';
         $caption             = _AM_SF_PUBLISHED;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_PUBLISHED . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_PUBLISHED.' ';
         $status_explaination = _AM_SF_PUBLISHED_EXP;
         break;
 
     case Constants::SF_STATUS_NEW_ANSWER:
         $selectedtxt6        = 'selected';
         $caption             = _AM_SF_NEW_ANSWER;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_NEW_ANSWER . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_NEW_ANSWER.' ';
         $status_explaination = _AM_SF_NEW_ANSWER_EXP;
         break;
 
     case Constants::SF_STATUS_OFFLINE:
         $selectedtxt7        = 'selected';
         $caption             = _AM_SF_OFFLINE;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_OFFLINE . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_OFFLINE.' ';
         $status_explaination = _AM_SF_OFFLINE_EXP;
         break;
 
     case Constants::SF_STATUS_REJECTED_QUESTION:
         $selectedtxt8        = 'selected';
         $caption             = _AM_SF_REJECTED_QUESTION;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_REJECTED_QUESTION . ' ';
+        $cond                = ' WHERE status = '.Constants::SF_STATUS_REJECTED_QUESTION.' ';
         $status_explaination = _AM_SF_REJECTED_QUESTION_EXP;
         break;
 
     case Constants::SF_STATUS_REJECTED_SMARTFAQ:
         $selectedtxt9        = 'selected';
         $caption             = _AM_SF_REJECTED_SMARTFAQ;
-        $cond                = ' WHERE status = ' . Constants::SF_STATUS_REJECTED_SMARTFAQ . ' ';
+        $cond                = ' WHERE status = '.Constants::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>
@@ -316,7 +316,7 @@ 
 $faqsObj = $faqHandler->getFaqsAdminSide($helper->getConfig('perpage'), $startentry, $statusSelected, -1, $sortsel, $ordersel);
 
 // fetching all categories
-$allCats          = $categoryHandler->getObjects(null, true);
+$allCats = $categoryHandler->getObjects(null, true);
 //$totalItemsOnPage = count($faqsObj);
 buildTable();
 
@@ -339,65 +339,65 @@ 
         switch ($faqsObj[$i]->status()) {
             case Constants::SF_STATUS_ASKED:
                 $statustxt = _AM_SF_ASKED;
-                $approve   = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/on.png' . "'  title='" . _AM_SF_QUESTION_MODERATE . "'  alt='" . _AM_SF_QUESTION_MODERATE . "'></a>&nbsp;";
+                $approve   = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/on.png'."'  title='"._AM_SF_QUESTION_MODERATE."'  alt='"._AM_SF_QUESTION_MODERATE."'></a>&nbsp;";
                 $modify    = '';
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "'></a>";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."'></a>";
                 break;
 
             case Constants::SF_STATUS_OPENED:
                 $statustxt = _AM_SF_OPENED;
                 $approve   = '';
-                $modify    = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_QUESTION_EDIT . "' alt='" . _AM_SF_QUESTION_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "'></a>";
+                $modify    = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_QUESTION_EDIT."' alt='"._AM_SF_QUESTION_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."'></a>";
                 break;
 
             case Constants::SF_STATUS_ANSWERED:
                 $statustxt = _AM_SF_ANSWERED;
-                $approve   = "<a href='answer.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_ANSWERED_MODERATE . "' alt='" . _AM_SF_ANSWERED_MODERATE . "'></a>&nbsp;";
+                $approve   = "<a href='answer.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_ANSWERED_MODERATE."' alt='"._AM_SF_ANSWERED_MODERATE."'></a>&nbsp;";
                 $modify    = '';
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "'></a>";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."'></a>";
                 break;
 
             case Constants::SF_STATUS_SUBMITTED:
                 $statustxt = _AM_SF_SUBMITTED;
-                $approve   = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_SUBMISSION_MODERATE . "' alt='" . _AM_SF_SUBMISSION_MODERATE . "'></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $approve   = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_SUBMISSION_MODERATE."' alt='"._AM_SF_SUBMISSION_MODERATE."'></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
                 $modify    = '';
                 break;
 
             case Constants::SF_STATUS_PUBLISHED:
                 $statustxt = _AM_SF_PUBLISHED;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
                 break;
 
             case Constants::SF_STATUS_NEW_ANSWER:
                 $statustxt = _AM_SF_NEWANSWER;
-                $approve   = "<a href='answer.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/approve.gif' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/delete.gif' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $approve   = "<a href='answer.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/approve.gif' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/delete.gif' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
                 $modify    = '';
                 break;
 
             case Constants::SF_STATUS_OFFLINE:
                 $statustxt = _AM_SF_OFFLINE;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_EDIT . "' alt='" . _AM_SF_FAQ_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_FAQ_EDIT."' alt='"._AM_SF_FAQ_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
                 break;
 
             case Constants::SF_STATUS_REJECTED_QUESTION:
                 $statustxt = _AM_SF_REJECTED_QUESTION;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_REJECTED_EDIT . "' alt='" . _AM_SF_REJECTED_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEQUESTION . "' alt='" . _AM_SF_DELETEQUESTION . "'></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_REJECTED_EDIT."' alt='"._AM_SF_REJECTED_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEQUESTION."' alt='"._AM_SF_DELETEQUESTION."'></a>";
                 break;
 
             case Constants::SF_STATUS_REJECTED_SMARTFAQ:
                 $statustxt = _AM_SF_REJECTED_SMARTFAQ;
                 $approve   = '';
-                $modify    = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_REJECTED_EDIT . "' alt='" . _AM_SF_REJECTED_EDIT . "'></a>&nbsp;";
-                $delete    = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $modify    = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_REJECTED_EDIT."' alt='"._AM_SF_REJECTED_EDIT."'></a>&nbsp;";
+                $delete    = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
                 break;
 
             case 'default':
@@ -411,14 +411,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 = Smartfaq\Utility::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
         /** @var \XoopsModules\Smartfaq\AnswerHandler $answerHandler */
@@ -428,7 +428,7 @@ 
         $criteria->add(new \Criteria('faqid', $faqsObj[$i]->faqid()));
         $criteria->add(new \Criteria('status', true));
 
-        $answerObjects =& $answerHandler->getObjects($criteria, true);
+        $answerObjects = & $answerHandler->getObjects($criteria, true);
 
         foreach (array_keys($answerObjects) as $j) {
             $answerObj = $answerObjects[$j];
@@ -441,20 +441,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";
@@ -462,9 +462,9 @@ 
 $pagenav = new \XoopsPageNav($numrows, $helper->getConfig('perpage'), $startentry, 'startentry', "statussel=$statussel&amp;sortsel=$sortsel&amp;ordersel=$ordersel");
 
 if (1 == $helper->getConfig('useimagenavpage')) {
-    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>';
@@ -472,4 +472,4 @@ 
 echo '</div>';
 echo '</div>';
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/question.php

Indentation +5 added lines, -5 removed lines

@@ -293,11 +293,11 @@
             $faqid = \Xmf\Request::getInt('faqid', 0, 'GET');
             xoops_cp_header();
             xoops_confirm([
-                              'op'      => 'del',
-                              'faqid'   => $faqObj->faqid(),
-                              'confirm' => 1,
-                              'name'    => $faqObj->question()
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                                'op'      => 'del',
+                                'faqid'   => $faqObj->faqid(),
+                                'confirm' => 1,
+                                'name'    => $faqObj->question()
+                            ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 

Spacing +31 added lines, -31 removed lines

@@ -11,7 +11,7 @@ 
 /** @var Smartfaq\Helper $helper */
 $helper = Smartfaq\Helper::getInstance();
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 global $xoopsUser;
 
@@ -40,11 +40,11 @@ 
  */
 function editfaq($showmenu = false, $faqid = -1)
 {
-    global $faqHandler, $categoryHandler, $xoopsUser, $xoopsConfig, $xoopsDB, $modify,  $xoopsModule, $XOOPS_URL, $myts;
+    global $faqHandler, $categoryHandler, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModule, $XOOPS_URL, $myts;
     /** @var Smartfaq\Helper $helper */
     $helper = Smartfaq\Helper::getInstance();
 
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
     if (-1 != $faqid) {
         // Creating the FAQ object
@@ -76,9 +76,9 @@ 
 
         echo "<br>\n";
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . $collapsableBar_title . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".$collapsableBar_title.'</h3>';
         echo "<div id='bottomtable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $collapsableBar_info . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$collapsableBar_info.'</span>';
     } else {
         // there's no parameter, so we're adding a faq
         $faqObj = $faqHandler->create();
@@ -89,7 +89,7 @@ 
         $button_caption    = _AM_SF_CREATE;
 
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CREATEQUESTION . '</h3>';
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CREATEQUESTION.'</h3>';
         echo "<div id='bottomtable'>";
     }
     $sform = new \XoopsThemeForm(_AM_SF_OPEN_QUESTION, 'op', xoops_getenv('PHP_SELF'), 'post', true);
@@ -163,7 +163,7 @@ 
         $button_tray->addElement($butt_create);
 
         $butt_edit = new \XoopsFormButton('', '', _AM_SF_OPEN_QUESTION_EDIT, 'button');
-        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=" . $faqid . "'\"");
+        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=".$faqid."'\"");
         $button_tray->addElement($butt_edit);
 
         $butt_cancel = new \XoopsFormButton('', '', _AM_SF_CANCEL, 'button');
@@ -195,7 +195,7 @@ 
         xoops_cp_header();
 
         $adminObject->displayNavigation(basename(__FILE__));
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
         editfaq(true, $faqid);
         break;
@@ -256,7 +256,7 @@ 
 
         // Storing the FAQ
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR . Smartfaq\Utility::formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR.Smartfaq\Utility::formatErrors($faqObj->getErrors()));
         }
 
         // Send notifications
@@ -297,7 +297,7 @@ 
                               'faqid'   => $faqObj->faqid(),
                               'confirm' => 1,
                               'name'    => $faqObj->question()
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
+                          ], 'question.php', _AM_SF_DELETETHISQUESTION." <br>'".$faqObj->question()."'. <br> <br>", _AM_SF_DELETE);
             xoops_cp_footer();
         }
 
@@ -310,18 +310,18 @@ 
         xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
 
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
 
-        global  $xoopsConfig, $xoopsDB,  $xoopsModule, $smartModuleConfig;
+        global  $xoopsConfig, $xoopsDB, $xoopsModule, $smartModuleConfig;
 
         echo "<br>\n";
 
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
 
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_OPENED_TITLE . '</h3>';
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_OPENED_TITLE.'</h3>';
         echo "<div id='toptable'>";
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_OPENED_DSC . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_OPENED_DSC.'</span>';
 
         // Get the total number of published FAQs
         $totalfaqs = $faqHandler->getFaqsCount(-1, [Constants::SF_STATUS_OPENED]);
@@ -331,14 +331,14 @@ 
         $allCats         = $categoryHandler->getObjects(null, true);
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
-        echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
+        echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+        echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+        echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
 
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
 
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
         echo '</tr>';
         //var_dump( $faqsObj);
         if ($totalfaqs > 0) {
@@ -346,33 +346,33 @@ 
             foreach (array_keys($faqsObj) as $i) {
                 $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
 
-                $modify = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_EDITART . "'></a>";
-                $delete = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
+                $modify = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_EDITART."'></a>";
+                $delete = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
 
                 $requester = Smartfaq\Utility::getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
 
                 echo '<tr>';
-                echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
-                echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
-                echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/answer.php?faqid=' . $faqsObj[$i]->faqid() . "'>" . $faqsObj[$i]->question(100) . '</a></td>';
+                echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
+                echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
+                echo "<td class='even' align='left'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/answer.php?faqid='.$faqsObj[$i]->faqid()."'>".$faqsObj[$i]->question(100).'</a></td>';
 
-                echo "<td class='even' align='center'>" . $requester . '</td>';
+                echo "<td class='even' align='center'>".$requester.'</td>';
 
-                echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
+                echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
                 echo "<td class='even' align='center'> $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             $faqid = -1;
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOQUEUED . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOQUEUED.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
         echo "<br>\n";
 
         $pagenav = new \XoopsPageNav($totalfaqs, $helper->getConfig('perpage'), $startfaq, 'startfaq');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '</div>';
 
         $totalcategories = $categoryHandler->getCategoriesCount(-1);
@@ -383,4 +383,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

print.php

Spacing +12 added lines, -12 removed lines

@@ -8,7 +8,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $faqid = \Xmf\Request::getInt('faqid', 0, 'GET');
 
@@ -46,23 +46,23 @@ 
 
 echo "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN'>\n";
 echo "<html>\n<head>\n";
-echo '<title>' . _MD_SF_FAQCOMEFROM . ' ' . $xoopsConfig['sitename'] . "</title>\n";
-echo "<meta http-equiv='Content-Type' content='text/html; charset=" . _CHARSET . "'>\n";
-echo "<meta name='AUTHOR' content='" . $xoopsConfig['sitename'] . "'>\n";
-echo "<meta name='COPYRIGHT' content='Copyright (c) 2001 by " . $xoopsConfig['sitename'] . "'>\n";
-echo "<meta name='DESCRIPTION' content='" . $xoopsConfig['slogan'] . "'>\n";
-echo "<meta name='GENERATOR' content='" . XOOPS_VERSION . "'>\n\n\n";
+echo '<title>'._MD_SF_FAQCOMEFROM.' '.$xoopsConfig['sitename']."</title>\n";
+echo "<meta http-equiv='Content-Type' content='text/html; charset="._CHARSET."'>\n";
+echo "<meta name='AUTHOR' content='".$xoopsConfig['sitename']."'>\n";
+echo "<meta name='COPYRIGHT' content='Copyright (c) 2001 by ".$xoopsConfig['sitename']."'>\n";
+echo "<meta name='DESCRIPTION' content='".$xoopsConfig['slogan']."'>\n";
+echo "<meta name='GENERATOR' content='".XOOPS_VERSION."'>\n\n\n";
 
 echo "<body bgcolor='#ffffff' text='#000000' onload='window.print()'>
      <div style='width: 650px; border: 1px solid #000; padding: 20px;'>
-     <div style='text-align: center; display: block; margin: 0 0 6px 0;'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/logo_module.png' border='0' alt=''><h2 style='margin: 0;'>" . $faqObj->question() . "</h2></div>
-     <div align='center'>" . $who_where . "</div>
+     <div style='text-align: center; display: block; margin: 0 0 6px 0;'><img src='" . XOOPS_URL."/modules/smartfaq/assets/images/logo_module.png' border='0' alt=''><h2 style='margin: 0;'>".$faqObj->question()."</h2></div>
+     <div align='center'>" . $who_where."</div>
                 <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
                 <div></div>
-                <b><p>" . $faqObj->question() . '</p></b>
-                <p>' . $answerObj->answer() . "</p>
+                <b><p>" . $faqObj->question().'</p></b>
+                <p>' . $answerObj->answer()."</p>
                 <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
-                <p>" . $comeFrom . '</p>
+                <p>" . $comeFrom.'</p>
             </div>
     <br>';