Completed
Push — master ( 80219e...2744eb )
by Michael
08:05
created
submit.php 2 patches
Switch Indentation   +134 added lines, -134 removed lines patch added patch discarded remove patch
@@ -52,153 +52,153 @@  discard block
 block discarded – undo
52 52
 }
53 53
 
54 54
 switch ($op) {
55
-    case 'preview':
55
+        case 'preview':
56 56
 
57
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
57
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
58 58
 
59
-        $faqObj      = $faqHandler->create();
60
-        $answerObj   = $answerHandler->create();
61
-        $categoryObj = $categoryHandler->get($_POST['categoryid']);
59
+            $faqObj      = $faqHandler->create();
60
+            $answerObj   = $answerHandler->create();
61
+            $categoryObj = $categoryHandler->get($_POST['categoryid']);
62 62
 
63
-        if (!$xoopsUser) {
64
-            if (1 == $xoopsModuleConfig['anonpost']) {
65
-                $uid = 0;
63
+            if (!$xoopsUser) {
64
+                if (1 == $xoopsModuleConfig['anonpost']) {
65
+                    $uid = 0;
66
+                } else {
67
+                    redirect_header('index.php', 3, _NOPERM);
68
+                }
66 69
             } else {
67
-                redirect_header('index.php', 3, _NOPERM);
70
+                $uid = $xoopsUser->uid();
68 71
             }
69
-        } else {
70
-            $uid = $xoopsUser->uid();
71
-        }
72 72
 
73
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
73
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
74 74
 
75
-        // Putting the values about the FAQ in the FAQ object
76
-        $faqObj->setVar('categoryid', $_POST['categoryid']);
77
-        $faqObj->setVar('uid', $uid);
78
-        $faqObj->setVar('question', $_POST['question']);
79
-        $faqObj->setVar('howdoi', $_POST['howdoi']);
80
-        $faqObj->setVar('diduno', $_POST['diduno']);
81
-        $faqObj->setVar('datesub', time());
75
+            // Putting the values about the FAQ in the FAQ object
76
+            $faqObj->setVar('categoryid', $_POST['categoryid']);
77
+            $faqObj->setVar('uid', $uid);
78
+            $faqObj->setVar('question', $_POST['question']);
79
+            $faqObj->setVar('howdoi', $_POST['howdoi']);
80
+            $faqObj->setVar('diduno', $_POST['diduno']);
81
+            $faqObj->setVar('datesub', time());
82 82
 
83
-        // Putting the values in the answer object
84
-        $answerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
85
-        $answerObj->setVar('faqid', $faqObj->faqid());
86
-        $answerObj->setVar('answer', $_POST['answer']);
87
-        $answerObj->setVar('uid', $uid);
83
+            // Putting the values in the answer object
84
+            $answerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
85
+            $answerObj->setVar('faqid', $faqObj->faqid());
86
+            $answerObj->setVar('answer', $_POST['answer']);
87
+            $answerObj->setVar('uid', $uid);
88 88
 
89
-        global $xoopsUser, $myts;
89
+            global $xoopsUser, $myts;
90 90
 
91
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
92
-        require_once XOOPS_ROOT_PATH . '/header.php';
93
-        require_once __DIR__ . '/footer.php';
91
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
92
+            require_once XOOPS_ROOT_PATH . '/header.php';
93
+            require_once __DIR__ . '/footer.php';
94 94
 
95
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
95
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
96 96
 
97
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
98
-        $faq                 = $faqObj->toArray(null, $categoryObj, false);
99
-        $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
100
-        $faq['answer']       = $answerObj->answer();
101
-        $faq['who_when']     = $faqObj->getWhoAndWhen();
97
+            $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
98
+            $faq                 = $faqObj->toArray(null, $categoryObj, false);
99
+            $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
100
+            $faq['answer']       = $answerObj->answer();
101
+            $faq['who_when']     = $faqObj->getWhoAndWhen();
102 102
 
103
-        $faq['comments'] = -1;
104
-        $xoopsTpl->assign('faq', $faq);
105
-        $xoopsTpl->assign('op', 'preview');
106
-        $xoopsTpl->assign('whereInSection', $moduleName);
107
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
103
+            $faq['comments'] = -1;
104
+            $xoopsTpl->assign('faq', $faq);
105
+            $xoopsTpl->assign('op', 'preview');
106
+            $xoopsTpl->assign('whereInSection', $moduleName);
107
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
108 108
 
109
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
110
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
109
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
110
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
111 111
 
112
-        require_once __DIR__ . '/include/submit.inc.php';
112
+            require_once __DIR__ . '/include/submit.inc.php';
113 113
 
114
-        require_once XOOPS_ROOT_PATH . '/footer.php';
114
+            require_once XOOPS_ROOT_PATH . '/footer.php';
115 115
 
116
-        exit();
117
-        break;
116
+            exit();
117
+            break;
118 118
 
119
-    case 'post':
119
+        case 'post':
120 120
 
121
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
121
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
122 122
 
123
-        $newFaqObj    = $faqHandler->create();
124
-        $newAnswerObj = $answerHandler->create();
123
+            $newFaqObj    = $faqHandler->create();
124
+            $newAnswerObj = $answerHandler->create();
125 125
 
126
-        if (!$xoopsUser) {
127
-            if (1 == $xoopsModuleConfig['anonpost']) {
128
-                $uid = 0;
126
+            if (!$xoopsUser) {
127
+                if (1 == $xoopsModuleConfig['anonpost']) {
128
+                    $uid = 0;
129
+                } else {
130
+                    redirect_header('index.php', 3, _NOPERM);
131
+                }
129 132
             } else {
130
-                redirect_header('index.php', 3, _NOPERM);
133
+                $uid = $xoopsUser->uid();
131 134
             }
132
-        } else {
133
-            $uid = $xoopsUser->uid();
134
-        }
135
-
136
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
137
-
138
-        // Putting the values about the FAQ in the FAQ object
139
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
140
-        $newFaqObj->setVar('uid', $uid);
141
-        $newFaqObj->setVar('question', $_POST['question']);
142
-        $newFaqObj->setVar('howdoi', $_POST['howdoi']);
143
-        $newFaqObj->setVar('diduno', $_POST['diduno']);
144
-        $newFaqObj->setVar('notifypub', $notifypub);
145
-        //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
146
-        //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
147 135
 
148
-        // Setting the status of the FAQ
149
-
150
-        // if user is admin, FAQ are automatically published
151
-        $isAdmin = Smartfaq\Utility::userIsAdmin();
152
-        if ($isAdmin) {
153
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
154
-        } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
155
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
156
-        } else {
157
-            $newFaqObj->setVar('status', Constants::SF_STATUS_SUBMITTED);
158
-        }
136
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
137
+
138
+            // Putting the values about the FAQ in the FAQ object
139
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
140
+            $newFaqObj->setVar('uid', $uid);
141
+            $newFaqObj->setVar('question', $_POST['question']);
142
+            $newFaqObj->setVar('howdoi', $_POST['howdoi']);
143
+            $newFaqObj->setVar('diduno', $_POST['diduno']);
144
+            $newFaqObj->setVar('notifypub', $notifypub);
145
+            //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
146
+            //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
147
+
148
+            // Setting the status of the FAQ
149
+
150
+            // if user is admin, FAQ are automatically published
151
+            $isAdmin = Smartfaq\Utility::userIsAdmin();
152
+            if ($isAdmin) {
153
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
154
+            } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
155
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
156
+            } else {
157
+                $newFaqObj->setVar('status', Constants::SF_STATUS_SUBMITTED);
158
+            }
159 159
 
160
-        // Storing the FAQ object in the database
161
-        if (!$newFaqObj->store()) {
162
-            redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
163
-        }
160
+            // Storing the FAQ object in the database
161
+            if (!$newFaqObj->store()) {
162
+                redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
163
+            }
164 164
 
165
-        // Putting the values in the answer object
166
-        $newAnswerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
167
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
168
-        $newAnswerObj->setVar('answer', $_POST['answer']);
169
-        $newAnswerObj->setVar('uid', $uid);
170
-
171
-        //====================================================================================
172
-        //TODO post Attachment
173
-        $attachments_tmp = [];
174
-        if (!empty($_POST['attachments_tmp'])) {
175
-            $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
176
-            if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
177
-                foreach ($_POST['delete_tmp'] as $key) {
178
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
179
-                    unset($attachments_tmp[$key]);
165
+            // Putting the values in the answer object
166
+            $newAnswerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
167
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
168
+            $newAnswerObj->setVar('answer', $_POST['answer']);
169
+            $newAnswerObj->setVar('uid', $uid);
170
+
171
+            //====================================================================================
172
+            //TODO post Attachment
173
+            $attachments_tmp = [];
174
+            if (!empty($_POST['attachments_tmp'])) {
175
+                $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
176
+                if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
177
+                    foreach ($_POST['delete_tmp'] as $key) {
178
+                        unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
179
+                        unset($attachments_tmp[$key]);
180
+                    }
180 181
                 }
181 182
             }
182
-        }
183
-        if (count($attachments_tmp)) {
184
-            foreach ($attachments_tmp as $key => $attach) {
185
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
186
-                    $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
183
+            if (count($attachments_tmp)) {
184
+                foreach ($attachments_tmp as $key => $attach) {
185
+                    if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
186
+                        $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
187
+                    }
187 188
                 }
188 189
             }
189
-        }
190
-        $error_upload = '';
190
+            $error_upload = '';
191 191
 
192
-        if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
193
-            && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
194
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
195
-            $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
196
-            $uploaddir   = XOOPS_CACHE_PATH;
192
+            if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
193
+                && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
194
+                require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
195
+                $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
196
+                $uploaddir   = XOOPS_CACHE_PATH;
197 197
 
198
-            $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
198
+                $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
199 199
 
200
-            if ($_FILES['userfile']['error'] > 0) {
201
-                switch ($_FILES['userfile']['error']) {
200
+                if ($_FILES['userfile']['error'] > 0) {
201
+                    switch ($_FILES['userfile']['error']) {
202 202
                     case 1:
203 203
                         $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
204 204
                         break;
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
                     default:
209 209
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
210 210
                         break;
211
-                }
211
+                    }
212 212
             } else {
213 213
                 $uploader->setCheckMediaTypeByExt();
214 214
 
@@ -271,30 +271,30 @@  discard block
 block discarded – undo
271 271
         redirect_header('index.php', 2, $redirect_msg);
272 272
         break;
273 273
 
274
-    case 'form':
275
-    default:
274
+        case 'form':
275
+        default:
276 276
 
277
-        global $xoopsUser, $myts;
277
+            global $xoopsUser, $myts;
278 278
 
279
-        $faqObj      = $faqHandler->create();
280
-        $answerObj   = $answerHandler->create();
281
-        $categoryObj = $categoryHandler->create();
279
+            $faqObj      = $faqHandler->create();
280
+            $answerObj   = $answerHandler->create();
281
+            $categoryObj = $categoryHandler->create();
282 282
 
283
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
284
-        require_once XOOPS_ROOT_PATH . '/header.php';
285
-        require_once __DIR__ . '/footer.php';
283
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
284
+            require_once XOOPS_ROOT_PATH . '/header.php';
285
+            require_once __DIR__ . '/footer.php';
286 286
 
287
-        $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
288
-        $notifypub  = 1;
289
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
290
-        $xoopsTpl->assign('whereInSection', $moduleName);
291
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
287
+            $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
288
+            $notifypub  = 1;
289
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
290
+            $xoopsTpl->assign('whereInSection', $moduleName);
291
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
292 292
 
293
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
294
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
293
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
294
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
295 295
 
296
-        require_once __DIR__ . '/include/submit.inc.php';
296
+            require_once __DIR__ . '/include/submit.inc.php';
297 297
 
298
-        require_once XOOPS_ROOT_PATH . '/footer.php';
299
-        break;
298
+            require_once XOOPS_ROOT_PATH . '/footer.php';
299
+            break;
300 300
 }
Please login to merge, or discard this patch.
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 use XoopsModules\Smartfaq;
10 10
 use XoopsModules\Smartfaq\Constants;
11 11
 
12
-require_once __DIR__ . '/header.php';
12
+require_once __DIR__.'/header.php';
13 13
 
14 14
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
15 15
 
@@ -89,12 +89,12 @@  discard block
 block discarded – undo
89 89
         global $xoopsUser, $myts;
90 90
 
91 91
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
92
-        require_once XOOPS_ROOT_PATH . '/header.php';
93
-        require_once __DIR__ . '/footer.php';
92
+        require_once XOOPS_ROOT_PATH.'/header.php';
93
+        require_once __DIR__.'/footer.php';
94 94
 
95 95
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
96 96
 
97
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
97
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
98 98
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
99 99
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
100 100
         $faq['answer']       = $answerObj->answer();
@@ -107,11 +107,11 @@  discard block
 block discarded – undo
107 107
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
108 108
 
109 109
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
110
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
110
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
111 111
 
112
-        require_once __DIR__ . '/include/submit.inc.php';
112
+        require_once __DIR__.'/include/submit.inc.php';
113 113
 
114
-        require_once XOOPS_ROOT_PATH . '/footer.php';
114
+        require_once XOOPS_ROOT_PATH.'/footer.php';
115 115
 
116 116
         exit();
117 117
         break;
@@ -175,14 +175,14 @@  discard block
 block discarded – undo
175 175
             $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
176 176
             if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
177 177
                 foreach ($_POST['delete_tmp'] as $key) {
178
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
178
+                    unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0]);
179 179
                     unset($attachments_tmp[$key]);
180 180
                 }
181 181
             }
182 182
         }
183 183
         if (count($attachments_tmp)) {
184 184
             foreach ($attachments_tmp as $key => $attach) {
185
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
185
+                if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0])) {
186 186
                     $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
187 187
                 }
188 188
             }
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 
192 192
         if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
193 193
             && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
194
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
194
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
195 195
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
196 196
             $uploaddir   = XOOPS_CACHE_PATH;
197 197
 
@@ -213,19 +213,19 @@  discard block
 block discarded – undo
213 213
                 $uploader->setCheckMediaTypeByExt();
214 214
 
215 215
                 if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
216
-                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid() . '_' : 'newbb_';
216
+                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid().'_' : 'newbb_';
217 217
                     $uploader->setPrefix($prefix);
218 218
                     if (!$uploader->upload()) {
219
-                        $error_message[] = $error_upload =& $uploader->getErrors();
219
+                        $error_message[] = $error_upload = & $uploader->getErrors();
220 220
                     } else {
221 221
                         if (is_file($uploader->getSavedDestination())) {
222
-                            if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $uploader->getSavedFileName())) {
222
+                            if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$uploader->getSavedFileName())) {
223 223
                                 $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
224 224
                             }
225 225
                         }
226 226
                     }
227 227
                 } else {
228
-                    $error_message[] = $error_upload =& $uploader->getErrors();
228
+                    $error_message[] = $error_upload = & $uploader->getErrors();
229 229
                 }
230 230
             }
231 231
         }
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
         } else {
259 259
             // Subscribe the user to On Published notification, if requested
260 260
             if (1 == $notifypub) {
261
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
261
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
262 262
                 $notificationHandler = xoops_getHandler('notification');
263 263
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
264 264
             }
@@ -281,20 +281,20 @@  discard block
 block discarded – undo
281 281
         $categoryObj = $categoryHandler->create();
282 282
 
283 283
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
284
-        require_once XOOPS_ROOT_PATH . '/header.php';
285
-        require_once __DIR__ . '/footer.php';
284
+        require_once XOOPS_ROOT_PATH.'/header.php';
285
+        require_once __DIR__.'/footer.php';
286 286
 
287 287
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
288 288
         $notifypub  = 1;
289
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
289
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
290 290
         $xoopsTpl->assign('whereInSection', $moduleName);
291 291
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
292 292
 
293 293
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
294
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
294
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
295 295
 
296
-        require_once __DIR__ . '/include/submit.inc.php';
296
+        require_once __DIR__.'/include/submit.inc.php';
297 297
 
298
-        require_once XOOPS_ROOT_PATH . '/footer.php';
298
+        require_once XOOPS_ROOT_PATH.'/footer.php';
299 299
         break;
300 300
 }
Please login to merge, or discard this patch.
admin/mygroupperm.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
             $criteria->add(new \Criteria('gperm_itemid', (int)$gperm_itemid));
23 23
         }
24 24
     }
25
-    $sql = 'DELETE FROM ' . $db->prefix('group_permission') . ' ' . $criteria->renderWhere();
25
+    $sql = 'DELETE FROM '.$db->prefix('group_permission').' '.$criteria->renderWhere();
26 26
     if (!$result = $db->query($sql)) {
27 27
         return false;
28 28
     }
@@ -34,16 +34,16 @@  discard block
 block discarded – undo
34 34
 $modid = isset($_POST['modid']) ? (int)$_POST['modid'] : 1;
35 35
 // we dont want system module permissions to be changed here ( 1 -> 0 GIJ)
36 36
 if ($modid <= 0 || !is_object($xoopsUser) || !$xoopsUser->isAdmin($modid)) {
37
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
37
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
38 38
 }
39 39
 /** @var XoopsModuleHandler $moduleHandler */
40 40
 $moduleHandler = xoops_getHandler('module');
41 41
 $module        = $moduleHandler->get($modid);
42 42
 if (!is_object($module) || !$module->getVar('isactive')) {
43
-    redirect_header(XOOPS_URL . '/admin.php', 1, _MODULENOEXIST);
43
+    redirect_header(XOOPS_URL.'/admin.php', 1, _MODULENOEXIST);
44 44
 }
45 45
 $memberHandler = xoops_getHandler('member');
46
-$group_list    =& $memberHandler->getGroupList();
46
+$group_list    = & $memberHandler->getGroupList();
47 47
 if (is_array($_POST['perms']) && !empty($_POST['perms'])) {
48 48
     $gpermHandler = xoops_getHandler('groupperm');
49 49
     foreach ($_POST['perms'] as $perm_name => $perm_data) {
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
                             foreach ($parent_ids as $pid) {
67 67
                                 if (0 != $pid && !in_array($pid, array_keys($item_ids))) {
68 68
                                     // one of the parent items were not selected, so skip this item
69
-                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>') . ' (' . _MD_AM_PERMADDNGP . ')';
69
+                                    $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>').' ('._MD_AM_PERMADDNGP.')';
70 70
                                     continue 2;
71 71
                                 }
72 72
                             }
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
                         $gperm->setVar('gperm_modid', $modid);
78 78
                         $gperm->setVar('gperm_itemid', $item_id);
79 79
                         if (!$gpermHandler->insert($gperm)) {
80
-                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
80
+                            $msg[] = sprintf(_MD_AM_PERMADDNG, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
81 81
                         } else {
82
-                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>' . $perm_name . '</b>', '<b>' . $perm_data['itemname'][$item_id] . '</b>', '<b>' . $group_list[$group_id] . '</b>');
82
+                            $msg[] = sprintf(_MD_AM_PERMADDOK, '<b>'.$perm_name.'</b>', '<b>'.$perm_data['itemname'][$item_id].'</b>', '<b>'.$group_list[$group_id].'</b>');
83 83
                         }
84 84
                         unset($gperm);
85 85
                     }
Please login to merge, or discard this patch.
admin/myblocksadmin.php 2 patches
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -174,22 +174,22 @@  discard block
 block discarded – undo
174 174
             </td>
175 175
             <td class='$class' align='center' nowrap='nowrap'>
176 176
                 <input type='radio' name='side[$bid]' value='"
177
-             . Constants::XOOPS_SIDEBLOCK_LEFT
178
-             . "'$ssel0>-<input type='radio' name='side[$bid]' value='"
179
-             . Constants::XOOPS_CENTERBLOCK_LEFT
180
-             . "'$ssel2><input type='radio' name='side[$bid]' value='"
181
-             . Constants::XOOPS_CENTERBLOCK_CENTER
182
-             . "'$ssel3><input type='radio' name='side[$bid]' value='"
183
-             . Constants::XOOPS_CENTERBLOCK_RIGHT
184
-             . "'$ssel4>-<input type='radio' name='side[$bid]' value='"
185
-             . Constants::XOOPS_SIDEBLOCK_RIGHT
186
-             . "'$ssel1>
177
+                . Constants::XOOPS_SIDEBLOCK_LEFT
178
+                . "'$ssel0>-<input type='radio' name='side[$bid]' value='"
179
+                . Constants::XOOPS_CENTERBLOCK_LEFT
180
+                . "'$ssel2><input type='radio' name='side[$bid]' value='"
181
+                . Constants::XOOPS_CENTERBLOCK_CENTER
182
+                . "'$ssel3><input type='radio' name='side[$bid]' value='"
183
+                . Constants::XOOPS_CENTERBLOCK_RIGHT
184
+                . "'$ssel4>-<input type='radio' name='side[$bid]' value='"
185
+                . Constants::XOOPS_SIDEBLOCK_RIGHT
186
+                . "'$ssel1>
187 187
                 <br>
188 188
                 <br>
189 189
                 <input type='radio' name='side[$bid]' value='-1'$sseln>
190 190
                 "
191
-             . _NONE
192
-             . "
191
+                . _NONE
192
+                . "
193 193
             </td>
194 194
             <td class='$class' align='center'>
195 195
                 <input type='text' name=weight[$bid] value='$weight' size='5' maxlength='5' style='text-align:right;'>
@@ -206,8 +206,8 @@  discard block
 block discarded – undo
206 206
             </td>
207 207
             <td class='$class' align='center'>
208 208
                 <a href='admin.php?fct=blocksadmin&amp;op=edit&amp;bid=$bid'>"
209
-             . _EDIT
210
-             . "</a>
209
+                . _EDIT
210
+                . "</a>
211 211
                 <input type='hidden' name='bid[$bid]' value='$bid'>
212 212
             </td>
213 213
         </tr>\n";
@@ -240,14 +240,14 @@  discard block
 block discarded – undo
240 240
     }
241 241
 
242 242
     $form = new GroupPermForm('', 1, 'block_read', "<img id='bottomtableicon' src="
243
-                                                          . XOOPS_URL
244
-                                                          . '/modules/'
245
-                                                          . $xoopsModule->dirname()
246
-                                                          . "/assets/images/icon/close12.gif alt=''></a>&nbsp;"
247
-                                                          . _AM_SF_GROUPS
248
-                                                          . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
249
-                                                          . _AM_SF_GROUPSINFO
250
-                                                          . '</span>');
243
+                                                            . XOOPS_URL
244
+                                                            . '/modules/'
245
+                                                            . $xoopsModule->dirname()
246
+                                                            . "/assets/images/icon/close12.gif alt=''></a>&nbsp;"
247
+                                                            . _AM_SF_GROUPS
248
+                                                            . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
249
+                                                            . _AM_SF_GROUPSINFO
250
+                                                            . '</span>');
251 251
     $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACTIVERIGHTS);
252 252
     $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACCESSRIGHTS);
253 253
     foreach ($item_list as $item_id => $item_name) {
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -15,12 +15,12 @@  discard block
 block discarded – undo
15 15
 use XoopsModules\Smartfaq;
16 16
 use XoopsModules\Smartfaq\Constants;
17 17
 
18
-require_once __DIR__ . '/../../../include/cp_header.php';
19
-require_once __DIR__ . '/mygrouppermform.php';
20
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
18
+require_once __DIR__.'/../../../include/cp_header.php';
19
+require_once __DIR__.'/mygrouppermform.php';
20
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
21 21
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/include/functions.php';
22 22
 
23
-$xoops_system_path = XOOPS_ROOT_PATH . '/modules/system';
23
+$xoops_system_path = XOOPS_ROOT_PATH.'/modules/system';
24 24
 
25 25
 // language files
26 26
 $language = $xoopsConfig['language'];
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 
31 31
 // to prevent from notice that constants already defined
32 32
 $error_reporting_level = error_reporting(0);
33
-require_once __DIR__ . '/../../system/constants.php';
34
-require_once __DIR__ . "/../../language/$language/admin.php";
35
-require_once __DIR__ . "/../../language/$language/admin/blocksadmin.php";
33
+require_once __DIR__.'/../../system/constants.php';
34
+require_once __DIR__."/../../language/$language/admin.php";
35
+require_once __DIR__."/../../language/$language/admin/blocksadmin.php";
36 36
 //require_once __DIR__ . '/../include/functions.php';
37 37
 error_reporting($error_reporting_level);
38 38
 
@@ -45,13 +45,13 @@  discard block
 block discarded – undo
45 45
 
46 46
 // check $xoopsModule
47 47
 if (!is_object($xoopsModule)) {
48
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
48
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
49 49
 }
50 50
 
51 51
 // check access right (needs system_admin of BLOCK)
52 52
 $syspermHandler = xoops_getHandler('groupperm');
53 53
 if (!$syspermHandler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) {
54
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
54
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
55 55
 }
56 56
 
57 57
 // get blocks owned by the module
@@ -78,20 +78,20 @@  discard block
 block discarded – undo
78 78
 
79 79
     // displaying TH
80 80
     Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
81
-    echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_BLOCKS . '</h3>';
81
+    echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_BLOCKS.'</h3>';
82 82
     echo "<div id='toptable'>";
83
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_BLOCKSTXT . '</span>';
83
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_BLOCKSTXT.'</span>';
84 84
 
85 85
     echo "
86 86
     <form action='admin.php' name='blockadmin' method='post'>
87 87
         <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
88 88
         <tr valign='middle'>
89
-            <th>" . _AM_TITLE . "</th>
90
-            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION . "</th>
91
-            <th align='center'>" . _AM_WEIGHT . "</th>
92
-            <th align='center'>" . _AM_VISIBLEIN . "</th>
93
-            <th align='center'>" . _AM_BCACHETIME . "</th>
94
-            <th align='center'>" . _AM_ACTION . "</th>
89
+            <th>" . _AM_TITLE."</th>
90
+            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION."</th>
91
+            <th align='center'>" . _AM_WEIGHT."</th>
92
+            <th align='center'>" . _AM_VISIBLEIN."</th>
93
+            <th align='center'>" . _AM_BCACHETIME."</th>
94
+            <th align='center'>" . _AM_ACTION."</th>
95 95
         </tr>\n";
96 96
 
97 97
     // blocks displaying loop
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
 
142 142
         // target modules
143 143
         $db            = \XoopsDatabaseFactory::getDatabaseConnection();
144
-        $result        = $db->query('SELECT module_id FROM ' . $db->prefix('block_module_link') . " WHERE block_id='$bid'");
144
+        $result        = $db->query('SELECT module_id FROM '.$db->prefix('block_module_link')." WHERE block_id='$bid'");
145 145
         $selected_mids = [];
146 146
         while (false !== (list($selected_mid) = $db->fetchRow($result))) {
147 147
             $selected_mids[] = (int)$selected_mid;
@@ -158,9 +158,9 @@  discard block
 block discarded – undo
158 158
         $myts           = \MyTextSanitizer::getInstance();
159 159
         foreach ($module_list as $mid => $mname) {
160 160
             if (in_array($mid, $selected_mids)) {
161
-                $module_options .= "<option value='$mid' selected>" . $myts->displayTarea($mname) . "</option>\n";
161
+                $module_options .= "<option value='$mid' selected>".$myts->displayTarea($mname)."</option>\n";
162 162
             } else {
163
-                $module_options .= "<option value='$mid'>" . $myts->displayTarea($mname) . "</option>\n";
163
+                $module_options .= "<option value='$mid'>".$myts->displayTarea($mname)."</option>\n";
164 164
             }
165 165
         }
166 166
 
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
220 220
             <td class='foot' align='center' colspan='6'>
221 221
                 <input type='hidden' name='fct' value='blocksadmin'>
222 222
                 <input type='hidden' name='op' value='order'>
223
-                <input type='submit' name='submit' value='" . _SUBMIT . "'>
223
+                <input type='submit' name='submit' value='" . _SUBMIT."'>
224 224
             </td>
225 225
         </tr>
226 226
         </table>
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
                                                           . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
249 249
                                                           . _AM_SF_GROUPSINFO
250 250
                                                           . '</span>');
251
-    $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACTIVERIGHTS);
252
-    $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACCESSRIGHTS);
251
+    $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACTIVERIGHTS);
252
+    $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACCESSRIGHTS);
253 253
     foreach ($item_list as $item_id => $item_name) {
254 254
         $form->addItem($item_id, $myts->displayTarea($item_name));
255 255
     }
@@ -258,14 +258,14 @@  discard block
 block discarded – undo
258 258
 }
259 259
 
260 260
 if (!empty($_POST['submit'])) {
261
-    include __DIR__ . '/mygroupperm.php';
261
+    include __DIR__.'/mygroupperm.php';
262 262
     require_once "$xoops_system_path/language/$language/admin.php";
263
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
263
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
264 264
 }
265 265
 
266 266
 xoops_cp_header();
267 267
 if (file_exists('./mymenu.php')) {
268
-    include __DIR__ . '/mymenu.php';
268
+    include __DIR__.'/mymenu.php';
269 269
 }
270 270
 
271 271
 list_blocks();
Please login to merge, or discard this patch.
class/Utility.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
                 break;
72 72
 
73 73
             case 'inside':
74
-                return XOOPS_URL . '/modules/smartfaq/doc/';
74
+                return XOOPS_URL.'/modules/smartfaq/doc/';
75 75
                 break;
76 76
 
77 77
             case 'custom':
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
     {
89 89
         $ret = '';
90 90
         foreach ($errors as $key => $value) {
91
-            $ret .= '<br> - ' . $value;
91
+            $ret .= '<br> - '.$value;
92 92
         }
93 93
 
94 94
         return $ret;
@@ -112,13 +112,13 @@  discard block
 block discarded – undo
112 112
             $spaces .= '--';
113 113
         }
114 114
 
115
-        $ret .= "<option value='" . $categoryObj->categoryid() . "'";
115
+        $ret .= "<option value='".$categoryObj->categoryid()."'";
116 116
         if ($selectedid == $categoryObj->categoryid()) {
117 117
             $ret .= ' selected';
118 118
         }
119
-        $ret .= '>' . $spaces . $categoryObj->name() . "</option>\n";
119
+        $ret .= '>'.$spaces.$categoryObj->name()."</option>\n";
120 120
 
121
-        $subCategoriesObj =& $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
121
+        $subCategoriesObj = & $categoryHandler->getCategories(0, 0, $categoryObj->categoryid());
122 122
         if (count($subCategoriesObj) > 0) {
123 123
             ++$level;
124 124
             foreach ($subCategoriesObj as $catID => $subCategoryObj) {
@@ -137,10 +137,10 @@  discard block
 block discarded – undo
137 137
      */
138 138
     public static function createCategorySelect($selectedid = 0, $parentcategory = 0, $allCatOption = true)
139 139
     {
140
-        $ret = '' . _MB_SF_SELECTCAT . "&nbsp;<select name='options[]'>";
140
+        $ret = ''._MB_SF_SELECTCAT."&nbsp;<select name='options[]'>";
141 141
         if ($allCatOption) {
142 142
             $ret .= "<option value='0'";
143
-            $ret .= '>' . _MB_SF_ALLCAT . "</option>\n";
143
+            $ret .= '>'._MB_SF_ALLCAT."</option>\n";
144 144
         }
145 145
 
146 146
         // Creating the category handler object
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
     {
210 210
         $smartModule = self::getModuleInfo();
211 211
 
212
-        $modfootertxt = 'Module ' . $smartModule->getInfo('name') . ' - Version ' . $smartModule->getInfo('version') . '';
212
+        $modfootertxt = 'Module '.$smartModule->getInfo('name').' - Version '.$smartModule->getInfo('version').'';
213 213
 
214
-        $modfooter = "<a href='" . $smartModule->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . "/modules/smartfaq/assets/images/sfcssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
214
+        $modfooter = "<a href='".$smartModule->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL."/modules/smartfaq/assets/images/sfcssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
215 215
 
216 216
         return $modfooter;
217 217
     }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
         $module_id   = $smartModule->getVar('mid');
234 234
 
235 235
         if (!empty($xoopsUser)) {
236
-            $groups =& $xoopsUser->getGroups();
236
+            $groups = & $xoopsUser->getGroups();
237 237
             $result = in_array(XOOPS_GROUP_ADMIN, $groups) || $xoopsUser->isAdmin($module_id);
238 238
         }
239 239
 
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 
308 308
         $gpermHandler = xoops_getHandler('groupperm');
309 309
 
310
-        $sql    = 'SELECT faqid FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE categoryid = '$categoryid' ";
310
+        $sql    = 'SELECT faqid FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE categoryid = '$categoryid' ";
311 311
         $result = $xoopsDB->queryF($sql);
312 312
 
313 313
         if ($GLOBALS['xoopsDB']->getRowsNum($result) > 0) {
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
         $ret = [];
423 423
         global $xoopsDB;
424 424
 
425
-        $result = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_faq') . " WHERE faqid = '$faqid'");
425
+        $result = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_faq')." WHERE faqid = '$faqid'");
426 426
         $ret    = $xoopsDB->fetchArray($result);
427 427
 
428 428
         return $ret;
@@ -441,26 +441,26 @@  discard block
 block discarded – undo
441 441
     {
442 442
         global $xoopsUser, $xoopsModule, $xoopsModuleConfig, $xoopsConfig;
443 443
         $adminLinks = '';
444
-        $modulePath = XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/';
444
+        $modulePath = XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/';
445 445
         $page       = $open ? 'question.php' : 'faq.php';
446 446
         if ($xoopsUser && $xoopsUser->isAdmin($xoopsModule->getVar('mid'))) {
447 447
             // Edit button
448
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=mod&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/edit.gif'" . " title='" . _MD_SF_EDIT . "' alt='" . _MD_SF_EDIT . "'></a>";
448
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=mod&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/edit.gif'"." title='"._MD_SF_EDIT."' alt='"._MD_SF_EDIT."'></a>";
449 449
             $adminLinks .= ' ';
450 450
             // Delete button
451
-            $adminLinks .= "<a href='" . $modulePath . "admin/$page?op=del&amp;faqid=" . $faqid . "'><img src='" . $modulePath . "assets/images/links/delete.gif'" . " title='" . _MD_SF_DELETE . "' alt='" . _MD_SF_DELETE . "'></a>";
451
+            $adminLinks .= "<a href='".$modulePath."admin/$page?op=del&amp;faqid=".$faqid."'><img src='".$modulePath."assets/images/links/delete.gif'"." title='"._MD_SF_DELETE."' alt='"._MD_SF_DELETE."'></a>";
452 452
             $adminLinks .= ' ';
453 453
         }
454 454
         // Print button
455
-        $adminLinks .= "<a href='" . $modulePath . 'print.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/print.gif' title='" . _MD_SF_PRINT . "' alt='" . _MD_SF_PRINT . "'></a>";
455
+        $adminLinks .= "<a href='".$modulePath.'print.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/print.gif' title='"._MD_SF_PRINT."' alt='"._MD_SF_PRINT."'></a>";
456 456
         $adminLinks .= ' ';
457 457
         // Email button
458
-        $maillink   = 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&amp;body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . $modulePath . 'faq.php?faqid=' . $faqid;
459
-        $adminLinks .= '<a href="' . $maillink . "\"><img src='" . $modulePath . "assets/images/links/friend.gif' title='" . _MD_SF_MAIL . "' alt='" . _MD_SF_MAIL . "'></a>";
458
+        $maillink = 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&amp;body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.$modulePath.'faq.php?faqid='.$faqid;
459
+        $adminLinks .= '<a href="'.$maillink."\"><img src='".$modulePath."assets/images/links/friend.gif' title='"._MD_SF_MAIL."' alt='"._MD_SF_MAIL."'></a>";
460 460
         $adminLinks .= ' ';
461 461
         // Submit New Answer button
462 462
         if ($xoopsModuleConfig['allownewanswer'] && (is_object($xoopsUser) || $xoopsModuleConfig['anonpost'])) {
463
-            $adminLinks .= "<a href='" . $modulePath . 'answer.php?faqid=' . $faqid . "'><img src='" . $modulePath . "assets/images/links/newanswer.gif' title='" . _MD_SF_SUBMITANSWER . "' alt='" . _MD_SF_SUBMITANSWER . "'></a>";
463
+            $adminLinks .= "<a href='".$modulePath.'answer.php?faqid='.$faqid."'><img src='".$modulePath."assets/images/links/newanswer.gif' title='"._MD_SF_SUBMITANSWER."' alt='"._MD_SF_SUBMITANSWER."'></a>";
464 464
             $adminLinks .= ' ';
465 465
         }
466 466
 
@@ -491,7 +491,7 @@  discard block
 block discarded – undo
491 491
                 if (!isset($users[$userid])) {
492 492
                     return $GLOBALS['xoopsConfig']['anonymous'];
493 493
                 }
494
-                $user =& $users[$userid];
494
+                $user = & $users[$userid];
495 495
             }
496 496
 
497 497
             if (is_object($user)) {
@@ -505,9 +505,9 @@  discard block
 block discarded – undo
505 505
                     $fullname = $user->getVar('name');
506 506
                 }
507 507
                 if (!empty($fullname)) {
508
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
508
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
509 509
                 } else {
510
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
510
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
511 511
                 }
512 512
 
513 513
                 return $linkeduser;
@@ -589,6 +589,6 @@  discard block
 block discarded – undo
589 589
             //-->
590 590
         </script>
591 591
         <?php
592
-        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('" . $tablename . "'); toggleIcon('" . $iconname . "');\">";
592
+        echo "<h3 style=\"color: #2F5376; margin: 6px 0 0 0; \"><a href='#' onClick=\"toggle('".$tablename."'); toggleIcon('".$iconname."');\">";
593 593
     }
594 594
 }
Please login to merge, or discard this patch.
class/Tree.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
     {
70 70
         $selectId = (int)$selectId;
71 71
         $arr      = [];
72
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
72
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
73 73
         if ('' !== $order) {
74 74
             $sql .= " ORDER BY $order";
75 75
         }
@@ -96,7 +96,7 @@  discard block
 block discarded – undo
96 96
     {
97 97
         $selectId = (int)$selectId;
98 98
         $idarray  = [];
99
-        $result   = $this->db->query('SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '');
99
+        $result   = $this->db->query('SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'');
100 100
         $count    = $this->db->getRowsNum($result);
101 101
         if (0 == $count) {
102 102
             return $idarray;
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
     public function getAllChildId($selectId, $order = '', array $idarray = [])
121 121
     {
122 122
         $selectId = (int)$selectId;
123
-        $sql      = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
123
+        $sql      = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'';
124 124
         if ('' !== $order) {
125 125
             $sql .= " ORDER BY $order";
126 126
         }
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
     public function getAllParentId($selectId, $order = '', array $idarray = [])
150 150
     {
151 151
         $selectId = (int)$selectId;
152
-        $sql      = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $selectId . '';
152
+        $sql      = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$selectId.'';
153 153
         if ('' !== $order) {
154 154
             $sql .= " ORDER BY $order";
155 155
         }
@@ -176,14 +176,14 @@  discard block
 block discarded – undo
176 176
     public function getPathFromId($selectId, $title, $path = '')
177 177
     {
178 178
         $selectId = (int)$selectId;
179
-        $result   = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
179
+        $result   = $this->db->query('SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
180 180
         if (0 == $this->db->getRowsNum($result)) {
181 181
             return $path;
182 182
         }
183 183
         list($parentid, $name) = $this->db->fetchRow($result);
184 184
         $myts = \MyTextSanitizer::getInstance();
185 185
         $name = $myts->htmlspecialchars($name);
186
-        $path = '/' . $name . $path . '';
186
+        $path = '/'.$name.$path.'';
187 187
         if (0 == $parentid) {
188 188
             return $path;
189 189
         }
@@ -209,12 +209,12 @@  discard block
 block discarded – undo
209 209
             $sel_name = $this->id;
210 210
         }
211 211
         $myts = \MyTextSanitizer::getInstance();
212
-        echo "<select name='" . $sel_name . "'";
212
+        echo "<select name='".$sel_name."'";
213 213
         if ('' !== $onchange) {
214
-            echo " onchange='" . $onchange . "'";
214
+            echo " onchange='".$onchange."'";
215 215
         }
216 216
         echo ">\n";
217
-        $sql = 'SELECT ' . $this->id . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=0';
217
+        $sql = 'SELECT '.$this->id.', '.$title.' FROM '.$this->table.' WHERE '.$this->pid.'=0';
218 218
         if ('' !== $order) {
219 219
             $sql .= " ORDER BY $order";
220 220
         }
@@ -232,11 +232,11 @@  discard block
 block discarded – undo
232 232
             $arr = $this->getChildTreeArray($catid, $order);
233 233
             foreach ($arr as $option) {
234 234
                 $option['prefix'] = str_replace('.', '--', $option['prefix']);
235
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlspecialchars($option[$title]);
235
+                $catpath          = $option['prefix'].'&nbsp;'.$myts->htmlspecialchars($option[$title]);
236 236
                 if ($option[$this->id] == $preset_id) {
237 237
                     $sel = " selected='selected'";
238 238
                 }
239
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
239
+                echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
240 240
                 $sel = '';
241 241
             }
242 242
         }
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
     {
258 258
         $path     = !empty($path) ? $path : '';
259 259
         $selectId = (int)$selectId;
260
-        $sql      = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId";
260
+        $sql      = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId";
261 261
         $result   = $this->db->query($sql);
262 262
         if (0 == $this->db->getRowsNum($result)) {
263 263
             return $path;
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
         list($parentid, $name) = $this->db->fetchRow($result);
266 266
         $myts = \MyTextSanitizer::getInstance();
267 267
         $name = $myts->htmlspecialchars($name);
268
-        $path = "<li><a href='" . $funcURL . '&amp;' . $this->id . '=' . $selectId . "'>" . $name . '</a></li>' . $path . '';
268
+        $path = "<li><a href='".$funcURL.'&amp;'.$this->id.'='.$selectId."'>".$name.'</a></li>'.$path.'';
269 269
         if (0 == $parentid) {
270 270
             return $path;
271 271
         }
@@ -285,12 +285,12 @@  discard block
 block discarded – undo
285 285
     public function getIdPathFromId($selectId, $path = '')
286 286
     {
287 287
         $selectId = (int)$selectId;
288
-        $result   = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
288
+        $result   = $this->db->query('SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
289 289
         if (0 == $this->db->getRowsNum($result)) {
290 290
             return $path;
291 291
         }
292 292
         list($parentid) = $this->db->fetchRow($result);
293
-        $path = '/' . $selectId . $path . '';
293
+        $path = '/'.$selectId.$path.'';
294 294
         if (0 == $parentid) {
295 295
             return $path;
296 296
         }
@@ -311,7 +311,7 @@  discard block
 block discarded – undo
311 311
     public function getAllChild($selectId = 0, $order = '', array $parray = [])
312 312
     {
313 313
         $selectId = (int)$selectId;
314
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
314
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
315 315
         if ('' !== $order) {
316 316
             $sql .= " ORDER BY $order";
317 317
         }
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
     public function getChildTreeArray($selectId = 0, $order = '', array $parray = [], $r_prefix = '')
342 342
     {
343 343
         $selectId = (int)$selectId;
344
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
344
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
345 345
         if ('' !== $order) {
346 346
             $sql .= " ORDER BY $order";
347 347
         }
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
             return $parray;
352 352
         }
353 353
         while (false !== ($row = $this->db->fetchArray($result))) {
354
-            $row['prefix'] = $r_prefix . '.';
354
+            $row['prefix'] = $r_prefix.'.';
355 355
             array_push($parray, $row);
356 356
             $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
357 357
         }
Please login to merge, or discard this patch.
class/SmartDbTable.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
     //Verifies that a MySQL table exists
23 23
     $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
24 24
     $realname = $xoopsDB->prefix($table);
25
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
25
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
26 26
     $ret      = $xoopsDB->queryF($sql);
27 27
     while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
28 28
         if ($m_table == $realname) {
@@ -163,14 +163,14 @@  discard block
 block discarded – undo
163 163
     public function getExistingFieldsArray()
164 164
     {
165 165
         global $xoopsDB;
166
-        $result = $xoopsDB->queryF('SHOW COLUMNS FROM ' . $this->name());
166
+        $result = $xoopsDB->queryF('SHOW COLUMNS FROM '.$this->name());
167 167
         while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
168 168
             $fields[$existing_field['Field']] = $existing_field['Type'];
169 169
             if ('YES' !== $existing_field['Null']) {
170 170
                 $fields[$existing_field['Field']] .= ' NOT NULL';
171 171
             }
172 172
             if ($existing_field['Extra']) {
173
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
173
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
174 174
             }
175 175
         }
176 176
 
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
             $query = sprintf('INSERT INTO `%s` VALUES ("%s")', $this->name(), $data);
247 247
             $ret   = $xoopsDB->queryF($query);
248 248
             if (!$ret) {
249
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
249
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
250 250
             } else {
251
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
251
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
252 252
             }
253 253
         }
254 254
 
@@ -413,9 +413,9 @@  discard block
 block discarded – undo
413 413
 
414 414
         $ret = $xoopsDB->queryF($query);
415 415
         if (!$ret) {
416
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . '<br>';
416
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).'<br>';
417 417
         } else {
418
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
418
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
419 419
         }
420 420
 
421 421
         return $ret;
@@ -434,11 +434,11 @@  discard block
 block discarded – undo
434 434
         $query = sprintf('DROP TABLE `%s`', $this->name());
435 435
         $ret   = $xoopsDB->queryF($query);
436 436
         if (!$ret) {
437
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . '<br>';
437
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).'<br>';
438 438
 
439 439
             return false;
440 440
         } else {
441
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
441
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
442 442
 
443 443
             return true;
444 444
         }
@@ -462,9 +462,9 @@  discard block
 block discarded – undo
462 462
             $ret = $ret && $xoopsDB->queryF($query);
463 463
             if ($alteredField['showerror']) {
464 464
                 if (!$ret) {
465
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . '<br>';
465
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).'<br>';
466 466
                 } else {
467
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
467
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
468 468
                 }
469 469
             }
470 470
         }
@@ -488,9 +488,9 @@  discard block
 block discarded – undo
488 488
             //echo $query;
489 489
             $ret = $ret && $xoopsDB->queryF($query);
490 490
             if (!$ret) {
491
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
491
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
492 492
             } else {
493
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
493
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
494 494
             }
495 495
         }
496 496
 
@@ -513,9 +513,9 @@  discard block
 block discarded – undo
513 513
             $query = sprintf('UPDATE `%s` SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
514 514
             $ret   = $ret && $xoopsDB->queryF($query);
515 515
             if (!$ret) {
516
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
516
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
517 517
             } else {
518
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
518
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
519 519
             }
520 520
         }
521 521
 
@@ -538,9 +538,9 @@  discard block
 block discarded – undo
538 538
             //echo $query."<br>";
539 539
             $ret = $ret && $xoopsDB->queryF($query);
540 540
             if (!$ret) {
541
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
541
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
542 542
             } else {
543
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
543
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
544 544
             }
545 545
         }
546 546
 
@@ -564,9 +564,9 @@  discard block
 block discarded – undo
564 564
 
565 565
             $ret = $ret && $xoopsDB->queryF($query);
566 566
             if (!$ret) {
567
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . '<br>';
567
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).'<br>';
568 568
             } else {
569
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
569
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
570 570
             }
571 571
         }
572 572
 
Please login to merge, or discard this patch.
class/AnswerHandler.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
     public function get($id = null, $fields = null)
50 50
     {
51 51
         if ((int)$id > 0) {
52
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers') . ' WHERE answerid=' . $id;
52
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers').' WHERE answerid='.$id;
53 53
             if (!$result = $this->db->query($sql)) {
54 54
                 return false;
55 55
             }
@@ -177,11 +177,11 @@  discard block
 block discarded – undo
177 177
     {
178 178
         $ret   = [];
179 179
         $limit = $start = 0;
180
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers');
180
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers');
181 181
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
182
-            $sql .= ' ' . $criteria->renderWhere();
182
+            $sql .= ' '.$criteria->renderWhere();
183 183
             if ('' != $criteria->getSort()) {
184
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
184
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
185 185
             }
186 186
             $limit = $criteria->getLimit();
187 187
             $start = $criteria->getStart();
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
             $answer = new Smartfaq\Answer();
196 196
             $answer->assignVars($myrow);
197 197
             if (!$id_as_key) {
198
-                $ret[] =& $answer;
198
+                $ret[] = & $answer;
199 199
             } else {
200 200
                 $ret[$myrow['answerid']] = $answer;
201 201
             }
@@ -265,7 +265,7 @@  discard block
 block discarded – undo
265 265
         $criteria->setOrder($order);
266 266
         $criteria->setLimit($limit);
267 267
         $criteria->setStart($start);
268
-        $ret =& $this->getObjects($criteria);
268
+        $ret = & $this->getObjects($criteria);
269 269
 
270 270
         return $ret;
271 271
     }
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
      */
279 279
     public function getCount(\CriteriaElement $criteria = null)
280 280
     {
281
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
281
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
282 282
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
283
-            $sql .= ' ' . $criteria->renderWhere();
283
+            $sql .= ' '.$criteria->renderWhere();
284 284
         }
285 285
         $result = $this->db->query($sql);
286 286
         if (!$result) {
@@ -299,10 +299,10 @@  discard block
 block discarded – undo
299 299
      */
300 300
     public function getCountByFAQ($criteria = null)
301 301
     {
302
-        $sql = 'SELECT faqid, COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
302
+        $sql = 'SELECT faqid, COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
303 303
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
304
-            $sql .= ' ' . $criteria->renderWhere();
305
-            $sql .= ' ' . $criteria->getGroupby();
304
+            $sql .= ' '.$criteria->renderWhere();
305
+            $sql .= ' '.$criteria->getGroupby();
306 306
         }
307 307
 
308 308
         //echo "<br>$sql<br>";
@@ -329,9 +329,9 @@  discard block
 block discarded – undo
329 329
      */
330 330
     public function deleteAll(\CriteriaElement $criteria = null, $force = true, $asObject = false)
331 331
     {
332
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_answers');
332
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_answers');
333 333
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
334
-            $sql .= ' ' . $criteria->renderWhere();
334
+            $sql .= ' '.$criteria->renderWhere();
335 335
         }
336 336
         if (!$this->db->query($sql)) {
337 337
             return false;
@@ -351,10 +351,10 @@  discard block
 block discarded – undo
351 351
      */
352 352
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null, $force = false)
353 353
     {
354
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
355
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_answers') . ' SET ' . $set_clause;
354
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
355
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_answers').' SET '.$set_clause;
356 356
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
357
-            $sql .= ' ' . $criteria->renderWhere();
357
+            $sql .= ' '.$criteria->renderWhere();
358 358
         }
359 359
         //echo "<br>" . $sql . "<br>";
360 360
         if (!$this->db->queryF($sql)) {
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
     public function getLastPublishedByFaq($faqids)
372 372
     {
373 373
         $ret    = [];
374
-        $sql    = 'SELECT faqid, answer, uid, datesub FROM ' . $this->db->prefix('smartfaq_answers') . '
375
-               WHERE faqid IN (' . implode(',', $faqids) . ') AND status = ' . Constants::SF_AN_STATUS_APPROVED . ' GROUP BY faqid';
374
+        $sql    = 'SELECT faqid, answer, uid, datesub FROM '.$this->db->prefix('smartfaq_answers').'
375
+               WHERE faqid IN (' . implode(',', $faqids).') AND status = '.Constants::SF_AN_STATUS_APPROVED.' GROUP BY faqid';
376 376
         $result = $this->db->query($sql);
377 377
         if (!$result) {
378 378
             return $ret;
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
         while (false !== ($row = $this->db->fetchArray($result))) {
381 381
             $answer = new Smartfaq\Answer();
382 382
             $answer->assignVars($row);
383
-            $ret[$row['faqid']] =& $answer;
383
+            $ret[$row['faqid']] = & $answer;
384 384
             unset($answer);
385 385
         }
386 386
 
Please login to merge, or discard this patch.
class/FaqHandler.php 2 patches
Spacing   +63 added lines, -63 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
     public function get($id)
49 49
     {
50 50
         if ((int)$id > 0) {
51
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE faqid=' . $id;
51
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq').' WHERE faqid='.$id;
52 52
             if (!$result = $this->db->query($sql)) {
53 53
                 return false;
54 54
             }
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 //            $faq->setError($this->db->error());
163 163
 
164 164
 
165
-            trigger_error('Class ' . $faq . ' could not be saved ' . __FILE__ . ' at line ' . __LINE__, E_USER_WARNING);
165
+            trigger_error('Class '.$faq.' could not be saved '.__FILE__.' at line '.__LINE__, E_USER_WARNING);
166 166
 
167 167
             return false;
168 168
         }
@@ -228,26 +228,26 @@  discard block
 block discarded – undo
228 228
     {
229 229
         $ret   = [];
230 230
         $limit = $start = 0;
231
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_faq');
231
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_faq');
232 232
 
233 233
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
234 234
             $whereClause = $criteria->renderWhere();
235 235
 
236 236
             if ('WHERE ()' !== $whereClause) {
237
-                $sql .= ' ' . $criteria->renderWhere();
237
+                $sql .= ' '.$criteria->renderWhere();
238 238
                 if (!empty($notNullFields)) {
239 239
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
240 240
                 }
241 241
             } elseif (!empty($notNullFields)) {
242
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
242
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
243 243
             }
244 244
             if ('' != $criteria->getSort()) {
245
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
245
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
246 246
             }
247 247
             $limit = $criteria->getLimit();
248 248
             $start = $criteria->getStart();
249 249
         } elseif (!empty($notNullFields)) {
250
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
250
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
251 251
         }
252 252
 
253 253
         //echo "<br>" . $sql . "<br>";
@@ -266,9 +266,9 @@  discard block
 block discarded – undo
266 266
             $faq->assignVars($myrow);
267 267
 
268 268
             if (!$id_as_key) {
269
-                $ret[] =& $faq;
269
+                $ret[] = & $faq;
270 270
             } else {
271
-                $ret[$myrow['faqid']] =& $faq;
271
+                $ret[$myrow['faqid']] = & $faq;
272 272
             }
273 273
             unset($faq);
274 274
         }
@@ -308,26 +308,26 @@  discard block
 block discarded – undo
308 308
                             faq.modulelink AS modulelink,
309 309
                             faq.contextpage AS contextpage,
310 310
                             faq.exacturl AS exacturl
311
-                FROM ' . $this->db->prefix('smartfaq_faq') . ' AS faq INNER JOIN ' . $this->db->prefix('smartfaq_categories') . ' AS category ON faq.categoryid = category.categoryid ';
311
+                FROM ' . $this->db->prefix('smartfaq_faq').' AS faq INNER JOIN '.$this->db->prefix('smartfaq_categories').' AS category ON faq.categoryid = category.categoryid ';
312 312
 
313 313
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
314 314
             $whereClause = $criteria->renderWhere();
315 315
 
316 316
             if ('WHERE ()' !== $whereClause) {
317
-                $sql .= ' ' . $criteria->renderWhere();
317
+                $sql .= ' '.$criteria->renderWhere();
318 318
                 if (!empty($notNullFields)) {
319 319
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
320 320
                 }
321 321
             } elseif (!empty($notNullFields)) {
322
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
322
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
323 323
             }
324 324
             if ('' != $criteria->getSort()) {
325
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
325
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
326 326
             }
327 327
             $limit = $criteria->getLimit();
328 328
             $start = $criteria->getStart();
329 329
         } elseif (!empty($notNullFields)) {
330
-            $sql .= $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
330
+            $sql .= $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
331 331
         }
332 332
 
333 333
         //echo "<br>" . $sql . "<br>";
@@ -345,9 +345,9 @@  discard block
 block discarded – undo
345 345
             $faq->assignVars($myrow);
346 346
 
347 347
             if (!$id_as_key) {
348
-                $ret[] =& $faq;
348
+                $ret[] = & $faq;
349 349
             } else {
350
-                $ret[$myrow['faqid']] =& $faq;
350
+                $ret[$myrow['faqid']] = & $faq;
351 351
             }
352 352
             unset($faq);
353 353
         }
@@ -377,19 +377,19 @@  discard block
 block discarded – undo
377 377
      */
378 378
     public function getCount($criteria = null, $notNullFields = '')
379 379
     {
380
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq');
380
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_faq');
381 381
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
382 382
             $whereClause = $criteria->renderWhere();
383 383
             if ('WHERE ()' !== $whereClause) {
384
-                $sql .= ' ' . $criteria->renderWhere();
384
+                $sql .= ' '.$criteria->renderWhere();
385 385
                 if (!empty($notNullFields)) {
386 386
                     $sql .= $this->NotNullFieldClause($notNullFields, true);
387 387
                 }
388 388
             } elseif (!empty($notNullFields)) {
389
-                $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
389
+                $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
390 390
             }
391 391
         } elseif (!empty($notNullFields)) {
392
-            $sql .= ' WHERE ' . $this->NotNullFieldClause($notNullFields);
392
+            $sql .= ' WHERE '.$this->NotNullFieldClause($notNullFields);
393 393
         }
394 394
 
395 395
         //echo "<br>" . $sql . "<br>";
@@ -423,11 +423,11 @@  discard block
 block discarded – undo
423 423
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
424 424
 
425 425
             $categoriesGranted = $smartPermHandler->getPermissions('category');
426
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
426
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
427 427
 
428 428
             $faqsGranted = $smartPermHandler->getPermissions('item');
429 429
             $grantedFaq  = new \CriteriaCompo();
430
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
430
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
431 431
             // If user is anonymous, check if the FAQ allow partialview
432 432
             if (!is_object($xoopsUser)) {
433 433
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
      */
475 475
     public function getFaqsCountByStatus()
476 476
     {
477
-        $sql    = 'SELECT status, COUNT(*) FROM ' . $this->db->prefix('smartfaq_faq') . ' GROUP BY status';
477
+        $sql    = 'SELECT status, COUNT(*) FROM '.$this->db->prefix('smartfaq_faq').' GROUP BY status';
478 478
         $result = $this->db->query($sql);
479 479
         if (!$result) {
480 480
             return [];
@@ -544,11 +544,11 @@  discard block
 block discarded – undo
544 544
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
545 545
 
546 546
             $categoriesGranted = $smartPermHandler->getPermissions('category');
547
-            $grantedCategories = new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
547
+            $grantedCategories = new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
548 548
 
549 549
             $faqsGranted = $smartPermHandler->getPermissions('item');
550 550
             $grantedFaq  = new \CriteriaCompo();
551
-            $grantedFaq->add(new \Criteria('faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
551
+            $grantedFaq->add(new \Criteria('faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
552 552
             // If user is anonymous, check if the FAQ allow partialview
553 553
             if (!is_object($xoopsUser)) {
554 554
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 
558 558
         if (isset($categoryid) && (-1 != $categoryid)) {
559 559
             if (is_array($categoryid)) {
560
-                $criteriaCategory = new \Criteria('categoryid', '(' . implode(',', $categoryid) . ')', 'IN');
560
+                $criteriaCategory = new \Criteria('categoryid', '('.implode(',', $categoryid).')', 'IN');
561 561
             } else {
562 562
                 $criteriaCategory = new \Criteria('categoryid', (int)$categoryid);
563 563
             }
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
         $criteria->setStart($start);
601 601
         $criteria->setSort($sort);
602 602
         $criteria->setOrder($order);
603
-        $ret =& $this->getObjects($criteria, false, $notNullFields);
603
+        $ret = & $this->getObjects($criteria, false, $notNullFields);
604 604
 
605 605
         return $ret;
606 606
     }
@@ -689,7 +689,7 @@  discard block
 block discarded – undo
689 689
             $entrynumber = mt_rand(0, $totalFaqs);
690 690
             $faq         = $this->getFaqs(1, $entrynumber, $status, -1, 'datesub', 'DESC', $notNullFields);
691 691
             if ($faq) {
692
-                $ret =& $faq[0];
692
+                $ret = & $faq[0];
693 693
             }
694 694
         }
695 695
 
@@ -720,10 +720,10 @@  discard block
 block discarded – undo
720 720
                 $httphost    = $_SERVER['HTTP_HOST'];
721 721
                 $querystring = $_SERVER['QUERY_STRING'];
722 722
                 if ('' != $querystring) {
723
-                    $querystring = '?' . $querystring;
723
+                    $querystring = '?'.$querystring;
724 724
                 }
725
-                $currenturl     = $http . $httphost . $phpself . $querystring;
726
-                $fullcontexturl = XOOPS_URL . '/' . $iValue->contextpage();
725
+                $currenturl     = $http.$httphost.$phpself.$querystring;
726
+                $fullcontexturl = XOOPS_URL.'/'.$iValue->contextpage();
727 727
                 switch ($iValue->modulelink()) {
728 728
                     case '':
729 729
                         $display = false;
@@ -742,7 +742,7 @@  discard block
 block discarded – undo
742 742
                         }
743 743
                         break;
744 744
                     default:
745
-                        if (false === strpos($currenturl, XOOPS_URL . '/modules/')) {
745
+                        if (false === strpos($currenturl, XOOPS_URL.'/modules/')) {
746 746
                             $display = false;
747 747
                         } else {
748 748
                             if (false === strpos($currenturl, $iValue->modulelink())) {
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
754 754
                         break;
755 755
                 }
756 756
                 if ($display) {
757
-                    $randomFaqs[] =& $faqsObj[$i];
757
+                    $randomFaqs[] = & $faqsObj[$i];
758 758
                 }
759 759
             }
760 760
         }
@@ -763,10 +763,10 @@  discard block
 block discarded – undo
763 763
             mt_srand((float)microtime() * 10000000);
764 764
             $rand_keys = array_rand($randomFaqs, $limit);
765 765
             for ($j = 0, $jMax = count($rand_keys); $j < $jMax; ++$j) {
766
-                $ret[] =& $randomFaqs[$rand_keys[$j]];
766
+                $ret[] = & $randomFaqs[$rand_keys[$j]];
767 767
             }
768 768
         } else {
769
-            $ret =& $randomFaqs;
769
+            $ret = & $randomFaqs;
770 770
         }
771 771
 
772 772
         return $ret;
@@ -784,14 +784,14 @@  discard block
 block discarded – undo
784 784
             /** @var Smartfaq\PermissionHandler $smartPermHandler */
785 785
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
786 786
             $items            = $smartPermHandler->getPermissions('item');
787
-            $faqclause        = ' AND faqid IN (' . implode(',', $items) . ')';
787
+            $faqclause        = ' AND faqid IN ('.implode(',', $items).')';
788 788
         }
789 789
 
790 790
         $sql  = "CREATE TEMPORARY TABLE tmp (categoryid INT(8) UNSIGNED NOT NULL,datesub INT(11) DEFAULT '0' NOT NULL);";
791
-        $sql2 = ' LOCK TABLES ' . $this->db->prefix('smartfaq_faq') . ' READ;';
792
-        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM ' . $this->db->prefix('smartfaq_faq') . ' WHERE status IN (' . implode(',', $status) . ") $faqclause GROUP BY categoryid;";
793
-        $sql4 = ' SELECT ' . $this->db->prefix('smartfaq_faq') . '.categoryid, faqid, question, uid, ' . $this->db->prefix('smartfaq_faq') . '.datesub FROM ' . $this->db->prefix('smartfaq_faq') . ', tmp
794
-                              WHERE ' . $this->db->prefix('smartfaq_faq') . '.categoryid=tmp.categoryid AND ' . $this->db->prefix('smartfaq_faq') . '.datesub=tmp.datesub;';
791
+        $sql2 = ' LOCK TABLES '.$this->db->prefix('smartfaq_faq').' READ;';
792
+        $sql3 = ' INSERT INTO tmp SELECT categoryid, MAX(datesub) FROM '.$this->db->prefix('smartfaq_faq').' WHERE status IN ('.implode(',', $status).") $faqclause GROUP BY categoryid;";
793
+        $sql4 = ' SELECT '.$this->db->prefix('smartfaq_faq').'.categoryid, faqid, question, uid, '.$this->db->prefix('smartfaq_faq').'.datesub FROM '.$this->db->prefix('smartfaq_faq').', tmp
794
+                              WHERE ' . $this->db->prefix('smartfaq_faq').'.categoryid=tmp.categoryid AND '.$this->db->prefix('smartfaq_faq').'.datesub=tmp.datesub;';
795 795
         /*
796 796
         //Old implementation
797 797
         $sql = "SELECT categoryid, faqid, question, uid, MAX(datesub) AS datesub FROM ".$this->db->prefix("smartfaq_faq")."
@@ -806,14 +806,14 @@  discard block
 block discarded – undo
806 806
         $this->db->queryF('UNLOCK TABLES;');
807 807
         $this->db->queryF('DROP TABLE tmp;');
808 808
         if (!$result) {
809
-            trigger_error('Error in getLastPublishedByCat SQL: ' . $error);
809
+            trigger_error('Error in getLastPublishedByCat SQL: '.$error);
810 810
 
811 811
             return $ret;
812 812
         }
813 813
         while (false !== ($row = $this->db->fetchArray($result))) {
814 814
             $faq = new Smartfaq\Faq();
815 815
             $faq->assignVars($row);
816
-            $ret[$row['categoryid']] =& $faq;
816
+            $ret[$row['categoryid']] = & $faq;
817 817
             unset($faq);
818 818
         }
819 819
 
@@ -828,9 +828,9 @@  discard block
 block discarded – undo
828 828
      */
829 829
     public function deleteAll($criteria = null)
830 830
     {
831
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_faq');
831
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_faq');
832 832
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
833
-            $sql .= ' ' . $criteria->renderWhere();
833
+            $sql .= ' '.$criteria->renderWhere();
834 834
         }
835 835
         if (!$this->db->query($sql)) {
836 836
             return false;
@@ -851,10 +851,10 @@  discard block
 block discarded – undo
851 851
      **/
852 852
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
853 853
     {
854
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
855
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET ' . $set_clause;
854
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
855
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET '.$set_clause;
856 856
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
857
-            $sql .= ' ' . $criteria->renderWhere();
857
+            $sql .= ' '.$criteria->renderWhere();
858 858
         }
859 859
         if (!$this->db->queryF($sql)) {
860 860
             return false;
@@ -869,7 +869,7 @@  discard block
 block discarded – undo
869 869
      */
870 870
     public function updateCounter($faqid)
871 871
     {
872
-        $sql = 'UPDATE ' . $this->db->prefix('smartfaq_faq') . ' SET counter=counter+1 WHERE faqid = ' . $faqid;
872
+        $sql = 'UPDATE '.$this->db->prefix('smartfaq_faq').' SET counter=counter+1 WHERE faqid = '.$faqid;
873 873
         if ($this->db->queryF($sql)) {
874 874
             return true;
875 875
         } else {
@@ -921,12 +921,12 @@  discard block
 block discarded – undo
921 921
             $criteriaUser->add(new \Criteria('answer.uid', $userid), 'OR');
922 922
         }
923 923
 
924
-        if (! empty($queryarray)) {
924
+        if (!empty($queryarray)) {
925 925
             $criteriaKeywords = new \CriteriaCompo();
926 926
             foreach ($queryarray as $iValue) {
927 927
                 $criteriaKeyword = new \CriteriaCompo();
928
-                $criteriaKeyword->add(new \Criteria('faq.question', '%' . $iValue . '%', 'LIKE'), 'OR');
929
-                $criteriaKeyword->add(new \Criteria('answer.answer', '%' . $iValue . '%', 'LIKE'), 'OR');
928
+                $criteriaKeyword->add(new \Criteria('faq.question', '%'.$iValue.'%', 'LIKE'), 'OR');
929
+                $criteriaKeyword->add(new \Criteria('answer.answer', '%'.$iValue.'%', 'LIKE'), 'OR');
930 930
                 $criteriaKeywords->add($criteriaKeyword, $andor);
931 931
                 unset($criteriaKeyword);
932 932
             }
@@ -945,9 +945,9 @@  discard block
 block discarded – undo
945 945
             if (empty($faqsGranted)) {
946 946
                 return $ret;
947 947
             }
948
-            $grantedCategories = new \Criteria('faq.categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN');
948
+            $grantedCategories = new \Criteria('faq.categoryid', '('.implode(',', $categoriesGranted).')', 'IN');
949 949
             $grantedFaq        = new \CriteriaCompo();
950
-            $grantedFaq->add(new \Criteria('faq.faqid', '(' . implode(',', $faqsGranted) . ')', 'IN'), 'OR');
950
+            $grantedFaq->add(new \Criteria('faq.faqid', '('.implode(',', $faqsGranted).')', 'IN'), 'OR');
951 951
             // If user is anonymous, check if the FAQ allow partialview
952 952
             if (!is_object($xoopsUser)) {
953 953
                 $grantedFaq->add(new \Criteria('partialview', '1'), 'OR');
@@ -993,15 +993,15 @@  discard block
 block discarded – undo
993 993
         $criteria->setSort('faq.datesub');
994 994
         $criteria->setOrder('DESC');
995 995
 
996
-        $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';
996
+        $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';
997 997
 
998 998
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
999 999
             $whereClause = $criteria->renderWhere();
1000 1000
 
1001 1001
             if ('WHERE ()' !== $whereClause) {
1002
-                $sql .= ' ' . $criteria->renderWhere();
1002
+                $sql .= ' '.$criteria->renderWhere();
1003 1003
                 if ('' != $criteria->getSort()) {
1004
-                    $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
1004
+                    $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
1005 1005
                 }
1006 1006
                 $limit = $criteria->getLimit();
1007 1007
                 $start = $criteria->getStart();
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
         while (false !== ($myrow = $this->db->fetchArray($result))) {
1025 1025
             $faq = new Smartfaq\Faq();
1026 1026
             $faq->assignVars($myrow);
1027
-            $ret[] =& $faq;
1027
+            $ret[] = & $faq;
1028 1028
             unset($faq);
1029 1029
         }
1030 1030
 
@@ -1040,20 +1040,20 @@  discard block
 block discarded – undo
1040 1040
     {
1041 1041
         global $xoopsUser;
1042 1042
         $ret = [];
1043
-        $sql = 'SELECT categoryid, COUNT(*) AS count FROM ' . $this->db->prefix('smartfaq_faq');
1043
+        $sql = 'SELECT categoryid, COUNT(*) AS count FROM '.$this->db->prefix('smartfaq_faq');
1044 1044
         if ((int)$cat_id > 0) {
1045
-            $sql .= ' WHERE categoryid = ' . (int)$cat_id;
1046
-            $sql .= ' AND status IN (' . implode(',', $status) . ')';
1045
+            $sql .= ' WHERE categoryid = '.(int)$cat_id;
1046
+            $sql .= ' AND status IN ('.implode(',', $status).')';
1047 1047
         } else {
1048
-            $sql .= ' WHERE status IN (' . implode(',', $status) . ')';
1048
+            $sql .= ' WHERE status IN ('.implode(',', $status).')';
1049 1049
             if (!Smartfaq\Utility::userIsAdmin()) {
1050 1050
                 /** @var Smartfaq\PermissionHandler $smartPermHandler */
1051 1051
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
1052 1052
                 $items            = $smartPermHandler->getPermissions('item');
1053 1053
                 if (is_object($xoopsUser)) {
1054
-                    $sql .= ' AND faqid IN (' . implode(',', $items) . ')';
1054
+                    $sql .= ' AND faqid IN ('.implode(',', $items).')';
1055 1055
                 } else {
1056
-                    $sql .= ' AND (faqid IN (' . implode(',', $items) . ') OR partialview = 1)';
1056
+                    $sql .= ' AND (faqid IN ('.implode(',', $items).') OR partialview = 1)';
1057 1057
                 }
1058 1058
             }
1059 1059
         }
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
         if ($faq->isNew()) {
95 95
             $sql = sprintf(
96 96
                 '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)',
97
-                           $this->db->prefix('smartfaq_faq'),
97
+                            $this->db->prefix('smartfaq_faq'),
98 98
                 $categoryid,
99 99
                 $this->db->quoteString($question),
100 100
                 $this->db->quoteString($howdoi),
Please login to merge, or discard this patch.
admin/docbook_export.php 1 patch
Spacing   +14 added lines, -14 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
-require_once __DIR__ . '/../../../include/cp_header.php';
9
+require_once __DIR__.'/../../../include/cp_header.php';
10 10
 
11
-$op = 'go';//'start';
11
+$op = 'go'; //'start';
12 12
 
13 13
 if (isset($_POST['op']) && ('go' === $_POST['op'])) {
14 14
     $op = $_POST['op'];
15 15
 }
16 16
 
17 17
 if ('start' === $op) {
18
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
18
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
19 19
 
20 20
     xoops_cp_header();
21 21
 
@@ -44,41 +44,41 @@  discard block
 block discarded – undo
44 44
 
45 45
     echo "  <title>{module title}</title>\r\n";
46 46
 
47
-    $resultC = $xoopsDB->queryF('SELECT * FROM ' . $xoopsDB->prefix('smartfaq_categories'));
47
+    $resultC = $xoopsDB->queryF('SELECT * FROM '.$xoopsDB->prefix('smartfaq_categories'));
48 48
     while (false !== ($arrC = $xoopsDB->fetchArray($resultC))) {
49 49
         extract($arrC, EXTR_PREFIX_ALL, 'c');
50 50
 
51 51
         echo "  <qandadiv ID=\"c$c_categoryid\" Revision=\"$c_created\">\r\n";
52
-        echo '    <title>' . encodeText($c_name) . "</title>\r\n";
53
-        echo '    <para>' . encodeText($c_description) . "</para>\r\n";
52
+        echo '    <title>'.encodeText($c_name)."</title>\r\n";
53
+        echo '    <para>'.encodeText($c_description)."</para>\r\n";
54 54
 
55
-        $resultQ = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('smartfaq_faq') . " where categoryid=$c_categoryid");
55
+        $resultQ = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('smartfaq_faq')." where categoryid=$c_categoryid");
56 56
         while (false !== ($arrQ = $xoopsDB->fetchArray($resultQ))) {
57 57
             extract($arrQ, EXTR_PREFIX_ALL, 'q');
58 58
 
59
-            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"" . getUserFullName($q_uid) . "\">\r\n";
59
+            echo "    <qandaentry ID=\"q$q_faqid\" Revision=\"$q_datesub\" Condition=\"$q_html $q_smiley $q_xcodes\" XrefLabel=\"$q_modulelink $q_contextpage\" Vendor=\"".getUserFullName($q_uid)."\">\r\n";
60 60
             echo "      <question>\r\n";
61
-            echo '        <para>' . encodeText($q_question) . "</para>\r\n";
61
+            echo '        <para>'.encodeText($q_question)."</para>\r\n";
62 62
             if (!empty($q_howdoi)) {
63 63
                 echo "        <note Conformance=\"howdoi\">\r\n";
64 64
                 echo "          <title>{'How do I' from language file}</title>\r\n";
65
-                echo '          <para>' . encodeText($q_howdoi) . "</para>\r\n";
65
+                echo '          <para>'.encodeText($q_howdoi)."</para>\r\n";
66 66
                 echo "        </note>\r\n";
67 67
             }
68 68
             if (!empty($q_diduno)) {
69 69
                 echo "        <note Conformance=\"diduno\">\r\n";
70 70
                 echo "          <title>{'Did you know' from language file}</title>\r\n";
71
-                echo '          <para>' . encodeText($q_diduno) . "</para>\r\n";
71
+                echo '          <para>'.encodeText($q_diduno)."</para>\r\n";
72 72
                 echo "        </note>\r\n";
73 73
             }
74 74
             echo "      </question>\r\n";
75 75
 
76
-            $resultA = $xoopsDB->queryF('select * from ' . $xoopsDB->prefix('smartfaq_answers') . " where answerid=$q_answerid");
76
+            $resultA = $xoopsDB->queryF('select * from '.$xoopsDB->prefix('smartfaq_answers')." where answerid=$q_answerid");
77 77
             while (false !== ($arrA = $xoopsDB->fetchArray($resultA))) {
78 78
                 extract($arrA, EXTR_PREFIX_ALL, 'a');
79 79
 
80
-                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"" . getUserFullName($a_uid) . "\">\r\n";
81
-                echo '        <para>' . encodeText($a_answer) . "</para>\r\n";
80
+                echo "      <answer ID=\"a$a_answerid\" Revision=\"$a_datesub\" Vendor=\"".getUserFullName($a_uid)."\">\r\n";
81
+                echo '        <para>'.encodeText($a_answer)."</para>\r\n";
82 82
                 echo "      </answer>\r\n";
83 83
             }
84 84
             $xoopsDB->freeRecordSet($resultA);
Please login to merge, or discard this patch.