Passed
Branch master (4e30dc)
by Michael
02:20
created
admin/admin_header.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 
20 20
 use XoopsModules\Smartfaq;
21 21
 
22
-require_once __DIR__ . '/../../../include/cp_header.php';
22
+require_once __DIR__.'/../../../include/cp_header.php';
23 23
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
24 24
 
25 25
 // require_once __DIR__ . '/../class/Utility.php';
@@ -28,18 +28,18 @@  discard block
 block discarded – undo
28 28
 $moduleDirName = basename(dirname(__DIR__));
29 29
 
30 30
 $path = dirname(dirname(dirname(__DIR__)));
31
-require_once $path . '/kernel/module.php';
32
-require_once $path . '/class/xoopstree.php';
33
-require_once $path . '/class/xoopslists.php';
34
-require_once $path . '/class/pagenav.php';
35
-require_once $path . '/class/xoopsformloader.php';
31
+require_once $path.'/kernel/module.php';
32
+require_once $path.'/class/xoopstree.php';
33
+require_once $path.'/class/xoopslists.php';
34
+require_once $path.'/class/pagenav.php';
35
+require_once $path.'/class/xoopsformloader.php';
36 36
 
37 37
 //require_once __DIR__ . '/../include/functions.php';
38 38
 // require_once __DIR__ . '/../class/category.php';
39 39
 // require_once __DIR__ . '/../class/faq.php';
40 40
 // require_once __DIR__ . '/../class/answer.php';
41 41
 // require_once __DIR__ . '/../class/Utility.php';
42
-require_once __DIR__ . '/../include/common.php';
42
+require_once __DIR__.'/../include/common.php';
43 43
 /** @var Smartfaq\Helper $helper */
44 44
 $helper      = Smartfaq\Helper::getInstance();
45 45
 $adminObject = \Xmf\Module\Admin::getInstance();
Please login to merge, or discard this patch.
admin/question.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use XoopsModules\Smartfaq;
10 10
 use XoopsModules\Smartfaq\Constants;
11 11
 
12
-require_once __DIR__ . '/admin_header.php';
12
+require_once __DIR__.'/admin_header.php';
13 13
 
14 14
 global $xoopsUser;
15 15
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 {
41 41
     global $faqHandler, $categoryHandler, $xoopsUser, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $XOOPS_URL, $myts;
42 42
 
43
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
43
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
44 44
     // If there is a parameter, and the id exists, retrieve data: we're editing a faq
45 45
     if (-1 != $faqid) {
46 46
         // Creating the FAQ object
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 
73 73
         echo "<br>\n";
74 74
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
75
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . $collapsableBar_title . '</h3>';
75
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;".$collapsableBar_title.'</h3>';
76 76
         echo "<div id='bottomtable'>";
77
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $collapsableBar_info . '</span>';
77
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$collapsableBar_info.'</span>';
78 78
     } else {
79 79
         // there's no parameter, so we're adding a faq
80 80
         $faqObj = $faqHandler->create();
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
         $button_caption    = _AM_SF_CREATE;
86 86
 
87 87
         Smartfaq\Utility::collapsableBar('bottomtable', 'bottomtableicon');
88
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_CREATEQUESTION . '</h3>';
88
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_CREATEQUESTION.'</h3>';
89 89
         echo "<div id='bottomtable'>";
90 90
     }
91 91
     $sform = new \XoopsThemeForm(_AM_SF_OPEN_QUESTION, 'op', xoops_getenv('PHP_SELF'), 'post', true);
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
         $button_tray->addElement($butt_create);
160 160
 
161 161
         $butt_edit = new \XoopsFormButton('', '', _AM_SF_OPEN_QUESTION_EDIT, 'button');
162
-        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=" . $faqid . "'\"");
162
+        $butt_edit->setExtra("onclick=\"location='faq.php?op=mod&amp;faqid=".$faqid."'\"");
163 163
         $button_tray->addElement($butt_edit);
164 164
 
165 165
         $butt_cancel = new \XoopsFormButton('', '', _AM_SF_CANCEL, 'button');
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
         xoops_cp_header();
192 192
 
193 193
         $adminObject->displayNavigation(basename(__FILE__));
194
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
194
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
195 195
 
196 196
         editfaq(true, $faqid);
197 197
         break;
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 
253 253
         // Storing the FAQ
254 254
         if (!$faqObj->store()) {
255
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR . Smartfaq\Utility::formatErrors($faqObj->getErrors()));
255
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_ERROR.Smartfaq\Utility::formatErrors($faqObj->getErrors()));
256 256
         }
257 257
 
258 258
         // Send notifications
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
                               'faqid'   => $faqObj->faqid(),
294 294
                               'confirm' => 1,
295 295
                               'name'    => $faqObj->question()
296
-                          ], 'question.php', _AM_SF_DELETETHISQUESTION . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
296
+                          ], 'question.php', _AM_SF_DELETETHISQUESTION." <br>'".$faqObj->question()."'. <br> <br>", _AM_SF_DELETE);
297 297
             xoops_cp_footer();
298 298
         }
299 299
 
@@ -306,8 +306,8 @@  discard block
 block discarded – undo
306 306
         xoops_cp_header();
307 307
         $adminObject->displayNavigation(basename(__FILE__));
308 308
 
309
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
310
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
309
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
310
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
311 311
 
312 312
         global  $xoopsConfig, $xoopsDB, $xoopsModuleConfig, $xoopsModule, $smartModuleConfig;
313 313
 
@@ -315,9 +315,9 @@  discard block
 block discarded – undo
315 315
 
316 316
         Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
317 317
 
318
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_OPENED_TITLE . '</h3>';
318
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_OPENED_TITLE.'</h3>';
319 319
         echo "<div id='toptable'>";
320
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_OPENED_DSC . '</span>';
320
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_OPENED_DSC.'</span>';
321 321
 
322 322
         // Get the total number of published FAQs
323 323
         $totalfaqs = $faqHandler->getFaqsCount(-1, [Constants::SF_STATUS_OPENED]);
@@ -327,14 +327,14 @@  discard block
 block discarded – undo
327 327
         $allCats         = $categoryHandler->getObjects(null, true);
328 328
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
329 329
         echo '<tr>';
330
-        echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
331
-        echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
332
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
330
+        echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
331
+        echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
332
+        echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
333 333
 
334
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
334
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
335 335
 
336
-        echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
337
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
336
+        echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
337
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
338 338
         echo '</tr>';
339 339
         //var_dump( $faqsObj);
340 340
         if ($totalfaqs > 0) {
@@ -342,33 +342,33 @@  discard block
 block discarded – undo
342 342
             foreach (array_keys($faqsObj) as $i) {
343 343
                 $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
344 344
 
345
-                $modify = "<a href='question.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_EDITART . "'></a>";
346
-                $delete = "<a href='question.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_DELETEART . "' alt='" . _AM_SF_DELETEART . "'></a>";
345
+                $modify = "<a href='question.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_EDITART."'></a>";
346
+                $delete = "<a href='question.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_DELETEART."' alt='"._AM_SF_DELETEART."'></a>";
347 347
 
348 348
                 $requester = Smartfaq\Utility::getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
349 349
 
350 350
                 echo '<tr>';
351
-                echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
352
-                echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
353
-                echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/answer.php?faqid=' . $faqsObj[$i]->faqid() . "'>" . $faqsObj[$i]->question(100) . '</a></td>';
351
+                echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
352
+                echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
353
+                echo "<td class='even' align='left'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/answer.php?faqid='.$faqsObj[$i]->faqid()."'>".$faqsObj[$i]->question(100).'</a></td>';
354 354
 
355
-                echo "<td class='even' align='center'>" . $requester . '</td>';
355
+                echo "<td class='even' align='center'>".$requester.'</td>';
356 356
 
357
-                echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
357
+                echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
358 358
                 echo "<td class='even' align='center'> $modify $delete </td>";
359 359
                 echo '</tr>';
360 360
             }
361 361
         } else {
362 362
             $faqid = -1;
363 363
             echo '<tr>';
364
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOQUEUED . '</td>';
364
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOQUEUED.'</td>';
365 365
             echo '</tr>';
366 366
         }
367 367
         echo "</table>\n";
368 368
         echo "<br>\n";
369 369
 
370 370
         $pagenav = new \XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq');
371
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
371
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
372 372
         echo '</div>';
373 373
 
374 374
         $totalcategories = $categoryHandler->getCategoriesCount(-1);
@@ -379,4 +379,4 @@  discard block
 block discarded – undo
379 379
         break;
380 380
 }
381 381
 
382
-require_once __DIR__ . '/admin_footer.php';
382
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.