Completed
Push — master ( a7fe76...1b2f30 )
by Michael
04:20
created
class/uploader.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@
 block discarded – undo
11 11
 
12 12
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
13 13
 
14
-include_once XOOPS_ROOT_PATH . '/class/uploader.php';
14
+include_once XOOPS_ROOT_PATH.'/class/uploader.php';
15 15
 
16 16
 /**
17 17
  * Class sfUploader
Please login to merge, or discard this patch.
class/smartdbupdater.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
     //Verifies that a MySQL table exists
17 17
     $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
18 18
     $realname = $xoopsDB->prefix($table);
19
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
19
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
20 20
     $ret      = $xoopsDB->queryF($sql);
21 21
     while (list($m_table) = $xoopsDB->fetchRow($ret)) {
22 22
         if ($m_table == $realname) {
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
  * Include the language constants for the SmartObjectDBUpdater
54 54
  */
55 55
 global $xoopsConfig;
56
-$common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
56
+$common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/'.$xoopsConfig['language'].'/smartdbupdater.php';
57 57
 if (!file_exists($common_file)) {
58
-    $common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/english/smartdbupdater.php';
58
+    $common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/english/smartdbupdater.php';
59 59
 }
60 60
 
61 61
 include($common_file);
@@ -152,14 +152,14 @@  discard block
 block discarded – undo
152 152
     public function getExistingFieldsArray()
153 153
     {
154 154
         global $xoopsDB;
155
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
155
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
156 156
         while ($existing_field = $xoopsDB->fetchArray($result)) {
157 157
             $fields[$existing_field['Field']] = $existing_field['Type'];
158 158
             if ($existing_field['Null'] !== 'YES') {
159 159
                 $fields[$existing_field['Field']] .= ' NOT NULL';
160 160
             }
161 161
             if ($existing_field['Extra']) {
162
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
162
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
163 163
             }
164 164
         }
165 165
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
236 236
             $ret   = $xoopsDB->query($query);
237 237
             if (!$ret) {
238
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br />';
238
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br />';
239 239
             } else {
240
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br />';
240
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br />';
241 241
             }
242 242
         }
243 243
 
@@ -393,9 +393,9 @@  discard block
 block discarded – undo
393 393
 
394 394
         $ret = $xoopsDB->query($query);
395 395
         if (!$ret) {
396
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . '<br />';
396
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).'<br />';
397 397
         } else {
398
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br />';
398
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br />';
399 399
         }
400 400
 
401 401
         return $ret;
@@ -414,11 +414,11 @@  discard block
 block discarded – undo
414 414
         $query = sprintf('DROP TABLE %s', $this->name());
415 415
         $ret   = $xoopsDB->query($query);
416 416
         if (!$ret) {
417
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . '<br />';
417
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).'<br />';
418 418
 
419 419
             return false;
420 420
         } else {
421
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br />';
421
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br />';
422 422
 
423 423
             return true;
424 424
         }
@@ -442,9 +442,9 @@  discard block
 block discarded – undo
442 442
             $ret = $ret && $xoopsDB->query($query);
443 443
             if ($alteredField['showerror']) {
444 444
                 if (!$ret) {
445
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . '<br />';
445
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).'<br />';
446 446
                 } else {
447
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br />';
447
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br />';
448 448
                 }
449 449
             }
450 450
         }
@@ -468,9 +468,9 @@  discard block
 block discarded – undo
468 468
             //echo $query;
469 469
             $ret = $ret && $xoopsDB->query($query);
470 470
             if (!$ret) {
471
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br />';
471
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br />';
472 472
             } else {
473
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br />';
473
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br />';
474 474
             }
475 475
         }
476 476
 
@@ -493,9 +493,9 @@  discard block
 block discarded – undo
493 493
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
494 494
             $ret   = $ret && $xoopsDB->query($query);
495 495
             if (!$ret) {
496
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br />';
496
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br />';
497 497
             } else {
498
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br />';
498
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br />';
499 499
             }
500 500
         }
501 501
 
@@ -518,9 +518,9 @@  discard block
 block discarded – undo
518 518
             //echo $query."<br>";
519 519
             $ret = $ret && $xoopsDB->query($query);
520 520
             if (!$ret) {
521
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br />';
521
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br />';
522 522
             } else {
523
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br />';
523
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br />';
524 524
             }
525 525
         }
526 526
 
@@ -544,9 +544,9 @@  discard block
 block discarded – undo
544 544
 
545 545
             $ret = $ret && $xoopsDB->query($query);
546 546
             if (!$ret) {
547
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . '<br />';
547
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).'<br />';
548 548
             } else {
549
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br />';
549
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br />';
550 550
             }
551 551
         }
552 552
 
@@ -615,11 +615,11 @@  discard block
 block discarded – undo
615 615
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
616 616
         $ret   = $xoopsDB->query($query);
617 617
         if (!$ret) {
618
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br />';
618
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br />';
619 619
 
620 620
             return false;
621 621
         } else {
622
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br />';
622
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br />';
623 623
 
624 624
             return true;
625 625
         }
Please login to merge, or discard this patch.
class/faq.php 1 patch
Spacing   +72 added lines, -72 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
10 10
 
11
-require_once XOOPS_ROOT_PATH . '/modules/smartfaq/class/category.php';
11
+require_once XOOPS_ROOT_PATH.'/modules/smartfaq/class/category.php';
12 12
 
13 13
 // FAQ status
14 14
 define('_SF_STATUS_NOTSET', -1);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
      */
129 129
     public function checkPermission()
130 130
     {
131
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
131
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
132 132
 
133 133
         $userIsAdmin = sf_userIsAdmin();
134 134
         if ($userIsAdmin) {
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
204 204
         if ($maxLength != 0) {
205 205
             if (!XOOPS_USE_MULTIBYTES) {
206 206
                 if (strlen($ret) >= $maxLength) {
207
-                    $ret = substr($ret, 0, $maxLength - 1) . '...';
207
+                    $ret = substr($ret, 0, $maxLength-1).'...';
208 208
                 }
209 209
             }
210 210
         }
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
490 490
         $tags['FAQ_NAME']      = $this->question();
491 491
         $tags['CATEGORY_NAME'] = $this->getCategoryName();
492
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
492
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
493 493
         $tags['FAQ_QUESTION']  = $this->question();
494 494
         $answerObj             = $this->answer();
495 495
         if (is_object($answerObj)) {
@@ -501,7 +501,7 @@  discard block
 block discarded – undo
501 501
         foreach ($notifications as $notification) {
502 502
             switch ($notification) {
503 503
                 case _SF_NOT_FAQ_PUBLISHED:
504
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $this->faqid();
504
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$this->faqid();
505 505
 
506 506
                     $notificationHandler->triggerEvent('global_faq', 0, 'published', $tags);
507 507
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'published', $tags);
@@ -509,20 +509,20 @@  discard block
 block discarded – undo
509 509
                     break;
510 510
 
511 511
                 case _SF_NOT_FAQ_SUBMITTED:
512
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/faq.php?faqid=' . $this->faqid();
512
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/faq.php?faqid='.$this->faqid();
513 513
                     $notificationHandler->triggerEvent('global_faq', 0, 'submitted', $tags);
514 514
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'submitted', $tags);
515 515
                     break;
516 516
 
517 517
                 case _SF_NOT_QUESTION_PUBLISHED:
518
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/answer.php?faqid=' . $this->faqid();
518
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/answer.php?faqid='.$this->faqid();
519 519
                     $notificationHandler->triggerEvent('global_question', 0, 'published', $tags);
520 520
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'published', $tags);
521 521
                     $notificationHandler->triggerEvent('question', $this->faqid(), 'approved', $tags);
522 522
                     break;
523 523
 
524 524
                 case _SF_NOT_QUESTION_SUBMITTED:
525
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/question.php?op=mod&faqid=' . $this->faqid();
525
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/question.php?op=mod&faqid='.$this->faqid();
526 526
                     $notificationHandler->triggerEvent('global_question', 0, 'submitted', $tags);
527 527
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'submitted', $tags);
528 528
                     break;
@@ -532,7 +532,7 @@  discard block
 block discarded – undo
532 532
                     break;
533 533
 
534 534
                 case _SF_NOT_NEW_ANSWER_PROPOSED:
535
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/answer.php?op=mod&faqid=' . $this->faqid();
535
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/answer.php?op=mod&faqid='.$this->faqid();
536 536
                     $notificationHandler->triggerEvent('global_faq', 0, 'answer_proposed', $tags);
537 537
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'answer_proposed', $tags);
538 538
                     break;
@@ -646,7 +646,7 @@  discard block
 block discarded – undo
646 646
             $text = _MD_SF_FAQCOMEFROM;
647 647
         }
648 648
 
649
-        return $text . $xoopsConfig['sitename'] . ' : <a href=' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '>' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '</a>';
649
+        return $text.$xoopsConfig['sitename'].' : <a href='.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'>'.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'</a>';
650 650
     }
651 651
 
652 652
     /**
@@ -658,16 +658,16 @@  discard block
 block discarded – undo
658 658
     public function toArray($faq = array(), $category = null, $linkInQuestion = true)
659 659
     {
660 660
         global $xoopsModuleConfig;
661
-        $lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
661
+        $lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
662 662
 
663 663
         $faq['id']         = $this->faqid();
664 664
         $faq['categoryid'] = $this->categoryid();
665 665
         $faq['question']   = $this->question();
666 666
         $page              = ($this->status() == _SF_STATUS_OPENED) ? 'answer.php' : 'faq.php';
667 667
 
668
-        $faq['questionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question($lastfaqsize) . '</a>';
668
+        $faq['questionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question($lastfaqsize).'</a>';
669 669
         if ($linkInQuestion) {
670
-            $faq['fullquestionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question() . '</a>';
670
+            $faq['fullquestionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question().'</a>';
671 671
         } else {
672 672
             $faq['fullquestionlink'] = $this->question();
673 673
         }
@@ -683,7 +683,7 @@  discard block
 block discarded – undo
683 683
                 $categoryObj = $category[$this->categoryid()];
684 684
             }
685 685
             $faq['categoryname'] = $categoryObj->getVar('name');
686
-            $faq['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $categoryObj->getVar('name') . '</a>';
686
+            $faq['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$categoryObj->getVar('name').'</a>';
687 687
         }
688 688
 
689 689
         return $faq;
@@ -723,8 +723,8 @@  discard block
 block discarded – undo
723 723
      */
724 724
     public function & get($id)
725 725
     {
726
-        if ((int)$id > 0) {
727
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE faqid=' . $id;
726
+        if ((int) $id > 0) {
727
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq').' WHERE faqid='.$id;
728 728
             if (!$result = $this->db->query($sql)) {
729 729
                 return false;
730 730
             }
@@ -841,26 +841,26 @@  discard block
 block discarded – undo
841 841
     {
842 842
         $ret   = array();
843 843
         $limit = $start = 0;
844
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq');
844
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq');
845 845
 
846 846
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
847 847
             $whereClause = $criteria->renderWhere();
848 848
 
849 849
             if ($whereClause !== 'WHERE ()') {
850
-                $sql .= ' ' . $criteria->renderWhere();
850
+                $sql .= ' '.$criteria->renderWhere();
851 851
                 if (!empty($notNullFields)) {
852 852
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
853 853
                 }
854 854
             } elseif (!empty($notNullFields)) {
855
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
855
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
856 856
             }
857 857
             if ($criteria->getSort() != '') {
858
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
858
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
859 859
             }
860 860
             $limit = $criteria->getLimit();
861 861
             $start = $criteria->getStart();
862 862
         } elseif (!empty($notNullFields)) {
863
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
863
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
864 864
         }
865 865
 
866 866
         //echo "<br />" . $sql . "<br />";
@@ -920,26 +920,26 @@  discard block
 block discarded – undo
920 920
                             faq.modulelink AS modulelink,
921 921
                             faq.contextpage AS contextpage,
922 922
                             faq.exacturl AS exacturl
923
-                FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_categories') . ' AS category ON faq.categoryid = category.categoryid ';
923
+                FROM ' . $this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_categories').' AS category ON faq.categoryid = category.categoryid ';
924 924
 
925 925
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
926 926
             $whereClause = $criteria->renderWhere();
927 927
 
928 928
             if ($whereClause !== 'WHERE ()') {
929
-                $sql .= ' ' . $criteria->renderWhere();
929
+                $sql .= ' '.$criteria->renderWhere();
930 930
                 if (!empty($notNullFields)) {
931 931
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
932 932
                 }
933 933
             } elseif (!empty($notNullFields)) {
934
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
934
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
935 935
             }
936 936
             if ($criteria->getSort() != '') {
937
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
937
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
938 938
             }
939 939
             $limit = $criteria->getLimit();
940 940
             $start = $criteria->getStart();
941 941
         } elseif (!empty($notNullFields)) {
942
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
942
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
943 943
         }
944 944
 
945 945
         //echo "<br />" . $sql . "<br />";
@@ -989,19 +989,19 @@  discard block
 block discarded – undo
989 989
      */
990 990
     public function getCount($criteria = null, $notNullFields = '')
991 991
     {
992
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq');
992
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_faq');
993 993
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
994 994
             $whereClause = $criteria->renderWhere();
995 995
             if ($whereClause !== 'WHERE ()') {
996
-                $sql .= ' ' . $criteria->renderWhere();
996
+                $sql .= ' '.$criteria->renderWhere();
997 997
                 if (!empty($notNullFields)) {
998 998
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
999 999
                 }
1000 1000
             } elseif (!empty($notNullFields)) {
1001
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
1001
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
1002 1002
             }
1003 1003
         } elseif (!empty($notNullFields)) {
1004
-            $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
1004
+            $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
1005 1005
         }
1006 1006
 
1007 1007
         //echo "<br />" . $sql . "<br />";
@@ -1034,11 +1034,11 @@  discard block
 block discarded – undo
1034 1034
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
1035 1035
 
1036 1036
             $categoriesGranted = $smartPermHandler->getPermissions('category');
1037
-            $grantedCategories = new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
1037
+            $grantedCategories = new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
1038 1038
 
1039 1039
             $faqsGranted = $smartPermHandler->getPermissions('item');
1040 1040
             $grantedFaq  = new CriteriaCompo();
1041
-            $grantedFaq->add(new Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
1041
+            $grantedFaq->add(new Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
1042 1042
             // If user is anonymous, check if the FAQ allow partialview
1043 1043
             if (!is_object($xoopsUser)) {
1044 1044
                 $grantedFaq->add(new Criteria('partialview', '1'), 'OR');
@@ -1085,7 +1085,7 @@  discard block
 block discarded – undo
1085 1085
      */
1086 1086
     public function getFaqsCountByStatus()
1087 1087
     {
1088
-        $sql    = 'SELECT status, COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq') . ' GROUP BY status';
1088
+        $sql    = 'SELECT status, COUNT(*) FROM '.$this->db->prefix('smartfaq_faq').' GROUP BY status';
1089 1089
         $result = $this->db->query($sql);
1090 1090
         if (!$result) {
1091 1091
             return array();
@@ -1127,7 +1127,7 @@  discard block
 block discarded – undo
1127 1127
     public function getFaqs($limit = 0, $start = 0, $status = '', $categoryid = -1, $sort = 'datesub', $order = 'DESC', $notNullFields = '', $asobject = true, $otherCriteria = null)
1128 1128
     {
1129 1129
         global $xoopsUser;
1130
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
1130
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
1131 1131
 
1132 1132
         //if ( ($categoryid == -1) && (empty($status) || ($status == -1)) && ($limit == 0) && ($start ==0) ) {
1133 1133
         //  return $this->getObjects();
@@ -1139,11 +1139,11 @@  discard block
 block discarded – undo
1139 1139
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
1140 1140
 
1141 1141
             $categoriesGranted = $smartPermHandler->getPermissions('category');
1142
-            $grantedCategories = new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
1142
+            $grantedCategories = new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
1143 1143
 
1144 1144
             $faqsGranted = $smartPermHandler->getPermissions('item');
1145 1145
             $grantedFaq  = new CriteriaCompo();
1146
-            $grantedFaq->add(new Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
1146
+            $grantedFaq->add(new Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
1147 1147
             // If user is anonymous, check if the FAQ allow partialview
1148 1148
             if (!is_object($xoopsUser)) {
1149 1149
                 $grantedFaq->add(new Criteria('partialview', '1'), 'OR');
@@ -1152,9 +1152,9 @@  discard block
 block discarded – undo
1152 1152
 
1153 1153
         if (isset($categoryid) && ($categoryid != -1)) {
1154 1154
             if (is_array($categoryid)) {
1155
-                $criteriaCategory = new Criteria('categoryid', '(' . implode(',', $categoryid) . ')', 'IN');
1155
+                $criteriaCategory = new Criteria('categoryid', '('.implode(',', $categoryid).')', 'IN');
1156 1156
             } else {
1157
-                $criteriaCategory = new Criteria('categoryid', (int)$categoryid);
1157
+                $criteriaCategory = new Criteria('categoryid', (int) $categoryid);
1158 1158
             }
1159 1159
         }
1160 1160
 
@@ -1213,7 +1213,7 @@  discard block
 block discarded – undo
1213 1213
      */
1214 1214
     public function getFaqsAdminSide($limit = 0, $start = 0, $status = '', $categoryid = -1, $sort = 'datesub', $order = 'DESC', $asobject = true, $otherCriteria = null)
1215 1215
     {
1216
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
1216
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
1217 1217
 
1218 1218
         $smartModule = sf_getModuleInfo();
1219 1219
 
@@ -1272,7 +1272,7 @@  discard block
 block discarded – undo
1272 1272
 
1273 1273
         if ($totalFaqs > 0) {
1274 1274
             --$totalFaqs;
1275
-            mt_srand((double)microtime() * 1000000);
1275
+            mt_srand((double) microtime() * 1000000);
1276 1276
             $entrynumber = mt_rand(0, $totalFaqs);
1277 1277
             $faq         = $this->getFaqs(1, $entrynumber, $status, -1, 'datesub', 'DESC', $notNullFields);
1278 1278
             if ($faq) {
@@ -1307,10 +1307,10 @@  discard block
 block discarded – undo
1307 1307
                 $httphost    = $_SERVER['HTTP_HOST'];
1308 1308
                 $querystring = $_SERVER['QUERY_STRING'];
1309 1309
                 if ($querystring != '') {
1310
-                    $querystring = '?' . $querystring;
1310
+                    $querystring = '?'.$querystring;
1311 1311
                 }
1312
-                $currenturl     = $http . $httphost . $phpself . $querystring;
1313
-                $fullcontexturl = XOOPS_URL . '/' . $faqsObj[$i]->contextpage();
1312
+                $currenturl     = $http.$httphost.$phpself.$querystring;
1313
+                $fullcontexturl = XOOPS_URL.'/'.$faqsObj[$i]->contextpage();
1314 1314
                 switch ($faqsObj[$i]->modulelink()) {
1315 1315
                     case '':
1316 1316
                         $display = false;
@@ -1329,7 +1329,7 @@  discard block
 block discarded – undo
1329 1329
                         }
1330 1330
                         break;
1331 1331
                     default:
1332
-                        if (strpos($currenturl, XOOPS_URL . '/modules/') === false) {
1332
+                        if (strpos($currenturl, XOOPS_URL.'/modules/') === false) {
1333 1333
                             $display = false;
1334 1334
                         } else {
1335 1335
                             if (strpos($currenturl, $faqsObj[$i]->modulelink()) === false) {
@@ -1347,7 +1347,7 @@  discard block
 block discarded – undo
1347 1347
         }
1348 1348
 
1349 1349
         if (count($randomFaqs) > $limit) {
1350
-            mt_srand((float)microtime() * 10000000);
1350
+            mt_srand((float) microtime() * 10000000);
1351 1351
             $rand_keys = array_rand($randomFaqs, $limit);
1352 1352
             for ($j = 0, $jMax = count($rand_keys); $j < $jMax; ++$j) {
1353 1353
                 $ret[] = &$randomFaqs[$rand_keys[$j]];
@@ -1370,14 +1370,14 @@  discard block
 block discarded – undo
1370 1370
         if (!sf_userIsAdmin()) {
1371 1371
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
1372 1372
             $items            = $smartPermHandler->getPermissions('item');
1373
-            $faqclause        = ' AND faqid IN (' . implode(',', $items) . ')';
1373
+            $faqclause        = ' AND faqid IN ('.implode(',', $items).')';
1374 1374
         }
1375 1375
 
1376 1376
         $sql  = "CREATE TEMPORARY TABLE tmp (categoryid INT(8) UNSIGNED NOT NULL,datesub int(11) DEFAULT '0' NOT NULL);";
1377
-        $sql2 = ' LOCK TABLES ' . $this->db->prefix('smartfaq_faq') . ' READ;';
1378
-        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE status IN (' . implode(',', $status) . ") $faqclause GROUP BY categoryid;";
1379
-        $sql4 = ' SELECT ' . $this->db->prefix('smartfaq_faq') . '.categoryid, faqid, question, uid, ' . $this->db->prefix('smartfaq_faq') . '.datesub FROM ' . $this->db->prefix('smartfaq_faq') . ', tmp
1380
-                              WHERE ' . $this->db->prefix('smartfaq_faq') . '.categoryid=tmp.categoryid AND ' . $this->db->prefix('smartfaq_faq') . '.datesub=tmp.datesub;';
1377
+        $sql2 = ' LOCK TABLES '.$this->db->prefix('smartfaq_faq').' READ;';
1378
+        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM '.$this->db->prefix('smartfaq_faq').' WHERE status IN ('.implode(',', $status).") $faqclause GROUP BY categoryid;";
1379
+        $sql4 = ' SELECT '.$this->db->prefix('smartfaq_faq').'.categoryid, faqid, question, uid, '.$this->db->prefix('smartfaq_faq').'.datesub FROM '.$this->db->prefix('smartfaq_faq').', tmp
1380
+                              WHERE ' . $this->db->prefix('smartfaq_faq').'.categoryid=tmp.categoryid AND '.$this->db->prefix('smartfaq_faq').'.datesub=tmp.datesub;';
1381 1381
         /*
1382 1382
         //Old implementation
1383 1383
         $sql = "SELECT categoryid, faqid, question, uid, MAX(datesub) AS datesub FROM ".$this->db->prefix("smartfaq_faq")."
@@ -1392,7 +1392,7 @@  discard block
 block discarded – undo
1392 1392
         $this->db->queryF('UNLOCK TABLES;');
1393 1393
         $this->db->queryF('DROP TABLE tmp;');
1394 1394
         if (!$result) {
1395
-            trigger_error('Error in getLastPublishedByCat SQL: ' . $error);
1395
+            trigger_error('Error in getLastPublishedByCat SQL: '.$error);
1396 1396
 
1397 1397
             return $ret;
1398 1398
         }
@@ -1414,9 +1414,9 @@  discard block
 block discarded – undo
1414 1414
      */
1415 1415
     public function deleteAll($criteria = null)
1416 1416
     {
1417
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_faq');
1417
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_faq');
1418 1418
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
1419
-            $sql .= ' ' . $criteria->renderWhere();
1419
+            $sql .= ' '.$criteria->renderWhere();
1420 1420
         }
1421 1421
         if (!$this->db->query($sql)) {
1422 1422
             return false;
@@ -1437,10 +1437,10 @@  discard block
 block discarded – undo
1437 1437
      **/
1438 1438
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
1439 1439
     {
1440
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
1441
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET ' . $set_clause;
1440
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
1441
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET '.$set_clause;
1442 1442
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
1443
-            $sql .= ' ' . $criteria->renderWhere();
1443
+            $sql .= ' '.$criteria->renderWhere();
1444 1444
         }
1445 1445
         if (!$this->db->queryF($sql)) {
1446 1446
             return false;
@@ -1455,7 +1455,7 @@  discard block
 block discarded – undo
1455 1455
      */
1456 1456
     public function updateCounter($faqid)
1457 1457
     {
1458
-        $sql = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET counter=counter+1 WHERE faqid = ' . $faqid;
1458
+        $sql = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET counter=counter+1 WHERE faqid = '.$faqid;
1459 1459
         if ($this->db->queryF($sql)) {
1460 1460
             return true;
1461 1461
         } else {
@@ -1511,8 +1511,8 @@  discard block
 block discarded – undo
1511 1511
             $criteriaKeywords = new CriteriaCompo();
1512 1512
             for ($i = 0, $iMax = count($queryarray); $i < $iMax; ++$i) {
1513 1513
                 $criteriaKeyword = new CriteriaCompo();
1514
-                $criteriaKeyword->add(new Criteria('faq.question', '%' . $queryarray[$i] . '%', 'LIKE'), 'OR');
1515
-                $criteriaKeyword->add(new Criteria('answer.answer', '%' . $queryarray[$i] . '%', 'LIKE'), 'OR');
1514
+                $criteriaKeyword->add(new Criteria('faq.question', '%'.$queryarray[$i].'%', 'LIKE'), 'OR');
1515
+                $criteriaKeyword->add(new Criteria('answer.answer', '%'.$queryarray[$i].'%', 'LIKE'), 'OR');
1516 1516
                 $criteriaKeywords->add($criteriaKeyword, $andor);
1517 1517
                 unset($criteriaKeyword);
1518 1518
             }
@@ -1530,9 +1530,9 @@  discard block
 block discarded – undo
1530 1530
             if (!$faqsGranted) {
1531 1531
                 return $ret;
1532 1532
             }
1533
-            $grantedCategories = new Criteria('faq.categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
1533
+            $grantedCategories = new Criteria('faq.categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
1534 1534
             $grantedFaq        = new CriteriaCompo();
1535
-            $grantedFaq->add(new Criteria('faq.faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
1535
+            $grantedFaq->add(new Criteria('faq.faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
1536 1536
             // If user is anonymous, check if the FAQ allow partialview
1537 1537
             if (!is_object($xoopsUser)) {
1538 1538
                 $grantedFaq->add(new Criteria('partialview', '1'), 'OR');
@@ -1578,15 +1578,15 @@  discard block
 block discarded – undo
1578 1578
         $criteria->setSort('faq.datesub');
1579 1579
         $criteria->setOrder('DESC');
1580 1580
 
1581
-        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM ' . $this->db->prefix('smartfaq_faq') . ' as faq INNER JOIN ' . $this->db->prefix('smartfaq_answers') . ' as answer ON faq.faqid = answer.faqid';
1581
+        $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM '.$this->db->prefix('smartfaq_faq').' as faq INNER JOIN '.$this->db->prefix('smartfaq_answers').' as answer ON faq.faqid = answer.faqid';
1582 1582
 
1583 1583
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
1584 1584
             $whereClause = $criteria->renderWhere();
1585 1585
 
1586 1586
             if ($whereClause !== 'WHERE ()') {
1587
-                $sql .= ' ' . $criteria->renderWhere();
1587
+                $sql .= ' '.$criteria->renderWhere();
1588 1588
                 if ($criteria->getSort() != '') {
1589
-                    $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
1589
+                    $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
1590 1590
                 }
1591 1591
                 $limit = $criteria->getLimit();
1592 1592
                 $start = $criteria->getStart();
@@ -1625,19 +1625,19 @@  discard block
 block discarded – undo
1625 1625
     {
1626 1626
         global $xoopsUser;
1627 1627
         $ret = array();
1628
-        $sql = 'SELECT categoryid, COUNT(*) AS count FROM ' . $this->db->prefix('smartfaq_faq');
1629
-        if ((int)$cat_id > 0) {
1630
-            $sql .= ' WHERE categoryid = ' . (int)$cat_id;
1631
-            $sql .= ' AND status IN (' . implode(',', $status) . ')';
1628
+        $sql = 'SELECT categoryid, COUNT(*) AS count FROM '.$this->db->prefix('smartfaq_faq');
1629
+        if ((int) $cat_id > 0) {
1630
+            $sql .= ' WHERE categoryid = '.(int) $cat_id;
1631
+            $sql .= ' AND status IN ('.implode(',', $status).')';
1632 1632
         } else {
1633
-            $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
1633
+            $sql .= ' WHERE status IN ('.implode(',', $status).')';
1634 1634
             if (!sf_userIsAdmin()) {
1635 1635
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
1636 1636
                 $items            = $smartPermHandler->getPermissions('item');
1637 1637
                 if (is_object($xoopsUser)) {
1638
-                    $sql .= ' AND faqid IN (' . implode(',', $items) . ')';
1638
+                    $sql .= ' AND faqid IN ('.implode(',', $items).')';
1639 1639
                 } else {
1640
-                    $sql .= ' AND (faqid IN (' . implode(',', $items) . ') OR partialview = 1)';
1640
+                    $sql .= ' AND (faqid IN ('.implode(',', $items).') OR partialview = 1)';
1641 1641
                 }
1642 1642
             }
1643 1643
         }
@@ -1650,7 +1650,7 @@  discard block
 block discarded – undo
1650 1650
             return $ret;
1651 1651
         }
1652 1652
         while ($row = $this->db->fetchArray($result)) {
1653
-            $ret[$row['categoryid']] = (int)$row['count'];
1653
+            $ret[$row['categoryid']] = (int) $row['count'];
1654 1654
         }
1655 1655
 
1656 1656
         return $ret;
Please login to merge, or discard this patch.
class/category.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
                 $this->assignVars($id);
48 48
             } else {
49 49
                 $categoryHandler = new sfCategoryHandler($this->db);
50
-                $category        =& $categoryHandler->get($id);
50
+                $category        = & $categoryHandler->get($id);
51 51
                 foreach ($category->vars as $k => $v) {
52 52
                     $this->assignVar($k, $v['value']);
53 53
                 }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
      */
81 81
     public function checkPermission()
82 82
     {
83
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
83
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
84 84
 
85 85
         $userIsAdmin = sf_userIsAdmin();
86 86
         if ($userIsAdmin) {
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
             $filename = 'open_category.php';
158 158
         }
159 159
         if ($withAllLink) {
160
-            $ret = "<a href='" . XOOPS_URL . '/modules/smartfaq/' . $filename . '?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
160
+            $ret = "<a href='".XOOPS_URL.'/modules/smartfaq/'.$filename.'?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
161 161
         } else {
162 162
             $ret = $this->name();
163 163
         }
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
                 exit;
170 170
             }
171 171
             $parentid = $parentObj->parentid();
172
-            $ret      = $parentObj->getCategoryPath(true, $open) . ' > ' . $ret;
172
+            $ret      = $parentObj->getCategoryPath(true, $open).' > '.$ret;
173 173
         }
174 174
 
175 175
         return $ret;
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
         $tags                  = array();
224 224
         $tags['MODULE_NAME']   = $myts->htmlSpecialChars($smartModule->getVar('name'));
225 225
         $tags['CATEGORY_NAME'] = $this->name();
226
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
226
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
227 227
 
228 228
         $notificationHandler = xoops_getHandler('notification');
229 229
         $notificationHandler->triggerEvent('global_faq', 0, 'category_created', $tags);
@@ -239,9 +239,9 @@  discard block
 block discarded – undo
239 239
         $category['categoryid'] = $this->categoryid();
240 240
         $category['name']       = $this->name();
241 241
         if ($open != false) {
242
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/open_category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
242
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/open_category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
243 243
         } else {
244
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
244
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
245 245
         }
246 246
         $category['total']       = $this->getVar('faqcount');
247 247
         $category['description'] = $this->description();
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
290 290
     public function &get($id)
291 291
     {
292 292
         $false = false;
293
-        if ((int)$id > 0) {
294
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
293
+        if ((int) $id > 0) {
294
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
295 295
             if (!$result = $this->db->query($sql)) {
296 296
                 return $false;
297 297
             }
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
         }
374 374
 
375 375
         // Deleteing the sub categories
376
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
376
+        $subcats = & $this->getCategories(0, 0, $category->categoryid());
377 377
         foreach ($subcats as $subcat) {
378 378
             $this->delete($subcat);
379 379
         }
@@ -410,11 +410,11 @@  discard block
 block discarded – undo
410 410
     {
411 411
         $ret   = array();
412 412
         $limit = $start = 0;
413
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories');
413
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories');
414 414
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
415
-            $sql .= ' ' . $criteria->renderWhere();
415
+            $sql .= ' '.$criteria->renderWhere();
416 416
             if ($criteria->getSort() != '') {
417
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
417
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
418 418
             }
419 419
             $limit = $criteria->getLimit();
420 420
             $start = $criteria->getStart();
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
      */
451 451
     public function &getCategories($limit = 0, $start = 0, $parentid = 0, $sort = 'weight', $order = 'ASC', $id_as_key = true)
452 452
     {
453
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
453
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
454 454
 
455 455
         $criteria = new CriteriaCompo();
456 456
 
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
465 465
 
466 466
             $categoriesGranted = $smartPermHandler->getPermissions('category');
467
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
467
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
468 468
         }
469 469
         $criteria->setStart($start);
470 470
         $criteria->setLimit($limit);
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
      */
484 484
     public function &getCategoriesWithOpenQuestion($limit = 0, $start = 0, $parentid = 0, $sort = 'weight', $order = 'ASC')
485 485
     {
486
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
486
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
487 487
 
488 488
         $criteria = new CriteriaCompo();
489 489
 
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
498 498
 
499 499
             $categoriesGranted = $smartPermHandler->getPermissions('category');
500
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
500
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
501 501
         }
502 502
 
503 503
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
@@ -506,11 +506,11 @@  discard block
 block discarded – undo
506 506
 
507 507
         $ret   = array();
508 508
         $limit = $start = 0;
509
-        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
509
+        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
510 510
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
511
-            $sql .= ' ' . $criteria->renderWhere();
511
+            $sql .= ' '.$criteria->renderWhere();
512 512
             if ($criteria->getSort() != '') {
513
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
513
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
514 514
             }
515 515
             $limit = $criteria->getLimit();
516 516
             $start = $criteria->getStart();
@@ -539,9 +539,9 @@  discard block
 block discarded – undo
539 539
      */
540 540
     public function getCount($criteria = null)
541 541
     {
542
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_categories');
542
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_categories');
543 543
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
544
-            $sql .= ' ' . $criteria->renderWhere();
544
+            $sql .= ' '.$criteria->renderWhere();
545 545
         }
546 546
         $result = $this->db->query($sql);
547 547
         if (!$result) {
@@ -568,7 +568,7 @@  discard block
 block discarded – undo
568 568
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
569 569
 
570 570
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
571
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
571
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
572 572
             }
573 573
         }
574 574
 
@@ -591,16 +591,16 @@  discard block
 block discarded – undo
591 591
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
592 592
 
593 593
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
594
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
594
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
595 595
             }
596 596
         }
597 597
 
598 598
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
599 599
 
600
-        $sql = 'SELECT COUNT(c.categoryid) FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
600
+        $sql = 'SELECT COUNT(c.categoryid) FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
601 601
 
602 602
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
603
-            $sql .= ' ' . $criteria->renderWhere();
603
+            $sql .= ' '.$criteria->renderWhere();
604 604
         }
605 605
 
606 606
         $result = $this->db->query($sql);
@@ -618,13 +618,13 @@  discard block
 block discarded – undo
618 618
      */
619 619
     public function getSubCats($categories)
620 620
     {
621
-        $criteria = new CriteriaCompo(new Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')'), 'IN');
621
+        $criteria = new CriteriaCompo(new Criteria('parentid', '('.implode(',', array_keys($categories)).')'), 'IN');
622 622
         $ret      = array();
623 623
         if (!sf_userIsAdmin()) {
624 624
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
625 625
 
626 626
             $categoriesGranted = $smartPermHandler->getPermissions('category');
627
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
627
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
628 628
         }
629 629
         $subcats = $this->getObjects($criteria, true);
630 630
         foreach ($subcats as $subcat_id => $subcat) {
@@ -642,9 +642,9 @@  discard block
 block discarded – undo
642 642
      */
643 643
     public function deleteAll($criteria = null)
644 644
     {
645
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_categories');
645
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_categories');
646 646
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
647
-            $sql .= ' ' . $criteria->renderWhere();
647
+            $sql .= ' '.$criteria->renderWhere();
648 648
         }
649 649
         if (!$this->db->query($sql)) {
650 650
             return false;
@@ -666,10 +666,10 @@  discard block
 block discarded – undo
666 666
      **/
667 667
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
668 668
     {
669
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
670
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_categories') . ' SET ' . $set_clause;
669
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
670
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_categories').' SET '.$set_clause;
671 671
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
672
-            $sql .= ' ' . $criteria->renderWhere();
672
+            $sql .= ' '.$criteria->renderWhere();
673 673
         }
674 674
         if (!$this->db->queryF($sql)) {
675 675
             return false;
@@ -695,7 +695,7 @@  discard block
 block discarded – undo
695 695
     public function faqsCount($cat_id = 0, $status = '')
696 696
     {
697 697
         global $xoopsUser;
698
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
698
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
699 699
 
700 700
         $faqHandler = sf_gethandler('faq');
701 701
 
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 //about
26 26
 $modversion['module_status']       = 'RC 1';
27 27
 $modversion['release_date']        = '2016/03/28';
28
-$modversion['release_file']        = XOOPS_URL . '/modules/' . $modversion['dirname'] . '/docs/changelog.txt';
28
+$modversion['release_file']        = XOOPS_URL.'/modules/'.$modversion['dirname'].'/docs/changelog.txt';
29 29
 $modversion['module_website_url']  = 'www.xoops.org';
30 30
 $modversion['module_website_name'] = 'XOOPS';
31 31
 $modversion['min_php']             = '5.5';
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
133 133
             $modversion['sub'][2]['url']  = 'request.php?op=add';
134 134
         }
135 135
 
136
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
136
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
137 137
 
138 138
         // Creating the FAQ handler object
139 139
         $faqHandler = sf_gethandler('faq');
Please login to merge, or discard this patch.
faq.php 1 patch
Spacing   +10 added lines, -10 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);
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
     $faqObj->updateCounter();
43 43
 }
44 44
 $xoopsOption['template_main'] = 'smartfaq_faq.tpl';
45
-include_once(XOOPS_ROOT_PATH . '/header.php');
46
-include_once __DIR__ . '/footer.php';
45
+include_once(XOOPS_ROOT_PATH.'/header.php');
46
+include_once __DIR__.'/footer.php';
47 47
 
48 48
 $faq = $faqObj->toArray(null, $categoryObj, false);
49 49
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 $xoopsTpl->assign('display_categoryname', false);
79 79
 
80 80
 $xoopsTpl->assign('xcodes', $faqObj->getVar('xcodes'));
81
-$xoopsTpl->assign('mail_link', 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/faq.php?faqid=' . $faqObj->getVar('faqid'));
81
+$xoopsTpl->assign('mail_link', 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/faq.php?faqid='.$faqObj->getVar('faqid'));
82 82
 $xoopsTpl->assign('lang_printerpage', _MD_SF_PRINTERFRIENDLY);
83 83
 $xoopsTpl->assign('lang_sendstory', _MD_SF_SENDSTORY);
84 84
 $xoopsTpl->assign('faqid', $faqObj->getVar('faqid'));
@@ -94,19 +94,19 @@  discard block
 block discarded – undo
94 94
 
95 95
 // Page Title Hack by marcan
96 96
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
97
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $categoryObj->name() . ' - ' . $faq['question']);
97
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$categoryObj->name().' - '.$faq['question']);
98 98
 // End Page Title Hack by marcan
99 99
 
100 100
 // Include the comments if the selected FAQ supports comments
101 101
 if ($faqObj->cancomment() == 1) {
102
-    include_once XOOPS_ROOT_PATH . '/include/comment_view.php';
102
+    include_once XOOPS_ROOT_PATH.'/include/comment_view.php';
103 103
 }
104 104
 
105 105
 //code to include smartie
106
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
107
-    include_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
106
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
107
+    include_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
108 108
     $xoopsTpl->assign('smarttie', 1);
109 109
 }
110 110
 //end code for smarttie
111 111
 
112
-include_once XOOPS_ROOT_PATH . '/footer.php';
112
+include_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
open_index.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,15 +6,15 @@  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 $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
12 12
 
13 13
 // At which record shall we start for the Categories
14
-$catstart = isset($_GET['catstart']) ? (int)$_GET['catstart'] : 0;
14
+$catstart = isset($_GET['catstart']) ? (int) $_GET['catstart'] : 0;
15 15
 
16 16
 // At which record shall we start for the FAQs
17
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
17
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
18 18
 
19 19
 // Creating the category handler object
20 20
 $categoryHandler = sf_gethandler('category');
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 
43 43
 $xoopsOption['template_main'] = 'smartfaq_index.tpl';
44 44
 
45
-include_once(XOOPS_ROOT_PATH . '/header.php');
46
-include_once __DIR__ . '/footer.php';
45
+include_once(XOOPS_ROOT_PATH.'/header.php');
46
+include_once __DIR__.'/footer.php';
47 47
 
48 48
 //get all categories for future reference
49 49
 $allcategories = $categoryHandler->getObjects(null, true);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
             if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
66 66
                 if (isset($last_qnaObj[$subcat_id])) {
67 67
                     $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
68
-                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question(50) . '</a>');
68
+                    $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question(50).'</a>');
69 69
                 }
70 70
                 $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
71 71
                 $categories[$cat_id]['subcats'][$subcat_id] = $subcat->toArray(null, true);
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
         }
102 102
 
103 103
         $memberHandler = xoops_getHandler('member');
104
-        $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
104
+        $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
105 105
         for ($i = 0; $i < $totalQnasOnPage; ++$i) {
106 106
             $faq = $faqsObj[$i]->toArray(null, $allcategories);
107 107
 
@@ -114,10 +114,10 @@  discard block
 block discarded – undo
114 114
     }
115 115
 }
116 116
 // Language constants
117
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
117
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
118 118
 $xoopsTpl->assign(array('lang_on' => _MD_SF_ON, 'lang_postedby' => _MD_SF_POSTEDBY, 'lang_total' => $totalQnasOnPage, 'lang_faq' => _MD_SF_FAQ, 'lang_datesub' => _MD_SF_DATESUB, 'lang_hits' => _MD_SF_HITS));
119 119
 
120
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
120
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
121 121
 $xoopsTpl->assign('lang_mainhead', sprintf(_MD_SF_OPEN_WELCOME, $xoopsConfig['sitename']));
122 122
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['openquestionintromsg'], 1));
123 123
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_QUESTIONS);
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 $xoopsTpl->assign('lang_description', _MD_SF_DESCRIPTION);
126 126
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
127 127
 $xoopsTpl->assign('sectionname', $moduleName);
128
-$xoopsTpl->assign('whereInSection', "<a href='index.php'>" . $moduleName . '</a> > ' . _MD_SF_OPEN_SECTION);
128
+$xoopsTpl->assign('whereInSection', "<a href='index.php'>".$moduleName.'</a> > '._MD_SF_OPEN_SECTION);
129 129
 
130 130
 $xoopsTpl->assign('displayFull', false);
131 131
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
@@ -141,25 +141,25 @@  discard block
 block discarded – undo
141 141
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
142 142
 
143 143
 // Category Navigation Bar
144
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
144
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
145 145
 $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['catperpage'], $catstart, 'catstart', '');
146 146
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
147
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
147
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
148 148
 } else {
149
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
149
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
150 150
 }
151 151
 
152 152
 // FAQ Navigation Bar
153 153
 $pagenav = new XoopsPageNav($totalFaqs, $xoopsModuleConfig['indexperpage'], $start, 'start', '');
154 154
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
155
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
155
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
156 156
 } else {
157
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
157
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
158 158
 }
159 159
 
160 160
 // Page Title Hack by marcan
161 161
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
162
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category->getVar('name'));
162
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category->getVar('name'));
163 163
 // End Page Title Hack by marcan
164 164
 
165
-include_once(XOOPS_ROOT_PATH . '/footer.php');
165
+include_once(XOOPS_ROOT_PATH.'/footer.php');
Please login to merge, or discard this patch.
category.php 1 patch
Spacing   +19 added lines, -19 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
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
11
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
12 12
 
13 13
 // Creating the category handler object
14 14
 $categoryHandler = sf_gethandler('category');
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 }
33 33
 $xoopsOption['template_main'] = 'smartfaq_category.tpl';
34 34
 
35
-include_once(XOOPS_ROOT_PATH . '/header.php');
36
-include_once __DIR__ . '/footer.php';
35
+include_once(XOOPS_ROOT_PATH.'/header.php');
36
+include_once __DIR__.'/footer.php';
37 37
 
38 38
 // At which record shall we start
39
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
39
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
40 40
 
41 41
 // Creating the faq handler object
42 42
 $faqHandler = sf_gethandler('faq');
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     // Get the last smartfaq
71 71
     $last_qnaObj = $faqHandler->getLastPublishedByCat();
72 72
 }
73
-$lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
73
+$lastfaqsize = (int) $xoopsModuleConfig['lastfaqsize'];
74 74
 // Creating the sub-categories objects that belong to the selected category
75 75
 $subcatsObj    = $categoryHandler->getCategories(0, 0, $categoryid);
76 76
 $total_subcats = count($subcatsObj);
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
83 83
             if (isset($last_qnaObj[$subcat_id])) {
84 84
                 $subcatsObj[$i]->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
85
-                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
85
+                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
86 86
             }
87 87
         }
88 88
         $subcatsObj[$i]->setVar('faqcount', $totalQnas[$subcat_id]);
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     $xoopsTpl->assign('subcats', $subcats);
94 94
 }
95 95
 $thiscategory_faqcount = isset($totalQnas[$categoryid]) ? $totalQnas[$categoryid] : 0;
96
-$category['total']     = $thiscategory_faqcount + $total_faqs;
96
+$category['total']     = $thiscategory_faqcount+$total_faqs;
97 97
 
98 98
 if (count($faqsObj) > 0) {
99 99
     $userids = array();
@@ -109,13 +109,13 @@  discard block
 block discarded – undo
109 109
     }
110 110
 
111 111
     $memberHandler = xoops_getHandler('member');
112
-    $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
112
+    $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
113 113
     // Adding the Q&As of the selected category
114 114
     for ($i = 0; $i < $totalQnasOnPage; ++$i) {
115 115
         $faq = $faqsObj[$i]->toArray(null, $categoryObj);
116 116
 
117 117
         // Creating the answer object
118
-        $answerObj =& $allanswers[$faqsObj[$i]->faqid()];
118
+        $answerObj = & $allanswers[$faqsObj[$i]->faqid()];
119 119
 
120 120
         $answerObj->setVar('dohtml', $faqsObj[$i]->getVar('html'));
121 121
         $answerObj->setVar('doxcode', $faqsObj[$i]->getVar('xcodes'));
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 
136 136
     if (isset($last_qnaObj) && $last_qnaObj) {
137 137
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
138
-        $category['last_question_link'] = "<a href='faq.php?faqid=" . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid') . "'>" . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize) . '</a>';
138
+        $category['last_question_link'] = "<a href='faq.php?faqid=".$last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')."'>".$last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize).'</a>';
139 139
     }
140 140
 }
141 141
 
@@ -160,26 +160,26 @@  discard block
 block discarded – undo
160 160
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
161 161
 
162 162
 // The Navigation Bar
163
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
164
-$pagenav = new XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
163
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
164
+$pagenav = new XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
165 165
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
166
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
166
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
167 167
 } else {
168
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
168
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
169 169
 }
170 170
 
171 171
 $xoopsTpl->assign('category', $category);
172 172
 
173 173
 // Page Title Hack by marcan
174 174
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
175
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
175
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
176 176
 // End Page Title Hack by marcan
177 177
 
178 178
 //code to include smartie
179
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
180
-    include_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
179
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
180
+    include_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
181 181
     $xoopsTpl->assign('smarttie', 1);
182 182
 }
183 183
 //end code for smarttie
184 184
 
185
-include_once(XOOPS_ROOT_PATH . '/footer.php');
185
+include_once(XOOPS_ROOT_PATH.'/footer.php');
Please login to merge, or discard this patch.
admin/mygrouppermform.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
 // ------------------------------------------------------------------------- //
38 38
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
39 39
 
40
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
41
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
42
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php';
43
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
44
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
45
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
40
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
41
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
42
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php';
43
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
44
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
45
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
46 46
 
47 47
 /**
48 48
  * Renders a form for setting module specific group permissions
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
     {
94 94
         //      $this->XoopsForm($title, 'groupperm_form', XOOPS_URL.'/modules/system/admin/groupperm.php', 'post'); GIJ
95 95
         parent::__construct($title, 'groupperm_form', '', 'post');
96
-        $this->_modid    = (int)$modid;
96
+        $this->_modid    = (int) $modid;
97 97
         $this->_permName = $permname;
98 98
         $this->_permDesc = $permdesc;
99 99
         $this->addElement(new XoopsFormHidden('modid', $this->_modid));
@@ -167,11 +167,11 @@  discard block
 block discarded – undo
167 167
         }
168 168
         $gpermHandler  = xoops_getHandler('groupperm');
169 169
         $memberHandler = xoops_getHandler('member');
170
-        $glist         =& $memberHandler->getGroupList();
170
+        $glist         = & $memberHandler->getGroupList();
171 171
         foreach (array_keys($glist) as $i) {
172 172
             // get selected item id(s) for each group
173 173
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
174
-            $ele      = new MyXoopsGroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
174
+            $ele      = new MyXoopsGroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
175 175
             $ele->setOptionTree($this->_itemTree);
176 176
 
177 177
             foreach ($this->_appendix as $key => $append) {
@@ -198,18 +198,18 @@  discard block
 block discarded – undo
198 198
         $tray->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
199 199
         $this->addElement($tray);
200 200
 
201
-        $ret = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br />';
202
-        $ret .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1'>\n";
203
-        $elements =& $this->getElements();
201
+        $ret = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br />';
202
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
203
+        $elements = & $this->getElements();
204 204
         foreach (array_keys($elements) as $i) {
205 205
             if (!is_object($elements[$i])) {
206 206
                 $ret .= $elements[$i];
207 207
             } elseif (!$elements[$i]->isHidden()) {
208
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
208
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
209 209
                 if ($elements[$i]->getDescription() != '') {
210
-                    $ret .= '<br /><br /><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
210
+                    $ret .= '<br /><br /><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
211 211
                 }
212
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
212
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
213 213
             } else {
214 214
                 $ret .= $elements[$i]->render();
215 215
             }
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
      */
296 296
     public function setOptionTree(&$optionTree)
297 297
     {
298
-        $this->_optionTree =& $optionTree;
298
+        $this->_optionTree = & $optionTree;
299 299
     }
300 300
 
301 301
     /**
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
                     $cols = 1;
329 329
                 }
330 330
                 $checked = $append['selected'] ? 'checked="checked"' : '';
331
-                $name    = 'perms[' . $append['permname'] . ']';
331
+                $name    = 'perms['.$append['permname'].']';
332 332
                 $itemid  = $append['itemid'];
333 333
                 $itemid  = $append['itemid'];
334 334
                 $ret .= "<td class=\"odd\"><input type=\"checkbox\" name=\"{$name}[groups][$this->_groupId][$itemid]\" id=\"{$name}[groups][$this->_groupId][$itemid]\" value=\"1\" $checked />{$append['itemname']}<input type=\"hidden\" name=\"{$name}[parents][$itemid]\" value=\"\" /><input type=\"hidden\" name=\"{$name}[itemname][$itemid]\" value=\"{$append['itemname']}\" /><br /></td>";
@@ -347,7 +347,7 @@  discard block
 block discarded – undo
347 347
             $tree   = '<td class="odd">';
348 348
             $prefix = '';
349 349
             $this->renderOptionTree($tree, $this->_optionTree[$topitem], $prefix);
350
-            $ret .= $tree . '</td>';
350
+            $ret .= $tree.'</td>';
351 351
             ++$cols;
352 352
         }
353 353
         $ret .= '</tr></table>';
@@ -366,31 +366,31 @@  discard block
 block discarded – undo
366 366
      */
367 367
     private function renderOptionTree(&$tree, $option, $prefix, $parentIds = array())
368 368
     {
369
-        $tree .= $prefix . "<input type=\"checkbox\" name=\"" . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" id=\"" . $this->getName() . '[groups][' . $this->_groupId . '][' . $option['id'] . "]\" onclick=\"";
369
+        $tree .= $prefix."<input type=\"checkbox\" name=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" id=\"".$this->getName().'[groups]['.$this->_groupId.']['.$option['id']."]\" onclick=\"";
370 370
         // If there are parent elements, add javascript that will
371 371
         // make them selecteded when this element is checked to make
372 372
         // sure permissions to parent items are added as well.
373 373
         foreach ($parentIds as $pid) {
374
-            $parent_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $pid . ']';
375
-            $tree .= "var ele = xoopsGetElementById('" . $parent_ele . "'); if (ele.checked != true) {ele.checked = this.checked;}";
374
+            $parent_ele = $this->getName().'[groups]['.$this->_groupId.']['.$pid.']';
375
+            $tree .= "var ele = xoopsGetElementById('".$parent_ele."'); if (ele.checked != true) {ele.checked = this.checked;}";
376 376
         }
377 377
         // If there are child elements, add javascript that will
378 378
         // make them unchecked when this element is unchecked to make
379 379
         // sure permissions to child items are not added when there
380 380
         // is no permission to this item.
381 381
         foreach ($option['allchild'] as $cid) {
382
-            $child_ele = $this->getName() . '[groups][' . $this->_groupId . '][' . $cid . ']';
383
-            $tree .= "var ele = xoopsGetElementById('" . $child_ele . "'); if (this.checked != true) {ele.checked = false;}";
382
+            $child_ele = $this->getName().'[groups]['.$this->_groupId.']['.$cid.']';
383
+            $tree .= "var ele = xoopsGetElementById('".$child_ele."'); if (this.checked != true) {ele.checked = false;}";
384 384
         }
385 385
         $tree .= '" value="1"';
386 386
         if (isset($this->_value) && in_array($option['id'], $this->_value)) {
387 387
             $tree .= ' checked="checked"';
388 388
         }
389
-        $tree .= ' />' . $option['name'] . "<input type=\"hidden\" name=\"" . $this->getName() . '[parents][' . $option['id'] . "]\" value=\"" . implode(':', $parentIds) . "\" /><input type=\"hidden\" name=\"" . $this->getName() . '[itemname][' . $option['id'] . "]\" value=\"" . htmlspecialchars($option['name']) . "\" /><br />\n";
389
+        $tree .= ' />'.$option['name']."<input type=\"hidden\" name=\"".$this->getName().'[parents]['.$option['id']."]\" value=\"".implode(':', $parentIds)."\" /><input type=\"hidden\" name=\"".$this->getName().'[itemname]['.$option['id']."]\" value=\"".htmlspecialchars($option['name'])."\" /><br />\n";
390 390
         if (isset($option['children'])) {
391 391
             foreach ($option['children'] as $child) {
392 392
                 array_push($parentIds, $option['id']);
393
-                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix . '&nbsp;-', $parentIds);
393
+                $this->renderOptionTree($tree, $this->_optionTree[$child], $prefix.'&nbsp;-', $parentIds);
394 394
             }
395 395
         }
396 396
     }
Please login to merge, or discard this patch.