Completed
Push — master ( a7fe76...1b2f30 )
by Michael
04:20
created
admin/menu.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -9,17 +9,17 @@  discard block
 block discarded – undo
9 9
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
10 10
 
11 11
 $path = dirname(dirname(dirname(__DIR__)));
12
-include_once $path . '/mainfile.php';
12
+include_once $path.'/mainfile.php';
13 13
 
14 14
 $dirname         = basename(dirname(__DIR__));
15 15
 $moduleHandler   = xoops_getHandler('module');
16 16
 $module          = $moduleHandler->getByDirname($dirname);
17 17
 $pathIcon32      = $module->getInfo('icons32');
18 18
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');
19
-$pathLanguage    = $path . $pathModuleAdmin;
19
+$pathLanguage    = $path.$pathModuleAdmin;
20 20
 
21
-if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
22
-    $fileinc = $pathLanguage . '/language/english/main.php';
21
+if (!file_exists($fileinc = $pathLanguage.'/language/'.$GLOBALS['xoopsConfig']['language'].'/'.'main.php')) {
22
+    $fileinc = $pathLanguage.'/language/english/main.php';
23 23
 }
24 24
 
25 25
 include_once $fileinc;
@@ -28,36 +28,36 @@  discard block
 block discarded – undo
28 28
 $i                      = 0;
29 29
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_HOME;
30 30
 $adminmenu[$i]['link']  = 'admin/index.php';
31
-$adminmenu[$i]['icon']  = $pathIcon32 . '/home.png';
31
+$adminmenu[$i]['icon']  = $pathIcon32.'/home.png';
32 32
 ++$i;
33 33
 $adminmenu[$i]['title'] = _MI_SF_ADMENU1;
34 34
 $adminmenu[$i]['link']  = 'admin/main.php';
35
-$adminmenu[$i]['icon']  = $pathIcon32 . '/manage.png';
35
+$adminmenu[$i]['icon']  = $pathIcon32.'/manage.png';
36 36
 
37 37
 ++$i;
38 38
 $adminmenu[$i]['title'] = _MI_SF_ADMENU2;
39 39
 $adminmenu[$i]['link']  = 'admin/category.php';
40
-$adminmenu[$i]['icon']  = $pathIcon32 . '/category.png';
40
+$adminmenu[$i]['icon']  = $pathIcon32.'/category.png';
41 41
 ++$i;
42 42
 $adminmenu[$i]['title'] = _MI_SF_ADMENU3;
43 43
 $adminmenu[$i]['link']  = 'admin/faq.php';
44
-$adminmenu[$i]['icon']  = $pathIcon32 . '/search.png';
44
+$adminmenu[$i]['icon']  = $pathIcon32.'/search.png';
45 45
 ++$i;
46 46
 $adminmenu[$i]['title'] = _MI_SF_ADMENU4;
47 47
 $adminmenu[$i]['link']  = 'admin/question.php';
48
-$adminmenu[$i]['icon']  = $pathIcon32 . '/faq.png';
48
+$adminmenu[$i]['icon']  = $pathIcon32.'/faq.png';
49 49
 ++$i;
50 50
 $adminmenu[$i]['title'] = _MI_SF_ADMENU5;
51 51
 $adminmenu[$i]['link']  = 'admin/permissions.php';
52
-$adminmenu[$i]['icon']  = $pathIcon32 . '/permissions.png';
52
+$adminmenu[$i]['icon']  = $pathIcon32.'/permissions.png';
53 53
 ++$i;
54 54
 $adminmenu[$i]['title'] = _MI_SF_ADMENU8;
55 55
 $adminmenu[$i]['link']  = 'admin/import.php';
56
-$adminmenu[$i]['icon']  = $pathIcon32 . '/download.png';
56
+$adminmenu[$i]['icon']  = $pathIcon32.'/download.png';
57 57
 ++$i;
58 58
 $adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
59 59
 $adminmenu[$i]['link']  = 'admin/about.php';
60
-$adminmenu[$i]['icon']  = $pathIcon32 . '/about.png';
60
+$adminmenu[$i]['icon']  = $pathIcon32.'/about.png';
61 61
 //++$i;
62 62
 //$adminmenu[$i]['title'] = _AM_MODULEADMIN_ABOUT;
63 63
 //$adminmenu[$i]["link"]  = "admin/about2.php";
Please login to merge, or discard this patch.
admin/admin_header2.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
10
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
11
-include_once XOOPS_ROOT_PATH . '/kernel/module.php';
12
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
13
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
14
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
15
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
9
+include_once dirname(dirname(dirname(__DIR__))).'/mainfile.php';
10
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
11
+include_once XOOPS_ROOT_PATH.'/kernel/module.php';
12
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
13
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
14
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
15
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
16 16
 
17
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
18
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
19
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/faq.php';
20
-include_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/answer.php';
17
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
18
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
19
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/faq.php';
20
+include_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/answer.php';
21 21
 
22 22
 $myts = MyTextSanitizer::getInstance();
Please login to merge, or discard this patch.
admin/docbook_export.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
9
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
10 10
 
11
-$op = 'go';//'start';
11
+$op = 'go'; //'start';
12 12
 
13 13
 if (isset($HTTP_POST_VARS['op']) && ($HTTP_POST_VARS['op'] === 'go')) {
14 14
     $op = $HTTP_POST_VARS['op'];
15 15
 }
16 16
 
17 17
 if ($op === 'start') {
18
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
18
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
19 19
 
20 20
     xoops_cp_header();
21 21
 
@@ -44,41 +44,41 @@  discard block
 block discarded – undo
44 44
 
45 45
     echo "  <title>{module title}</title>\r\n";
46 46
 
47
-    $resultC = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_categories'));
47
+    $resultC = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_categories'));
48 48
     while ($arrC = $xoopsDB->fetchArray($resultC)) {
49 49
         extract($arrC, EXTR_PREFIX_ALL, 'c');
50 50
 
51 51
         echo "  <qandadiv ID=\"c$c_categoryid\" Revision=\"$c_created\">\r\n";
52
-        echo '    <title>' . encodeText($c_name) . "</title>\r\n";
53
-        echo '    <para>' . encodeText($c_description) . "</para>\r\n";
52
+        echo '    <title>'.encodeText($c_name)."</title>\r\n";
53
+        echo '    <para>'.encodeText($c_description)."</para>\r\n";
54 54
 
55
-        $resultQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_faq') . " where categoryid=$c_categoryid");
55
+        $resultQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_faq')." where categoryid=$c_categoryid");
56 56
         while ($arrQ = $xoopsDB->fetchArray($resultQ)) {
57 57
             extract($arrQ, EXTR_PREFIX_ALL, 'q');
58 58
 
59
-            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"" . getUserFullName($q_uid) . "\">\r\n";
59
+            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"".getUserFullName($q_uid)."\">\r\n";
60 60
             echo "      <question>\r\n";
61
-            echo '        <para>' . encodeText($q_question) . "</para>\r\n";
61
+            echo '        <para>'.encodeText($q_question)."</para>\r\n";
62 62
             if (!empty($q_howdoi)) {
63 63
                 echo "        <note Conformance=\"howdoi\">\r\n";
64 64
                 echo "          <title>{'How do I' from language file}</title>\r\n";
65
-                echo '          <para>' . encodeText($q_howdoi) . "</para>\r\n";
65
+                echo '          <para>'.encodeText($q_howdoi)."</para>\r\n";
66 66
                 echo "        </note>\r\n";
67 67
             }
68 68
             if (!empty($q_diduno)) {
69 69
                 echo "        <note Conformance=\"diduno\">\r\n";
70 70
                 echo "          <title>{'Did you know' from language file}</title>\r\n";
71
-                echo '          <para>' . encodeText($q_diduno) . "</para>\r\n";
71
+                echo '          <para>'.encodeText($q_diduno)."</para>\r\n";
72 72
                 echo "        </note>\r\n";
73 73
             }
74 74
             echo "      </question>\r\n";
75 75
 
76
-            $resultA = $xoopsDB->query('select * from ' . $xoopsDB->prefix('smartfaq_answers') . " where answerid=$q_answerid");
76
+            $resultA = $xoopsDB->query('select * from '.$xoopsDB->prefix('smartfaq_answers')." where answerid=$q_answerid");
77 77
             while ($arrA = $xoopsDB->fetchArray($resultA)) {
78 78
                 extract($arrA, EXTR_PREFIX_ALL, 'a');
79 79
 
80
-                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"" . getUserFullName($a_uid) . "\">\r\n";
81
-                echo '        <para>' . encodeText($a_answer) . "</para>\r\n";
80
+                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"".getUserFullName($a_uid)."\">\r\n";
81
+                echo '        <para>'.encodeText($a_answer)."</para>\r\n";
82 82
                 echo "      </answer>\r\n";
83 83
             }
84 84
             mysqli_free_result($resultA);
Please login to merge, or discard this patch.
admin/main.php 1 patch
Spacing   +78 added lines, -78 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/admin_header.php';
9
+include_once __DIR__.'/admin_header.php';
10 10
 $myts = MyTextSanitizer::getInstance();
11 11
 
12
-$faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : 0;
12
+$faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : 0;
13 13
 
14 14
 //$pick = isset($_GET['pick'])? (int)($_GET['pick']) : 0;
15 15
 //$pick = isset($_POST['pick'])? (int)($_POST['pick']) : $_GET['pick'];
16 16
 
17
-$statussel = isset($_GET['statussel']) ? (int)$_GET['statussel'] : _SF_STATUS_ALL;
18
-$statussel = isset($_POST['statussel']) ? (int)$_POST['statussel'] : $statussel;
17
+$statussel = isset($_GET['statussel']) ? (int) $_GET['statussel'] : _SF_STATUS_ALL;
18
+$statussel = isset($_POST['statussel']) ? (int) $_POST['statussel'] : $statussel;
19 19
 
20 20
 $sortsel = isset($_GET['sortsel']) ? $_GET['sortsel'] : 'faqid';
21 21
 $sortsel = isset($_POST['sortsel']) ? $_POST['sortsel'] : $sortsel;
@@ -32,23 +32,23 @@  discard block
 block discarded – undo
32 32
     global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
33 33
     echo "<table width='100%' cellspacing='1' cellpadding='3' border='0' class='outer'>";
34 34
     echo '<tr>';
35
-    echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_FAQID . '</b></td>';
36
-    echo "<th width='20%' class='bg3' align='center'><b>" . _AM_SF_FAQCAT . '</b></td>';
37
-    echo "<th class='bg3' align='center'><b>" . _AM_SF_QUESTION . '</b></td>';
35
+    echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_FAQID.'</b></td>';
36
+    echo "<th width='20%' class='bg3' align='center'><b>"._AM_SF_FAQCAT.'</b></td>';
37
+    echo "<th class='bg3' align='center'><b>"._AM_SF_QUESTION.'</b></td>';
38 38
 
39
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
40
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
39
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
40
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
41 41
 
42
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
43
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_STATUS . '</b></td>';
42
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
43
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_STATUS.'</b></td>';
44 44
     //echo "<td width='30' class='bg3' align='center'><b>" . _AM_SF_ANSWERS . "</b></td>";
45
-    echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
45
+    echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
46 46
     echo '</tr>';
47 47
 }
48 48
 
49 49
 // Code for the page
50
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
51
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
50
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
51
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
52 52
 
53 53
 // Creating the category handler object
54 54
 $categoryHandler = sf_gethandler('category');
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 // Creating the FAQ handler object
57 57
 $faqHandler = sf_gethandler('faq');
58 58
 
59
-$startentry = isset($_GET['startentry']) ? (int)$_GET['startentry'] : 0;
59
+$startentry = isset($_GET['startentry']) ? (int) $_GET['startentry'] : 0;
60 60
 
61 61
 $indexAdmin = new ModuleAdmin();
62 62
 xoops_cp_header();
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
 
130 130
 // Construction of lower table
131 131
 sf_collapsableBar('bottomtable', 'bottomtableicon');
132
-echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_ALLFAQS . '</h3>';
132
+echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_ALLFAQS.'</h3>';
133 133
 echo "<div id='bottomtable'>";
134
-echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">" . _AM_SF_ALLFAQSMSG . '</span>';
134
+echo "<span style=\"color: #567; margin: 3px 0 18px 0; font-size: small; display: block; \">"._AM_SF_ALLFAQSMSG.'</span>';
135 135
 
136 136
 $showingtxt    = '';
137 137
 $selectedtxt   = '';
@@ -200,98 +200,98 @@  discard block
 block discarded – undo
200 200
     case _SF_STATUS_ASKED:
201 201
         $selectedtxt1        = "selected='selected'";
202 202
         $caption             = _AM_SF_ASKED;
203
-        $cond                = ' WHERE status = ' . _SF_STATUS_ASKED . ' ';
203
+        $cond                = ' WHERE status = '._SF_STATUS_ASKED.' ';
204 204
         $status_explaination = _AM_SF_ASKED_EXP;
205 205
         break;
206 206
 
207 207
     case _SF_STATUS_OPENED:
208 208
         $selectedtxt2        = "selected='selected'";
209 209
         $caption             = _AM_SF_OPENED;
210
-        $cond                = ' WHERE status = ' . _SF_STATUS_OPENED . ' ';
210
+        $cond                = ' WHERE status = '._SF_STATUS_OPENED.' ';
211 211
         $status_explaination = _AM_SF_OPENED_EXP;
212 212
         break;
213 213
 
214 214
     case _SF_STATUS_ANSWERED:
215 215
         $selectedtxt3        = "selected='selected'";
216 216
         $caption             = _AM_SF_ANSWERED;
217
-        $cond                = ' WHERE status = ' . _SF_STATUS_ANSWERED . ' ';
217
+        $cond                = ' WHERE status = '._SF_STATUS_ANSWERED.' ';
218 218
         $status_explaination = _AM_SF_ANSWERED_EXP;
219 219
         break;
220 220
 
221 221
     case _SF_STATUS_SUBMITTED:
222 222
         $selectedtxt4        = "selected='selected'";
223 223
         $caption             = _AM_SF_SUBMITTED;
224
-        $cond                = ' WHERE status = ' . _SF_STATUS_SUBMITTED . ' ';
224
+        $cond                = ' WHERE status = '._SF_STATUS_SUBMITTED.' ';
225 225
         $status_explaination = _AM_SF_SUBMITTED_EXP;
226 226
         break;
227 227
 
228 228
     case _SF_STATUS_PUBLISHED:
229 229
         $selectedtxt5        = "selected='selected'";
230 230
         $caption             = _AM_SF_PUBLISHED;
231
-        $cond                = ' WHERE status = ' . _SF_STATUS_PUBLISHED . ' ';
231
+        $cond                = ' WHERE status = '._SF_STATUS_PUBLISHED.' ';
232 232
         $status_explaination = _AM_SF_PUBLISHED_EXP;
233 233
         break;
234 234
 
235 235
     case _SF_STATUS_NEW_ANSWER:
236 236
         $selectedtxt6        = "selected='selected'";
237 237
         $caption             = _AM_SF_NEW_ANSWER;
238
-        $cond                = ' WHERE status = ' . _SF_STATUS_NEW_ANSWER . ' ';
238
+        $cond                = ' WHERE status = '._SF_STATUS_NEW_ANSWER.' ';
239 239
         $status_explaination = _AM_SF_NEW_ANSWER_EXP;
240 240
         break;
241 241
 
242 242
     case _SF_STATUS_OFFLINE:
243 243
         $selectedtxt7        = "selected='selected'";
244 244
         $caption             = _AM_SF_OFFLINE;
245
-        $cond                = ' WHERE status = ' . _SF_STATUS_OFFLINE . ' ';
245
+        $cond                = ' WHERE status = '._SF_STATUS_OFFLINE.' ';
246 246
         $status_explaination = _AM_SF_OFFLINE_EXP;
247 247
         break;
248 248
 
249 249
     case _SF_STATUS_REJECTED_QUESTION:
250 250
         $selectedtxt8        = "selected='selected'";
251 251
         $caption             = _AM_SF_REJECTED_QUESTION;
252
-        $cond                = ' WHERE status = ' . _SF_STATUS_REJECTED_QUESTION . ' ';
252
+        $cond                = ' WHERE status = '._SF_STATUS_REJECTED_QUESTION.' ';
253 253
         $status_explaination = _AM_SF_REJECTED_QUESTION_EXP;
254 254
         break;
255 255
 
256 256
     case _SF_STATUS_REJECTED_SMARTFAQ:
257 257
         $selectedtxt9        = "selected='selected'";
258 258
         $caption             = _AM_SF_REJECTED_SMARTFAQ;
259
-        $cond                = ' WHERE status = ' . _SF_STATUS_REJECTED_SMARTFAQ . ' ';
259
+        $cond                = ' WHERE status = '._SF_STATUS_REJECTED_SMARTFAQ.' ';
260 260
         $status_explaination = _AM_SF_REJECTED_SMARTFAQ_EXP;
261 261
         break;
262 262
 }
263 263
 
264 264
 /* -- Code to show selected terms -- */
265
-echo "<form name='pick' id='pick' action='" . $_SERVER['PHP_SELF'] . "' method='POST' style='margin: 0;'>";
265
+echo "<form name='pick' id='pick' action='".$_SERVER['PHP_SELF']."' method='POST' style='margin: 0;'>";
266 266
 
267 267
 echo "
268 268
     <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;'>
269 269
         <tr>
270
-            <td><span style='font-weight: bold; font-size: 12px; font-variant: small-caps;'>" . _AM_SF_SHOWING . ' ' . $caption . "</span></td>
271
-            <td align='right'>" . _AM_SF_SELECT_SORT . "
270
+            <td><span style='font-weight: bold; font-size: 12px; font-variant: small-caps;'>" . _AM_SF_SHOWING.' '.$caption."</span></td>
271
+            <td align='right'>" . _AM_SF_SELECT_SORT."
272 272
                 <select name='sortsel' onchange='submit()'>
273
-                    <option value='faq.faqid' $sorttxtfaqid>" . _AM_SF_ID . "</option>
274
-                    <option value='category.name' $sorttxtcategory>" . _AM_SF_CATEGORY . "</option>
275
-                    <option value='faq.question' $sorttxtquestion>" . _AM_SF_QUESTION . "</option>
276
-                    <option value='faq.datesub' $sorttxtcreated>" . _AM_SF_CREATED . "</option>
277
-                    <option value='faq.weight' $sorttxtweight>" . _AM_SF_WEIGHT . "</option>
273
+                    <option value='faq.faqid' $sorttxtfaqid>"._AM_SF_ID."</option>
274
+                    <option value='category.name' $sorttxtcategory>"._AM_SF_CATEGORY."</option>
275
+                    <option value='faq.question' $sorttxtquestion>"._AM_SF_QUESTION."</option>
276
+                    <option value='faq.datesub' $sorttxtcreated>"._AM_SF_CREATED."</option>
277
+                    <option value='faq.weight' $sorttxtweight>"._AM_SF_WEIGHT."</option>
278 278
                 </select>
279 279
                 <select name='ordersel' onchange='submit()'>
280
-                    <option value='ASC' $ordertxtasc>" . _AM_SF_ASC . "</option>
281
-                    <option value='DESC' $ordertxtdesc>" . _AM_SF_DESC . '</option>
280
+                    <option value='ASC' $ordertxtasc>"._AM_SF_ASC."</option>
281
+                    <option value='DESC' $ordertxtdesc>"._AM_SF_DESC.'</option>
282 282
                 </select>
283
-            ' . _AM_SF_SELECT_STATUS . " :
283
+            ' . _AM_SF_SELECT_STATUS." :
284 284
                 <select name='statussel' onchange='submit()'>
285
-                    <option value='0' $selectedtxt0>" . _AM_SF_ALL . " [$totalfaqs]</option>
286
-                    <option value='1' $selectedtxt1>" . _AM_SF_ASKED . " [$totalasked]</option>
287
-                    <option value='2' $selectedtxt2>" . _AM_SF_OPENED . " [$totalopened]</option>
288
-                    <option value='3' $selectedtxt3>" . _AM_SF_ANSWERED . " [$totalanswered]</option>
289
-                    <option value='4' $selectedtxt4>" . _AM_SF_SUBMITTED . " [$totalsubmitted]</option>
290
-                    <option value='5' $selectedtxt5>" . _AM_SF_PUBLISHED . " [$totalpublished]</option>
291
-                    <option value='6' $selectedtxt6>" . _AM_SF_NEWANSWER . " [$totalnewanswers]</option>
292
-                    <option value='7' $selectedtxt7>" . _AM_SF_OFFLINE . " [$totaloffline]</option>
293
-                    <option value='8' $selectedtxt8>" . _AM_SF_REJECTED_QUESTION . " [$totalrejectedquestion]</option>
294
-                    <option value='9' $selectedtxt9>" . _AM_SF_REJECTED_SMARTFAQ . " [$totalrejectedsmartfaq]</option>
285
+                    <option value='0' $selectedtxt0>"._AM_SF_ALL." [$totalfaqs]</option>
286
+                    <option value='1' $selectedtxt1>"._AM_SF_ASKED." [$totalasked]</option>
287
+                    <option value='2' $selectedtxt2>"._AM_SF_OPENED." [$totalopened]</option>
288
+                    <option value='3' $selectedtxt3>"._AM_SF_ANSWERED." [$totalanswered]</option>
289
+                    <option value='4' $selectedtxt4>"._AM_SF_SUBMITTED." [$totalsubmitted]</option>
290
+                    <option value='5' $selectedtxt5>"._AM_SF_PUBLISHED." [$totalpublished]</option>
291
+                    <option value='6' $selectedtxt6>"._AM_SF_NEWANSWER." [$totalnewanswers]</option>
292
+                    <option value='7' $selectedtxt7>"._AM_SF_OFFLINE." [$totaloffline]</option>
293
+                    <option value='8' $selectedtxt8>"._AM_SF_REJECTED_QUESTION." [$totalrejectedquestion]</option>
294
+                    <option value='9' $selectedtxt9>"._AM_SF_REJECTED_SMARTFAQ." [$totalrejectedsmartfaq]</option>
295 295
                 </select>
296 296
             </td>
297 297
         </tr>
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
 
320 320
     foreach (array_keys($faqsObj) as $i) {
321 321
         // Creating the category object to which this faq is linked
322
-        $categoryObj =& $allcats[$faqsObj[$i]->categoryid()];
322
+        $categoryObj = & $allcats[$faqsObj[$i]->categoryid()];
323 323
         global $pathIcon16, $smartModuleConfig;
324 324
 
325 325
         //$answers = $answer_arr[$i];
@@ -329,65 +329,65 @@  discard block
 block discarded – undo
329 329
         switch ($faqsObj[$i]->status()) {
330 330
             case _SF_STATUS_ASKED:
331 331
                 $statustxt = _AM_SF_ASKED;
332
-                $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;";
332
+                $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;";
333 333
                 $modify    = '';
334
-                $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>";
334
+                $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>";
335 335
                 break;
336 336
 
337 337
             case _SF_STATUS_OPENED:
338 338
                 $statustxt = _AM_SF_OPENED;
339 339
                 $approve   = '';
340
-                $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;";
341
-                $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>";
340
+                $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;";
341
+                $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>";
342 342
                 break;
343 343
 
344 344
             case _SF_STATUS_ANSWERED:
345 345
                 $statustxt = _AM_SF_ANSWERED;
346
-                $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;";
346
+                $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;";
347 347
                 $modify    = '';
348
-                $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>";
348
+                $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>";
349 349
                 break;
350 350
 
351 351
             case _SF_STATUS_SUBMITTED:
352 352
                 $statustxt = _AM_SF_SUBMITTED;
353
-                $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;";
354
-                $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>";
353
+                $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;";
354
+                $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>";
355 355
                 $modify    = '';
356 356
                 break;
357 357
 
358 358
             case _SF_STATUS_PUBLISHED:
359 359
                 $statustxt = _AM_SF_PUBLISHED;
360 360
                 $approve   = '';
361
-                $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;";
362
-                $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>";
361
+                $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;";
362
+                $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>";
363 363
                 break;
364 364
 
365 365
             case _SF_STATUS_NEW_ANSWER:
366 366
                 $statustxt = _AM_SF_NEWANSWER;
367
-                $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;";
368
-                $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>";
367
+                $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;";
368
+                $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>";
369 369
                 $modify    = '';
370 370
                 break;
371 371
 
372 372
             case _SF_STATUS_OFFLINE:
373 373
                 $statustxt = _AM_SF_OFFLINE;
374 374
                 $approve   = '';
375
-                $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;";
376
-                $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>";
375
+                $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;";
376
+                $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>";
377 377
                 break;
378 378
 
379 379
             case _SF_STATUS_REJECTED_QUESTION:
380 380
                 $statustxt = _AM_SF_REJECTED_QUESTION;
381 381
                 $approve   = '';
382
-                $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;";
383
-                $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>";
382
+                $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;";
383
+                $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>";
384 384
                 break;
385 385
 
386 386
             case _SF_STATUS_REJECTED_SMARTFAQ:
387 387
                 $statustxt = _AM_SF_REJECTED_SMARTFAQ;
388 388
                 $approve   = '';
389
-                $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;";
390
-                $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>";
389
+                $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;";
390
+                $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>";
391 391
                 break;
392 392
 
393 393
             case 'default':
@@ -401,14 +401,14 @@  discard block
 block discarded – undo
401 401
         //$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;";
402 402
 
403 403
         echo '<tr>';
404
-        echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
405
-        echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
406
-        echo "<td class='even' align='left'>" . $faqsObj[$i]->question(100) . '</td>';
404
+        echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
405
+        echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
406
+        echo "<td class='even' align='left'>".$faqsObj[$i]->question(100).'</td>';
407 407
 
408 408
         //mb---------------------------------------
409 409
         //adding name of the Question Submitter
410 410
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
411
-        echo "<td class='even' align='center'>" . $requester . '</td>';
411
+        echo "<td class='even' align='center'>".$requester.'</td>';
412 412
 
413 413
         //adding name of the Answer Submitter
414 414
 
@@ -431,20 +431,20 @@  discard block
 block discarded – undo
431 431
         } else {
432 432
             $answerSubmitter = '--------';
433 433
         }
434
-        echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
434
+        echo "<td class='even' align='center'>".$answerSubmitter.'</td>';
435 435
 
436 436
         //mb---------------------------------------
437 437
 
438
-        echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
439
-        echo "<td class='even' align='center'>" . $statustxt . '</td>';
438
+        echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
439
+        echo "<td class='even' align='center'>".$statustxt.'</td>';
440 440
         //echo "<td class='even' align='center'>" . $answers . "</td>";
441
-        echo "<td class='even' align='center'> " . $approve . $modify . $delete . '</td>';
441
+        echo "<td class='even' align='center'> ".$approve.$modify.$delete.'</td>';
442 442
         echo '</tr>';
443 443
     }
444 444
 } else {
445 445
     // that is, $numrows = 0, there's no entries yet
446 446
     echo '<tr>';
447
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOFAQSSEL . '</td>';
447
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQSSEL.'</td>';
448 448
     echo '</tr>';
449 449
 }
450 450
 echo "</table>\n";
@@ -452,9 +452,9 @@  discard block
 block discarded – undo
452 452
 $pagenav = new XoopsPageNav($numrows, $xoopsModuleConfig['perpage'], $startentry, 'startentry', "statussel=$statussel&amp;sortsel=$sortsel&amp;ordersel=$ordersel");
453 453
 
454 454
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
455
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderImageNav() . '</div>';
455
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderImageNav().'</div>';
456 456
 } else {
457
-    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">' . $pagenav->renderNav() . '</div>';
457
+    echo '<div style="text-align:right; background-color: white; margin: 10px 0;">'.$pagenav->renderNav().'</div>';
458 458
 }
459 459
 // ENDs code to show active entries
460 460
 echo '</div>';
@@ -462,4 +462,4 @@  discard block
 block discarded – undo
462 462
 echo '</div>';
463 463
 echo '</div>';
464 464
 
465
-include_once __DIR__ . '/admin_footer.php';
465
+include_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/import.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/admin_header.php';
9
+include_once __DIR__.'/admin_header.php';
10 10
 
11 11
 $op = 'none';
12 12
 
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
     case 'importExecute':
24 24
 
25 25
         $importfile      = isset($_POST['importfile']) ? $_POST['importfile'] : 'nonselected';
26
-        $importfile_path = XOOPS_ROOT_PATH . '/modules/smartfaq/admin/' . $importfile . '.php';
26
+        $importfile_path = XOOPS_ROOT_PATH.'/modules/smartfaq/admin/'.$importfile.'.php';
27 27
         if (!file_exists($importfile_path)) {
28 28
             $errs[] = sprintf(_AM_SF_IMPORT_FILE_NOT_FOUND, $importfile_path);
29 29
             $error  = true;
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             include_once($importfile_path);
32 32
         }
33 33
         foreach ($msgs as $m) {
34
-            echo $m . '<br />';
34
+            echo $m.'<br />';
35 35
         }
36 36
         echo '<br />';
37 37
         $endMsg = _AM_SF_IMPORT_SUCCESS;
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 
42 42
         echo $endMsg;
43 43
         echo '<br /><br />';
44
-        echo "<a href='import.php'>" . _AM_SF_IMPORT_BACK . '</a>';
44
+        echo "<a href='import.php'>"._AM_SF_IMPORT_BACK.'</a>';
45 45
         echo '<br /><br />';
46 46
         break;
47 47
 
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
53 53
         xoops_cp_header();
54 54
 
55 55
         sf_collapsableBar('bottomtable', 'bottomtableicon');
56
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_IMPORT_TITLE . '</h3>';
56
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_IMPORT_TITLE.'</h3>';
57 57
         echo "<div id='bottomtable'>";
58
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_INFO . '</span>';
58
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_INFO.'</span>';
59 59
 
60 60
         global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts;
61 61
 
62
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
62
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
63 63
 
64 64
         $moduleHandler = xoops_getHandler('module');
65 65
         if ($moduleHandler->getByDirname('xoopsfaq')) {
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
             $sform->display();
99 99
             unset($hidden);
100 100
         } else {
101
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_MODULE . '</span>';
101
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_MODULE.'</span>';
102 102
         }
103 103
 
104 104
         // End of collapsable bar
@@ -107,4 +107,4 @@  discard block
 block discarded – undo
107 107
         break;
108 108
 }
109 109
 
110
-include_once __DIR__ . '/admin_footer.php';
110
+include_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/category.php 2 patches
Switch Indentation   +115 added lines, -115 removed lines patch added patch discarded remove patch
@@ -215,144 +215,144 @@
 block discarded – undo
215 215
 }
216 216
 
217 217
 switch ($op) {
218
-    case 'mod':
219
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
220
-        $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
221
-        $indexAdmin = new ModuleAdmin();
222
-        xoops_cp_header();
218
+        case 'mod':
219
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
220
+            $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
221
+            $indexAdmin = new ModuleAdmin();
222
+            xoops_cp_header();
223 223
 
224
-        echo $indexAdmin->addNavigation(basename(__FILE__));
225
-        editcat(true, $categoryid);
226
-        break;
224
+            echo $indexAdmin->addNavigation(basename(__FILE__));
225
+            editcat(true, $categoryid);
226
+            break;
227 227
 
228
-    case 'addcategory':
229
-        global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
228
+        case 'addcategory':
229
+            global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
230 230
 
231
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
231
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
232 232
 
233
-        if ($categoryid != 0) {
234
-            $categoryObj = new sfCategory($categoryid);
235
-        } else {
236
-            $categoryObj = $categoryHandler->create();
237
-        }
233
+            if ($categoryid != 0) {
234
+                $categoryObj = new sfCategory($categoryid);
235
+            } else {
236
+                $categoryObj = $categoryHandler->create();
237
+            }
238 238
 
239
-        //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
240
-        //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
239
+            //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
240
+            //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
241 241
 
242
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
243
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
244
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
242
+            $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
243
+            $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
244
+            $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
245 245
 
246
-        // Groups and permissions
247
-        if (isset($_POST['groups_read'])) {
248
-            $categoryObj->setGroups_read($_POST['groups_read']);
249
-        } else {
250
-            $categoryObj->setGroups_read();
251
-        }
252
-        //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
253
-        //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
254
-
255
-        $categoryObj->setVar('name', $_POST['name']);
256
-
257
-        $categoryObj->setVar('description', $_POST['description']);
258
-        if ($categoryObj->isNew()) {
259
-            $redirect_msg = _AM_SF_CATCREATED;
260
-            $redirect_to  = 'category.php?op=mod';
261
-        } else {
262
-            $redirect_msg = _AM_SF_COLMODIFIED;
263
-            $redirect_to  = 'category.php';
264
-        }
265
-
266
-        if (!$categoryObj->store()) {
267
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
268
-        }
269
-        // TODO : put this function in the category class
270
-        sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
271
-        //sf_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
246
+            // Groups and permissions
247
+            if (isset($_POST['groups_read'])) {
248
+                $categoryObj->setGroups_read($_POST['groups_read']);
249
+            } else {
250
+                $categoryObj->setGroups_read();
251
+            }
252
+            //  $groups_admin = isset($_POST['groups_admin'])? $_POST['groups_admin'] : array();
253
+            //  $mod_perms = isset($_POST['mod_perms'])? $_POST['mod_perms'] : array();
254
+
255
+            $categoryObj->setVar('name', $_POST['name']);
256
+
257
+            $categoryObj->setVar('description', $_POST['description']);
258
+            if ($categoryObj->isNew()) {
259
+                $redirect_msg = _AM_SF_CATCREATED;
260
+                $redirect_to  = 'category.php?op=mod';
261
+            } else {
262
+                $redirect_msg = _AM_SF_COLMODIFIED;
263
+                $redirect_to  = 'category.php';
264
+            }
272 265
 
273
-        if ($applyall) {
266
+            if (!$categoryObj->store()) {
267
+                redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
268
+            }
274 269
             // TODO : put this function in the category class
275
-            sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
276
-        }
270
+            sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
271
+            //sf_saveCategory_Permissions($groups_admin, $categoriesObj->categoryid(), 'category_admin');
277 272
 
278
-        redirect_header($redirect_to, 2, $redirect_msg);
279
-        break;
273
+            if ($applyall) {
274
+                // TODO : put this function in the category class
275
+                sf_overrideFaqsPermissions($categoryObj->getGroups_read(), $categoryObj->categoryid());
276
+            }
280 277
 
281
-    case 'del':
282
-        global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
278
+            redirect_header($redirect_to, 2, $redirect_msg);
279
+            break;
283 280
 
284
-        $module_id    = $xoopsModule->getVar('mid');
285
-        $gpermHandler = xoops_getHandler('groupperm');
281
+        case 'del':
282
+            global $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $_GET;
286 283
 
287
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
288
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
284
+            $module_id    = $xoopsModule->getVar('mid');
285
+            $gpermHandler = xoops_getHandler('groupperm');
289 286
 
290
-        $categoryObj = new sfCategory($categoryid);
287
+            $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
288
+            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
291 289
 
292
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
293
-        $name    = isset($_POST['name']) ? $_POST['name'] : '';
290
+            $categoryObj = new sfCategory($categoryid);
294 291
 
295
-        if ($confirm) {
296
-            if (!$categoryHandler->delete($categoryObj)) {
297
-                redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
292
+            $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
293
+            $name    = isset($_POST['name']) ? $_POST['name'] : '';
294
+
295
+            if ($confirm) {
296
+                if (!$categoryHandler->delete($categoryObj)) {
297
+                    redirect_header('category.php', 1, _AM_SF_DELETE_CAT_ERROR);
298
+                }
299
+                redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
300
+            } else {
301
+                // no confirm: show deletion condition
302
+                $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
303
+                xoops_cp_header();
304
+                xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
305
+                xoops_cp_footer();
298 306
             }
299
-            redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
300
-        } else {
301
-            // no confirm: show deletion condition
302
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
307
+            exit();
308
+            break;
309
+
310
+        case 'cancel':
311
+            redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
312
+            break;
313
+        case 'default':
314
+        default:
315
+            $indexAdmin = new ModuleAdmin();
303 316
             xoops_cp_header();
304
-            xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
305
-            xoops_cp_footer();
306
-        }
307
-        exit();
308
-        break;
309
-
310
-    case 'cancel':
311
-        redirect_header('category.php', 1, sprintf(_AM_SF_BACK2IDX, ''));
312
-        break;
313
-    case 'default':
314
-    default:
315
-        $indexAdmin = new ModuleAdmin();
316
-        xoops_cp_header();
317
-
318
-        echo $indexAdmin->addNavigation(basename(__FILE__));
319
-        echo "<br />\n";
320 317
 
321
-        // Creating the objects for top categories
322
-        $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
323
-
324
-        sf_collapsableBar('toptable', 'toptableicon');
325
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
326
-        echo "<div id='toptable'>";
327
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_CATEGORIES_DSC . '</span>';
328
-
329
-        echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
330
-        echo '<tr>';
331
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
332
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
333
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
334
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
335
-        echo '</tr>';
336
-        $totalCategories = $categoryHandler->getCategoriesCount(0);
337
-        if (count($categoriesObj) > 0) {
338
-            foreach ($categoriesObj as $key => $thiscat) {
339
-                displayCategory($thiscat);
340
-            }
341
-        } else {
318
+            echo $indexAdmin->addNavigation(basename(__FILE__));
319
+            echo "<br />\n";
320
+
321
+            // Creating the objects for top categories
322
+            $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
323
+
324
+            sf_collapsableBar('toptable', 'toptableicon');
325
+            echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
326
+            echo "<div id='toptable'>";
327
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_CATEGORIES_DSC . '</span>';
328
+
329
+            echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
342 330
             echo '<tr>';
343
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
331
+            echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
332
+            echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
333
+            echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
334
+            echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
344 335
             echo '</tr>';
345
-            $categoryid = '0';
346
-        }
347
-        echo "</table>\n";
348
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
349
-        $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
350
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
351
-        echo '</div>';
336
+            $totalCategories = $categoryHandler->getCategoriesCount(0);
337
+            if (count($categoriesObj) > 0) {
338
+                foreach ($categoriesObj as $key => $thiscat) {
339
+                    displayCategory($thiscat);
340
+                }
341
+            } else {
342
+                echo '<tr>';
343
+                echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
344
+                echo '</tr>';
345
+                $categoryid = '0';
346
+            }
347
+            echo "</table>\n";
348
+            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
349
+            $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
350
+            echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
351
+            echo '</div>';
352 352
 
353
-        editcat(false);
353
+            editcat(false);
354 354
 
355
-        break;
355
+            break;
356 356
 }
357 357
 
358 358
 include_once __DIR__ . '/admin_footer.php';
Please login to merge, or discard this patch.
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/admin_header.php';
9
+include_once __DIR__.'/admin_header.php';
10 10
 
11 11
 // Creating the category handler object
12 12
 $categoryHandler = sf_gethandler('category');
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 }
22 22
 
23 23
 // Where do we start?
24
-$startcategory = isset($_GET['startcategory']) ? (int)$_GET['startcategory'] : 0;
24
+$startcategory = isset($_GET['startcategory']) ? (int) $_GET['startcategory'] : 0;
25 25
 
26 26
 /**
27 27
  * @param     $categoryObj
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
     $description = $categoryObj->description();
34 34
     if (!XOOPS_USE_MULTIBYTES) {
35 35
         if (strlen($description) >= 100) {
36
-            $description = substr($description, 0, 100 - 1) . '...';
36
+            $description = substr($description, 0, 100-1).'...';
37 37
         }
38 38
     }
39
-    $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITCOL . "' alt='" . _AM_SF_EDITCOL . "' /></a>";
40
-    $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->categoryid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETECOL . "' alt='" . _AM_SF_DELETECOL . "' /></a>";
39
+    $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITCOL."' alt='"._AM_SF_EDITCOL."' /></a>";
40
+    $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->categoryid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETECOL."' alt='"._AM_SF_DELETECOL."' /></a>";
41 41
 
42 42
     $spaces = '';
43 43
     for ($j = 0; $j < $level; ++$j) {
@@ -45,9 +45,9 @@  discard block
 block discarded – undo
45 45
     }
46 46
 
47 47
     echo '<tr>';
48
-    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>';
49
-    echo "<td class='even' align='left'>" . $description . '</td>';
50
-    echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
48
+    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>';
49
+    echo "<td class='even' align='left'>".$description.'</td>';
50
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
51 51
     echo "<td class='even' align='center'> $modify $delete </td>";
52 52
     echo '</tr>';
53 53
     $subCategoriesObj = $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
@@ -68,9 +68,9 @@  discard block
 block discarded – undo
68 68
 {
69 69
     //$moderators = array(); // just to define the variable
70 70
     //$allmods = array();
71
-    $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
71
+    $startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
72 72
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
73
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
73
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
74 74
 
75 75
     // Creating the faq handler object
76 76
     $faqHandler = sf_gethandler('faq');
@@ -92,13 +92,13 @@  discard block
 block discarded – undo
92 92
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
93 93
         }
94 94
         sf_collapsableBar('bottomtable', 'bottomtableicon');
95
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
95
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
96 96
         echo "<div id='bottomtable'>";
97 97
     } else {
98 98
         $categoryObj = $categoryHandler->create();
99 99
         echo "<br />\n";
100 100
         sf_collapsableBar('bottomtable', 'bottomtableicon');
101
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
101
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
102 102
         echo "<div id='bottomtable'>";
103 103
     }
104 104
     // Start category form
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     }
144 144
     $sform->addElement($groups_read_checkbox);
145 145
     // Apply permissions on all faqs
146
-    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
146
+    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
147 147
     $sform->addElement($addapplyall_radio);
148 148
     // MODERATORS
149 149
     //$moderators_tray = new XoopsFormElementTray(_AM_SF_MODERATORS_DEF, '');
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
     echo '</div>';
209 209
 
210 210
     if ($categoryid) {
211
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
211
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
212 212
     }
213 213
 
214 214
     unset($hidden);
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 
217 217
 switch ($op) {
218 218
     case 'mod':
219
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
219
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
220 220
         $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
221 221
         $indexAdmin = new ModuleAdmin();
222 222
         xoops_cp_header();
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
     case 'addcategory':
229 229
         global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
230 230
 
231
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
231
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
232 232
 
233 233
         if ($categoryid != 0) {
234 234
             $categoryObj = new sfCategory($categoryid);
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
         //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
240 240
         //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
241 241
 
242
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
243
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
244
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
242
+        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int) $_POST['parentid'] : 0);
243
+        $applyall = isset($_POST['applyall']) ? (int) $_POST['applyall'] : 0;
244
+        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int) $_POST['weight'] : 1);
245 245
 
246 246
         // Groups and permissions
247 247
         if (isset($_POST['groups_read'])) {
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
         }
265 265
 
266 266
         if (!$categoryObj->store()) {
267
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
267
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.sf_formatErrors($categoryObj->getErrors()));
268 268
         }
269 269
         // TODO : put this function in the category class
270 270
         sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -284,8 +284,8 @@  discard block
 block discarded – undo
284 284
         $module_id    = $xoopsModule->getVar('mid');
285 285
         $gpermHandler = xoops_getHandler('groupperm');
286 286
 
287
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
288
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
287
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
288
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : $categoryid;
289 289
 
290 290
         $categoryObj = new sfCategory($categoryid);
291 291
 
@@ -299,9 +299,9 @@  discard block
 block discarded – undo
299 299
             redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
300 300
         } else {
301 301
             // no confirm: show deletion condition
302
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
302
+            $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
303 303
             xoops_cp_header();
304
-            xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br /> <br />" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
304
+            xoops_confirm(array('op' => 'del', 'categoryid' => $categoryObj->categoryid(), 'confirm' => 1, 'name' => $categoryObj->name()), 'category.php', _AM_SF_DELETECOL." '".$categoryObj->name()."'. <br /> <br />"._AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
305 305
             xoops_cp_footer();
306 306
         }
307 307
         exit();
@@ -322,16 +322,16 @@  discard block
 block discarded – undo
322 322
         $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
323 323
 
324 324
         sf_collapsableBar('toptable', 'toptableicon');
325
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
325
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
326 326
         echo "<div id='toptable'>";
327
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_CATEGORIES_DSC . '</span>';
327
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_CATEGORIES_DSC.'</span>';
328 328
 
329 329
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
330 330
         echo '<tr>';
331
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
332
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
333
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
334
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
331
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
332
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
333
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
334
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
335 335
         echo '</tr>';
336 336
         $totalCategories = $categoryHandler->getCategoriesCount(0);
337 337
         if (count($categoriesObj) > 0) {
@@ -340,14 +340,14 @@  discard block
 block discarded – undo
340 340
             }
341 341
         } else {
342 342
             echo '<tr>';
343
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
343
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
344 344
             echo '</tr>';
345 345
             $categoryid = '0';
346 346
         }
347 347
         echo "</table>\n";
348
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
348
+        include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
349 349
         $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
350
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
350
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
351 351
         echo '</div>';
352 352
 
353 353
         editcat(false);
@@ -355,4 +355,4 @@  discard block
 block discarded – undo
355 355
         break;
356 356
 }
357 357
 
358
-include_once __DIR__ . '/admin_footer.php';
358
+include_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/xoopsfaq.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  *
12 12
  */
13 13
 
14
-include_once __DIR__ . '/admin_header.php';
14
+include_once __DIR__.'/admin_header.php';
15 15
 
16 16
 $importFromModuleName = 'XoopsFAQ';
17 17
 $scriptname           = 'xoopsfaq.php';
@@ -24,33 +24,33 @@  discard block
 block discarded – undo
24 24
 
25 25
 if ($op === 'start') {
26 26
     xoops_cp_header();
27
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
27
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
28 28
 
29
-    $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('xoopsfaq_categories'));
29
+    $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('xoopsfaq_categories'));
30 30
     list($totalCat) = $xoopsDB->fetchRow($result);
31 31
 
32 32
     sf_collapsableBar('bottomtable', 'bottomtableicon');
33
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
33
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
34 34
     echo "<div id='bottomtable'>";
35 35
 
36 36
     if ($totalCat == 0) {
37
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
37
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_CATEGORY.'</span>';
38 38
     } else {
39
-        include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
39
+        include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
40 40
 
41
-        $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('xoopsfaq_contents'));
41
+        $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('xoopsfaq_contents'));
42 42
         list($totalFAQ) = $xoopsDB->fetchRow($result);
43 43
 
44 44
         if ($totalFAQ == 0) {
45
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
45
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
46 46
         } else {
47
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ) . '</span>';
47
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ).'</span>';
48 48
 
49
-            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL . '/modules/smartfaq/admin/' . $scriptname);
49
+            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL.'/modules/smartfaq/admin/'.$scriptname);
50 50
 
51 51
             // Categories to be imported
52 52
             $cat_cbox = new XoopsFormCheckBox(sprintf(_AM_SF_IMPORT_CATEGORIES, $importFromModuleName), 'import_category', -1);
53
-            $result   = $xoopsDB->query('select c.category_id, c.category_title, count(q.contents_id) from ' . $xoopsDB->prefix('xoopsfaq_categories') . ' as c, ' . $xoopsDB->prefix('xoopsfaq_contents') . ' as q where c.category_id=q.category_id group by c.category_id order by category_order');
53
+            $result   = $xoopsDB->query('select c.category_id, c.category_title, count(q.contents_id) from '.$xoopsDB->prefix('xoopsfaq_categories').' as c, '.$xoopsDB->prefix('xoopsfaq_contents').' as q where c.category_id=q.category_id group by c.category_id order by category_order');
54 54
 
55 55
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
56 56
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             ob_end_clean();
66 66
 
67 67
             // Auto-Approve
68
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
68
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
69 69
 
70 70
             // Submitted and answered by
71 71
             $memberHandler = xoops_getHandler('member');
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
             $form->addElement($user_select);
79 79
 
80 80
             // Q&As can be commented?
81
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
81
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
82 82
 
83 83
             $group_list      = $memberHandler->getGroupList();
84 84
             $groups_selected = array();
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 }
103 103
 
104 104
 if ($op === 'go') {
105
-    include_once __DIR__ . '/admin_header.php';
105
+    include_once __DIR__.'/admin_header.php';
106 106
 
107 107
     $import_category = (isset($_POST['import_category']) ? $_POST['import_category'] : null);
108 108
     if (!$import_category) {
@@ -112,9 +112,9 @@  discard block
 block discarded – undo
112 112
     xoops_cp_header();
113 113
 
114 114
     sf_collapsableBar('bottomtable', 'bottomtableicon');
115
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
115
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
116 116
     echo "<div id='bottomtable'>";
117
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_RESULT . '</span>';
117
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_RESULT.'</span>';
118 118
 
119 119
     $cnt_imported_cat = 0;
120 120
     $cnt_imported_faq = 0;
@@ -142,7 +142,7 @@  discard block
 block discarded – undo
142 142
     echo "Can Comment: $cancomment<br/>";
143 143
     echo "Auto aprove: $autoaprove<br/>";*/
144 144
 
145
-    $resultCat = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_categories') . " where category_id in ($import_category_list) order by category_order");
145
+    $resultCat = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_categories')." where category_id in ($import_category_list) order by category_order");
146 146
 
147 147
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
148 148
         extract($arrCat, EXTR_PREFIX_ALL, 'xcat');
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
         $categoryObj->setVar('name', $xcat_category_title);
157 157
 
158 158
         if (!$categoryObj->store(false)) {
159
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br/>';
159
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br/>';
160 160
             continue;
161 161
         }
162 162
 
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 
165 165
         ++$cnt_imported_cat;
166 166
 
167
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title) . "<br\>";
167
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $xcat_category_title)."<br\>";
168 168
 
169
-        $resultFAQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('xoopsfaq_contents') . " where category_id=$xcat_category_id order by contents_order");
169
+        $resultFAQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('xoopsfaq_contents')." where category_id=$xcat_category_id order by contents_order");
170 170
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
171 171
             extract($arrFAQ, EXTR_PREFIX_ALL, 'xfaq');
172 172
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
             $faqObj->setVar('cancomment', $cancomment);
195 195
 
196 196
             if (!$faqObj->store(false)) {
197
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title) . '<br/>';
197
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $xfaq_contents_title).'<br/>';
198 198
                 continue;
199 199
             } else {
200 200
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -203,10 +203,10 @@  discard block
 block discarded – undo
203 203
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
204 204
 
205 205
                 if (!$answerObj->store()) {
206
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br/>';
206
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br/>';
207 207
                     continue;
208 208
                 } else {
209
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br />';
209
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br />';
210 210
                     ++$cnt_imported_faq;
211 211
                 }
212 212
             }
@@ -216,8 +216,8 @@  discard block
 block discarded – undo
216 216
     }
217 217
 
218 218
     echo 'Done.<br/>';
219
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
220
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br/>';
219
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br/>';
220
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br/>';
221 221
 
222 222
     exit();
223 223
 }
Please login to merge, or discard this patch.
admin/wffaq.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Module: SmartFAQ
4
- * Author: Marius Scurtescu <[email protected]>
5
- * Licence: GNU
6
- *
7
- * Import script from WF-FAQ to SmartFAQ.
8
- *
9
- * It was tested with WF-FAQ version 1.0.5 and SmartFAQ version 1.0 beta
10
- *
11
- */
3
+     * Module: SmartFAQ
4
+     * Author: Marius Scurtescu <[email protected]>
5
+     * Licence: GNU
6
+     *
7
+     * Import script from WF-FAQ to SmartFAQ.
8
+     *
9
+     * It was tested with WF-FAQ version 1.0.5 and SmartFAQ version 1.0 beta
10
+     *
11
+     */
12 12
 
13 13
 include_once __DIR__ . '/admin_header.php';
14 14
 
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  *
11 11
  */
12 12
 
13
-include_once __DIR__ . '/admin_header.php';
13
+include_once __DIR__.'/admin_header.php';
14 14
 
15 15
 $importFromModuleName = 'WF-FAQ';
16 16
 $scriptname           = 'wffaq.php';
@@ -22,33 +22,33 @@  discard block
 block discarded – undo
22 22
 }
23 23
 
24 24
 if ($op === 'start') {
25
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
25
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
26 26
     xoops_cp_header();
27
-    $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('faqcategories'));
27
+    $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('faqcategories'));
28 28
     list($totalCat) = $xoopsDB->fetchRow($result);
29 29
 
30 30
     sf_collapsableBar('bottomtable', 'bottomtableicon');
31
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
31
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
32 32
     echo "<div id='bottomtable'>";
33 33
 
34 34
     if ($totalCat == 0) {
35
-        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_NO_CATEGORY . '</span>';
35
+        echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_NO_CATEGORY.'</span>';
36 36
     } else {
37
-        include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
37
+        include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
38 38
 
39
-        $result = $xoopsDB->query('select count(*) from ' . $xoopsDB->prefix('faqtopics'));
39
+        $result = $xoopsDB->query('select count(*) from '.$xoopsDB->prefix('faqtopics'));
40 40
         list($totalFAQ) = $xoopsDB->fetchRow($result);
41 41
 
42 42
         if ($totalFAQ == 0) {
43
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat) . '</span>';
43
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND_NO_FAQ, $importFromModuleName, $totalCat).'</span>';
44 44
         } else {
45
-            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ) . '</span>';
45
+            echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".sprintf(_AM_SF_IMPORT_MODULE_FOUND, $importFromModuleName, $totalCat, $totalFAQ).'</span>';
46 46
 
47
-            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL . '/modules/smartfaq/admin/' . $scriptname);
47
+            $form = new XoopsThemeForm(_AM_SF_IMPORT_SETTINGS, 'import_form', XOOPS_URL.'/modules/smartfaq/admin/'.$scriptname);
48 48
 
49 49
             // Categories to be imported
50 50
             $cat_cbox = new XoopsFormCheckBox(sprintf(_AM_SF_IMPORT_CATEGORIES, $importFromModuleName), 'import_category', -1);
51
-            $result   = $xoopsDB->query('select c.catID, c.name, count(t.topicID) from ' . $xoopsDB->prefix('faqcategories') . ' as c, ' . $xoopsDB->prefix('faqtopics') . ' as t where c.catID=t.catID group by t.catID order by c.weight');
51
+            $result   = $xoopsDB->query('select c.catID, c.name, count(t.topicID) from '.$xoopsDB->prefix('faqcategories').' as c, '.$xoopsDB->prefix('faqtopics').' as t where c.catID=t.catID group by t.catID order by c.weight');
52 52
             while (list($cid, $cat_title, $count) = $xoopsDB->fetchRow($result)) {
53 53
                 $cat_cbox->addOption($cid, "$cat_title ($count)<br\>");
54 54
             }
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
             ob_end_clean();
63 63
 
64 64
             // Auto-Approve
65
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
65
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_AUTOAPPROVE, 'autoaprove', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
66 66
 
67 67
             // Submitted and answered by
68 68
             $memberHandler = xoops_getHandler('member');
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             $form->addElement($user_select);
76 76
 
77 77
             // Q&As can be commented?
78
-            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . ''));
78
+            $form->addElement(new XoopsFormRadioYN(_AM_SF_IMPORT_ALLOWCOMMENTS, 'cancomment', 1, ' '._AM_SF_YES.'', ' '._AM_SF_NO.''));
79 79
             $group_list      = $memberHandler->getGroupList();
80 80
             $groups_selected = array();
81 81
             $groups_checkbox = new XoopsFormCheckBox(_AM_SF_IMPORT_PERMISSIONS, 'groups_read');
@@ -104,13 +104,13 @@  discard block
 block discarded – undo
104 104
         redirect_header($scriptname, 2, _AM_SF_NOCATSELECTED);
105 105
     }
106 106
 
107
-    include_once __DIR__ . '/admin_header.php';
107
+    include_once __DIR__.'/admin_header.php';
108 108
     xoops_cp_header();
109 109
 
110 110
     sf_collapsableBar('bottomtable', 'bottomtableicon');
111
-    echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName) . '</h3>';
111
+    echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".sprintf(_AM_SF_IMPORT_FROM, $importFromModuleName).'</h3>';
112 112
     echo "<div id='bottomtable'>";
113
-    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . _AM_SF_IMPORT_RESULT . '</span>';
113
+    echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">"._AM_SF_IMPORT_RESULT.'</span>';
114 114
 
115 115
     $cnt_imported_cat = 0;
116 116
     $cnt_imported_faq = 0;
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
     echo "Can Comment: $cancomment<br/>";
139 139
     echo "Auto aprove: $autoaprove<br/>";*/
140 140
 
141
-    $resultCat = $xoopsDB->query('select * from ' . $xoopsDB->prefix('faqcategories') . " where catID in ($import_category_list) order by weight");
141
+    $resultCat = $xoopsDB->query('select * from '.$xoopsDB->prefix('faqcategories')." where catID in ($import_category_list) order by weight");
142 142
 
143 143
     while ($arrCat = $xoopsDB->fetchArray($resultCat)) {
144 144
         extract($arrCat, EXTR_PREFIX_ALL, 'wfc');
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
         $categoryObj->setVar('description', $wfc_description);
154 154
 
155 155
         if (!$categoryObj->store(false)) {
156
-            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name) . '<br/>';
156
+            echo sprintf(_AM_SF_IMPORT_CATEGORY_ERROR, $xcat_name).'<br/>';
157 157
             continue;
158 158
         }
159 159
 
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 
162 162
         ++$cnt_imported_cat;
163 163
 
164
-        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name) . "<br\>";
164
+        echo sprintf(_AM_SF_IMPORT_CATEGORY_SUCCESS, $wfc_name)."<br\>";
165 165
 
166
-        $resultFAQ = $xoopsDB->query('select * from ' . $xoopsDB->prefix('faqtopics') . " where catID=$wfc_catID order by weight");
166
+        $resultFAQ = $xoopsDB->query('select * from '.$xoopsDB->prefix('faqtopics')." where catID=$wfc_catID order by weight");
167 167
         while ($arrFAQ = $xoopsDB->fetchArray($resultFAQ)) {
168 168
             extract($arrFAQ, EXTR_PREFIX_ALL, 'wft');
169 169
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
             $faqObj->setVar('exacturl', 0);
196 196
 
197 197
             if (!$faqObj->store(false)) {
198
-                echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR, $wft_question) . '<br/>';
198
+                echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR, $wft_question).'<br/>';
199 199
                 continue;
200 200
             } else {
201 201
                 $answerObj->setVar('faqid', $faqObj->faqid());
@@ -204,10 +204,10 @@  discard block
 block discarded – undo
204 204
                 $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
205 205
 
206 206
                 if (!$answerObj->store()) {
207
-                    echo sprintf('  ' . _AM_SF_IMPORT_FAQ_ERROR) . '<br/>';
207
+                    echo sprintf('  '._AM_SF_IMPORT_FAQ_ERROR).'<br/>';
208 208
                     continue;
209 209
                 } else {
210
-                    echo '&nbsp;&nbsp;' . sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)) . '<br />';
210
+                    echo '&nbsp;&nbsp;'.sprintf(_AM_SF_IMPORTED_QUESTION, $faqObj->question(50)).'<br />';
211 211
                     ++$cnt_imported_faq;
212 212
                 }
213 213
             }
@@ -217,8 +217,8 @@  discard block
 block discarded – undo
217 217
     }
218 218
 
219 219
     echo 'Done.<br/>';
220
-    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br/>';
221
-    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq) . '<br/>';
220
+    echo sprintf(_AM_SF_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br/>';
221
+    echo sprintf(_AM_SF_IMPORTED_QUESTIONS, $cnt_imported_faq).'<br/>';
222 222
 
223 223
     exit();
224 224
 }
Please login to merge, or discard this patch.
submit.php 2 patches
Switch Indentation   +133 added lines, -133 removed lines patch added patch discarded remove patch
@@ -42,152 +42,152 @@  discard block
 block discarded – undo
42 42
 }
43 43
 
44 44
 switch ($op) {
45
-    case 'preview':
45
+        case 'preview':
46 46
 
47
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
47
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
48 48
 
49
-        $faqObj      = $faqHandler->create();
50
-        $answerObj   = $answerHandler->create();
51
-        $categoryObj = $categoryHandler->get($_POST['categoryid']);
49
+            $faqObj      = $faqHandler->create();
50
+            $answerObj   = $answerHandler->create();
51
+            $categoryObj = $categoryHandler->get($_POST['categoryid']);
52 52
 
53
-        if (!$xoopsUser) {
54
-            if ($xoopsModuleConfig['anonpost'] == 1) {
55
-                $uid = 0;
53
+            if (!$xoopsUser) {
54
+                if ($xoopsModuleConfig['anonpost'] == 1) {
55
+                    $uid = 0;
56
+                } else {
57
+                    redirect_header('index.php', 3, _NOPERM);
58
+                }
56 59
             } else {
57
-                redirect_header('index.php', 3, _NOPERM);
60
+                $uid = $xoopsUser->uid();
58 61
             }
59
-        } else {
60
-            $uid = $xoopsUser->uid();
61
-        }
62 62
 
63
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
63
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
64 64
 
65
-        // Putting the values about the FAQ in the FAQ object
66
-        $faqObj->setVar('categoryid', $_POST['categoryid']);
67
-        $faqObj->setVar('uid', $uid);
68
-        $faqObj->setVar('question', $_POST['question']);
69
-        $faqObj->setVar('howdoi', $_POST['howdoi']);
70
-        $faqObj->setVar('diduno', $_POST['diduno']);
71
-        $faqObj->setVar('datesub', time());
65
+            // Putting the values about the FAQ in the FAQ object
66
+            $faqObj->setVar('categoryid', $_POST['categoryid']);
67
+            $faqObj->setVar('uid', $uid);
68
+            $faqObj->setVar('question', $_POST['question']);
69
+            $faqObj->setVar('howdoi', $_POST['howdoi']);
70
+            $faqObj->setVar('diduno', $_POST['diduno']);
71
+            $faqObj->setVar('datesub', time());
72 72
 
73
-        // Putting the values in the answer object
74
-        $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
75
-        $answerObj->setVar('faqid', $faqObj->faqid());
76
-        $answerObj->setVar('answer', $_POST['answer']);
77
-        $answerObj->setVar('uid', $uid);
73
+            // Putting the values in the answer object
74
+            $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
75
+            $answerObj->setVar('faqid', $faqObj->faqid());
76
+            $answerObj->setVar('answer', $_POST['answer']);
77
+            $answerObj->setVar('uid', $uid);
78 78
 
79
-        global $xoopsUser, $myts;
79
+            global $xoopsUser, $myts;
80 80
 
81
-        $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
82
-        include_once(XOOPS_ROOT_PATH . '/header.php');
83
-        include_once __DIR__ . '/footer.php';
81
+            $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
82
+            include_once(XOOPS_ROOT_PATH . '/header.php');
83
+            include_once __DIR__ . '/footer.php';
84 84
 
85
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
85
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
86 86
 
87
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
88
-        $faq                 = $faqObj->toArray(null, $categoryObj, false);
89
-        $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
90
-        $faq['answer']       = $answerObj->answer();
91
-        $faq['who_when']     = $faqObj->getWhoAndWhen();
87
+            $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
88
+            $faq                 = $faqObj->toArray(null, $categoryObj, false);
89
+            $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
90
+            $faq['answer']       = $answerObj->answer();
91
+            $faq['who_when']     = $faqObj->getWhoAndWhen();
92 92
 
93
-        $faq['comments'] = -1;
94
-        $xoopsTpl->assign('faq', $faq);
95
-        $xoopsTpl->assign('op', 'preview');
96
-        $xoopsTpl->assign('whereInSection', $moduleName);
97
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
93
+            $faq['comments'] = -1;
94
+            $xoopsTpl->assign('faq', $faq);
95
+            $xoopsTpl->assign('op', 'preview');
96
+            $xoopsTpl->assign('whereInSection', $moduleName);
97
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
98 98
 
99
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
100
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
99
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
100
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
101 101
 
102
-        include_once 'include/submit.inc.php';
102
+            include_once 'include/submit.inc.php';
103 103
 
104
-        include_once XOOPS_ROOT_PATH . '/footer.php';
104
+            include_once XOOPS_ROOT_PATH . '/footer.php';
105 105
 
106
-        exit();
107
-        break;
106
+            exit();
107
+            break;
108 108
 
109
-    case 'post':
109
+        case 'post':
110 110
 
111
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
111
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
112 112
 
113
-        $newFaqObj    = $faqHandler->create();
114
-        $newAnswerObj = $answerHandler->create();
113
+            $newFaqObj    = $faqHandler->create();
114
+            $newAnswerObj = $answerHandler->create();
115 115
 
116
-        if (!$xoopsUser) {
117
-            if ($xoopsModuleConfig['anonpost'] == 1) {
118
-                $uid = 0;
116
+            if (!$xoopsUser) {
117
+                if ($xoopsModuleConfig['anonpost'] == 1) {
118
+                    $uid = 0;
119
+                } else {
120
+                    redirect_header('index.php', 3, _NOPERM);
121
+                }
119 122
             } else {
120
-                redirect_header('index.php', 3, _NOPERM);
123
+                $uid = $xoopsUser->uid();
121 124
             }
122
-        } else {
123
-            $uid = $xoopsUser->uid();
124
-        }
125
-
126
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
127
-
128
-        // Putting the values about the FAQ in the FAQ object
129
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
130
-        $newFaqObj->setVar('uid', $uid);
131
-        $newFaqObj->setVar('question', $_POST['question']);
132
-        $newFaqObj->setVar('howdoi', $_POST['howdoi']);
133
-        $newFaqObj->setVar('diduno', $_POST['diduno']);
134
-        $newFaqObj->setVar('notifypub', $notifypub);
135
-        //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
136
-        //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
137 125
 
138
-        // Setting the status of the FAQ
139
-
140
-        // if user is admin, FAQ are automatically published
141
-        $isAdmin = sf_userIsAdmin();
142
-        if ($isAdmin) {
143
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
144
-        } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
145
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
146
-        } else {
147
-            $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
148
-        }
126
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
127
+
128
+            // Putting the values about the FAQ in the FAQ object
129
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
130
+            $newFaqObj->setVar('uid', $uid);
131
+            $newFaqObj->setVar('question', $_POST['question']);
132
+            $newFaqObj->setVar('howdoi', $_POST['howdoi']);
133
+            $newFaqObj->setVar('diduno', $_POST['diduno']);
134
+            $newFaqObj->setVar('notifypub', $notifypub);
135
+            //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
136
+            //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
137
+
138
+            // Setting the status of the FAQ
139
+
140
+            // if user is admin, FAQ are automatically published
141
+            $isAdmin = sf_userIsAdmin();
142
+            if ($isAdmin) {
143
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
144
+            } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
145
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
146
+            } else {
147
+                $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
148
+            }
149 149
 
150
-        // Storing the FAQ object in the database
151
-        if (!$newFaqObj->store()) {
152
-            redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
153
-        }
150
+            // Storing the FAQ object in the database
151
+            if (!$newFaqObj->store()) {
152
+                redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
153
+            }
154 154
 
155
-        // Putting the values in the answer object
156
-        $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
157
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
158
-        $newAnswerObj->setVar('answer', $_POST['answer']);
159
-        $newAnswerObj->setVar('uid', $uid);
160
-
161
-        //====================================================================================
162
-        //TODO post Attachment
163
-        $attachments_tmp = array();
164
-        if (!empty($_POST['attachments_tmp'])) {
165
-            $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
166
-            if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
167
-                foreach ($_POST['delete_tmp'] as $key) {
168
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
169
-                    unset($attachments_tmp[$key]);
155
+            // Putting the values in the answer object
156
+            $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
157
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
158
+            $newAnswerObj->setVar('answer', $_POST['answer']);
159
+            $newAnswerObj->setVar('uid', $uid);
160
+
161
+            //====================================================================================
162
+            //TODO post Attachment
163
+            $attachments_tmp = array();
164
+            if (!empty($_POST['attachments_tmp'])) {
165
+                $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
166
+                if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
167
+                    foreach ($_POST['delete_tmp'] as $key) {
168
+                        unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
169
+                        unset($attachments_tmp[$key]);
170
+                    }
170 171
                 }
171 172
             }
172
-        }
173
-        if (count($attachments_tmp)) {
174
-            foreach ($attachments_tmp as $key => $attach) {
175
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
176
-                    $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
173
+            if (count($attachments_tmp)) {
174
+                foreach ($attachments_tmp as $key => $attach) {
175
+                    if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
176
+                        $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
177
+                    }
177 178
                 }
178 179
             }
179
-        }
180
-        $error_upload = '';
180
+            $error_upload = '';
181 181
 
182
-        if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != '' && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
183
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
184
-            $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
185
-            $uploaddir   = XOOPS_CACHE_PATH;
182
+            if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != '' && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
183
+                require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
184
+                $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
185
+                $uploaddir   = XOOPS_CACHE_PATH;
186 186
 
187
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
187
+                $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
188 188
 
189
-            if ($_FILES['userfile']['error'] > 0) {
190
-                switch ($_FILES['userfile']['error']) {
189
+                if ($_FILES['userfile']['error'] > 0) {
190
+                    switch ($_FILES['userfile']['error']) {
191 191
                     case 1:
192 192
                         $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
193 193
                         break;
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                     default:
198 198
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
199 199
                         break;
200
-                }
200
+                    }
201 201
             } else {
202 202
                 $uploader->setCheckMediaTypeByExt();
203 203
 
@@ -260,30 +260,30 @@  discard block
 block discarded – undo
260 260
         redirect_header('index.php', 2, $redirect_msg);
261 261
         break;
262 262
 
263
-    case 'form':
264
-    default:
263
+        case 'form':
264
+        default:
265 265
 
266
-        global $xoopsUser, $myts;
266
+            global $xoopsUser, $myts;
267 267
 
268
-        $faqObj      = $faqHandler->create();
269
-        $answerObj   = $answerHandler->create();
270
-        $categoryObj = $categoryHandler->create();
268
+            $faqObj      = $faqHandler->create();
269
+            $answerObj   = $answerHandler->create();
270
+            $categoryObj = $categoryHandler->create();
271 271
 
272
-        $xoopsOption['template_main'] = 'smartfaq_submit.html';
273
-        include_once(XOOPS_ROOT_PATH . '/header.php');
274
-        include_once __DIR__ . '/footer.php';
272
+            $xoopsOption['template_main'] = 'smartfaq_submit.html';
273
+            include_once(XOOPS_ROOT_PATH . '/header.php');
274
+            include_once __DIR__ . '/footer.php';
275 275
 
276
-        $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
277
-        $notifypub  = 1;
278
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
279
-        $xoopsTpl->assign('whereInSection', $moduleName);
280
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
276
+            $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
277
+            $notifypub  = 1;
278
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
279
+            $xoopsTpl->assign('whereInSection', $moduleName);
280
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
281 281
 
282
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
283
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
282
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
283
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
284 284
 
285
-        include_once 'include/submit.inc.php';
285
+            include_once 'include/submit.inc.php';
286 286
 
287
-        include_once XOOPS_ROOT_PATH . '/footer.php';
288
-        break;
287
+            include_once XOOPS_ROOT_PATH . '/footer.php';
288
+            break;
289 289
 }
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/header.php';
9
+include_once __DIR__.'/header.php';
10 10
 
11 11
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
12 12
 
@@ -79,12 +79,12 @@  discard block
 block discarded – undo
79 79
         global $xoopsUser, $myts;
80 80
 
81 81
         $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
82
-        include_once(XOOPS_ROOT_PATH . '/header.php');
83
-        include_once __DIR__ . '/footer.php';
82
+        include_once(XOOPS_ROOT_PATH.'/header.php');
83
+        include_once __DIR__.'/footer.php';
84 84
 
85 85
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
86 86
 
87
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
87
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
88 88
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
89 89
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
90 90
         $faq['answer']       = $answerObj->answer();
@@ -97,11 +97,11 @@  discard block
 block discarded – undo
97 97
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
98 98
 
99 99
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
100
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
100
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
101 101
 
102 102
         include_once 'include/submit.inc.php';
103 103
 
104
-        include_once XOOPS_ROOT_PATH . '/footer.php';
104
+        include_once XOOPS_ROOT_PATH.'/footer.php';
105 105
 
106 106
         exit();
107 107
         break;
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
             $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
166 166
             if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
167 167
                 foreach ($_POST['delete_tmp'] as $key) {
168
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
168
+                    unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0]);
169 169
                     unset($attachments_tmp[$key]);
170 170
                 }
171 171
             }
172 172
         }
173 173
         if (count($attachments_tmp)) {
174 174
             foreach ($attachments_tmp as $key => $attach) {
175
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
175
+                if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0])) {
176 176
                     $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
177 177
                 }
178 178
             }
@@ -180,11 +180,11 @@  discard block
 block discarded – undo
180 180
         $error_upload = '';
181 181
 
182 182
         if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != '' && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
183
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
183
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
184 184
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
185 185
             $uploaddir   = XOOPS_CACHE_PATH;
186 186
 
187
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
187
+            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int) $maxfilesize, (int) $xoopsModuleConfig['max_img_width'], (int) $xoopsModuleConfig['max_img_height']);
188 188
 
189 189
             if ($_FILES['userfile']['error'] > 0) {
190 190
                 switch ($_FILES['userfile']['error']) {
@@ -202,13 +202,13 @@  discard block
 block discarded – undo
202 202
                 $uploader->setCheckMediaTypeByExt();
203 203
 
204 204
                 if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
205
-                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid() . '_' : 'newbb_';
205
+                    $prefix = is_object($xoopsUser) ? (string) $xoopsUser->uid().'_' : 'newbb_';
206 206
                     $uploader->setPrefix($prefix);
207 207
                     if (!$uploader->upload()) {
208 208
                         $error_message[] = $error_upload = $uploader->getErrors();
209 209
                     } else {
210 210
                         if (is_file($uploader->getSavedDestination())) {
211
-                            if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $uploader->getSavedFileName())) {
211
+                            if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$uploader->getSavedFileName())) {
212 212
                                 $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
213 213
                             }
214 214
                         }
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
         }
228 228
 
229 229
         // Get the cateopry object related to that FAQ
230
-        $categoryObj =& $newFaqObj->category();
230
+        $categoryObj = & $newFaqObj->category();
231 231
 
232 232
         // If autoapprove_submitted_faq
233 233
         if ($isAdmin) {
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
         } else {
248 248
             // Subscribe the user to On Published notification, if requested
249 249
             if ($notifypub == 1) {
250
-                include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
250
+                include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
251 251
                 $notificationHandler = xoops_getHandler('notification');
252 252
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
253 253
             }
@@ -270,20 +270,20 @@  discard block
 block discarded – undo
270 270
         $categoryObj = $categoryHandler->create();
271 271
 
272 272
         $xoopsOption['template_main'] = 'smartfaq_submit.html';
273
-        include_once(XOOPS_ROOT_PATH . '/header.php');
274
-        include_once __DIR__ . '/footer.php';
273
+        include_once(XOOPS_ROOT_PATH.'/header.php');
274
+        include_once __DIR__.'/footer.php';
275 275
 
276 276
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
277 277
         $notifypub  = 1;
278
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
278
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
279 279
         $xoopsTpl->assign('whereInSection', $moduleName);
280 280
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
281 281
 
282 282
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
283
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
283
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
284 284
 
285 285
         include_once 'include/submit.inc.php';
286 286
 
287
-        include_once XOOPS_ROOT_PATH . '/footer.php';
287
+        include_once XOOPS_ROOT_PATH.'/footer.php';
288 288
         break;
289 289
 }
Please login to merge, or discard this patch.