Completed
Push — master ( ed7d20...bb1ebf )
by Michael
02:47
created
faq.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@  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
-$faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
11
+$faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
12 12
 
13 13
 if ($faqid == 0) {
14 14
     redirect_header('javascript:history.go(-1)', 1, _MD_SF_NOFAQSELECTED);
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
     $faqObj->updateCounter();
46 46
 }
47 47
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_faq.tpl';
48
-include_once XOOPS_ROOT_PATH . '/header.php';
49
-include_once __DIR__ . '/footer.php';
48
+include_once XOOPS_ROOT_PATH.'/header.php';
49
+include_once __DIR__.'/footer.php';
50 50
 
51 51
 $faq = $faqObj->toArray(null, $categoryObj, false);
52 52
 
@@ -106,19 +106,19 @@  discard block
 block discarded – undo
106 106
 
107 107
 // Page Title Hack by marcan
108 108
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
109
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $categoryObj->name() . ' - ' . $faq['question']);
109
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$categoryObj->name().' - '.$faq['question']);
110 110
 // End Page Title Hack by marcan
111 111
 
112 112
 // Include the comments if the selected FAQ supports comments
113 113
 if ($faqObj->cancomment() == 1) {
114
-    include_once XOOPS_ROOT_PATH . '/include/comment_view.php';
114
+    include_once XOOPS_ROOT_PATH.'/include/comment_view.php';
115 115
 }
116 116
 
117 117
 //code to include smartie
118
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
119
-    include_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
118
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
119
+    include_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
120 120
     $xoopsTpl->assign('smarttie', 1);
121 121
 }
122 122
 //end code for smarttie
123 123
 
124
-include_once XOOPS_ROOT_PATH . '/footer.php';
124
+include_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
admin/category.php 1 patch
Spacing   +33 added lines, -33 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
-require_once __DIR__ . '/admin_header.php';
9
+require_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 XoopsObject $categoryObj
@@ -33,7 +33,7 @@  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 39
     $modify = "<a href='category.php?op=mod&categoryid="
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
          . "/modules/smartfaq/assets/images/icon/subcat.gif' alt='' />&nbsp;"
77 77
          . $categoryObj->name()
78 78
          . '</a></td>';
79
-    echo "<td class='even' align='left'>" . $description . '</td>';
80
-    echo "<td class='even' align='center'>" . $categoryObj->weight() . '</td>';
79
+    echo "<td class='even' align='left'>".$description.'</td>';
80
+    echo "<td class='even' align='center'>".$categoryObj->weight().'</td>';
81 81
     echo "<td class='even' align='center'> $modify $delete </td>";
82 82
     echo '</tr>';
83 83
     $subCategoriesObj = $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 {
99 99
     //$moderators = array(); // just to define the variable
100 100
     //$allmods = array();
101
-    $startfaq = isset($_GET['startfaq']) ? (int)$_GET['startfaq'] : 0;
101
+    $startfaq = isset($_GET['startfaq']) ? (int) $_GET['startfaq'] : 0;
102 102
     global $categoryHandler, $xoopsUser, $xoopsUser, $myts, $xoopsConfig, $xoopsDB, $modify, $xoopsModuleConfig, $xoopsModule, $_GET;
103
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
103
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
104 104
 
105 105
     // Creating the faq handler object
106 106
     $faqHandler = sf_gethandler('faq');
@@ -122,13 +122,13 @@  discard block
 block discarded – undo
122 122
             redirect_header('category.php', 1, _AM_SF_NOCOLTOEDIT);
123 123
         }
124 124
         sf_collapsableBar('bottomtable', 'bottomtableicon');
125
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_EDITCOL . '</h3>';
125
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_EDITCOL.'</h3>';
126 126
         echo "<div id='bottomtable'>";
127 127
     } else {
128 128
         $categoryObj = $categoryHandler->create();
129 129
         echo "<br>\n";
130 130
         sf_collapsableBar('bottomtable', 'bottomtableicon');
131
-        echo "<img id='bottomtableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORY_CREATE . '</h3>';
131
+        echo "<img id='bottomtableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CATEGORY_CREATE.'</h3>';
132 132
         echo "<div id='bottomtable'>";
133 133
     }
134 134
     // Start category form
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
     }
174 174
     $sform->addElement($groups_read_checkbox);
175 175
     // Apply permissions on all faqs
176
-    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' ' . _AM_SF_YES . '', ' ' . _AM_SF_NO . '');
176
+    $addapplyall_radio = new XoopsFormRadioYN(_AM_SF_PERMISSIONS_APPLY_ON_FAQS, 'applyall', 0, ' '._AM_SF_YES.'', ' '._AM_SF_NO.'');
177 177
     $sform->addElement($addapplyall_radio);
178 178
     // MODERATORS
179 179
     //$moderators_tray = new XoopsFormElementTray(_AM_SF_MODERATORS_DEF, '');
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
     echo '</div>';
239 239
 
240 240
     if ($categoryid) {
241
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/displayfaqs.php';
241
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/displayfaqs.php';
242 242
     }
243 243
 
244 244
     unset($hidden);
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
 
247 247
 switch ($op) {
248 248
     case 'mod':
249
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
249
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
250 250
         $destList   = isset($_POST['destList']) ? $_POST['destList'] : '';
251
-        $adminObject  = \Xmf\Module\Admin::getInstance();
251
+        $adminObject = \Xmf\Module\Admin::getInstance();
252 252
         xoops_cp_header();
253 253
 
254 254
         $adminObject->displayNavigation(basename(__FILE__));
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
     case 'addcategory':
259 259
         global $_POST, $xoopsUser, $xoopsUser, $xoopsConfig, $xoopsDB, $xoopsModule, $xoopsModuleConfig, $modify, $myts, $categoryid;
260 260
 
261
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
261
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
262 262
 
263 263
         if ($categoryid != 0) {
264 264
             $categoryObj = new sfCategory($categoryid);
@@ -269,9 +269,9 @@  discard block
 block discarded – undo
269 269
         //if (isset($_POST['allmods'])) $allmods = $_POST['allmods'];
270 270
         //if (isset($_POST['moderators'])) $moderators = $_POST['moderators'];
271 271
 
272
-        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int)$_POST['parentid'] : 0);
273
-        $applyall = isset($_POST['applyall']) ? (int)$_POST['applyall'] : 0;
274
-        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int)$_POST['weight'] : 1);
272
+        $categoryObj->setVar('parentid', isset($_POST['parentid']) ? (int) $_POST['parentid'] : 0);
273
+        $applyall = isset($_POST['applyall']) ? (int) $_POST['applyall'] : 0;
274
+        $categoryObj->setVar('weight', isset($_POST['weight']) ? (int) $_POST['weight'] : 1);
275 275
 
276 276
         // Groups and permissions
277 277
         if (isset($_POST['groups_read'])) {
@@ -294,7 +294,7 @@  discard block
 block discarded – undo
294 294
         }
295 295
 
296 296
         if (!$categoryObj->store()) {
297
-            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR . sf_formatErrors($categoryObj->getErrors()));
297
+            redirect_header('javascript:history.go(-1)', 3, _AM_SF_CATEGORY_SAVE_ERROR.sf_formatErrors($categoryObj->getErrors()));
298 298
         }
299 299
         // TODO : put this function in the category class
300 300
         sf_saveCategory_Permissions($categoryObj->getGroups_read(), $categoryObj->categoryid(), 'category_read');
@@ -314,8 +314,8 @@  discard block
 block discarded – undo
314 314
         $module_id    = $xoopsModule->getVar('mid');
315 315
         $gpermHandler = xoops_getHandler('groupperm');
316 316
 
317
-        $categoryid = isset($_POST['categoryid']) ? (int)$_POST['categoryid'] : 0;
318
-        $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : $categoryid;
317
+        $categoryid = isset($_POST['categoryid']) ? (int) $_POST['categoryid'] : 0;
318
+        $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : $categoryid;
319 319
 
320 320
         $categoryObj = new sfCategory($categoryid);
321 321
 
@@ -329,14 +329,14 @@  discard block
 block discarded – undo
329 329
             redirect_header('category.php', 1, sprintf(_AM_SF_COLISDELETED, $name));
330 330
         } else {
331 331
             // no confirm: show deletion condition
332
-            $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
332
+            $categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
333 333
             xoops_cp_header();
334 334
             xoops_confirm(array(
335 335
                               'op'         => 'del',
336 336
                               'categoryid' => $categoryObj->categoryid(),
337 337
                               'confirm'    => 1,
338 338
                               'name'       => $categoryObj->name()
339
-                          ), 'category.php', _AM_SF_DELETECOL . " '" . $categoryObj->name() . "'. <br> <br>" . _AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
339
+                          ), 'category.php', _AM_SF_DELETECOL." '".$categoryObj->name()."'. <br> <br>"._AM_SF_DELETE_CAT_CONFIRM, _AM_SF_DELETE);
340 340
             xoops_cp_footer();
341 341
         }
342 342
         exit();
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
         break;
348 348
     case 'default':
349 349
     default:
350
-        $adminObject  = \Xmf\Module\Admin::getInstance();
350
+        $adminObject = \Xmf\Module\Admin::getInstance();
351 351
         xoops_cp_header();
352 352
 
353 353
         $adminObject->displayNavigation(basename(__FILE__));
@@ -357,16 +357,16 @@  discard block
 block discarded – undo
357 357
         $categoriesObj = $categoryHandler->getCategories($xoopsModuleConfig['perpage'], $startcategory, 0);
358 358
 
359 359
         sf_collapsableBar('toptable', 'toptableicon');
360
-        echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . _AM_SF_CATEGORIES_TITLE . '</h3>';
360
+        echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;"._AM_SF_CATEGORIES_TITLE.'</h3>';
361 361
         echo "<div id='toptable'>";
362
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_CATEGORIES_DSC . '</span>';
362
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_CATEGORIES_DSC.'</span>';
363 363
 
364 364
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
365 365
         echo '<tr>';
366
-        echo "<th width='35%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
367
-        echo "<th class='bg3' align='left'><b>" . _AM_SF_DESCRIP . '</b></td>';
368
-        echo "<th class='bg3' width='65' align='center'><b>" . _AM_SF_WEIGHT . '</b></td>';
369
-        echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
366
+        echo "<th width='35%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
367
+        echo "<th class='bg3' align='left'><b>"._AM_SF_DESCRIP.'</b></td>';
368
+        echo "<th class='bg3' width='65' align='center'><b>"._AM_SF_WEIGHT.'</b></td>';
369
+        echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
370 370
         echo '</tr>';
371 371
         $totalCategories = $categoryHandler->getCategoriesCount(0);
372 372
         if (count($categoriesObj) > 0) {
@@ -375,14 +375,14 @@  discard block
 block discarded – undo
375 375
             }
376 376
         } else {
377 377
             echo '<tr>';
378
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOCAT . '</td>';
378
+            echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOCAT.'</td>';
379 379
             echo '</tr>';
380 380
             $categoryid = '0';
381 381
         }
382 382
         echo "</table>\n";
383
-        include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
383
+        include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
384 384
         $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['perpage'], $startcategory, 'startcategory');
385
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
385
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
386 386
         echo '</div>';
387 387
 
388 388
         editcat(false);
@@ -390,4 +390,4 @@  discard block
 block discarded – undo
390 390
         break;
391 391
 }
392 392
 
393
-require_once __DIR__ . '/admin_footer.php';
393
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/admin.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -28,47 +28,47 @@  discard block
 block discarded – undo
28 28
 if (empty($fct)) {
29 29
     $fct = 'preferences';
30 30
 }
31
-include __DIR__ . '/../../../mainfile.php';
32
-include XOOPS_ROOT_PATH . '/include/cp_functions.php';
31
+include __DIR__.'/../../../mainfile.php';
32
+include XOOPS_ROOT_PATH.'/include/cp_functions.php';
33 33
 
34
-include_once XOOPS_ROOT_PATH . '/kernel/module.php';
34
+include_once XOOPS_ROOT_PATH.'/kernel/module.php';
35 35
 
36 36
 $admintest = 0;
37 37
 
38 38
 if (is_object($xoopsUser)) {
39 39
     $xoopsModule = XoopsModule::getByDirname('system');
40 40
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
41
-        redirect_header(XOOPS_URL . '/user.php', 3, _NOPERM);
41
+        redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
42 42
     }
43 43
     $admintest = 1;
44 44
 } else {
45
-    redirect_header(XOOPS_URL . '/user.php', 3, _NOPERM);
45
+    redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
46 46
 }
47 47
 
48 48
 // include system category definitions
49
-include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
49
+include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
50 50
 $error = false;
51 51
 if ($admintest != 0) {
52 52
     if (isset($fct) && $fct != '') {
53
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/system/admin/' . $fct . '/xoops_version.php')) {
54
-            include_once XOOPS_ROOT_PATH . '/modules/system/language/' . $xoopsConfig['language'] . '/admin.php';
53
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/system/admin/'.$fct.'/xoops_version.php')) {
54
+            include_once XOOPS_ROOT_PATH.'/modules/system/language/'.$xoopsConfig['language'].'/admin.php';
55 55
 
56
-            if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $xoopsConfig['language'] . '/admin/' . $fct . '.php')) {
57
-                include XOOPS_ROOT_PATH . '/modules/system/language/' . $xoopsConfig['language'] . '/admin/' . $fct . '.php';
58
-            } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/english/admin/' . $fct . '.php')) {
59
-                include XOOPS_ROOT_PATH . '/modules/system/language/english/admin/' . $fct . '.php';
56
+            if (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/'.$xoopsConfig['language'].'/admin/'.$fct.'.php')) {
57
+                include XOOPS_ROOT_PATH.'/modules/system/language/'.$xoopsConfig['language'].'/admin/'.$fct.'.php';
58
+            } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/english/admin/'.$fct.'.php')) {
59
+                include XOOPS_ROOT_PATH.'/modules/system/language/english/admin/'.$fct.'.php';
60 60
             }
61
-            include XOOPS_ROOT_PATH . '/modules/system/admin/' . $fct . '/xoops_version.php';
61
+            include XOOPS_ROOT_PATH.'/modules/system/admin/'.$fct.'/xoops_version.php';
62 62
             $syspermHandler = xoops_getHandler('groupperm');
63
-            $category       = !empty($modversion['category']) ? (int)$modversion['category'] : 0;
63
+            $category       = !empty($modversion['category']) ? (int) $modversion['category'] : 0;
64 64
             unset($modversion);
65 65
             if ($category > 0) {
66
-                $groups =& $xoopsUser->getGroups();
66
+                $groups = & $xoopsUser->getGroups();
67 67
                 if (in_array(XOOPS_GROUP_ADMIN, $groups)
68 68
                     || false !== $syspermHandler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))
69 69
                 ) {
70 70
                     if (file_exists("../include/{$fct}.inc.php")) {
71
-                        include_once __DIR__ . "/../include/{$fct}.inc.php";
71
+                        include_once __DIR__."/../include/{$fct}.inc.php";
72 72
                     } else {
73 73
                         $error = true;
74 74
                     }
@@ -76,8 +76,8 @@  discard block
 block discarded – undo
76 76
                     $error = true;
77 77
                 }
78 78
             } elseif ($fct === 'version') {
79
-                if (file_exists(XOOPS_ROOT_PATH . '/modules/system/admin/version/main.php')) {
80
-                    include_once XOOPS_ROOT_PATH . '/modules/system/admin/version/main.php';
79
+                if (file_exists(XOOPS_ROOT_PATH.'/modules/system/admin/version/main.php')) {
80
+                    include_once XOOPS_ROOT_PATH.'/modules/system/admin/version/main.php';
81 81
                 } else {
82 82
                     $error = true;
83 83
                 }
@@ -101,22 +101,22 @@  discard block
 block discarded – undo
101 101
     $all_ok = false;
102 102
     if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
103 103
         $syspermHandler = xoops_getHandler('groupperm');
104
-        $ok_syscats     =& $syspermHandler->getItemIds('system_admin', $groups);
104
+        $ok_syscats     = & $syspermHandler->getItemIds('system_admin', $groups);
105 105
     } else {
106 106
         $all_ok = true;
107 107
     }
108
-    $admin_dir = XOOPS_ROOT_PATH . '/modules/system/admin';
108
+    $admin_dir = XOOPS_ROOT_PATH.'/modules/system/admin';
109 109
     $handle    = opendir($admin_dir);
110 110
     $counter   = 0;
111 111
     $class     = 'even';
112 112
     while ($file = readdir($handle)) {
113
-        if (strtolower($file) !== 'cvs' && !preg_match('/[.]/', $file) && is_dir($admin_dir . '/' . $file)) {
114
-            include $admin_dir . '/' . $file . '/xoops_version.php';
113
+        if (strtolower($file) !== 'cvs' && !preg_match('/[.]/', $file) && is_dir($admin_dir.'/'.$file)) {
114
+            include $admin_dir.'/'.$file.'/xoops_version.php';
115 115
             if ($modversion['hasAdmin']) {
116
-                $category = isset($modversion['category']) ? (int)$modversion['category'] : 0;
116
+                $category = isset($modversion['category']) ? (int) $modversion['category'] : 0;
117 117
                 if (false !== $all_ok || in_array($modversion['category'], $ok_syscats)) {
118 118
                     echo "<td class='$class' align='center' valign='bottom' width='19%'>";
119
-                    echo "<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=' . $file . "'><b>" . trim($modversion['name']) . "</b></a>\n";
119
+                    echo "<a href='".XOOPS_URL.'/modules/system/admin.php?fct='.$file."'><b>".trim($modversion['name'])."</b></a>\n";
120 120
                     echo '</td>';
121 121
                     ++$counter;
122 122
                     $class = ($class === 'even') ? 'odd' : 'even';
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         }
132 132
     }
133 133
     while ($counter < 5) {
134
-        echo '<td class="' . $class . '">&nbsp;</td>';
134
+        echo '<td class="'.$class.'">&nbsp;</td>';
135 135
         $class = ($class === 'even') ? 'odd' : 'even';
136 136
         ++$counter;
137 137
     }
Please login to merge, or discard this patch.
admin/about.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@
 block discarded – undo
17 17
  * @author       XOOPS Development Team
18 18
  */
19 19
 
20
-require_once __DIR__ . '/admin_header.php';
20
+require_once __DIR__.'/admin_header.php';
21 21
 xoops_cp_header();
22 22
 
23 23
 $adminObject->displayNavigation(basename(__FILE__));
24 24
 \Xmf\Module\Admin::setPaypal('[email protected]');
25 25
 $adminObject->displayAbout(false);
26 26
 
27
-require_once __DIR__ . '/admin_footer.php';
27
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
class/answer.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
         if (!$attach_key) {
92 92
             return false;
93 93
         }
94
-        $this->attachment_array[(string)$attach_key]['num_download']++;
94
+        $this->attachment_array[(string) $attach_key]['num_download']++;
95 95
 
96
-        return $this->attachment_array[(string)$attach_key]['num_download'];
96
+        return $this->attachment_array[(string) $attach_key]['num_download'];
97 97
     }
98 98
 
99 99
     /**
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
             $attachment_save = base64_encode(serialize($this->attachment_array));
107 107
         }
108 108
         $this->setVar('attachment', $attachment_save);
109
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('smartfaq_answers') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachment_save) . ' WHERE post_id = ' . $this->getVar('answerid');
109
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('smartfaq_answers').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachment_save).' WHERE post_id = '.$this->getVar('answerid');
110 110
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
111 111
             //xoops_error($GLOBALS["xoopsDB"]->error());
112 112
             return false;
@@ -138,8 +138,8 @@  discard block
 block discarded – undo
138 138
 
139 139
         foreach ($attach_old as $key => $attach) {
140 140
             if (in_array($key, $attach_array)) {
141
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attach['name_saved']);
142
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/thumbs/' . $attach['name_saved']); // delete thumbnails
141
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attach['name_saved']);
142
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/thumbs/'.$attach['name_saved']); // delete thumbnails
143 143
                 continue;
144 144
             }
145 145
             $this->attachment_array[$key] = $attach;
@@ -165,12 +165,12 @@  discard block
 block discarded – undo
165 165
         static $counter = 0;
166 166
         $this->attachment_array = $this->getAttachment();
167 167
         if ($name_saved) {
168
-            $key                          = (string)(time() + ($counter++));
168
+            $key                          = (string) (time()+($counter++));
169 169
             $this->attachment_array[$key] = array(
170 170
                 'name_saved'   => $name_saved,
171 171
                 'name_display' => isset($name_display) ? $name_display : $name_saved,
172 172
                 'mimetype'     => $mimetype,
173
-                'num_download' => isset($num_download) ? (int)$num_download : 0
173
+                'num_download' => isset($num_download) ? (int) $num_download : 0
174 174
             );
175 175
         }
176 176
         $attachment_save = null;
@@ -196,24 +196,24 @@  discard block
 block discarded – undo
196 196
         if (is_array($attachments) && count($attachments) > 0) {
197 197
             $iconHandler = sf_getIconHandler();
198 198
             $mime_path   = $iconHandler->getPath('mime');
199
-            include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/include/functions.image.php';
199
+            include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/include/functions.image.php';
200 200
             $image_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp'); // need improve !!!
201
-            $post_attachment  .= '<br><strong>' . _MD_ATTACHMENT . '</strong>:';
201
+            $post_attachment  .= '<br><strong>'._MD_ATTACHMENT.'</strong>:';
202 202
             $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
203 203
             foreach ($attachments as $key => $att) {
204 204
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
205 205
                 $filetype       = $file_extension;
206
-                if (file_exists(XOOPS_ROOT_PATH . '/' . $mime_path . '/' . $filetype . '.gif')) {
207
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
206
+                if (file_exists(XOOPS_ROOT_PATH.'/'.$mime_path.'/'.$filetype.'.gif')) {
207
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
208 208
                 } else {
209
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
209
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
210 210
                 }
211
-                $file_size = @filesize(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $att['name_saved']);
212
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
211
+                $file_size = @filesize(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$att['name_saved']);
212
+                $file_size = number_format($file_size / 1024, 2).' KB';
213 213
                 if ($xoopsModuleConfig['media_allowed'] && in_array(strtolower($file_extension), $image_extensions)) {
214
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['name_display'] . '</strong> <small>(' . $file_size . ')</small>';
215
-                    $post_attachment .= '<br>' . sf_attachmentImage($att['name_saved']);
216
-                    $isDisplayed     = true;
214
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'" /><strong>&nbsp; '.$att['name_display'].'</strong> <small>('.$file_size.')</small>';
215
+                    $post_attachment .= '<br>'.sf_attachmentImage($att['name_saved']);
216
+                    $isDisplayed = true;
217 217
                 } else {
218 218
                     global $xoopsUser;
219 219
                     if (empty($xoopsModuleConfig['show_userattach'])) {
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
         $tags                  = array();
371 371
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
372 372
         $tags['FAQ_NAME']      = $faqObj->question();
373
-        $tags['FAQ_URL']       = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $faqObj->faqid();
373
+        $tags['FAQ_URL']       = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$faqObj->faqid();
374 374
         $tags['CATEGORY_NAME'] = $faqObj->getCategoryName();
375
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $faqObj->categoryid();
375
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$faqObj->categoryid();
376 376
         $tags['FAQ_QUESTION']  = $faqObj->question();
377 377
 
378 378
         // TODO : Not sure about the 'formpreview' ...
@@ -429,8 +429,8 @@  discard block
 block discarded – undo
429 429
      */
430 430
     public function get($id = null, $fields = null)
431 431
     {
432
-        if ((int)$id > 0) {
433
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers') . ' WHERE answerid=' . $id;
432
+        if ((int) $id > 0) {
433
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers').' WHERE answerid='.$id;
434 434
             if (!$result = $this->db->query($sql)) {
435 435
                 return false;
436 436
             }
@@ -560,11 +560,11 @@  discard block
 block discarded – undo
560 560
     {
561 561
         $ret   = array();
562 562
         $limit = $start = 0;
563
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers');
563
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers');
564 564
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
565
-            $sql .= ' ' . $criteria->renderWhere();
565
+            $sql .= ' '.$criteria->renderWhere();
566 566
             if ($criteria->getSort() != '') {
567
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
567
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
568 568
             }
569 569
             $limit = $criteria->getLimit();
570 570
             $start = $criteria->getStart();
@@ -578,9 +578,9 @@  discard block
 block discarded – undo
578 578
             $answer = new sfAnswer();
579 579
             $answer->assignVars($myrow);
580 580
             if (!$id_as_key) {
581
-                $ret[] =& $answer;
581
+                $ret[] = & $answer;
582 582
             } else {
583
-                $ret[$myrow['answerid']] =& $answer;
583
+                $ret[$myrow['answerid']] = & $answer;
584 584
             }
585 585
             unset($answer);
586 586
         }
@@ -661,9 +661,9 @@  discard block
 block discarded – undo
661 661
      */
662 662
     public function getCount(CriteriaElement $criteria = null)
663 663
     {
664
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
664
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
665 665
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
666
-            $sql .= ' ' . $criteria->renderWhere();
666
+            $sql .= ' '.$criteria->renderWhere();
667 667
         }
668 668
         $result = $this->db->query($sql);
669 669
         if (!$result) {
@@ -682,10 +682,10 @@  discard block
 block discarded – undo
682 682
      */
683 683
     public function getCountByFAQ($criteria = null)
684 684
     {
685
-        $sql = 'SELECT faqid, COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
685
+        $sql = 'SELECT faqid, COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
686 686
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
687
-            $sql .= ' ' . $criteria->renderWhere();
688
-            $sql .= ' ' . $criteria->getGroupby();
687
+            $sql .= ' '.$criteria->renderWhere();
688
+            $sql .= ' '.$criteria->getGroupby();
689 689
         }
690 690
 
691 691
         //echo "<br>$sql<br>";
@@ -712,9 +712,9 @@  discard block
 block discarded – undo
712 712
      */
713 713
     public function deleteAll(CriteriaElement $criteria = null, $force = true, $asObject = false)
714 714
     {
715
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_answers');
715
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_answers');
716 716
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
717
-            $sql .= ' ' . $criteria->renderWhere();
717
+            $sql .= ' '.$criteria->renderWhere();
718 718
         }
719 719
         if (!$this->db->query($sql)) {
720 720
             return false;
@@ -734,10 +734,10 @@  discard block
 block discarded – undo
734 734
      */
735 735
     public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null, $force = false)
736 736
     {
737
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
738
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_answers') . ' SET ' . $set_clause;
737
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
738
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_answers').' SET '.$set_clause;
739 739
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
740
-            $sql .= ' ' . $criteria->renderWhere();
740
+            $sql .= ' '.$criteria->renderWhere();
741 741
         }
742 742
         //echo "<br>" . $sql . "<br>";
743 743
         if (!$this->db->queryF($sql)) {
@@ -754,8 +754,8 @@  discard block
 block discarded – undo
754 754
     public function getLastPublishedByFaq($faqids)
755 755
     {
756 756
         $ret    = array();
757
-        $sql    = 'SELECT faqid, answer, uid, datesub FROM ' . $this->db->prefix('smartfaq_answers') . '
758
-               WHERE faqid IN (' . implode(',', $faqids) . ') AND status = ' . _SF_AN_STATUS_APPROVED . ' GROUP BY faqid';
757
+        $sql    = 'SELECT faqid, answer, uid, datesub FROM '.$this->db->prefix('smartfaq_answers').'
758
+               WHERE faqid IN (' . implode(',', $faqids).') AND status = '._SF_AN_STATUS_APPROVED.' GROUP BY faqid';
759 759
         $result = $this->db->query($sql);
760 760
         if (!$result) {
761 761
             return $ret;
@@ -763,7 +763,7 @@  discard block
 block discarded – undo
763 763
         while ($row = $this->db->fetchArray($result)) {
764 764
             $answer = new sfAnswer();
765 765
             $answer->assignVars($row);
766
-            $ret[$row['faqid']] =& $answer;
766
+            $ret[$row['faqid']] = & $answer;
767 767
             unset($answer);
768 768
         }
769 769
 
Please login to merge, or discard this patch.
include/displayfaqs.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@  discard block
 block discarded – undo
23 23
 
24 24
 sf_collapsableBar('toptable', 'toptableicon');
25 25
 
26
-echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . $faqs_title . '</h3>';
26
+echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".$faqs_title.'</h3>';
27 27
 echo "<div id='toptable'>";
28
-echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $faqs_info . '</span>';
28
+echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$faqs_info.'</span>';
29 29
 
30 30
 // Get the total number of published FAQs
31 31
 $totalfaqs = $faqHandler->getFaqsCount($sel_cat, array(_SF_STATUS_PUBLISHED, _SF_STATUS_NEW_ANSWER));
@@ -36,15 +36,15 @@  discard block
 block discarded – undo
36 36
 $allCats         = $categoryHandler->getObjects(null, true);
37 37
 echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
38 38
 echo '<tr>';
39
-echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
40
-echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
41
-echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
39
+echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
40
+echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
41
+echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
42 42
 
43
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
44
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
43
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
44
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
45 45
 
46
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
47
-echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
46
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
47
+echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
48 48
 echo '</tr>';
49 49
 if ($totalfaqs > 0) {
50 50
     global $pathIcon16, $smartModuleConfig;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                        . "' alt='"
61 61
                        . _AM_SF_EDITART
62 62
                        . "' /></a>";
63
-        $delete      = "<a href='faq.php?op=del&amp;faqid="
63
+        $delete = "<a href='faq.php?op=del&amp;faqid="
64 64
                        . $faqsObj[$i]->faqid()
65 65
                        . "'><img src='"
66 66
                        . $pathIcon16
@@ -97,8 +97,8 @@  discard block
 block discarded – undo
97 97
         }
98 98
 
99 99
         echo '<tr>';
100
-        echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
101
-        echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
100
+        echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
101
+        echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
102 102
         echo "<td class='even' align='left'><a href='"
103 103
              . XOOPS_URL
104 104
              . '/modules/'
@@ -109,22 +109,22 @@  discard block
 block discarded – undo
109 109
              . $faqsObj[$i]->question(100)
110 110
              . '</a></td>';
111 111
 
112
-        echo "<td class='even' align='center'>" . $requester . '</td>';
113
-        echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
112
+        echo "<td class='even' align='center'>".$requester.'</td>';
113
+        echo "<td class='even' align='center'>".$answerSubmitter.'</td>';
114 114
 
115
-        echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
115
+        echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
116 116
         echo "<td class='even' align='center'> $modify $delete </td>";
117 117
         echo '</tr>';
118 118
     }
119 119
 } else {
120 120
     $faqid = -1;
121 121
     echo '<tr>';
122
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOFAQS . '</td>';
122
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQS.'</td>';
123 123
     echo '</tr>';
124 124
 }
125 125
 echo "</table>\n";
126 126
 echo "<br>\n";
127 127
 
128 128
 $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq', $pagenav_extra_args);
129
-echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
129
+echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
130 130
 echo '</div>';
Please login to merge, or discard this patch.