mambax7 / smartfaq

answer.php

Indentation +1 added lines, -1 removed lines

@@ -184,7 +184,7 @@
     }
 
     //redirect_header("javascript:history.go(-1)", 3, $redirect_msg);
-     redirect_header("index.php", 3, $redirect_msg);
+        redirect_header("index.php", 3, $redirect_msg);
     exit;
 
     break;

Spacing +21 added lines, -21 removed lines

@@ -7,7 +7,7 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -24,8 +24,8 @@ 
 if (isset($_POST['op'])) $op = $_POST['op'];
 
 // Getting the faqid
-$faqid = isset($_GET['faqid'])? intval($_GET['faqid']) : 0;
-$faqid = isset($_POST['faqid'])? intval($_POST['faqid']) : $faqid;
+$faqid = isset($_GET['faqid']) ? intval($_GET['faqid']) : 0;
+$faqid = isset($_POST['faqid']) ? intval($_POST['faqid']) : $faqid;
 
 // If no FAQ is selected, exit
 if ($faqid == 0) {
@@ -34,10 +34,10 @@ 
 }
 
 // Creating the FAQ handler object
-$faq_handler =& sf_gethandler('faq');
+$faq_handler = & sf_gethandler('faq');
 
 // Creating the answer handler object
-$answer_handler =& sf_gethandler('answer');
+$answer_handler = & sf_gethandler('answer');
 
 switch ($op) {
     // The answer is posted
@@ -67,14 +67,14 @@ 
     }
 
     // Get the category object related to that FAQ
-    $categoryObj =& $faqObj->category();
+    $categoryObj = & $faqObj->category();
 
     // Create the answer object
     $newAnswerObj = $answer_handler->create();
 
     // Putting the values in the answer object
     $newAnswerObj->setVar('faqid', $faqObj->faqid());
-    $newAnswerObj->setVar('answer',$_POST['answer']);
+    $newAnswerObj->setVar('answer', $_POST['answer']);
     $newAnswerObj->setVar('uid', $uid);
 
     // Depending of the status of the FAQ, some values need to be set
@@ -127,14 +127,14 @@ 
     }
 
     // Storing the FAQ object in the database
-    if ( !$faqObj->store() ) {
-        redirect_header("javascript:history.go(-1)", 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($faqObj->getErrors()));
+    if (!$faqObj->store()) {
+        redirect_header("javascript:history.go(-1)", 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($faqObj->getErrors()));
         exit();
     }
 
     // Storing the answer object in the database
-    if ( !$newAnswerObj->store() ) {
-        redirect_header("javascript:history.go(-1)", 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($newAnswerObj->getErrors()));
+    if (!$newAnswerObj->store()) {
+        redirect_header("javascript:history.go(-1)", 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($newAnswerObj->getErrors()));
         exit();
     }
 
@@ -151,7 +151,7 @@ 
         case 2 :
         // Answer for an open question submitted, auto-approved; became Q&A, need approbation
         if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-            include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+            include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
             $notification_handler->subscribe('faq', $faqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
         }
         // Send notifications
@@ -161,7 +161,7 @@ 
         case 3 :
         // Answer submitted, needs approbation
         if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-            include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+            include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
             $notification_handler->subscribe('question', $newAnswerObj->answerid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
         }
         // Send notifications
@@ -175,7 +175,7 @@ 
         // New answer submitted for a published Q&A, need approbation
         // Send notifications
         if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-            include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+            include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
             $notification_handler->subscribe('faq', $newAnswerObj->answerid(), 'answer_approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
         }
 
@@ -204,10 +204,10 @@ 
     }
 
     // Creating the category object that holds the selected FAQ
-    $categoryObj =& $faqObj->category();
+    $categoryObj = & $faqObj->category();
 
     // Creating the answer object
-    $answerObj =& $faqObj->answer();
+    $answerObj = & $faqObj->answer();
 
     // Check user permissions to access that category of the selected FAQ
     if (faqAccessGranted($faqObj) < 0) {
@@ -216,20 +216,20 @@ 
     }
 
     $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
-    include_once(XOOPS_ROOT_PATH . "/header.php");
-    include_once __DIR__ . '/footer.php';
+    include_once(XOOPS_ROOT_PATH."/header.php");
+    include_once __DIR__.'/footer.php';
 
-    $name = ($xoopsUser)? (ucwords($xoopsUser->getVar("uname"))) : 'Anonymous';
+    $name = ($xoopsUser) ? (ucwords($xoopsUser->getVar("uname"))) : 'Anonymous';
 
     $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);
 
     include_once 'include/answer.inc.php';
 
-    include_once XOOPS_ROOT_PATH . '/footer.php';
+    include_once XOOPS_ROOT_PATH.'/footer.php';
     break;
 }

Braces +6 added lines, -2 removed lines

@@ -36,8 +36,12 @@
 
 $op = '';
 
-if (isset($_GET['op'])) $op = $_GET['op'];
-if (isset($_POST['op'])) $op = $_POST['op'];
+if (isset($_GET['op'])) {
+    $op = $_GET['op'];
+}
+if (isset($_POST['op'])) {
+    $op = $_POST['op'];
+}
 
 switch ($op) {
     case 'post':

faq.php

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 * Licence: GNU
 */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 $faqid = isset($_GET['faqid']) ? intval($_GET['faqid']) : 0;
 
@@ -17,7 +17,7 @@ 
 }
 
 // Creating the FAQ handler object
-$faq_handler =& sf_gethandler('faq');
+$faq_handler = & sf_gethandler('faq');
 
 // Creating the FAQ object for the selected FAQ
 $faqObj = new sfFaq($faqid);
@@ -46,8 +46,8 @@ 
     $faqObj->updateCounter();
 }
 $xoopsOption['template_main'] = 'smartfaq_faq.tpl';
-include_once(XOOPS_ROOT_PATH . "/header.php");
-include_once __DIR__ . '/footer.php';
+include_once(XOOPS_ROOT_PATH."/header.php");
+include_once __DIR__.'/footer.php';
 
 $faq = $faqObj->toArray(null, $categoryObj, false);
 
@@ -82,7 +82,7 @@ 
 $xoopsTpl->assign('display_categoryname', false);
 
 $xoopsTpl->assign('xcodes', $faqObj->getVar('xcodes'));
-$xoopsTpl->assign('mail_link', 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/faq.php?faqid=' . $faqObj->getVar('faqid'));
+$xoopsTpl->assign('mail_link', 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/faq.php?faqid='.$faqObj->getVar('faqid'));
 $xoopsTpl->assign('lang_printerpage', _MD_SF_PRINTERFRIENDLY);
 $xoopsTpl->assign('lang_sendstory', _MD_SF_SENDSTORY);
 $xoopsTpl->assign('faqid', $faqObj->getVar('faqid'));
@@ -98,19 +98,19 @@ 
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $categoryObj->name() . ' - ' . $faq['question']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$categoryObj->name().' - '.$faq['question']);
 // End Page Title Hack by marcan
 
 // Include the comments if the selected FAQ supports comments
 if ($faqObj->cancomment() == 1) {
-    include_once XOOPS_ROOT_PATH . "/include/comment_view.php";
+    include_once XOOPS_ROOT_PATH."/include/comment_view.php";
 }
 
 //code to include smartie
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
-    include_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
-        $xoopsTpl->assign('smarttie',1);
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
+    include_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
+        $xoopsTpl->assign('smarttie', 1);
 }
 //end code for smarttie
 
-include_once XOOPS_ROOT_PATH . '/footer.php';
+include_once XOOPS_ROOT_PATH.'/footer.php';

include/searchform.php

Spacing +6 added lines, -6 removed lines

@@ -7,9 +7,9 @@ 
 * Licence: GNU
 */
 
-$categoryID = isset($categoryID)? intval($categoryID) : 0;
-$type = isset($type)? intval($type) : 3;
-$term = isset($term)? ($type) : '';
+$categoryID = isset($categoryID) ? intval($categoryID) : 0;
+$type = isset($type) ? intval($type) : 3;
+$term = isset($term) ? ($type) : '';
 
 $sform = new XoopsThemeForm(_MD_WB_SEARCHFORM, "searchform", "search.php");
 $sform->setExtra('enctype="multipart/form-data"');
@@ -20,12 +20,12 @@ 
 
 if ($xoopsModuleConfig['multicats'] == 1) {
     $searchcat = new XoopsFormSelect(_MD_WB_CATEGORY, 'categoryID', $categoryID);
-    $searchcat->addOption ("0", _MD_WB_ALLOFTHEM);
+    $searchcat->addOption("0", _MD_WB_ALLOFTHEM);
 
-    $resultcat = $xoopsDB->query ("SELECT categoryID, name FROM " . $xoopsDB->prefix ("wbcategories") . " ORDER BY categoryID");
+    $resultcat = $xoopsDB->query("SELECT categoryID, name FROM ".$xoopsDB->prefix("wbcategories")." ORDER BY categoryID");
 
     while (list($categoryID, $name) = $xoopsDB->fetchRow($resultcat)) {
-        $searchcat->addOption ("categoryID", "$categoryID : $name");
+        $searchcat->addOption("categoryID", "$categoryID : $name");
     }
     $sform->addElement($searchcat, true);
 }

include/answer.inc.php

Indentation +13 added lines, -13 removed lines

@@ -24,19 +24,19 @@
 //$form->addElement(new XoopsFormDhtmlTextArea(_MD_SF_ANSWER_FAQ, 'answer', '', 15, 60), true);
 
 $editorTray = new XoopsFormElementTray(_MD_SF_ANSWER_FAQ, '<br />');
-   if (class_exists('XoopsFormEditor')) {
-           $options['name'] = 'answer';
-           $options['value'] = '';
-           $options['rows'] = 5;
-           $options['cols'] = '100%';
-           $options['width'] = '100%';
-           $options['height'] = '200px';
-       $answerEditor  = new XoopsFormEditor('', $xoopsModuleConfig['form_editorOptionsUser'], $options, $nohtml = false, $onfailure = 'textarea');
-           $editorTray->addElement($answerEditor,true );
-       } else {
-       $answerEditor  = new XoopsFormDhtmlTextArea(_MD_SF_ANSWER_FAQ, 'answer', '', '100%', '100%');
-       $editorTray->addElement($answerEditor, true );
-   }
+    if (class_exists('XoopsFormEditor')) {
+            $options['name'] = 'answer';
+            $options['value'] = '';
+            $options['rows'] = 5;
+            $options['cols'] = '100%';
+            $options['width'] = '100%';
+            $options['height'] = '200px';
+        $answerEditor  = new XoopsFormEditor('', $xoopsModuleConfig['form_editorOptionsUser'], $options, $nohtml = false, $onfailure = 'textarea');
+            $editorTray->addElement($answerEditor,true );
+        } else {
+        $answerEditor  = new XoopsFormDhtmlTextArea(_MD_SF_ANSWER_FAQ, 'answer', '', '100%', '100%');
+        $editorTray->addElement($answerEditor, true );
+    }
 $form->addElement($editorTray);
 
 // NOTIFY ON PUBLISH

Spacing +7 added lines, -7 removed lines

@@ -10,9 +10,9 @@ 
 
 global $_POST;
 
-include_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
-include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
 //include_once 'functions.php';
 
 $mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid", "parentid");
@@ -32,10 +32,10 @@ 
            $options['width'] = '100%';
            $options['height'] = '200px';
        $answerEditor  = new XoopsFormEditor('', $xoopsModuleConfig['form_editorOptionsUser'], $options, $nohtml = false, $onfailure = 'textarea');
-           $editorTray->addElement($answerEditor,true );
+           $editorTray->addElement($answerEditor, true);
        } else {
        $answerEditor  = new XoopsFormDhtmlTextArea(_MD_SF_ANSWER_FAQ, 'answer', '', '100%', '100%');
-       $editorTray->addElement($answerEditor, true );
+       $editorTray->addElement($answerEditor, true);
    }
 $form->addElement($editorTray);
 
@@ -46,8 +46,8 @@ 
     $form->addElement($notify_checkbox);
 }
 
-if (($faqObj->status() == _SF_STATUS_PUBLISHED) || ($faqObj->status() == _SF_STATUS_NEW_ANSWER) ) {
-    $answerObj =& $faqObj->answer();
+if (($faqObj->status() == _SF_STATUS_PUBLISHED) || ($faqObj->status() == _SF_STATUS_NEW_ANSWER)) {
+    $answerObj = & $faqObj->answer();
     $form->addElement(new XoopsFormLabel(_MD_SF_ORIGINAL_ANSWER, $answerObj->answer()), false);
 }
 

include/request.inc.php

Spacing +4 added lines, -4 removed lines

@@ -10,13 +10,13 @@
 
 global $_POST;
 
-include_once XOOPS_ROOT_PATH . "/class/xoopstree.php";
-include_once XOOPS_ROOT_PATH . "/class/xoopslists.php";
-include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
+include_once XOOPS_ROOT_PATH."/class/xoopstree.php";
+include_once XOOPS_ROOT_PATH."/class/xoopslists.php";
+include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
 
 $form = new XoopsThemeForm(_MD_SF_REQUEST, "form", xoops_getenv('PHP_SELF'));
 // CATEGORY
-$mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid" , "parentid");
+$mytree = new XoopsTree($xoopsDB->prefix("smartfaq_categories"), "categoryid", "parentid");
 ob_start();
 $form->addElement(new XoopsFormHidden('categoryid', ''));
 $mytree->makeMySelBox("name", "weight", '');

include/displayfaqs.php

Spacing +22 added lines, -22 removed lines

@@ -24,9 +24,9 @@ 
 
 sf_collapsableBar('toptable', 'toptableicon');
 
-echo "<img id='toptableicon' src=" . XOOPS_URL . "/modules/" . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . $faqs_title . "</h3>";
+echo "<img id='toptableicon' src=".XOOPS_URL."/modules/".$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".$faqs_title."</h3>";
 echo "<div id='toptable'>";
-echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $faqs_info . "</span>";
+echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$faqs_info."</span>";
 
 // Get the total number of published FAQs
 $totalfaqs = $faq_handler->getFaqsCount($sel_cat, array(_SF_STATUS_PUBLISHED, _SF_STATUS_NEW_ANSWER));
@@ -37,29 +37,29 @@ 
 $allcats = $category_handler->getObjects(null, true);
 echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
 echo "<tr>";
-echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . "</b></td>";
-echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . "</b></td>";
-echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . "</b></td>";
+echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID."</b></td>";
+echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME."</b></td>";
+echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION."</b></td>";
 
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . "</b></td>";
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_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='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>";
 if ($totalfaqs > 0) {
     global $pathIcon16, $smartModuleConfig;
     for ($i = 0; $i < $totalFaqsOnPage; ++$i) {
-        $categoryObj =& $allcats[$faqsObj[$i]->categoryid()];
-        $modify = "<a href='faq.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='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='". $pathIcon16 .'/delete.png'."' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_DELETEART . "'/></a>";
+        $categoryObj = & $allcats[$faqsObj[$i]->categoryid()];
+        $modify = "<a href='faq.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='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_DELETEART."'/></a>";
 
         //adding name of the Question Submitter
-        $requester= sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
+        $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
 
         //adding name of the Answer Submitter
 
-        $answer_handler =& sf_gethandler('answer');
+        $answer_handler = & sf_gethandler('answer');
 
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('faqid', $faqsObj[$i]->faqid()));
@@ -81,26 +81,26 @@ 
         }
 
         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() . "/faq.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()."/faq.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'>" . $answerSubmitter . "</td>";
+        echo "<td class='even' align='center'>".$requester."</td>";
+        echo "<td class='even' align='center'>".$answerSubmitter."</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_NOFAQS . "</td>";
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQS."</td>";
     echo "</tr>";
 }
 echo "</table>\n";
 echo "<br />\n";
 
 $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq', $pagenav_extra_args);
-echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 echo "</div>";

include/onupdate.inc.php

Indentation +5 added lines, -5 removed lines

@@ -24,7 +24,7 @@ 
     }
 
     // Changing categoryid type to int(11)
-       $table->addAlteredField('categoryid', "int(11) NOT NULL default '0'", false);
+        $table->addAlteredField('categoryid', "int(11) NOT NULL default '0'", false);
 
     if (!$dbupdater->updateTable($table)) {
         /**
@@ -36,10 +36,10 @@ 
     // Editing smartfaq_categories table
     $table = new SmartDbTable('smartfaq_categories');
     // Changing categoryid type to int(11)
-       $table->addAlteredField('categoryid', "int(11) NOT NULL default '0'", false);
+        $table->addAlteredField('categoryid', "int(11) NOT NULL default '0'", false);
 
     // Changing parentid type to int(11)
-       $table->addAlteredField('parentid', "int(11) NOT NULL default '0'", false);
+        $table->addAlteredField('parentid', "int(11) NOT NULL default '0'", false);
 
     if (!$dbupdater->updateTable($table)) {
         /**
@@ -51,10 +51,10 @@ 
     // Editing smartfaq_answers table
     $table = new SmartDbTable('smartfaq_answers');
     // Changing categoryid type to int(11)
-       $table->addAlteredField('answerid', "int(11) NOT NULL default '0'", false);
+        $table->addAlteredField('answerid', "int(11) NOT NULL default '0'", false);
 
     // Changing parentid type to int(11)
-       $table->addAlteredField('faqid', "int(11) NOT NULL default '0'", false);
+        $table->addAlteredField('faqid', "int(11) NOT NULL default '0'", false);
 
     if (!$dbupdater->updateTable($table)) {
         /**

Spacing +7 added lines, -7 removed lines

@@ -5,9 +5,9 @@ 
 function xoops_module_update_smartfaq($module)
 {
     // Load SmartDbUpdater from the SmartObject Framework if present
-    $smartdbupdater =  XOOPS_ROOT_PATH . "/modules/smartobject/class/smartdbupdater.php";
+    $smartdbupdater = XOOPS_ROOT_PATH."/modules/smartobject/class/smartdbupdater.php";
     if (!file_exists($smartdbupdater)) {
-        $smartdbupdater = XOOPS_ROOT_PATH . "/modules/smartfaq/class/smartdbupdater.php";
+        $smartdbupdater = XOOPS_ROOT_PATH."/modules/smartfaq/class/smartdbupdater.php";
     }
     include_once($smartdbupdater);
 
@@ -15,7 +15,7 @@ 
 
     ob_start();
 
-    echo "<code>" . _SDU_UPDATE_UPDATING_DATABASE . "<br />";
+    echo "<code>"._SDU_UPDATE_UPDATING_DATABASE."<br />";
 
     // Adding partialview field
     $table = new SmartDbTable('smartfaq_faq');
@@ -66,9 +66,9 @@ 
     /**
      * Check for items with categoryid=0
      */
-    include_once(XOOPS_ROOT_PATH . "/modules/smartfaq/include/functions.php");
-    $smartfaq_faq_handler = $answer_handler =& sf_gethandler('faq');
-    $smartfaq_category_handler = $answer_handler =& sf_gethandler('category');
+    include_once(XOOPS_ROOT_PATH."/modules/smartfaq/include/functions.php");
+    $smartfaq_faq_handler = $answer_handler = & sf_gethandler('faq');
+    $smartfaq_category_handler = $answer_handler = & sf_gethandler('category');
 
     //find a valid categoryid
     $categoriesObj = $smartfaq_category_handler->getCategories(1, 0, 0, 'weight', 'ASC', false);
@@ -96,7 +96,7 @@ 
 {
     ob_start();
 
-    include_once(XOOPS_ROOT_PATH . "/modules/" . $module->getVar('dirname') . "/include/functions.php");
+    include_once(XOOPS_ROOT_PATH."/modules/".$module->getVar('dirname')."/include/functions.php");
 
     $feedback = ob_get_clean();
     if (method_exists($module, "setMessage")) {

include/blocksadmin.inc.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 if ( isset($HTTP_POST_VARS) ) {
     foreach ($HTTP_POST_VARS as $k => $v) {
         $$k = $v;
-      }
+        }
 }
 
 if ( isset($HTTP_GET_VARS['op']) ) {

Switch Indentation +12 added lines, -12 removed lines

@@ -203,18 +203,18 @@
         }
         if ($myblock->getVar('block_type') == 'C') {
             switch ($bctype) {
-            case 'H':
-                $name = _AM_CUSTOMHTML;
-                break;
-            case 'P':
-                $name = _AM_CUSTOMPHP;
-                break;
-            case 'S':
-                $name = _AM_CUSTOMSMILE;
-                break;
-            default:
-                $name = _AM_CUSTOMNOSMILE;
-                break;
+                case 'H':
+                    $name = _AM_CUSTOMHTML;
+                    break;
+                case 'P':
+                    $name = _AM_CUSTOMPHP;
+                    break;
+                case 'S':
+                    $name = _AM_CUSTOMSMILE;
+                    break;
+                default:
+                    $name = _AM_CUSTOMNOSMILE;
+                    break;
             }
             $myblock->setVar('name', $name);
             $myblock->setVar('c_type', $bctype);

Spacing +24 added lines, -24 removed lines

@@ -38,23 +38,23 @@ 
 // ------------------------------------------------------------------------- //
 // defined("XOOPS_ROOT_PATH") || exit("XOOPS root path not defined");
 
-if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) {
+if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
     exit("Access Denied");
 }
 include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 include XOOPS_ROOT_PATH."/modules/system/admin/blocksadmin/blocksadmin.php";
 
 $op = "list";
-if ( isset($HTTP_POST_VARS) ) {
+if (isset($HTTP_POST_VARS)) {
     foreach ($HTTP_POST_VARS as $k => $v) {
         $$k = $v;
       }
 }
 
-if ( isset($HTTP_GET_VARS['op']) ) {
+if (isset($HTTP_GET_VARS['op'])) {
     if ($HTTP_GET_VARS['op'] == "edit" || $HTTP_GET_VARS['op'] == "delete" || $HTTP_GET_VARS['op'] == "delete_ok" || $HTTP_GET_VARS['op'] == "clone" || $HTTP_GET_VARS['op'] == 'previewpopup') {
         $op = $HTTP_GET_VARS['op'];
-        $bid = isset($HTTP_GET_VARS['bid'])? intval($HTTP_GET_VARS['bid']) : 0;
+        $bid = isset($HTTP_GET_VARS['bid']) ? intval($HTTP_GET_VARS['bid']) : 0;
     }
 }
 
@@ -77,7 +77,7 @@ 
         $myblock = new XoopsBlock();
         $myblock->setVar('block_type', 'C');
     }
-    $myts =& MyTextSanitizer::getInstance();
+    $myts = & MyTextSanitizer::getInstance();
     $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
     $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
     $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.$xoopsConfig['sitename'].'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body><table><tr><th>'.$myblock->getVar('title').'</th></tr><tr><td>'.$myblock->getContent('S', $bctype).'</td></tr></table></body></html>';
@@ -94,11 +94,11 @@ 
     $block['visible'] = $bvisible;
     $block['title'] = $myblock->getVar('title', 'E');
     $block['content'] = $myblock->getVar('content', 'E');
-    $block['modules'] =& $bmodule;
-    $block['ctype'] = isset($bctype)? $bctype : $myblock->getVar('c_type');
+    $block['modules'] = & $bmodule;
+    $block['ctype'] = isset($bctype) ? $bctype : $myblock->getVar('c_type');
     $block['is_custom'] = true;
     $block['cachetime'] = intval($bcachetime);
-    echo '<a href="admin.php?fct=blocksadmin">'. _AM_BADMIN .'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br /><br />';
+    echo '<a href="admin.php?fct=blocksadmin">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br /><br />';
     include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
     $form->display();
     xoops_cp_footer();
@@ -129,19 +129,19 @@ 
 if ($op == "order") {
     foreach (array_keys($bid) as $i) {
         if ($side[$i] < 0) {
-            $visible[$i] = 0 ;
-            $side[$i] = -1 ;
+            $visible[$i] = 0;
+            $side[$i] = -1;
         } else {
-            $visible[$i] = 1 ;
+            $visible[$i] = 1;
         }
 
-        $bmodule[$i] = (isset($bmodule[$i]) && is_array($bmodule[$i]))? $bmodule[$i] : array(-1) ;
+        $bmodule[$i] = (isset($bmodule[$i]) && is_array($bmodule[$i])) ? $bmodule[$i] : array(-1);
 
         myblocksadmin_update_block($i, $side[$i], $weight[$i], $visible[$i], $title[$i], '', '', $bcachetime[$i], $bmodule[$i], array());
 
     }
 
-    redirect_header("myblocksadmin.php",1,_AM_DBUPDATED);
+    redirect_header("myblocksadmin.php", 1, _AM_DBUPDATED);
     exit();
 }
 
@@ -151,13 +151,13 @@ 
 }
 
 if ($op == "update") {
-    $bcachetime = isset($bcachetime)? intval($bcachetime) : 0;
-    $options = isset($options)? $options : array();
-    $bcontent = isset($bcontent)? $bcontent : '';
-    $bctype = isset($bctype)? $bctype : '';
-    $bmodule = (isset($bmodule) && is_array($bmodule))? $bmodule : array(-1) ; // GIJ +
+    $bcachetime = isset($bcachetime) ? intval($bcachetime) : 0;
+    $options = isset($options) ? $options : array();
+    $bcontent = isset($bcontent) ? $bcontent : '';
+    $bctype = isset($bctype) ? $bctype : '';
+    $bmodule = (isset($bmodule) && is_array($bmodule)) ? $bmodule : array(-1); // GIJ +
     $msg = myblocksadmin_update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $options); // GIJ c
-    redirect_header('myblocksadmin.php',1,$msg); // GIJ +
+    redirect_header('myblocksadmin.php', 1, $msg); // GIJ +
 }
 
 if ($op == "delete_ok") {
@@ -180,7 +180,7 @@ 
 }
 
     // import from modules/system/admin/blocksadmin/blocksadmin.php
-    function myblocksadmin_update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $options=array())
+    function myblocksadmin_update_block($bid, $bside, $bweight, $bvisible, $btitle, $bcontent, $bctype, $bcachetime, $bmodule, $options = array())
     {
         global $xoopsConfig;
         if (empty($bmodule)) {
@@ -191,13 +191,13 @@ 
         }
         $myblock = new XoopsBlock($bid);
         // $myblock->setVar('side', $bside); GIJ -
-        if ( $bside >= 0 ) $myblock->setVar('side', $bside); // GIJ +
+        if ($bside >= 0) $myblock->setVar('side', $bside); // GIJ +
         $myblock->setVar('weight', $bweight);
         $myblock->setVar('visible', $bvisible);
         $myblock->setVar('title', $btitle);
         $myblock->setVar('content', $bcontent);
         $myblock->setVar('bcachetime', $bcachetime);
-        if ( isset($options) && (count($options) > 0) ) {
+        if (isset($options) && (count($options) > 0)) {
             $options = implode('|', $options);
             $myblock->setVar('options', $options);
         }
@@ -223,7 +223,7 @@ 
         }
         $msg = _AM_DBUPDATED;
         if ($myblock->store() != false) {
-            $db =& XoopsDatabaseFactory::getDatabaseConnection();
+            $db = & XoopsDatabaseFactory::getDatabaseConnection();
             $sql = sprintf("DELETE FROM %s WHERE block_id = %u", $db->prefix('block_module_link'), $bid);
             $db->query($sql);
             foreach ($bmodule as $bmid) {
@@ -250,5 +250,5 @@ 
             $msg = 'Failed update of block. ID:'.$bid;
         }
 
-        return $msg ; // GIJ +
+        return $msg; // GIJ +
     }

Braces +4 added lines, -1 removed lines

@@ -191,7 +191,10 @@
         }
         $myblock = new XoopsBlock($bid);
         // $myblock->setVar('side', $bside); GIJ -
-        if ( $bside >= 0 ) $myblock->setVar('side', $bside); // GIJ +
+        if ( $bside >= 0 ) {
+            $myblock->setVar('side', $bside);
+        }
+        // GIJ +
         $myblock->setVar('weight', $bweight);
         $myblock->setVar('visible', $bvisible);
         $myblock->setVar('title', $btitle);

include/notification.inc.php

Spacing +4 added lines, -4 removed lines

@@ -32,22 +32,22 @@
 
     if ($category == 'category') {
         // Assume we have a valid category id
-        $sql = 'SELECT name FROM ' . $xoopsDB->prefix('smartfaq_categories') . ' WHERE categoryid  = ' . $item_id;
+        $sql = 'SELECT name FROM '.$xoopsDB->prefix('smartfaq_categories').' WHERE categoryid  = '.$item_id;
         $result = $xoopsDB->query($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['name'];
-        $item['url'] = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/category.php?categoryid=' . $item_id;
+        $item['url'] = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/category.php?categoryid='.$item_id;
 
         return $item;
     }
 
     if ($category == 'faq') {
         // Assume we have a valid story id
-        $sql = 'SELECT question FROM ' . $xoopsDB->prefix('smartfaq_faq') . ' WHERE faqid = ' . $item_id;
+        $sql = 'SELECT question FROM '.$xoopsDB->prefix('smartfaq_faq').' WHERE faqid = '.$item_id;
         $result = $xoopsDB->query($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['question'];
-        $item['url'] = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/faq.php?faqid=' . $item_id;
+        $item['url'] = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/faq.php?faqid='.$item_id;
 
         return $item;
     }