Completed
Push — master ( bb1ebf...0d7d1b )
by Michael
02:07
created
language/english/admin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 define('_AM_SF_CATHEADER', 'Categories Management');
78 78
 define('_AM_SF_CONTEXTMODULELINK', 'Contextually linked to this module');
79 79
 define('_AM_SF_CONTEXTMODULELINK_FAQ',
80
-       "Contextually linked to this module<span style='font-size: xx-small; font-weight: normal; display: block;'>Select the module to which this Q&amp;A will be<br>linked. If the Contextual FAQ block is visible<br>on that module, the 'How do I' statement of<br>this Q&amp;A will be displayed.</span>");
80
+        "Contextually linked to this module<span style='font-size: xx-small; font-weight: normal; display: block;'>Select the module to which this Q&amp;A will be<br>linked. If the Contextual FAQ block is visible<br>on that module, the 'How do I' statement of<br>this Q&amp;A will be displayed.</span>");
81 81
 define('_AM_SF_CONTEXTOPTIONS', 'Contextual options');
82 82
 define('_AM_SF_CONTEXTPAGE', 'Contextually linked to this URL');
83 83
 define('_AM_SF_CONTEXTURLLINK', 'Link to this URL');
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 define('_AM_SF_ERROR_ANSWER_NOT_SAVED', 'An error occured. The answer was not saved in the database.');
119 119
 define('_AM_SF_ERROR_FAQ_NOT_SAVED', 'An error occured. The Q&amp;A was not saved in the database.');
120 120
 define('_AM_SF_EXACTURL',
121
-       "Exact URL?<span style='font-size: xx-small; font-weight: normal; display: block;'>If set to 'Yes', the Q&amp;A will only display in the'Specific URL set above'. If set to 'No', the Q&amp;A will be displayed in all pages that match a part of the root of the specific URL. ie; modules/newbb/*.php</span>");
121
+        "Exact URL?<span style='font-size: xx-small; font-weight: normal; display: block;'>If set to 'Yes', the Q&amp;A will only display in the'Specific URL set above'. If set to 'No', the Q&amp;A will be displayed in all pages that match a part of the root of the specific URL. ie; modules/newbb/*.php</span>");
122 122
 define('_AM_SF_FAQ_EDIT', 'Edit this Q&amp;A');
123 123
 define('_AM_SF_FAQ_NEW_ANSWER_PUBLISHED', 'The original answer was replaced by this answer.');
124 124
 define('_AM_SF_FAQ_REVIEW', 'Edit this answer before approbation');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -274,7 +274,7 @@
 block discarded – undo
274 274
 define('_AM_SF_STATUS_EXP', "Status<span style='font-size: xx-small; font-weight: normal; display: block;'>Select the status of the Q&amp;A.</span>");
275 275
 define('_AM_SF_SUBMISSIONSMNGMT', 'Submitted Q&amp;A');
276 276
 define('_AM_SF_SPECIFIC_URL_SELECT', 'Specific URL...');
277
-define('_AM_SF_SPECIFIC_URL', "Specific URL</span><span style='font-size: xx-small; font-weight: normal; display: block;'>If you have set the 'Contextually link to<br>this module' to <i>" . _AM_SF_SPECIFIC_URL_SELECT . "</i>, please<br>specify the URL.<br>\n<b>Example :</b> modules/newbb</span>");
277
+define('_AM_SF_SPECIFIC_URL', "Specific URL</span><span style='font-size: xx-small; font-weight: normal; display: block;'>If you have set the 'Contextually link to<br>this module' to <i>"._AM_SF_SPECIFIC_URL_SELECT."</i>, please<br>specify the URL.<br>\n<b>Example :</b> modules/newbb</span>");
278 278
 define('_AM_SF_SUBMISSION_MODERATE', "Moderate this Q&amp;A's submission");
279 279
 define('_AM_SF_SUBMITTED', 'Submitted');
280 280
 define('_AM_SF_SUBMITTED_EXP', '<b>Submitted Q&amp;A</b> : Q&amp;A that have been submitted by users. Once approved, they will be displayed in the Q&amp;A section.');
Please login to merge, or discard this patch.
language/english/modinfo.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 define('_MI_SF_REQUESTINTROMSG', 'Request introduction message:');
115 115
 define('_MI_SF_REQUESTINTROMSGDSC', 'Introduction message to be displayed in the Request a Q&amp;A page of the module.');
116 116
 define('_MI_SF_REQUESTINTROMSGDEF',
117
-       'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!');
117
+        'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!');
118 118
 
119 119
 define('_MI_SF_OPENINTROMSG', 'Open Questions section introduction message:');
120 120
 define('_MI_SF_OPENINTROMSGDSC', 'Introduction message to be displayed in the Open Questions section of the module.');
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 
126 126
 define('_MI_SF_HELP_PATH_SELECT', "Path of SmartFAQ's help files");
127 127
 define('_MI_SF_HELP_PATH_SELECT_DSC',
128
-       "SELECT FROM where you would LIKE TO access SmartFAQ's help files. If you downloaded the 'SmartFAQ's Help Package' AND uploaded it IN 'modules/smartfaq/doc/', you can SELECT 'Inside the module'. Alternatively, you can access the module's help file directly from docs.xoops.org by chosing this in the selector. You can also select 'Custom Path' and specify yourself the path of the help files in the next config option 'Custom path of SmartFAQ's help files'");
128
+        "SELECT FROM where you would LIKE TO access SmartFAQ's help files. If you downloaded the 'SmartFAQ's Help Package' AND uploaded it IN 'modules/smartfaq/doc/', you can SELECT 'Inside the module'. Alternatively, you can access the module's help file directly from docs.xoops.org by chosing this in the selector. You can also select 'Custom Path' and specify yourself the path of the help files in the next config option 'Custom path of SmartFAQ's help files'");
129 129
 
130 130
 define('_MI_SF_HELP_PATH_CUSTOM', "Custom path of SmartFAQ's help files");
131 131
 define('_MI_SF_HELP_PATH_CUSTOM_DSC', "If you selected 'Custom path' in the previous option 'Path of SmartFAQ's help files', please specify the URL of SmartFAQ's help files, in that format : http://www.yoursite.com/doc");
@@ -346,7 +346,7 @@  discard block
 block discarded – undo
346 346
 
347 347
 define('_MI_SF_DIR_ATTACHMENT', 'Attachments physical path.');
348 348
 define('_MI_SF_DIR_ATTACHMENT_DESC',
349
-       "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'");
349
+        "Physical path only needs to be set from your xoops root and not before, for example you may have attachments uploaded to www.yoururl.com/uploads/newbb the path entered would then be '/uploads/newbb' never include a trailing slash '/' the thumbnails path becomes '/uploads/newbb/thumbs'");
350 350
 define('_MI_SF_PATH_MAGICK', 'Path for ImageMagick');
351 351
 define('_MI_SF_PATH_MAGICK_DESC', "Usually it is '/usr/bin/X11'. Leave it BLANK if you do not have ImageMagicK installed or for autodetecting.");
352 352
 define('_MI_SF_SUBFORUM_DISPLAY', 'Display Mode of subforums on index page');
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -385,7 +385,7 @@
 block discarded – undo
385 385
 
386 386
 //Help
387 387
 define('_MI_SF_DIRNAME', basename(dirname(dirname(__DIR__))));
388
-define('_MI_SF_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
388
+define('_MI_SF_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
389 389
 define('_MI_SF_BACK_2_ADMIN', 'Back to Administration of ');
390 390
 define('_MI_SF_OVERVIEW', 'Overview');
391 391
 
Please login to merge, or discard this patch.
language/english/main.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 define('_MD_SF_MAIL', 'Send Q&amp;A');
76 76
 define('_MD_SF_MAINHEAD', 'Welcome to the');
77 77
 define('_MD_SF_MAININTRO',
78
-       "In this area of the site, you will find the answers to the frequently asked questions. Each Q&amp;A is placed in a category for easier finding. This is the section from where the random Q&amp;As in the right column of the site come from. Should you not find the answer to a particular question, don't hesitate to <a href='"
79
-       . XOOPS_URL
80
-       . "/forms/askus/form.php'>Ask us a Question!</a>");
78
+        "In this area of the site, you will find the answers to the frequently asked questions. Each Q&amp;A is placed in a category for easier finding. This is the section from where the random Q&amp;As in the right column of the site come from. Should you not find the answer to a particular question, don't hesitate to <a href='"
79
+        . XOOPS_URL
80
+        . "/forms/askus/form.php'>Ask us a Question!</a>");
81 81
 define('_MD_SF_MAINNOSELECTCAT', 'You did not select a valid category');
82 82
 define('_MD_SF_MAINNOFAQS', 'There are no Q&amp;As in this category');
83 83
 define('_MD_SF_MODERATION_MAIN_HEAD', 'Moderation section of ');
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 define('_MD_SF_REQUEST', 'Request a new Q&amp;A');
118 118
 define('_MD_SF_REQUEST_ERROR', 'An error occured. Your request was not sent.');
119 119
 define('_MD_SF_REQUEST_INTRO',
120
-       'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!');
120
+        'You did not find the answer to the question you were looking for? No problem! Simply fill the following form in order to request the answer for a new question. The site administrator will review your request and publish this new question in the Open Questions section for someone to answer it!');
121 121
 define('_MD_SF_REQUEST_RECEIVED_NEED_APPROVAL', 'Your request has been sent and will be published in the Open Questions section upon approval by a moderator.<br>Thank you for your contribution!');
122 122
 define('_MD_SF_REQUEST_RECEIVED_AND_PUBLISHED', 'Your request has been sent and automatically published in the Open Questions section. Thank you for your contribution!');
123 123
 define('_MD_SF_REQUESTED', 'Requested');
Please login to merge, or discard this patch.
submit.php 2 patches
Switch Indentation   +134 added lines, -134 removed lines patch added patch discarded remove patch
@@ -46,153 +46,153 @@  discard block
 block discarded – undo
46 46
 }
47 47
 
48 48
 switch ($op) {
49
-    case 'preview':
49
+        case 'preview':
50 50
 
51
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
51
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
52 52
 
53
-        $faqObj      = $faqHandler->create();
54
-        $answerObj   = $answerHandler->create();
55
-        $categoryObj = $categoryHandler->get($_POST['categoryid']);
53
+            $faqObj      = $faqHandler->create();
54
+            $answerObj   = $answerHandler->create();
55
+            $categoryObj = $categoryHandler->get($_POST['categoryid']);
56 56
 
57
-        if (!$xoopsUser) {
58
-            if ($xoopsModuleConfig['anonpost'] == 1) {
59
-                $uid = 0;
57
+            if (!$xoopsUser) {
58
+                if ($xoopsModuleConfig['anonpost'] == 1) {
59
+                    $uid = 0;
60
+                } else {
61
+                    redirect_header('index.php', 3, _NOPERM);
62
+                }
60 63
             } else {
61
-                redirect_header('index.php', 3, _NOPERM);
64
+                $uid = $xoopsUser->uid();
62 65
             }
63
-        } else {
64
-            $uid = $xoopsUser->uid();
65
-        }
66 66
 
67
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
67
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
68 68
 
69
-        // Putting the values about the FAQ in the FAQ object
70
-        $faqObj->setVar('categoryid', $_POST['categoryid']);
71
-        $faqObj->setVar('uid', $uid);
72
-        $faqObj->setVar('question', $_POST['question']);
73
-        $faqObj->setVar('howdoi', $_POST['howdoi']);
74
-        $faqObj->setVar('diduno', $_POST['diduno']);
75
-        $faqObj->setVar('datesub', time());
69
+            // Putting the values about the FAQ in the FAQ object
70
+            $faqObj->setVar('categoryid', $_POST['categoryid']);
71
+            $faqObj->setVar('uid', $uid);
72
+            $faqObj->setVar('question', $_POST['question']);
73
+            $faqObj->setVar('howdoi', $_POST['howdoi']);
74
+            $faqObj->setVar('diduno', $_POST['diduno']);
75
+            $faqObj->setVar('datesub', time());
76 76
 
77
-        // Putting the values in the answer object
78
-        $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
79
-        $answerObj->setVar('faqid', $faqObj->faqid());
80
-        $answerObj->setVar('answer', $_POST['answer']);
81
-        $answerObj->setVar('uid', $uid);
77
+            // Putting the values in the answer object
78
+            $answerObj->setVar('status', _SF_AN_STATUS_APPROVED);
79
+            $answerObj->setVar('faqid', $faqObj->faqid());
80
+            $answerObj->setVar('answer', $_POST['answer']);
81
+            $answerObj->setVar('uid', $uid);
82 82
 
83
-        global $xoopsUser, $myts;
83
+            global $xoopsUser, $myts;
84 84
 
85
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
86
-        require_once XOOPS_ROOT_PATH . '/header.php';
87
-        require_once __DIR__ . '/footer.php';
85
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
86
+            require_once XOOPS_ROOT_PATH . '/header.php';
87
+            require_once __DIR__ . '/footer.php';
88 88
 
89
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
89
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
90 90
 
91
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
92
-        $faq                 = $faqObj->toArray(null, $categoryObj, false);
93
-        $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
94
-        $faq['answer']       = $answerObj->answer();
95
-        $faq['who_when']     = $faqObj->getWhoAndWhen();
91
+            $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
92
+            $faq                 = $faqObj->toArray(null, $categoryObj, false);
93
+            $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
94
+            $faq['answer']       = $answerObj->answer();
95
+            $faq['who_when']     = $faqObj->getWhoAndWhen();
96 96
 
97
-        $faq['comments'] = -1;
98
-        $xoopsTpl->assign('faq', $faq);
99
-        $xoopsTpl->assign('op', 'preview');
100
-        $xoopsTpl->assign('whereInSection', $moduleName);
101
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
97
+            $faq['comments'] = -1;
98
+            $xoopsTpl->assign('faq', $faq);
99
+            $xoopsTpl->assign('op', 'preview');
100
+            $xoopsTpl->assign('whereInSection', $moduleName);
101
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
102 102
 
103
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
104
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
103
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
104
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
105 105
 
106
-        require_once __DIR__ . '/include/submit.inc.php';
106
+            require_once __DIR__ . '/include/submit.inc.php';
107 107
 
108
-        require_once XOOPS_ROOT_PATH . '/footer.php';
108
+            require_once XOOPS_ROOT_PATH . '/footer.php';
109 109
 
110
-        exit();
111
-        break;
110
+            exit();
111
+            break;
112 112
 
113
-    case 'post':
113
+        case 'post':
114 114
 
115
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
115
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
116 116
 
117
-        $newFaqObj    = $faqHandler->create();
118
-        $newAnswerObj = $answerHandler->create();
117
+            $newFaqObj    = $faqHandler->create();
118
+            $newAnswerObj = $answerHandler->create();
119 119
 
120
-        if (!$xoopsUser) {
121
-            if ($xoopsModuleConfig['anonpost'] == 1) {
122
-                $uid = 0;
120
+            if (!$xoopsUser) {
121
+                if ($xoopsModuleConfig['anonpost'] == 1) {
122
+                    $uid = 0;
123
+                } else {
124
+                    redirect_header('index.php', 3, _NOPERM);
125
+                }
123 126
             } else {
124
-                redirect_header('index.php', 3, _NOPERM);
127
+                $uid = $xoopsUser->uid();
125 128
             }
126
-        } else {
127
-            $uid = $xoopsUser->uid();
128
-        }
129
-
130
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
131
-
132
-        // Putting the values about the FAQ in the FAQ object
133
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
134
-        $newFaqObj->setVar('uid', $uid);
135
-        $newFaqObj->setVar('question', $_POST['question']);
136
-        $newFaqObj->setVar('howdoi', $_POST['howdoi']);
137
-        $newFaqObj->setVar('diduno', $_POST['diduno']);
138
-        $newFaqObj->setVar('notifypub', $notifypub);
139
-        //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
140
-        //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
141 129
 
142
-        // Setting the status of the FAQ
143
-
144
-        // if user is admin, FAQ are automatically published
145
-        $isAdmin = sf_userIsAdmin();
146
-        if ($isAdmin) {
147
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
148
-        } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
149
-            $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
150
-        } else {
151
-            $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
152
-        }
130
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
131
+
132
+            // Putting the values about the FAQ in the FAQ object
133
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
134
+            $newFaqObj->setVar('uid', $uid);
135
+            $newFaqObj->setVar('question', $_POST['question']);
136
+            $newFaqObj->setVar('howdoi', $_POST['howdoi']);
137
+            $newFaqObj->setVar('diduno', $_POST['diduno']);
138
+            $newFaqObj->setVar('notifypub', $notifypub);
139
+            //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
140
+            //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
141
+
142
+            // Setting the status of the FAQ
143
+
144
+            // if user is admin, FAQ are automatically published
145
+            $isAdmin = sf_userIsAdmin();
146
+            if ($isAdmin) {
147
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
148
+            } elseif ($xoopsModuleConfig['autoapprove_submitted_faq'] == 1) {
149
+                $newFaqObj->setVar('status', _SF_STATUS_PUBLISHED);
150
+            } else {
151
+                $newFaqObj->setVar('status', _SF_STATUS_SUBMITTED);
152
+            }
153 153
 
154
-        // Storing the FAQ object in the database
155
-        if (!$newFaqObj->store()) {
156
-            redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
157
-        }
154
+            // Storing the FAQ object in the database
155
+            if (!$newFaqObj->store()) {
156
+                redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
157
+            }
158 158
 
159
-        // Putting the values in the answer object
160
-        $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
161
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
162
-        $newAnswerObj->setVar('answer', $_POST['answer']);
163
-        $newAnswerObj->setVar('uid', $uid);
164
-
165
-        //====================================================================================
166
-        //TODO post Attachment
167
-        $attachments_tmp = array();
168
-        if (!empty($_POST['attachments_tmp'])) {
169
-            $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
170
-            if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
171
-                foreach ($_POST['delete_tmp'] as $key) {
172
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
173
-                    unset($attachments_tmp[$key]);
159
+            // Putting the values in the answer object
160
+            $newAnswerObj->setVar('status', _SF_AN_STATUS_APPROVED);
161
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
162
+            $newAnswerObj->setVar('answer', $_POST['answer']);
163
+            $newAnswerObj->setVar('uid', $uid);
164
+
165
+            //====================================================================================
166
+            //TODO post Attachment
167
+            $attachments_tmp = array();
168
+            if (!empty($_POST['attachments_tmp'])) {
169
+                $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
170
+                if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
171
+                    foreach ($_POST['delete_tmp'] as $key) {
172
+                        unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
173
+                        unset($attachments_tmp[$key]);
174
+                    }
174 175
                 }
175 176
             }
176
-        }
177
-        if (count($attachments_tmp)) {
178
-            foreach ($attachments_tmp as $key => $attach) {
179
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
180
-                    $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
177
+            if (count($attachments_tmp)) {
178
+                foreach ($attachments_tmp as $key => $attach) {
179
+                    if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
180
+                        $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
181
+                    }
181 182
                 }
182 183
             }
183
-        }
184
-        $error_upload = '';
184
+            $error_upload = '';
185 185
 
186
-        if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
187
-            && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
188
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
189
-            $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
190
-            $uploaddir   = XOOPS_CACHE_PATH;
186
+            if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
187
+                && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
188
+                require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
189
+                $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
190
+                $uploaddir   = XOOPS_CACHE_PATH;
191 191
 
192
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
192
+                $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
193 193
 
194
-            if ($_FILES['userfile']['error'] > 0) {
195
-                switch ($_FILES['userfile']['error']) {
194
+                if ($_FILES['userfile']['error'] > 0) {
195
+                    switch ($_FILES['userfile']['error']) {
196 196
                     case 1:
197 197
                         $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
198 198
                         break;
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
                     default:
203 203
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
204 204
                         break;
205
-                }
205
+                    }
206 206
             } else {
207 207
                 $uploader->setCheckMediaTypeByExt();
208 208
 
@@ -265,30 +265,30 @@  discard block
 block discarded – undo
265 265
         redirect_header('index.php', 2, $redirect_msg);
266 266
         break;
267 267
 
268
-    case 'form':
269
-    default:
268
+        case 'form':
269
+        default:
270 270
 
271
-        global $xoopsUser, $myts;
271
+            global $xoopsUser, $myts;
272 272
 
273
-        $faqObj      = $faqHandler->create();
274
-        $answerObj   = $answerHandler->create();
275
-        $categoryObj = $categoryHandler->create();
273
+            $faqObj      = $faqHandler->create();
274
+            $answerObj   = $answerHandler->create();
275
+            $categoryObj = $categoryHandler->create();
276 276
 
277
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
278
-        require_once XOOPS_ROOT_PATH . '/header.php';
279
-        require_once __DIR__ . '/footer.php';
277
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
278
+            require_once XOOPS_ROOT_PATH . '/header.php';
279
+            require_once __DIR__ . '/footer.php';
280 280
 
281
-        $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
282
-        $notifypub  = 1;
283
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
284
-        $xoopsTpl->assign('whereInSection', $moduleName);
285
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
281
+            $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
282
+            $notifypub  = 1;
283
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
284
+            $xoopsTpl->assign('whereInSection', $moduleName);
285
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
286 286
 
287
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
288
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
287
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
288
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
289 289
 
290
-        require_once __DIR__ . '/include/submit.inc.php';
290
+            require_once __DIR__ . '/include/submit.inc.php';
291 291
 
292
-        require_once XOOPS_ROOT_PATH . '/footer.php';
293
-        break;
292
+            require_once XOOPS_ROOT_PATH . '/footer.php';
293
+            break;
294 294
 }
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-require_once __DIR__ . '/header.php';
9
+require_once __DIR__.'/header.php';
10 10
 
11 11
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
12 12
 
@@ -83,12 +83,12 @@  discard block
 block discarded – undo
83 83
         global $xoopsUser, $myts;
84 84
 
85 85
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
86
-        require_once XOOPS_ROOT_PATH . '/header.php';
87
-        require_once __DIR__ . '/footer.php';
86
+        require_once XOOPS_ROOT_PATH.'/header.php';
87
+        require_once __DIR__.'/footer.php';
88 88
 
89 89
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
90 90
 
91
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
91
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
92 92
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
93 93
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
94 94
         $faq['answer']       = $answerObj->answer();
@@ -101,11 +101,11 @@  discard block
 block discarded – undo
101 101
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
102 102
 
103 103
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
104
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
104
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
105 105
 
106
-        require_once __DIR__ . '/include/submit.inc.php';
106
+        require_once __DIR__.'/include/submit.inc.php';
107 107
 
108
-        require_once XOOPS_ROOT_PATH . '/footer.php';
108
+        require_once XOOPS_ROOT_PATH.'/footer.php';
109 109
 
110 110
         exit();
111 111
         break;
@@ -169,14 +169,14 @@  discard block
 block discarded – undo
169 169
             $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
170 170
             if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
171 171
                 foreach ($_POST['delete_tmp'] as $key) {
172
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
172
+                    unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0]);
173 173
                     unset($attachments_tmp[$key]);
174 174
                 }
175 175
             }
176 176
         }
177 177
         if (count($attachments_tmp)) {
178 178
             foreach ($attachments_tmp as $key => $attach) {
179
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
179
+                if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0])) {
180 180
                     $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
181 181
                 }
182 182
             }
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
 
186 186
         if (isset($_FILES['userfile']['name']) && $_FILES['userfile']['name'] != ''
187 187
             && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
188
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
188
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
189 189
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
190 190
             $uploaddir   = XOOPS_CACHE_PATH;
191 191
 
192
-            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
192
+            $uploader = new sfUploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int) $maxfilesize, (int) $xoopsModuleConfig['max_img_width'], (int) $xoopsModuleConfig['max_img_height']);
193 193
 
194 194
             if ($_FILES['userfile']['error'] > 0) {
195 195
                 switch ($_FILES['userfile']['error']) {
@@ -207,19 +207,19 @@  discard block
 block discarded – undo
207 207
                 $uploader->setCheckMediaTypeByExt();
208 208
 
209 209
                 if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
210
-                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid() . '_' : 'newbb_';
210
+                    $prefix = is_object($xoopsUser) ? (string) $xoopsUser->uid().'_' : 'newbb_';
211 211
                     $uploader->setPrefix($prefix);
212 212
                     if (!$uploader->upload()) {
213
-                        $error_message[] = $error_upload =& $uploader->getErrors();
213
+                        $error_message[] = $error_upload = & $uploader->getErrors();
214 214
                     } else {
215 215
                         if (is_file($uploader->getSavedDestination())) {
216
-                            if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $uploader->getSavedFileName())) {
216
+                            if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$uploader->getSavedFileName())) {
217 217
                                 $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
218 218
                             }
219 219
                         }
220 220
                     }
221 221
                 } else {
222
-                    $error_message[] = $error_upload =& $uploader->getErrors();
222
+                    $error_message[] = $error_upload = & $uploader->getErrors();
223 223
                 }
224 224
             }
225 225
         }
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
         } else {
253 253
             // Subscribe the user to On Published notification, if requested
254 254
             if ($notifypub == 1) {
255
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
255
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
256 256
                 $notificationHandler = xoops_getHandler('notification');
257 257
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
258 258
             }
@@ -275,20 +275,20 @@  discard block
 block discarded – undo
275 275
         $categoryObj = $categoryHandler->create();
276 276
 
277 277
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
278
-        require_once XOOPS_ROOT_PATH . '/header.php';
279
-        require_once __DIR__ . '/footer.php';
278
+        require_once XOOPS_ROOT_PATH.'/header.php';
279
+        require_once __DIR__.'/footer.php';
280 280
 
281 281
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
282 282
         $notifypub  = 1;
283
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
283
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
284 284
         $xoopsTpl->assign('whereInSection', $moduleName);
285 285
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
286 286
 
287 287
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
288
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
288
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
289 289
 
290
-        require_once __DIR__ . '/include/submit.inc.php';
290
+        require_once __DIR__.'/include/submit.inc.php';
291 291
 
292
-        require_once XOOPS_ROOT_PATH . '/footer.php';
292
+        require_once XOOPS_ROOT_PATH.'/footer.php';
293 293
         break;
294 294
 }
Please login to merge, or discard this patch.
request.php 2 patches
Switch Indentation   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -44,94 +44,94 @@
 block discarded – undo
44 44
 }
45 45
 
46 46
 switch ($op) {
47
-    case 'post':
47
+        case 'post':
48 48
 
49
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
49
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
50 50
 
51
-        $newFaqObj = $faqHandler->create();
51
+            $newFaqObj = $faqHandler->create();
52 52
 
53
-        if (!$xoopsUser) {
54
-            if ($xoopsModuleConfig['anonpost'] == 1) {
55
-                $uid = 0;
53
+            if (!$xoopsUser) {
54
+                if ($xoopsModuleConfig['anonpost'] == 1) {
55
+                    $uid = 0;
56
+                } else {
57
+                    redirect_header('index.php', 3, _NOPERM);
58
+                }
56 59
             } else {
57
-                redirect_header('index.php', 3, _NOPERM);
60
+                $uid = $xoopsUser->uid();
58 61
             }
59
-        } else {
60
-            $uid = $xoopsUser->uid();
61
-        }
62
-
63
-        // Putting the values about the FAQ in the FAQ object
64
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
65
-        $newFaqObj->setVar('uid', $uid);
66
-        $newFaqObj->setVar('question', $_POST['question']);
67
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
68
-        $newFaqObj->setVar('notifypub', $notifypub);
69
-
70
-        // Setting the status of the FAQ
71
-        if ($xoopsModuleConfig['autoapprove_request'] == 1) {
72
-            $newFaqObj->setVar('status', _SF_STATUS_OPENED);
73
-        } else {
74
-            $newFaqObj->setVar('status', _SF_STATUS_ASKED);
75
-        }
76
-
77
-        // Storing the FAQ object in the database
78
-        if (!$newFaqObj->store()) {
79
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
80
-        }
81
-
82
-        // Get the cateopry object related to that FAQ
83
-        // If autoapprove_requested
84
-        if ($xoopsModuleConfig['autoapprove_request'] == 1) {
85
-            // We do not not subscribe user to notification on publish since we publish it right away
86
-
87
-            // Send notifications
88
-            $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_PUBLISHED));
89
-
90
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
91
-        } else {
92
-            // Subscribe the user to On Published notification, if requested
93
-            if ($notifypub == 1) {
94
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
95
-                $notificationHandler = xoops_getHandler('notification');
96
-                $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
62
+
63
+            // Putting the values about the FAQ in the FAQ object
64
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
65
+            $newFaqObj->setVar('uid', $uid);
66
+            $newFaqObj->setVar('question', $_POST['question']);
67
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
68
+            $newFaqObj->setVar('notifypub', $notifypub);
69
+
70
+            // Setting the status of the FAQ
71
+            if ($xoopsModuleConfig['autoapprove_request'] == 1) {
72
+                $newFaqObj->setVar('status', _SF_STATUS_OPENED);
73
+            } else {
74
+                $newFaqObj->setVar('status', _SF_STATUS_ASKED);
75
+            }
76
+
77
+            // Storing the FAQ object in the database
78
+            if (!$newFaqObj->store()) {
79
+                redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
97 80
             }
98
-            // Send notifications
99
-            $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_SUBMITTED));
100 81
 
101
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
102
-        }
82
+            // Get the cateopry object related to that FAQ
83
+            // If autoapprove_requested
84
+            if ($xoopsModuleConfig['autoapprove_request'] == 1) {
85
+                // We do not not subscribe user to notification on publish since we publish it right away
86
+
87
+                // Send notifications
88
+                $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_PUBLISHED));
89
+
90
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
91
+            } else {
92
+                // Subscribe the user to On Published notification, if requested
93
+                if ($notifypub == 1) {
94
+                    require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
95
+                    $notificationHandler = xoops_getHandler('notification');
96
+                    $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
97
+                }
98
+                // Send notifications
99
+                $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_SUBMITTED));
100
+
101
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
102
+            }
103 103
 
104
-        //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
105
-        redirect_header('index.php', 2, $redirect_msg);
106
-        break;
104
+            //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
105
+            redirect_header('index.php', 2, $redirect_msg);
106
+            break;
107 107
 
108
-    case 'form':
109
-    default:
108
+        case 'form':
109
+        default:
110 110
 
111
-        global $xoopsUser, $myts;
111
+            global $xoopsUser, $myts;
112 112
 
113
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
114
-        require_once XOOPS_ROOT_PATH . '/header.php';
115
-        require_once __DIR__ . '/footer.php';
113
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
114
+            require_once XOOPS_ROOT_PATH . '/header.php';
115
+            require_once __DIR__ . '/footer.php';
116 116
 
117
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
117
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
118 118
 
119
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
120
-        $xoopsTpl->assign('whereInSection', $moduleName);
121
-        $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
119
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
120
+            $xoopsTpl->assign('whereInSection', $moduleName);
121
+            $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
122 122
 
123
-        $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
124
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
123
+            $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
124
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
125 125
 
126
-        require_once __DIR__ . '/include/request.inc.php';
126
+            require_once __DIR__ . '/include/request.inc.php';
127 127
 
128
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
128
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
129 129
 
130
-        $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
130
+            $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
131 131
 
132
-        require_once __DIR__ . '/include/request.inc.php';
132
+            require_once __DIR__ . '/include/request.inc.php';
133 133
 
134
-        require_once XOOPS_ROOT_PATH . '/footer.php';
134
+            require_once XOOPS_ROOT_PATH . '/footer.php';
135 135
 
136
-        break;
136
+            break;
137 137
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-require_once __DIR__ . '/header.php';
10
-require_once XOOPS_ROOT_PATH . '/header.php';
9
+require_once __DIR__.'/header.php';
10
+require_once XOOPS_ROOT_PATH.'/header.php';
11 11
 
12 12
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
13 13
 
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 
77 77
         // Storing the FAQ object in the database
78 78
         if (!$newFaqObj->store()) {
79
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
79
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR.sf_formatErrors($newFaqObj->getErrors()));
80 80
         }
81 81
 
82 82
         // Get the cateopry object related to that FAQ
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         } else {
92 92
             // Subscribe the user to On Published notification, if requested
93 93
             if ($notifypub == 1) {
94
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
94
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
95 95
                 $notificationHandler = xoops_getHandler('notification');
96 96
                 $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
97 97
             }
@@ -111,27 +111,27 @@  discard block
 block discarded – undo
111 111
         global $xoopsUser, $myts;
112 112
 
113 113
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
114
-        require_once XOOPS_ROOT_PATH . '/header.php';
115
-        require_once __DIR__ . '/footer.php';
114
+        require_once XOOPS_ROOT_PATH.'/header.php';
115
+        require_once __DIR__.'/footer.php';
116 116
 
117 117
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
118 118
 
119
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
119
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
120 120
         $xoopsTpl->assign('whereInSection', $moduleName);
121 121
         $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
122 122
 
123 123
         $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
124
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
124
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, ".$myts->displayTarea($xoopsModuleConfig['requestintromsg']));
125 125
 
126
-        require_once __DIR__ . '/include/request.inc.php';
126
+        require_once __DIR__.'/include/request.inc.php';
127 127
 
128 128
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
129 129
 
130 130
         $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
131 131
 
132
-        require_once __DIR__ . '/include/request.inc.php';
132
+        require_once __DIR__.'/include/request.inc.php';
133 133
 
134
-        require_once XOOPS_ROOT_PATH . '/footer.php';
134
+        require_once XOOPS_ROOT_PATH.'/footer.php';
135 135
 
136 136
         break;
137 137
 }
Please login to merge, or discard this patch.
comment_delete.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,5 +6,5 @@
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-include __DIR__ . '/../../mainfile.php';
10
-require_once XOOPS_ROOT_PATH . '/include/comment_delete.php';
9
+include __DIR__.'/../../mainfile.php';
10
+require_once XOOPS_ROOT_PATH.'/include/comment_delete.php';
Please login to merge, or discard this patch.
open_category.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * Licence: GNU
7 7
  */
8 8
 
9
-require_once __DIR__ . '/header.php';
9
+require_once __DIR__.'/header.php';
10 10
 
11 11
 global $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
12 12
 
13 13
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.tpl';
14 14
 
15
-require_once XOOPS_ROOT_PATH . '/header.php';
16
-require_once __DIR__ . '/footer.php';
15
+require_once XOOPS_ROOT_PATH.'/header.php';
16
+require_once __DIR__.'/footer.php';
17 17
 
18
-$categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
18
+$categoryid = isset($_GET['categoryid']) ? (int) $_GET['categoryid'] : 0;
19 19
 
20 20
 // Creating the category object for the selected category
21 21
 $categoryObj = new sfCategory($categoryid);
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 $categoryHandler = sf_gethandler('category');
35 35
 
36 36
 // At which record shall we start
37
-$start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
37
+$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
38 38
 
39 39
 // Creating the faq handler object
40 40
 $faqHandler = sf_gethandler('faq');
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 $last_qnaObj = $faqHandler->getLastPublishedByCat(array(_SF_STATUS_OPENED));
59 59
 if (isset($last_qnaObj[$categoryid])) {
60 60
     $categoryObj->setVar('last_faqid', $last_qnaObj[$categoryid]->getVar('faqid'));
61
-    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$categoryid]->getVar('faqid') . "'>" . $last_qnaObj[$categoryid]->question(50) . '</a>');
61
+    $categoryObj->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$categoryid]->getVar('faqid')."'>".$last_qnaObj[$categoryid]->question(50).'</a>');
62 62
 }
63 63
 // Populating the smarty variables with informations related to the selected category
64 64
 $category                 = $categoryObj->toArray(null, true);
@@ -77,16 +77,16 @@  discard block
 block discarded – undo
77 77
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
78 78
             if (isset($last_qnaObj[$subcat_id])) {
79 79
                 $subcat->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
80
-                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question(50) . '</a>');
80
+                $subcat->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question(50).'</a>');
81 81
             }
82 82
             $subcat->setVar('faqcount', $totalQnas[$subcat_id]);
83 83
             $subcats[$subcat_id] = $subcat->toArray(null, true);
84
-            $catQnasWithSub      += $subcats[$subcat_id]['total'];
84
+            $catQnasWithSub += $subcats[$subcat_id]['total'];
85 85
         }
86 86
     }
87 87
     $xoopsTpl->assign('subcats', $subcats);
88 88
 }
89
-$category['total'] = $catQnasWithSub + $totalQnas[$categoryid];
89
+$category['total'] = $catQnasWithSub+$totalQnas[$categoryid];
90 90
 if ($faqsObj) {
91 91
     $userids = array();
92 92
     foreach ($faqsObj as $key => $thisfaq) {
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
     }
96 96
 
97 97
     $memberHandler = xoops_getHandler('member');
98
-    $users         = $memberHandler->getUsers(new Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
98
+    $users         = $memberHandler->getUsers(new Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
99 99
     for ($i = 0; $i < $totalQnasOnPage; ++$i) {
100 100
         $faq = $faqsObj[$i]->toArray(null, $allcategories);
101 101
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
     }
108 108
 }
109 109
 // Language constants
110
-$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name')) . " > <a href='open_index.php'>" . _MD_SF_OPEN_SECTION . '</a>');
110
+$xoopsTpl->assign('whereInSection', $myts->htmlSpecialChars($xoopsModule->getVar('name'))." > <a href='open_index.php'>"._MD_SF_OPEN_SECTION.'</a>');
111 111
 $xoopsTpl->assign('modulename', $xoopsModule->dirname());
112 112
 
113 113
 $xoopsTpl->assign('displaylastfaqs', true);
@@ -124,19 +124,19 @@  discard block
 block discarded – undo
124 124
 $xoopsTpl->assign('lang_category', _MD_SF_CATEGORY);
125 125
 
126 126
 // The Navigation Bar
127
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
128
-$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
127
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
128
+$pagenav = new XoopsPageNav($totalQnas[$categoryid], $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
129 129
 if ($xoopsModuleConfig['useimagenavpage'] == 1) {
130
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>';
130
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>';
131 131
 } else {
132
-    $category['navbar'] = '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
132
+    $category['navbar'] = '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
133 133
 }
134 134
 
135 135
 $xoopsTpl->assign('category', $category);
136 136
 
137 137
 // Page Title Hack by marcan
138 138
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
139
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
139
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
140 140
 // End Page Title Hack by marcan
141 141
 
142
-require_once XOOPS_ROOT_PATH . '/footer.php';
142
+require_once XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.