Completed
Branch master (c92e39)
by Michael
02:32
created
include/search.inc.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,7 +15,7 @@  discard block
 block discarded – undo
15 15
 
16 16
 function smartfaq_search($queryarray, $andor, $limit, $offset, $userid)
17 17
 {
18
-    include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
18
+    include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
19 19
 
20 20
     $ret = array();
21 21
 
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 
26 26
     for ($i = 0, $iMax = count($faqsObj); $i < $iMax; ++$i) {
27 27
         $ret[$i]['image'] = 'assets/images/smartfaq.gif';
28
-        $ret[$i]['link']  = 'faq.php?faqid=' . $faqsObj[$i]->faqid();
28
+        $ret[$i]['link']  = 'faq.php?faqid='.$faqsObj[$i]->faqid();
29 29
         $ret[$i]['title'] = $faqsObj[$i]->question(50);
30 30
         $ret[$i]['time']  = $faqsObj[$i]->getVar('datesub');
31 31
         $ret[$i]['uid']   = $faqsObj[$i]->uid();
Please login to merge, or discard this patch.
include/searchform.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-$categoryID = isset($categoryID) ? (int)$categoryID : 0;
10
-$type       = isset($type) ? (int)$type : 3;
9
+$categoryID = isset($categoryID) ? (int) $categoryID : 0;
10
+$type       = isset($type) ? (int) $type : 3;
11 11
 $term       = isset($term) ? $type : '';
12 12
 
13 13
 $sform = new XoopsThemeForm(_MD_WB_SEARCHFORM, 'searchform', 'search.php');
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     $searchcat = new XoopsFormSelect(_MD_WB_CATEGORY, 'categoryID', $categoryID);
22 22
     $searchcat->addOption('0', _MD_WB_ALLOFTHEM);
23 23
 
24
-    $resultcat = $xoopsDB->query('SELECT categoryID, name FROM ' . $xoopsDB->prefix('wbcategories') . ' ORDER BY categoryID');
24
+    $resultcat = $xoopsDB->query('SELECT categoryID, name FROM '.$xoopsDB->prefix('wbcategories').' ORDER BY categoryID');
25 25
 
26 26
     while (list($categoryID, $name) = $xoopsDB->fetchRow($resultcat)) {
27 27
         $searchcat->addOption('categoryID', "$categoryID : $name");
Please login to merge, or discard this patch.
include/notification.inc.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,22 +34,22 @@
 block discarded – undo
34 34
 
35 35
     if ($category === 'category') {
36 36
         // Assume we have a valid category id
37
-        $sql          = 'SELECT name FROM ' . $xoopsDB->prefix('smartfaq_categories') . ' WHERE categoryid  = ' . $item_id;
37
+        $sql          = 'SELECT name FROM '.$xoopsDB->prefix('smartfaq_categories').' WHERE categoryid  = '.$item_id;
38 38
         $result       = $xoopsDB->query($sql); // TODO: error check
39 39
         $result_array = $xoopsDB->fetchArray($result);
40 40
         $item['name'] = $result_array['name'];
41
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/category.php?categoryid=' . $item_id;
41
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/category.php?categoryid='.$item_id;
42 42
 
43 43
         return $item;
44 44
     }
45 45
 
46 46
     if ($category === 'faq') {
47 47
         // Assume we have a valid story id
48
-        $sql          = 'SELECT question FROM ' . $xoopsDB->prefix('smartfaq_faq') . ' WHERE faqid = ' . $item_id;
48
+        $sql          = 'SELECT question FROM '.$xoopsDB->prefix('smartfaq_faq').' WHERE faqid = '.$item_id;
49 49
         $result       = $xoopsDB->query($sql); // TODO: error check
50 50
         $result_array = $xoopsDB->fetchArray($result);
51 51
         $item['name'] = $result_array['question'];
52
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/faq.php?faqid=' . $item_id;
52
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/faq.php?faqid='.$item_id;
53 53
 
54 54
         return $item;
55 55
     }
Please login to merge, or discard this patch.
include/request.inc.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@
 block discarded – undo
9 9
 
10 10
 global $_POST;
11 11
 
12
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
13
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
14
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
12
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
13
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
14
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
15 15
 
16 16
 $form = new XoopsThemeForm(_MD_SF_REQUEST, 'form', xoops_getenv('PHP_SELF'));
17 17
 // CATEGORY
Please login to merge, or discard this patch.
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.
include/comment_functions.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
 function smartfaq_com_update($faq_id, $total_num)
12 12
 {
13 13
     $db  = XoopsDatabaseFactory::getDatabaseConnection();
14
-    $sql = 'UPDATE ' . $db->prefix('smartfaq_faq') . ' SET comments = ' . $total_num . ' WHERE faqid = ' . $faq_id;
14
+    $sql = 'UPDATE '.$db->prefix('smartfaq_faq').' SET comments = '.$total_num.' WHERE faqid = '.$faq_id;
15 15
     $db->query($sql);
16 16
 }
17 17
 
Please login to merge, or discard this patch.
open_category.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include_once __DIR__ . '/header.php';
9
+include_once __DIR__.'/header.php';
10 10
 
11 11
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
12 12
 
13 13
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.tpl';
14 14
 
15
-include_once XOOPS_ROOT_PATH . '/header.php';
16
-include_once __DIR__ . '/footer.php';
15
+include_once XOOPS_ROOT_PATH.'/header.php';
16
+include_once __DIR__.'/footer.php';
17 17
 
18
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
18
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
19 19
 
20 20
 // Creating the category object for the selected category
21 21
 $categoryObj = new sfCategory($categoryid);
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 $categoryHandler = sf_gethandler('category');
35 35
 
36 36
 // At which record shall we start
37
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
37
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
38 38
 
39 39
 // Creating the faq handler object
40 40
 $faqHandler = sf_gethandler('faq');
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 $last_qnaObj = $faqHandler->getLastPublishedByCat(array(_SF_STATUS_OPENED));
59 59
 if (isset($last_qnaObj[$categoryid])) {
60 60
     $categoryObj->setVar('last_faqid', $last_qnaObj[$categoryid]->getVar('faqid'));
61
-    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$categoryid]->getVar('faqid') . "'>" . $last_qnaObj[$categoryid]->question(50) . '</a>');
61
+    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$categoryid]->getVar('faqid')."'>".$last_qnaObj[$categoryid]->question(50).'</a>');
62 62
 }
63 63
 // Populating the smarty variables with informations related to the selected category
64 64
 $category                 = $categoryObj->toArray(null, true);
@@ -77,16 +77,16 @@  discard block
 block discarded – undo
77 77
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
78 78
             if (isset($last_qnaObj[$subcat_id])) {
79 79
                 $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
80
-                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question(50) . '</a>');
80
+                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question(50).'</a>');
81 81
             }
82 82
             $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
83 83
             $subcats[$subcat_id] = $subcat->toArray(null, true);
84
-            $catQnasWithSub      += $subcats[$subcat_id]['total'];
84
+            $catQnasWithSub += $subcats[$subcat_id]['total'];
85 85
         }
86 86
     }
87 87
     $xoopsTpl->assign('subcats', $subcats);
88 88
 }
89
-$category['total'] = $catQnasWithSub + $totalQnas[$categoryid];
89
+$category['total'] = $catQnasWithSub+$totalQnas[$categoryid];
90 90
 if ($faqsObj) {
91 91
     $userids = array();
92 92
     foreach ($faqsObj as $key => $thisfaq) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     }
96 96
 
97 97
     $memberHandler = xoops_getHandler('member');
98
-    $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
98
+    $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
99 99
     for ($i = 0; $i < $totalQnasOnPage; ++$i) {
100 100
         $faq = $faqsObj[$i]->toArray(null, $allcategories);
101 101
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     }
108 108
 }
109 109
 // Language constants
110
-$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name')) . " > <a href='open_index.php'>" . _MD_SF_OPEN_SECTION . '</a>');
110
+$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name'))." > <a href='open_index.php'>"._MD_SF_OPEN_SECTION.'</a>');
111 111
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());
112 112
 
113 113
 $xoopsTpl->assign('displaylastfaqs', true);
@@ -124,19 +124,19 @@  discard block
 block discarded – undo
124 124
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
125 125
 
126 126
 // The Navigation Bar
127
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
128
-$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
127
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
128
+$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
129 129
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
130
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>';
130
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>';
131 131
 } else {
132
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
132
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
133 133
 }
134 134
 
135 135
 $xoopsTpl->assign('category', $category);
136 136
 
137 137
 // Page Title Hack by marcan
138 138
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
139
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
139
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
140 140
 // End Page Title Hack by marcan
141 141
 
142
-include_once XOOPS_ROOT_PATH . '/footer.php';
142
+include_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
open_index.php 1 patch
Spacing   +18 added lines, -18 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
 $GLOBALS['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,11 +65,11 @@  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);
72
-                $total                                      += $totalQnas[$subcat_id];
72
+                $total += $totalQnas[$subcat_id];
73 73
             }
74 74
         }
75 75
     }
@@ -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,7 +114,7 @@  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(
119 119
                       'lang_on'       => _MD_SF_ON,
120 120
                       'lang_postedby' => _MD_SF_POSTEDBY,
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
                       'lang_hits'     => _MD_SF_HITS
125 125
                   ));
126 126
 
127
-$moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
127
+$moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
128 128
 $xoopsTpl->assign('lang_mainhead', sprintf(_MD_SF_OPEN_WELCOME, $xoopsConfig['sitename']));
129 129
 $xoopsTpl->assign('lang_mainintro', $myts->displayTarea($xoopsModuleConfig['openquestionintromsg'], 1));
130 130
 $xoopsTpl->assign('lang_total', _MD_SF_TOTAL_QUESTIONS);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 $xoopsTpl->assign('lang_description', _MD_SF_DESCRIPTION);
133 133
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
134 134
 $xoopsTpl->assign('sectionname', $moduleName);
135
-$xoopsTpl->assign('whereInSection', "<a href='index.php'>" . $moduleName . '</a> > ' . _MD_SF_OPEN_SECTION);
135
+$xoopsTpl->assign('whereInSection', "<a href='index.php'>".$moduleName.'</a> > '._MD_SF_OPEN_SECTION);
136 136
 
137 137
 $xoopsTpl->assign('displayFull', false);
138 138
 $xoopsTpl->assign('displaylastfaqs', $xoopsModuleConfig['displaylastfaqs']);
@@ -148,25 +148,25 @@  discard block
 block discarded – undo
148 148
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
149 149
 
150 150
 // Category Navigation Bar
151
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
151
+include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
152 152
 $pagenav = new XoopsPageNav($totalCategories, $xoopsModuleConfig['catperpage'], $catstart, 'catstart', '');
153 153
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
154
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
154
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
155 155
 } else {
156
-    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
156
+    $xoopsTpl->assign('catnavbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
157 157
 }
158 158
 
159 159
 // FAQ Navigation Bar
160 160
 $pagenav = new XoopsPageNav($totalFaqs, $xoopsModuleConfig['indexperpage'], $start, 'start', '');
161 161
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
162
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
162
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
163 163
 } else {
164
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
164
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
165 165
 }
166 166
 
167 167
 // Page Title Hack by marcan
168 168
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
169
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category->getVar('name'));
169
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category->getVar('name'));
170 170
 // End Page Title Hack by marcan
171 171
 
172
-include_once XOOPS_ROOT_PATH . '/footer.php';
172
+include_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
footer.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
 $uid     = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
12 12
 $isAdmin = (sf_userIsAdmin() || sf_moderator());
13 13
 
14
-$xoopsTpl->assign('sf_adminpage', "<a href='" . XOOPS_URL . "/modules/smartfaq/admin/index.php'>" . _MD_SF_ADMIN_PAGE . '</a>');
14
+$xoopsTpl->assign('sf_adminpage', "<a href='".XOOPS_URL."/modules/smartfaq/admin/index.php'>"._MD_SF_ADMIN_PAGE.'</a>');
15 15
 $xoopsTpl->assign('isAdmin', $isAdmin);
16 16
 
17 17
 $xoopsTpl->assign(array(
@@ -34,4 +34,4 @@  discard block
 block discarded – undo
34 34
 
35 35
 $xoopsTpl->assign('ref_smartfaq', 'SmartFAQ is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)');
36 36
 
37
-$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='" . XOOPS_URL . "/modules/smartfaq/assets/css/smartfaq.css'/>");
37
+$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartfaq/assets/css/smartfaq.css'/>");
Please login to merge, or discard this patch.