Completed
Branch master (c92e39)
by Michael
02:32
created
class/faq.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -243,7 +243,7 @@  discard block
 block discarded – undo
243 243
     }
244 244
 
245 245
     /**
246
-     * @return mixed
246
+     * @return integer
247 247
      */
248 248
     public function uid()
249 249
     {
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
     /**
755 755
      * insert a new faq in the database
756 756
      *
757
-     * @param  XoopsObject $faq reference to the {@link sfFaq} object
757
+     * @param  sfFaq $faq reference to the {@link sfFaq} object
758 758
      * @param  bool        $force
759 759
      * @return bool        FALSE if failed, TRUE if already present and unchanged or successful
760 760
      */
@@ -1143,7 +1143,7 @@  discard block
 block discarded – undo
1143 1143
      * @param  string $order
1144 1144
      * @param  string $notNullFields
1145 1145
      * @param  bool   $asobject
1146
-     * @param  null   $otherCriteria
1146
+     * @param  null|CriteriaCompo   $otherCriteria
1147 1147
      * @return array
1148 1148
      */
1149 1149
     public function getFaqs(
Please login to merge, or discard this patch.
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -647,16 +647,16 @@  discard block
 block discarded – undo
647 647
         }
648 648
 
649 649
         return $text
650
-               . $xoopsConfig['sitename']
651
-               . ' : <a href='
652
-               . XOOPS_URL
653
-               . '/modules/smartfaq/faq.php?faqid='
654
-               . $this->faqid()
655
-               . '>'
656
-               . XOOPS_URL
657
-               . '/modules/smartfaq/faq.php?faqid='
658
-               . $this->faqid()
659
-               . '</a>';
650
+                . $xoopsConfig['sitename']
651
+                . ' : <a href='
652
+                . XOOPS_URL
653
+                . '/modules/smartfaq/faq.php?faqid='
654
+                . $this->faqid()
655
+                . '>'
656
+                . XOOPS_URL
657
+                . '/modules/smartfaq/faq.php?faqid='
658
+                . $this->faqid()
659
+                . '</a>';
660 660
     }
661 661
 
662 662
     /**
@@ -778,14 +778,14 @@  discard block
 block discarded – undo
778 778
 
779 779
         if ($faq->isNew()) {
780 780
             $sql = sprintf('INSERT INTO %s (faqid, categoryid, question, howdoi, diduno, uid, datesub, `status`, counter, weight, html, smiley, xcodes, cancomment, comments, notifypub, modulelink, contextpage, exacturl, partialview) VALUES (NULL, %u, %s, %s, %s, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %u, %s, %s, %u, %u)',
781
-                           $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, time(), $status,
782
-                           $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub, $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl,
783
-                           $partialview);
781
+                            $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, time(), $status,
782
+                            $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub, $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl,
783
+                            $partialview);
784 784
         } else {
785 785
             $sql = sprintf('UPDATE %s SET categoryid = %u, question = %s, howdoi = %s, diduno = %s, uid = %u, datesub = %u, `status` = %u, counter = %u, weight = %u, html = %u, smiley = %u, xcodes = %u, cancomment = %u, comments = %u, notifypub = %u, modulelink = %s, contextpage = %s, exacturl = %u, partialview = %u  WHERE faqid = %u',
786
-                           $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, $datesub, $status,
787
-                           $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub, $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl,
788
-                           $partialview, $faqid);
786
+                            $this->db->prefix('smartfaq_faq'), $categoryid, $this->db->quoteString($question), $this->db->quoteString($howdoi), $this->db->quoteString($diduno), $uid, $datesub, $status,
787
+                            $counter, $weight, $html, $smiley, $xcodes, $cancomment, $comments, $notifypub, $this->db->quoteString($modulelink), $this->db->quoteString($contextpage), $exacturl,
788
+                            $partialview, $faqid);
789 789
         }
790 790
         if (false != $force) {
791 791
             $result = $this->db->queryF($sql);
@@ -1618,10 +1618,10 @@  discard block
 block discarded – undo
1618 1618
         $criteria->setOrder('DESC');
1619 1619
 
1620 1620
         $sql = 'SELECT faq.faqid, faq.question, faq.datesub, faq.uid FROM '
1621
-               . $this->db->prefix('smartfaq_faq')
1622
-               . ' AS faq INNER JOIN '
1623
-               . $this->db->prefix('smartfaq_answers')
1624
-               . ' AS answer ON faq.faqid = answer.faqid';
1621
+                . $this->db->prefix('smartfaq_faq')
1622
+                . ' AS faq INNER JOIN '
1623
+                . $this->db->prefix('smartfaq_answers')
1624
+                . ' AS answer ON faq.faqid = answer.faqid';
1625 1625
 
1626 1626
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
1627 1627
             $whereClause = $criteria->renderWhere();
Please login to merge, or discard this patch.
open_index.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -116,13 +116,13 @@
 block discarded – undo
116 116
 // Language constants
117 117
 $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
118 118
 $xoopsTpl->assign(array(
119
-                      'lang_on'       => _MD_SF_ON,
120
-                      'lang_postedby' => _MD_SF_POSTEDBY,
121
-                      'lang_total'    => $totalQnasOnPage,
122
-                      'lang_faq'      => _MD_SF_FAQ,
123
-                      'lang_datesub'  => _MD_SF_DATESUB,
124
-                      'lang_hits'     => _MD_SF_HITS
125
-                  ));
119
+                        'lang_on'       => _MD_SF_ON,
120
+                        'lang_postedby' => _MD_SF_POSTEDBY,
121
+                        'lang_total'    => $totalQnasOnPage,
122
+                        'lang_faq'      => _MD_SF_FAQ,
123
+                        'lang_datesub'  => _MD_SF_DATESUB,
124
+                        'lang_hits'     => _MD_SF_HITS
125
+                    ));
126 126
 
127 127
 $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
128 128
 $xoopsTpl->assign('lang_mainhead', sprintf(_MD_SF_OPEN_WELCOME, $xoopsConfig['sitename']));
Please login to merge, or discard this patch.
footer.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@
 block discarded – undo
15 15
 $xoopsTpl->assign('isAdmin', $isAdmin);
16 16
 
17 17
 $xoopsTpl->assign(array(
18
-                      'lang_on'       => _MD_SF_ON,
19
-                      'lang_postedby' => _MD_SF_POSTEDBY,
20
-                      'lang_faq'      => _MD_SF_QUESTION,
21
-                      'lang_datesub'  => _MD_SF_DATESUB,
22
-                      'lang_hits'     => _MD_SF_HITS
23
-                  ));
18
+                        'lang_on'       => _MD_SF_ON,
19
+                        'lang_postedby' => _MD_SF_POSTEDBY,
20
+                        'lang_faq'      => _MD_SF_QUESTION,
21
+                        'lang_datesub'  => _MD_SF_DATESUB,
22
+                        'lang_hits'     => _MD_SF_HITS
23
+                    ));
24 24
 $xoopsTpl->assign('sectionname', $myts->displayTarea($xoopsModule->getVar('name')));
25 25
 
26 26
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());
Please login to merge, or discard this patch.
category.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -136,10 +136,10 @@
 block discarded – undo
136 136
     if (isset($last_qnaObj) && $last_qnaObj) {
137 137
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
138 138
         $category['last_question_link'] = "<a href='faq.php?faqid="
139
-                                          . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')
140
-                                          . "'>"
141
-                                          . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize)
142
-                                          . '</a>';
139
+                                            . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')
140
+                                            . "'>"
141
+                                            . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize)
142
+                                            . '</a>';
143 143
     }
144 144
 }
145 145
 
Please login to merge, or discard this patch.
include/functions.php 1 patch
Indentation   +57 added lines, -57 removed lines patch added patch discarded remove patch
@@ -202,14 +202,14 @@  discard block
 block discarded – undo
202 202
     $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
203 203
 
204 204
     $modfooter = "<a href='"
205
-                 . $smartModule->getInfo('support_site_url')
206
-                 . "' target='_blank'><img src='"
207
-                 . XOOPS_URL
208
-                 . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='"
209
-                 . $modfootertxt
210
-                 . "' alt='"
211
-                 . $modfootertxt
212
-                 . "'/></a>";
205
+                    . $smartModule->getInfo('support_site_url')
206
+                    . "' target='_blank'><img src='"
207
+                    . XOOPS_URL
208
+                    . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='"
209
+                    . $modfootertxt
210
+                    . "' alt='"
211
+                    . $modfootertxt
212
+                    . "'/></a>";
213 213
 
214 214
     return $modfooter;
215 215
 }
@@ -444,70 +444,70 @@  discard block
 block discarded – undo
444 444
     if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
445 445
         // Edit button
446 446
         $adminLinks .= "<a href='"
447
-                       . $modulePath
448
-                       . "admin/$page?op=mod&amp;faqid="
449
-                       . $faqid
450
-                       . "'><img src='"
451
-                       . $modulePath
452
-                       . "assets/images/links/edit.gif'"
453
-                       . " title='"
454
-                       . _MD_SF_EDIT
455
-                       . "' alt='"
456
-                       . _MD_SF_EDIT
457
-                       . "'/></a>";
447
+                        . $modulePath
448
+                        . "admin/$page?op=mod&amp;faqid="
449
+                        . $faqid
450
+                        . "'><img src='"
451
+                        . $modulePath
452
+                        . "assets/images/links/edit.gif'"
453
+                        . " title='"
454
+                        . _MD_SF_EDIT
455
+                        . "' alt='"
456
+                        . _MD_SF_EDIT
457
+                        . "'/></a>";
458 458
         $adminLinks .= ' ';
459 459
         // Delete button
460 460
         $adminLinks .= "<a href='"
461
-                       . $modulePath
462
-                       . "admin/$page?op=del&amp;faqid="
463
-                       . $faqid
464
-                       . "'><img src='"
465
-                       . $modulePath
466
-                       . "assets/images/links/delete.gif'"
467
-                       . " title='"
468
-                       . _MD_SF_DELETE
469
-                       . "' alt='"
470
-                       . _MD_SF_DELETE
471
-                       . "'/></a>";
461
+                        . $modulePath
462
+                        . "admin/$page?op=del&amp;faqid="
463
+                        . $faqid
464
+                        . "'><img src='"
465
+                        . $modulePath
466
+                        . "assets/images/links/delete.gif'"
467
+                        . " title='"
468
+                        . _MD_SF_DELETE
469
+                        . "' alt='"
470
+                        . _MD_SF_DELETE
471
+                        . "'/></a>";
472 472
         $adminLinks .= ' ';
473 473
     }
474 474
     // Print button
475 475
     $adminLinks .= "<a href='"
476
-                   . $modulePath
477
-                   . 'print.php?faqid='
478
-                   . $faqid
479
-                   . "'><img src='"
480
-                   . $modulePath
481
-                   . "assets/images/links/print.gif' title='"
482
-                   . _MD_SF_PRINT
483
-                   . "' alt='"
484
-                   . _MD_SF_PRINT
485
-                   . "'/></a>";
476
+                    . $modulePath
477
+                    . 'print.php?faqid='
478
+                    . $faqid
479
+                    . "'><img src='"
480
+                    . $modulePath
481
+                    . "assets/images/links/print.gif' title='"
482
+                    . _MD_SF_PRINT
483
+                    . "' alt='"
484
+                    . _MD_SF_PRINT
485
+                    . "'/></a>";
486 486
     $adminLinks .= ' ';
487 487
     // Email button
488 488
     $maillink   = 'mailto:?subject='
489
-                  . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename'])
490
-                  . '&amp;body='
491
-                  . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename'])
492
-                  . ':  '
493
-                  . $modulePath
494
-                  . 'faq.php?faqid='
495
-                  . $faqid;
489
+                    . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename'])
490
+                    . '&amp;body='
491
+                    . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename'])
492
+                    . ':  '
493
+                    . $modulePath
494
+                    . 'faq.php?faqid='
495
+                    . $faqid;
496 496
     $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'/></a>";
497 497
     $adminLinks .= ' ';
498 498
     // Submit New Answer button
499 499
     if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
500 500
         $adminLinks .= "<a href='"
501
-                       . $modulePath
502
-                       . 'answer.php?faqid='
503
-                       . $faqid
504
-                       . "'><img src='"
505
-                       . $modulePath
506
-                       . "assets/images/links/newanswer.gif' title='"
507
-                       . _MD_SF_SUBMITANSWER
508
-                       . "' alt='"
509
-                       . _MD_SF_SUBMITANSWER
510
-                       . "'/></a>";
501
+                        . $modulePath
502
+                        . 'answer.php?faqid='
503
+                        . $faqid
504
+                        . "'><img src='"
505
+                        . $modulePath
506
+                        . "assets/images/links/newanswer.gif' title='"
507
+                        . _MD_SF_SUBMITANSWER
508
+                        . "' alt='"
509
+                        . _MD_SF_SUBMITANSWER
510
+                        . "'/></a>";
511 511
         $adminLinks .= ' ';
512 512
     }
513 513
 
Please login to merge, or discard this patch.
include/blocksadmin.inc.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -71,18 +71,18 @@
 block discarded – undo
71 71
     $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
72 72
     $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
73 73
     $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='
74
-                 . _CHARSET
75
-                 . '" /><meta http-equiv="content-language" content="'
76
-                 . _LANGCODE
77
-                 . '" /><title>'
78
-                 . $xoopsConfig['sitename']
79
-                 . '</title><link rel="stylesheet" type="text/css" media="all" href="'
80
-                 . getcss($xoopsConfig['theme_set'])
81
-                 . '" /></head><body><table><tr><th>'
82
-                 . $myblock->getVar('title')
83
-                 . '</th></tr><tr><td>'
84
-                 . $myblock->getContent('S', $bctype)
85
-                 . '</td></tr></table></body></html>';
74
+                    . _CHARSET
75
+                    . '" /><meta http-equiv="content-language" content="'
76
+                    . _LANGCODE
77
+                    . '" /><title>'
78
+                    . $xoopsConfig['sitename']
79
+                    . '</title><link rel="stylesheet" type="text/css" media="all" href="'
80
+                    . getcss($xoopsConfig['theme_set'])
81
+                    . '" /></head><body><table><tr><th>'
82
+                    . $myblock->getVar('title')
83
+                    . '</th></tr><tr><td>'
84
+                    . $myblock->getContent('S', $bctype)
85
+                    . '</td></tr></table></body></html>';
86 86
 
87 87
     $dummyfile = '_dummyfile_' . time() . '.html';
88 88
     $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');
Please login to merge, or discard this patch.
include/displayfaqs.php 1 patch
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -51,25 +51,25 @@  discard block
 block discarded – undo
51 51
     for ($i = 0; $i < $totalFaqsOnPage; ++$i) {
52 52
         $categoryObj = $allCats[$faqsObj[$i]->categoryid()];
53 53
         $modify      = "<a href='faq.php?op=mod&amp;faqid="
54
-                       . $faqsObj[$i]->faqid()
55
-                       . "'><img src='"
56
-                       . $pathIcon16
57
-                       . '/edit.png'
58
-                       . "' title='"
59
-                       . _AM_SF_EDITART
60
-                       . "' alt='"
61
-                       . _AM_SF_EDITART
62
-                       . "' /></a>";
54
+                        . $faqsObj[$i]->faqid()
55
+                        . "'><img src='"
56
+                        . $pathIcon16
57
+                        . '/edit.png'
58
+                        . "' title='"
59
+                        . _AM_SF_EDITART
60
+                        . "' alt='"
61
+                        . _AM_SF_EDITART
62
+                        . "' /></a>";
63 63
         $delete      = "<a href='faq.php?op=del&amp;faqid="
64
-                       . $faqsObj[$i]->faqid()
65
-                       . "'><img src='"
66
-                       . $pathIcon16
67
-                       . '/delete.png'
68
-                       . "' title='"
69
-                       . _AM_SF_EDITART
70
-                       . "' alt='"
71
-                       . _AM_SF_DELETEART
72
-                       . "'/></a>";
64
+                        . $faqsObj[$i]->faqid()
65
+                        . "'><img src='"
66
+                        . $pathIcon16
67
+                        . '/delete.png'
68
+                        . "' title='"
69
+                        . _AM_SF_EDITART
70
+                        . "' alt='"
71
+                        . _AM_SF_DELETEART
72
+                        . "'/></a>";
73 73
 
74 74
         //adding name of the Question Submitter
75 75
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
         echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
101 101
         echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
102 102
         echo "<td class='even' align='left'><a href='"
103
-             . XOOPS_URL
104
-             . '/modules/'
105
-             . $xoopsModule->dirname()
106
-             . '/faq.php?faqid='
107
-             . $faqsObj[$i]->faqid()
108
-             . "'>"
109
-             . $faqsObj[$i]->question(100)
110
-             . '</a></td>';
103
+                . XOOPS_URL
104
+                . '/modules/'
105
+                . $xoopsModule->dirname()
106
+                . '/faq.php?faqid='
107
+                . $faqsObj[$i]->faqid()
108
+                . "'>"
109
+                . $faqsObj[$i]->question(100)
110
+                . '</a></td>';
111 111
 
112 112
         echo "<td class='even' align='center'>" . $requester . '</td>';
113 113
         echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
Please login to merge, or discard this patch.
include/submit.inc.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -82,16 +82,16 @@
 block discarded – undo
82 82
     $delete_attach_checkbox = new XoopsFormCheckBox(_MD_SF_ATTACHED_FILES, 'delete_attach[]');
83 83
     foreach ($attachments as $key => $attachment) {
84 84
         $attach = ' '
85
-                  . _DELETE
86
-                  . ' <a href='
87
-                  . XOOPS_URL
88
-                  . '/'
89
-                  . $xoopsModuleConfig['dir_attachments']
90
-                  . '/'
91
-                  . $attachment['name_saved']
92
-                  . ' rel="external">'
93
-                  . $attachment['name_display']
94
-                  . '</a><br>';
85
+                    . _DELETE
86
+                    . ' <a href='
87
+                    . XOOPS_URL
88
+                    . '/'
89
+                    . $xoopsModuleConfig['dir_attachments']
90
+                    . '/'
91
+                    . $attachment['name_saved']
92
+                    . ' rel="external">'
93
+                    . $attachment['name_display']
94
+                    . '</a><br>';
95 95
         $delete_attach_checkbox->addOption($key, $attach);
96 96
     }
97 97
     $form->addElement($delete_attach_checkbox);
Please login to merge, or discard this patch.
print.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -53,25 +53,25 @@
 block discarded – undo
53 53
 echo "<body bgcolor='#ffffff' text='#000000' onload='window.print()'>
54 54
      <div style='width: 650px; border: 1px solid #000; padding: 20px;'>
55 55
      <div style='text-align: center; display: block; margin: 0 0 6px 0;'><img src='"
56
-     . XOOPS_URL
57
-     . "/modules/smartfaq/assets/images/logo_module.png' border='0' alt='' /><h2 style='margin: 0;'>"
58
-     . $faqObj->question()
59
-     . "</h2></div>
56
+        . XOOPS_URL
57
+        . "/modules/smartfaq/assets/images/logo_module.png' border='0' alt='' /><h2 style='margin: 0;'>"
58
+        . $faqObj->question()
59
+        . "</h2></div>
60 60
      <div align='center'>"
61
-     . $who_where
62
-     . "</div>
61
+        . $who_where
62
+        . "</div>
63 63
                 <div style='text-align: center; display: block; padding-bottom: 12px; margin: 0 0 6px 0; border-bottom: 2px solid #ccc;'></div>
64 64
                 <div></div>
65 65
                 <b><p>"
66
-     . $faqObj->question()
67
-     . '</p></b>
66
+        . $faqObj->question()
67
+        . '</p></b>
68 68
                 <p>'
69
-     . $answerObj->answer()
70
-     . "</p>
69
+        . $answerObj->answer()
70
+        . "</p>
71 71
                 <div style='padding-top: 12px; border-top: 2px solid #ccc;'></div>
72 72
                 <p>"
73
-     . $comeFrom
74
-     . '</p>
73
+        . $comeFrom
74
+        . '</p>
75 75
             </div>
76 76
     <br>';
77 77
 
Please login to merge, or discard this patch.