mambax7 / smartfaq

language/english/smartdbupdater.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 define('_SDU_MSG_NEWFIELD', 'Successfully added field %s');
 define('_SDU_MSG_NEWFIELD_ERR', 'Error adding field %s');
 define('_SDU_NEEDUPDATE',
-       'Your database is out-of-date. Please upgrade your database tables!<br><b>Note : The SmartFactory strongly recommends you to backup all SmartSection tables before running this upgrade script.</b><br>');
+        'Your database is out-of-date. Please upgrade your database tables!<br><b>Note : The SmartFactory strongly recommends you to backup all SmartSection tables before running this upgrade script.</b><br>');
 define('_SDU_NOUPDATE', 'Your database is up-to-date. No updates are necessary.');
 define('_SDU_UPDATE_DB', 'Updating Database');
 define('_SDU_UPDATE_ERR', 'Errors updating to version %s');

language/english/main.php

Indentation +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
 define('_MD_SF_CONTEXTMODULELINK', 'Contextually linked to this module');
 define('_MD_SF_CONTEXTMODULELINK_FAQ', 'Contextually linked to this module');
 define('_MD_SF_CONTEXTMODULELINK_FAQ_DSC',
-       "Select the module to which this Q&A will be linked. If the Contextual Q&A block is visible on that module, the 'How do I' statement of this Q&A will be displayed.");
+        "Select the module to which this Q&A will be linked. If the Contextual Q&A block is visible on that module, the 'How do I' statement of this Q&A will be displayed.");
 define('_MD_SF_CONTEXTPAGE', 'Contextually linked to this URL');
 define('_MD_SF_CONTEXTPAGEDEF', 'Contextual Page');
 define('_MD_SF_CONTEXTPAGEDEF_DSC', 'Page for which this Q&amp;A gives explanation <b>Example :</b> modules/newbb');
@@ -53,7 +53,7 @@ 
 define('_MD_SF_ERRORSAVINGDB', 'ERROR: Database has NOT been Updated due to an Error!');
 define('_MD_SF_EXACTURL', 'Exact URL?');
 define('_MD_SF_EXACTURL_DSC',
-       "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 all pages that match a part of the root of the specific URL.ie modules/newbb/*.php");
+        "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 all pages that match a part of the root of the specific URL.ie modules/newbb/*.php");
 define('_MD_SF_FAQ_NEW_ANSWER_NEED_APPROBATION', 'Your answer was submitted successfully and will be reviewed by a moderator.');
 define('_MD_SF_FAQ_NEW_ANSWER_PUBLISHED', 'Your answer was submitted successfully and will be automatically published in the Q&amp;A section, as a replacement of the original answer.');
 define('_MD_SF_FAQCOMEFROM', 'This Q&amp;A was found on ');
@@ -77,9 +77,9 @@ 
 define('_MD_SF_MAIL', 'Send Q&amp;A');
 define('_MD_SF_MAINHEAD', 'Welcome to the');
 define('_MD_SF_MAININTRO',
-       "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='"
-       . XOOPS_URL
-       . "/forms/askus/form.php'>Ask us a Question!</a>");
+        "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='"
+        . XOOPS_URL
+        . "/forms/askus/form.php'>Ask us a Question!</a>");
 define('_MD_SF_MAINNOSELECTCAT', 'You did not select a valid category');
 define('_MD_SF_MAINNOFAQS', 'There are no Q&amp;As in this category');
 define('_MD_SF_MODERATION_MAIN_HEAD', 'Moderation section of ');
@@ -119,7 +119,7 @@ 
 define('_MD_SF_REQUEST', 'Request a new Q&amp;A');
 define('_MD_SF_REQUEST_ERROR', 'An error occured. Your request was not sent.');
 define('_MD_SF_REQUEST_INTRO',
-       '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!');
+        '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!');
 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!');
 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!');
 define('_MD_SF_REQUESTED', 'Requested');
@@ -140,7 +140,7 @@ 
 define('_MD_SF_SUBMITANSWER', 'Submit answer');
 define('_MD_SF_SUBMITANSWERTO', 'Submit an answer to %s');
 define('_MD_SF_SUBMITANSWER_INTRO',
-       'please fill this form to submit an answer for this question. The site adminisrator will review it and then publish it as soon as possible. Thank you in advance for your contribution.');
+        'please fill this form to submit an answer for this question. The site adminisrator will review it and then publish it as soon as possible. Thank you in advance for your contribution.');
 define('_MD_SF_SUBMITANSWERBUTTON', 'Submit the answer');
 define('_MD_SF_SUBMITAPPROVED', 'The answer you sent has been received. Since the auto-approve option is on, the answer has been accepted and the Q&amp;A has been published.');
 define('_MD_SF_SUBMIT_FROM_ADMIN', 'Since you are an admin of the module, the Q&amp;A was automatically published with all permissions.');

Spacing +1 added lines, -1 removed lines

@@ -132,7 +132,7 @@
 define('_MD_SF_SPECIFIC_URL_SELECT', 'Specific URL...');
 define('_MD_SF_SENDSTORY', 'Send this Q&A to a friend');
 define('_MD_SF_SPECIFIC_URL', 'Specific URL');
-define('_MD_SF_SPECIFIC_URL_DSC', "If you have set the 'Contextually link to this module' to <i>" . _MD_SF_SPECIFIC_URL_SELECT . "</i>, please specify the URL.<br>\n<b>Example :</b> modules/newbb");
+define('_MD_SF_SPECIFIC_URL_DSC', "If you have set the 'Contextually link to this module' to <i>"._MD_SF_SPECIFIC_URL_SELECT."</i>, please specify the URL.<br>\n<b>Example :</b> modules/newbb");
 define('_MD_SF_SUB_INTRO', 'please fill this form to send your Q&amp;A. The site administrator will review it and then publish it as soon as possible. Thank you in advance for your contribution.');
 define('_MD_SF_SUB_SNEWNAME', 'Submit a Q&amp;A');
 define('_MD_SF_SUB_SMNAME', 'Submit a Q&amp;A');

language/english/admin.php

Indentation +19 added lines, -19 removed lines

@@ -27,14 +27,14 @@ 
 define('_AM_SF_ANSWERING', 'Answering');
 define('_AM_SF_ANSWERED', 'Answered');
 define('_AM_SF_ANSWERED_EXP',
-       '<b>Answered questions</b> : Questions in the Open Questions section that have been answered by users. Once an answer has been approved for a question, this very question becomes a submitted Q&amp;A and will require approval as well.');
+        '<b>Answered questions</b> : Questions in the Open Questions section that have been answered by users. Once an answer has been approved for a question, this very question becomes a submitted Q&amp;A and will require approval as well.');
 define('_AM_SF_ANSWERED_MODERATE', 'Moderate the answer to this question');
 define('_AM_SF_ANSWERISDELETED', 'The answer has been deleted.');
 define('_AM_SF_ANSWERNOTFOUND', 'Error : No official answer was found');
 define('_AM_SF_APPROVE', 'Approve');
 define('_AM_SF_APPROVED', 'Approved answer');
 define('_AM_SF_APPROVED_INFO',
-       'The answer for this question has been approved. This question has now been promoted to the status of submitted Q&amp;A and needs an approval to be published in the Q&amp;A section.');
+        'The answer for this question has been approved. This question has now been promoted to the status of submitted Q&amp;A and needs an approval to be published in the Q&amp;A section.');
 define('_AM_SF_APPROVED_MODERATE', "Moderate this Q&amp;A's submission");
 define('_AM_SF_APPROVED_TITLE', 'Approved answer');
 define('_AM_SF_APPROVESUB', 'Approve submission');
@@ -51,10 +51,10 @@ 
 define('_AM_SF_ASKED', 'Asked');
 define('_AM_SF_ASKED_APPROVE_SUCCESS', 'The asked question was answered and the Q&amp;A was published in the public section of the site.');
 define('_AM_SF_ASKED_EXP',
-       '<b>Asked questions</b> : questions that have been asked by users. These questions have not yet been approved by a moderator. Once approved, the <i>Asked question</i> will become an <i>Open question<i> and be displayed in the <b>Open Questions</b> section.');
+        '<b>Asked questions</b> : questions that have been asked by users. These questions have not yet been approved by a moderator. Once approved, the <i>Asked question</i> will become an <i>Open question<i> and be displayed in the <b>Open Questions</b> section.');
 define('_AM_SF_ASKED_TITLE', 'Asked Question');
 define('_AM_SF_ASKED_TITLE_INFO',
-       'This is a question asked by a user. You can review the question and write the answer.<br>Uppon approval, the Q&amp;A will be published in the public section of the site.');
+        'This is a question asked by a user. You can review the question and write the answer.<br>Uppon approval, the Q&amp;A will be published in the public section of the site.');
 define('_AM_SF_AUTHFAQ', 'Publish the submitted answer');
 define('_AM_SF_AUTHORIZE', 'Authorize');
 define('_AM_SF_BACK2IDX', 'Cancelled. Taking you back to the index');
@@ -81,7 +81,7 @@ 
 define('_AM_SF_CATHEADER', 'Categories Management');
 define('_AM_SF_CONTEXTMODULELINK', 'Contextually linked to this module');
 define('_AM_SF_CONTEXTMODULELINK_FAQ',
-       "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>");
+        "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>");
 define('_AM_SF_CONTEXTOPTIONS', 'Contextual options');
 define('_AM_SF_CONTEXTPAGE', 'Contextually linked to this URL');
 define('_AM_SF_CONTEXTURLLINK', 'Link to this URL');
@@ -97,7 +97,7 @@ 
 define('_AM_SF_DELETE', 'Delete');
 define('_AM_SF_DELETEART', 'Delete Q&amp;A');
 define('_AM_SF_DELETE_CAT_CONFIRM',
-       'Please note that by deleting a category, all the sub-categories and the Q&amp;A of this category will be deleted as well, along with any comments that may have been posted related to these Q&amp;A. Are you sure you wish to delete this category?');
+        'Please note that by deleting a category, all the sub-categories and the Q&amp;A of this category will be deleted as well, along with any comments that may have been posted related to these Q&amp;A. Are you sure you wish to delete this category?');
 define('_AM_SF_DELETE_CAT_ERROR', 'An error occured while deleting this category.');
 define('_AM_SF_DELETECOL', 'Delete category');
 define('_AM_SF_DELETESUBM', 'Delete submission');
@@ -123,7 +123,7 @@ 
 define('_AM_SF_ERROR_ANSWER_NOT_SAVED', 'An error occured. The answer was not saved in the database.');
 define('_AM_SF_ERROR_FAQ_NOT_SAVED', 'An error occured. The Q&amp;A was not saved in the database.');
 define('_AM_SF_EXACTURL',
-       "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>");
+        "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>");
 define('_AM_SF_FAQ_EDIT', 'Edit this Q&amp;A');
 define('_AM_SF_FAQ_NEW_ANSWER_PUBLISHED', 'The original answer was replaced by this answer.');
 define('_AM_SF_FAQ_REVIEW', 'Edit this answer before approbation');
@@ -135,7 +135,7 @@ 
 define('_AM_SF_HELP', 'Help');
 define('_AM_SF_HOWDOI', 'How do I...');
 define('_AM_SF_HOWDOI_FAQ',
-       "How do I...<span style='font-size: xx-small; font-weight: normal; display: block;'>This will be used in the Contextual FAQ Block.<br>It should be a short version of the question.</span>");
+        "How do I...<span style='font-size: xx-small; font-weight: normal; display: block;'>This will be used in the Contextual FAQ Block.<br>It should be a short version of the question.</span>");
 define('_AM_SF_ID', 'Id');
 define('_AM_SF_IMPORT', 'Import');
 define('_AM_SF_IMPORT_ALL_QUESTIONS', 'All questions');
@@ -158,7 +158,7 @@ 
 define('_AM_SF_IMPORT_ONLY_VISIBLE', 'Only visible questions ');
 define('_AM_SF_IMPORT_PARENT_CATEGORY', 'SmartFAQ Parent Category');
 define('_AM_SF_IMPORT_PERMISSIONS',
-       "Permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see these imported Q&amp;As.<br>this Q&amp;A.</span>");
+        "Permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see these imported Q&amp;As.<br>this Q&amp;A.</span>");
 define('_AM_SF_IMPORT_RESULT', 'Here is the result of the import.');
 define('_AM_SF_IMPORT_SETTINGS', 'Import Settings');
 define('_AM_SF_IMPORT_SUCCESS', 'The Q&amp;A set was successfully imported in the module.');
@@ -177,7 +177,7 @@ 
 define('_AM_SF_MODART', 'Modify a Q&amp;A');
 define('_AM_SF_MODCOL', 'Modify existing category');
 define('_AM_SF_MODERATORS_DEF',
-       "Moderators<span style='font-size: xx-small; font-weight: normal; display: block;'>Users that will act as moderators for this<br>category. They will be able to add, edit,<br>approve and delete questions and Q&amp;A<br>within this category.</span>");
+        "Moderators<span style='font-size: xx-small; font-weight: normal; display: block;'>Users that will act as moderators for this<br>category. They will be able to add, edit,<br>approve and delete questions and Q&amp;A<br>within this category.</span>");
 define('_AM_SF_MODIFY', 'Modify');
 define('_AM_SF_MODIFYCOL', 'Modify category');
 define('_AM_SF_MODIFYTHISCOL', 'Modify this category?');
@@ -214,7 +214,7 @@ 
 define('_AM_SF_OFFLINE_FIELD', "Offline<span style='font-size: xx-small; font-weight: normal; display: block;'>Select 'No' to put this Q&amp;A back<br>on line in the Q&amp;A section.</span>");
 define('_AM_SF_OFFLINEEDITING', 'Editing an offline Q&amp;A');
 define('_AM_SF_OFFLINEEDITING_INFO',
-       "You can edit this offline Q&amp;A. Modifications will be saved for this item. However, if you would like to display this Q&amp;A in the Q&amp;A section, you will need to set the <b>Offline</b> field to 'No'.");
+        "You can edit this offline Q&amp;A. Modifications will be saved for this item. However, if you would like to display this Q&amp;A in the Q&amp;A section, you will need to set the <b>Offline</b> field to 'No'.");
 define('_AM_SF_OPEN_QUESTION', 'Open Question');
 define('_AM_SF_OPEN_QUESTIONS', 'Open Questions');
 define('_AM_SF_OPENED', 'Opened');
@@ -222,21 +222,21 @@ 
 define('_AM_SF_OPENED_TITLE', 'Published questions in the Open Questions section');
 define('_AM_SF_OPENED_DSC', 'Here is a list of all the published questions in the Open Questions section.');
 define('_AM_SF_OPENED_EXP',
-       '<b>Opened questions</b> : Questions that have been asked by a user, and approved by a moderator. These questions are displayed in the <i>Open Questions</i> section of this module, waiting for user to answer them.');
+        '<b>Opened questions</b> : Questions that have been asked by a user, and approved by a moderator. These questions are displayed in the <i>Open Questions</i> section of this module, waiting for user to answer them.');
 define('_AM_SF_OPTIONS', 'Options');
 define('_AM_SF_OPTS', 'Preferences');
 define('_AM_SF_OPEN_QUESTION_ANSWERING', 'Answering an open question');
 define('_AM_SF_OPEN_QUESTION_ANSWERING_INFO', 'You are now answering an open question, which will become a Q&amp;A and be published in the Q&amp;A section. ');
 define('_AM_SF_OPENED_ANSWERING_SUCCESS', 'The open question has been answered and published in the Q&amp;A section!');
 define('_AM_SF_PARENT_CATEGORY_EXP',
-       "Parent category<span style='font-size: xx-small; font-weight: normal; display: block;'>If you want this new category to be a sub-category, select a parent here. If it is to be a top level category, leave this blank.</span>");
+        "Parent category<span style='font-size: xx-small; font-weight: normal; display: block;'>If you want this new category to be a sub-category, select a parent here. If it is to be a top level category, leave this blank.</span>");
 define('_AM_SF_PERMISSIONS', 'Permissions');
 define('_AM_SF_PERMISSIONS_FAQ', "Permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see<br>this Q&amp;A.</span>");
 define('_AM_SF_PERMISSIONS_QUESTION', "Permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see this Question.</span>");
 define('_AM_SF_PERMISSIONS_CAT_READ',
-       "Read permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see<br>this Category, as well as any open questions<br>and Q&amp;A inside that category.</span>");
+        "Read permissions<span style='font-size: xx-small; font-weight: normal; display: block;'>Groups that will have permissions to see<br>this Category, as well as any open questions<br>and Q&amp;A inside that category.</span>");
 define('_AM_SF_PERMISSIONS_APPLY_ON_FAQS',
-       "Apply read permissions on Q&amp;A<span style='font-size: xx-small; font-weight: normal; display: block;'>Apply the above Read Permissions on all<br>Q&amp;A within that category, overriding the<br>current permissions for all these Q&amp;A.</span>");
+        "Apply read permissions on Q&amp;A<span style='font-size: xx-small; font-weight: normal; display: block;'>Apply the above Read Permissions on all<br>Q&amp;A within that category, overriding the<br>current permissions for all these Q&amp;A.</span>");
 define('_AM_SF_PERMISSIONSADMIN', 'Permissions Management');
 define('_AM_SF_PERMISSIONSVIEWMAN', 'Permissions to view categories');
 define('_AM_SF_PERMISSIONSADMINMAN', 'Permissions to moderate categories');
@@ -272,7 +272,7 @@ 
 define('_AM_SF_REQUEST_QUEUE', 'The question has been successfully added to the Open Questions section.');
 define('_AM_SF_REJECTED_QUESTION', 'Rejected question');
 define('_AM_SF_REJECTED_QUESTION_EXP',
-       '<b>Rejected question</b> : Questions that have been asked by users but rejected by a moderator. Rejected questions are not displayes in the Open Questions section.');
+        '<b>Rejected question</b> : Questions that have been asked by users but rejected by a moderator. Rejected questions are not displayes in the Open Questions section.');
 define('_AM_SF_REJECTED_SMARTFAQ', 'Rejected Q&amp;A');
 define('_AM_SF_REJECTED_SMARTFAQ_EXP', '<b>Rejected Q&amp;A</b> : Q&amp;As that have been submitted by user, but rejected by a moderator. Rejected Q&amp;As are not displayed in the Q&amp;A section.');
 define('_AM_SF_REQUESTED_BY', 'Question asked by : ');
@@ -289,8 +289,8 @@ 
 define('_AM_SF_SUBMISSIONSMNGMT', 'Submitted Q&amp;A');
 define('_AM_SF_SPECIFIC_URL_SELECT', 'Specific URL...');
 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>");
+                                . _AM_SF_SPECIFIC_URL_SELECT
+                                . "</i>, please<br>specify the URL.<br>\n<b>Example :</b> modules/newbb</span>");
 define('_AM_SF_SUBMISSION_MODERATE', "Moderate this Q&amp;A's submission");
 define('_AM_SF_SUBMITTED', 'Submitted');
 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.');
@@ -298,7 +298,7 @@ 
 define('_AM_SF_SUBMITTED_ANSWER_ACCEPTED', 'The submitted answer has been approved.');
 define('_AM_SF_SUBMITTED_ANSWER_INFO', 'Here is a list of submitted answers for that question. Select one of them to be the official answer for that question.');
 define('_AM_SF_SUBMITTED_INFO',
-       'This Q&amp;A has been submitted by a member. You can make some modifications if you like. Upon approval, this Q&amp;A will be displayed in the Q&amp;A section of this site.');
+        'This Q&amp;A has been submitted by a member. You can make some modifications if you like. Upon approval, this Q&amp;A will be displayed in the Q&amp;A section of this site.');
 define('_AM_SF_SUBMITTED_APPROVE_SUCCESS', 'The submitted Q&amp;A has been published in the Q&amp;A section.');
 define('_AM_SF_SUBMITTED_TITLE', 'Approving a submitted Q&amp;A');
 define('_AM_SF_FAQ_DELETE_ERROR', 'An error occured while deleting this Q&amp;A.');

class/category.php

Indentation +6 added lines, -6 removed lines

@@ -333,10 +333,10 @@ 
 
         if ($category->isNew()) {
             $sql = sprintf('INSERT INTO %s (categoryid, parentid, name, description, total, weight, created) VALUES (NULL, %u, %s, %s, %u, %u, %u)', $this->db->prefix('smartfaq_categories'),
-                           $parentid, $this->db->quoteString($name), $this->db->quoteString($description), $total, $weight, time());
+                            $parentid, $this->db->quoteString($name), $this->db->quoteString($description), $total, $weight, time());
         } else {
             $sql = sprintf('UPDATE %s SET parentid = %u, name = %s, description = %s, total = %s, weight = %u, created = %u WHERE categoryid = %u', $this->db->prefix('smartfaq_categories'), $parentid,
-                           $this->db->quoteString($name), $this->db->quoteString($description), $total, $weight, $created, $categoryid);
+                            $this->db->quoteString($name), $this->db->quoteString($description), $total, $weight, $created, $categoryid);
         }
         if (false != $force) {
             $result = $this->db->queryF($sql);
@@ -520,10 +520,10 @@ 
         $ret   = array();
         $limit = $start = 0;
         $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM '
-                 . $this->db->prefix('smartfaq_categories')
-                 . ' AS c INNER JOIN '
-                 . $this->db->prefix('smartfaq_faq')
-                 . ' AS f ON c.categoryid = f.categoryid';
+                    . $this->db->prefix('smartfaq_categories')
+                    . ' AS c INNER JOIN '
+                    . $this->db->prefix('smartfaq_faq')
+                    . ' AS f ON c.categoryid = f.categoryid';
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             $sql .= ' ' . $criteria->renderWhere();
             if ($criteria->getSort() != '') {

Spacing +33 added lines, -33 removed lines

@@ -47,7 +47,7 @@ 
                 $this->assignVars($id);
             } else {
                 $categoryHandler = new sfCategoryHandler($this->db);
-                $category        =& $categoryHandler->get($id);
+                $category        = & $categoryHandler->get($id);
                 foreach ($category->vars as $k => $v) {
                     $this->assignVar($k, $v['value']);
                 }
@@ -80,7 +80,7 @@ 
      */
     public function checkPermission()
     {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $userIsAdmin = sf_userIsAdmin();
         if ($userIsAdmin) {
@@ -157,7 +157,7 @@ 
             $filename = 'open_category.php';
         }
         if ($withAllLink) {
-            $ret = "<a href='" . XOOPS_URL . '/modules/smartfaq/' . $filename . '?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $ret = "<a href='".XOOPS_URL.'/modules/smartfaq/'.$filename.'?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
             $ret = $this->name();
         }
@@ -169,7 +169,7 @@ 
                 exit;
             }
             $parentid = $parentObj->parentid();
-            $ret      = $parentObj->getCategoryPath(true, $open) . ' > ' . $ret;
+            $ret      = $parentObj->getCategoryPath(true, $open).' > '.$ret;
         }
 
         return $ret;
@@ -223,7 +223,7 @@ 
         $tags                  = array();
         $tags['MODULE_NAME']   = $myts->htmlSpecialChars($smartModule->getVar('name'));
         $tags['CATEGORY_NAME'] = $this->name();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
 
         $notificationHandler = xoops_getHandler('notification');
         $notificationHandler->triggerEvent('global_faq', 0, 'category_created', $tags);
@@ -239,9 +239,9 @@ 
         $category['categoryid'] = $this->categoryid();
         $category['name']       = $this->name();
         if ($open !== false) {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/open_category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/open_category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         } else {
-            $category['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $this->name() . '</a>';
+            $category['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$this->name().'</a>';
         }
         $category['total']       = $this->getVar('faqcount');
         $category['description'] = $this->description();
@@ -290,8 +290,8 @@ 
     public function &get($id)
     {
         $false = false;
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return $false;
             }
@@ -375,7 +375,7 @@ 
         }
 
         // Deleteing the sub categories
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
+        $subcats = & $this->getCategories(0, 0, $category->categoryid());
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -412,11 +412,11 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -458,7 +458,7 @@ 
         $order = 'ASC',
         $id_as_key = true
     ) {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $criteria = new CriteriaCompo();
 
@@ -472,7 +472,7 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $criteria->setStart($start);
         $criteria->setLimit($limit);
@@ -496,7 +496,7 @@ 
         $sort = 'weight',
         $order = 'ASC'
     ) {
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $criteria = new CriteriaCompo();
 
@@ -510,7 +510,7 @@ 
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
 
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
@@ -525,9 +525,9 @@ 
                  . $this->db->prefix('smartfaq_faq')
                  . ' AS f ON c.categoryid = f.categoryid';
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -556,9 +556,9 @@ 
      */
     public function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_categories');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -585,7 +585,7 @@ 
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
@@ -608,16 +608,16 @@ 
                 $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
         $criteria->add(new Criteria('f.status', _SF_STATUS_OPENED));
 
-        $sql = 'SELECT COUNT(c.categoryid) FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql = 'SELECT COUNT(c.categoryid) FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         $result = $this->db->query($sql);
@@ -635,13 +635,13 @@ 
      */
     public function getSubCats($categories)
     {
-        $criteria = new CriteriaCompo(new Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')'), 'IN');
+        $criteria = new CriteriaCompo(new Criteria('parentid', '('.implode(',', array_keys($categories)).')'), 'IN');
         $ret      = array();
         if (!sf_userIsAdmin()) {
             $smartPermHandler = xoops_getModuleHandler('permission', 'smartfaq');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $subcats = $this->getObjects($criteria, true);
         foreach ($subcats as $subcat_id => $subcat) {
@@ -659,9 +659,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_categories');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -683,10 +683,10 @@ 
      **/
     public function updateAll($fieldname, $fieldvalue, $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_categories') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_categories').' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->queryF($sql)) {
             return false;
@@ -712,7 +712,7 @@ 
     public function faqsCount($cat_id = 0, $status = '')
     {
         global $xoopsUser;
-        include_once XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php';
+        include_once XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php';
 
         $faqHandler = sf_gethandler('faq');
 

class/smartdbupdater.php

Spacing +23 added lines, -23 removed lines

@@ -16,7 +16,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (list($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -53,9 +53,9 @@ 
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = XOOPS_ROOT_PATH . '/modules/smartfaq/language/english/smartdbupdater.php';
+    $common_file = XOOPS_ROOT_PATH.'/modules/smartfaq/language/english/smartdbupdater.php';
 }
 
 include $common_file;
@@ -152,14 +152,14 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
         while ($existing_field = $xoopsDB->fetchArray($result)) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ($existing_field['Null'] !== 'YES') {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
         }
 
@@ -235,9 +235,9 @@ 
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
             $ret   = $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -402,9 +402,9 @@ 
 
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).'<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -423,11 +423,11 @@ 
         $query = sprintf('DROP TABLE %s', $this->name());
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -451,9 +451,9 @@ 
             $ret = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).'<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -477,9 +477,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -502,9 +502,9 @@ 
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -527,9 +527,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -553,9 +553,9 @@ 
 
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }
 
@@ -624,11 +624,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }

class/answer.php

Indentation +2 added lines, -2 removed lines

@@ -474,10 +474,10 @@
 
         if ($answerObj->isNew()) {
             $sql = sprintf('INSERT INTO %s (answerid, `status`, faqid, answer, uid, datesub, notifypub) VALUES (NULL, %u, %u, %s, %u, %u, %u)', $this->db->prefix('smartfaq_answers'), $status, $faqid,
-                           $this->db->quoteString($answer), $uid, time(), $notifypub);
+                            $this->db->quoteString($answer), $uid, time(), $notifypub);
         } else {
             $sql = sprintf('UPDATE %s SET STATUS = %u, faqid = %s, answer = %s, uid = %u, datesub = %u, notifypub = %u WHERE answerid = %u', $this->db->prefix('smartfaq_answers'), $status, $faqid,
-                           $this->db->quoteString($answer), $uid, $datesub, $notifypub, $answerid);
+                            $this->db->quoteString($answer), $uid, $datesub, $notifypub, $answerid);
         }
 
         if (false != $force) {

Spacing +40 added lines, -40 removed lines

@@ -91,9 +91,9 @@ 
         if (!$attach_key) {
             return false;
         }
-        $this->attachment_array[(string)$attach_key]['num_download']++;
+        $this->attachment_array[(string) $attach_key]['num_download']++;
 
-        return $this->attachment_array[(string)$attach_key]['num_download'];
+        return $this->attachment_array[(string) $attach_key]['num_download'];
     }
 
     /**
@@ -106,7 +106,7 @@ 
             $attachment_save = base64_encode(serialize($this->attachment_array));
         }
         $this->setVar('attachment', $attachment_save);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('smartfaq_answers') . ' SET attachment=' . $GLOBALS['xoopsDB']->quoteString($attachment_save) . ' WHERE post_id = ' . $this->getVar('answerid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('smartfaq_answers').' SET attachment='.$GLOBALS['xoopsDB']->quoteString($attachment_save).' WHERE post_id = '.$this->getVar('answerid');
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
             //xoops_error($GLOBALS["xoopsDB"]->error());
             return false;
@@ -138,8 +138,8 @@ 
 
         foreach ($attach_old as $key => $attach) {
             if (in_array($key, $attach_array)) {
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attach['name_saved']);
-                @unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/thumbs/' . $attach['name_saved']); // delete thumbnails
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attach['name_saved']);
+                @unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/thumbs/'.$attach['name_saved']); // delete thumbnails
                 continue;
             }
             $this->attachment_array[$key] = $attach;
@@ -165,12 +165,12 @@ 
         static $counter = 0;
         $this->attachment_array = $this->getAttachment();
         if ($name_saved) {
-            $key                          = (string)(time() + ($counter++));
+            $key                          = (string) (time()+($counter++));
             $this->attachment_array[$key] = array(
                 'name_saved'   => $name_saved,
                 'name_display' => isset($name_display) ? $name_display : $name_saved,
                 'mimetype'     => $mimetype,
-                'num_download' => isset($num_download) ? (int)$num_download : 0
+                'num_download' => isset($num_download) ? (int) $num_download : 0
             );
         }
         $attachment_save = null;
@@ -196,24 +196,24 @@ 
         if (is_array($attachments) && count($attachments) > 0) {
             $iconHandler = sf_getIconHandler();
             $mime_path   = $iconHandler->getPath('mime');
-            include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/include/functions.image.php';
+            include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/include/functions.image.php';
             $image_extensions = array('jpg', 'jpeg', 'gif', 'png', 'bmp'); // need improve !!!
-            $post_attachment  .= '<br><strong>' . _MD_ATTACHMENT . '</strong>:';
+            $post_attachment  .= '<br><strong>'._MD_ATTACHMENT.'</strong>:';
             $post_attachment  .= '<br><hr size="1" noshade="noshade" /><br>';
             foreach ($attachments as $key => $att) {
                 $file_extension = ltrim(strrchr($att['name_saved'], '.'), '.');
                 $filetype       = $file_extension;
-                if (file_exists(XOOPS_ROOT_PATH . '/' . $mime_path . '/' . $filetype . '.gif')) {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/' . $filetype . '.gif';
+                if (file_exists(XOOPS_ROOT_PATH.'/'.$mime_path.'/'.$filetype.'.gif')) {
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/'.$filetype.'.gif';
                 } else {
-                    $icon_filetype = XOOPS_URL . '/' . $mime_path . '/unknown.gif';
+                    $icon_filetype = XOOPS_URL.'/'.$mime_path.'/unknown.gif';
                 }
-                $file_size = @filesize(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $att['name_saved']);
-                $file_size = number_format($file_size / 1024, 2) . ' KB';
+                $file_size = @filesize(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$att['name_saved']);
+                $file_size = number_format($file_size / 1024, 2).' KB';
                 if ($xoopsModuleConfig['media_allowed'] && in_array(strtolower($file_extension), $image_extensions)) {
-                    $post_attachment .= '<br><img src="' . $icon_filetype . '" alt="' . $filetype . '" /><strong>&nbsp; ' . $att['name_display'] . '</strong> <small>(' . $file_size . ')</small>';
-                    $post_attachment .= '<br>' . sf_attachmentImage($att['name_saved']);
-                    $isDisplayed     = true;
+                    $post_attachment .= '<br><img src="'.$icon_filetype.'" alt="'.$filetype.'" /><strong>&nbsp; '.$att['name_display'].'</strong> <small>('.$file_size.')</small>';
+                    $post_attachment .= '<br>'.sf_attachmentImage($att['name_saved']);
+                    $isDisplayed = true;
                 } else {
                     global $xoopsUser;
                     if (empty($xoopsModuleConfig['show_userattach'])) {
@@ -370,9 +370,9 @@ 
         $tags                  = array();
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $faqObj->question();
-        $tags['FAQ_URL']       = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $faqObj->faqid();
+        $tags['FAQ_URL']       = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$faqObj->faqid();
         $tags['CATEGORY_NAME'] = $faqObj->getCategoryName();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $faqObj->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$faqObj->categoryid();
         $tags['FAQ_QUESTION']  = $faqObj->question();
 
         // TODO : Not sure about the 'formpreview' ...
@@ -431,8 +431,8 @@ 
      */
     public function get($id = null, $fields = null)
     {
-        if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers') . ' WHERE answerid=' . $id;
+        if ((int) $id > 0) {
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers').' WHERE answerid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }
@@ -562,11 +562,11 @@ 
     {
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() != '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -580,9 +580,9 @@ 
             $answer = new sfAnswer();
             $answer->assignVars($myrow);
             if (!$id_as_key) {
-                $ret[] =& $answer;
+                $ret[] = & $answer;
             } else {
-                $ret[$myrow['answerid']] =& $answer;
+                $ret[$myrow['answerid']] = & $answer;
             }
             unset($answer);
         }
@@ -650,7 +650,7 @@ 
         $criteria->setOrder($order);
         $criteria->setLimit($limit);
         $criteria->setStart($start);
-        $ret =& $this->getObjects($criteria);
+        $ret = & $this->getObjects($criteria);
 
         return $ret;
     }
@@ -663,9 +663,9 @@ 
      */
     public function getCount(CriteriaElement $criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -684,10 +684,10 @@ 
      */
     public function getCountByFAQ($criteria = null)
     {
-        $sql = 'SELECT faqid, COUNT(*) FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'SELECT faqid, COUNT(*) FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
-            $sql .= ' ' . $criteria->getGroupby();
+            $sql .= ' '.$criteria->renderWhere();
+            $sql .= ' '.$criteria->getGroupby();
         }
 
         //echo "<br>$sql<br>";
@@ -714,9 +714,9 @@ 
      */
     public function deleteAll(CriteriaElement $criteria = null, $force = true, $asObject = false)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_answers');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_answers');
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -736,10 +736,10 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null, $force = false)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_answers') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_answers').' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         //echo "<br>" . $sql . "<br>";
         if (!$this->db->queryF($sql)) {
@@ -756,8 +756,8 @@ 
     public function getLastPublishedByFaq($faqids)
     {
         $ret    = array();
-        $sql    = 'SELECT faqid, answer, uid, datesub FROM ' . $this->db->prefix('smartfaq_answers') . '
-               WHERE faqid IN (' . implode(',', $faqids) . ') AND status = ' . _SF_AN_STATUS_APPROVED . ' GROUP BY faqid';
+        $sql    = 'SELECT faqid, answer, uid, datesub FROM '.$this->db->prefix('smartfaq_answers').'
+               WHERE faqid IN (' . implode(',', $faqids).') AND status = '._SF_AN_STATUS_APPROVED.' GROUP BY faqid';
         $result = $this->db->query($sql);
         if (!$result) {
             return $ret;
@@ -765,7 +765,7 @@ 
         while ($row = $this->db->fetchArray($result)) {
             $answer = new sfAnswer();
             $answer->assignVars($row);
-            $ret[$row['faqid']] =& $answer;
+            $ret[$row['faqid']] = & $answer;
             unset($answer);
         }
 

comment_delete.php

Spacing +2 added lines, -2 removed lines

@@ -6,5 +6,5 @@
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/comment_delete.php';
+include __DIR__.'/../../mainfile.php';
+include_once XOOPS_ROOT_PATH.'/include/comment_delete.php';

comment_new.php

Spacing +2 added lines, -2 removed lines

@@ -6,5 +6,5 @@
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/comment_new.php';
+include __DIR__.'/../../mainfile.php';
+include_once XOOPS_ROOT_PATH.'/include/comment_new.php';

request.php

Switch Indentation +70 added lines, -70 removed lines

@@ -45,94 +45,94 @@
 }
 
 switch ($op) {
-    case 'post':
+        case 'post':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
 
-        $newFaqObj = $faqHandler->create();
+            $newFaqObj = $faqHandler->create();
 
-        if (!$xoopsUser) {
-            if ($xoopsModuleConfig['anonpost'] == 1) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if ($xoopsModuleConfig['anonpost'] == 1) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
-
-        // Putting the values about the FAQ in the FAQ object
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
-        $newFaqObj->setVar('uid', $uid);
-        $newFaqObj->setVar('question', $_POST['question']);
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
-        $newFaqObj->setVar('notifypub', $notifypub);
-
-        // Setting the status of the FAQ
-        if ($xoopsModuleConfig['autoapprove_request'] == 1) {
-            $newFaqObj->setVar('status', _SF_STATUS_OPENED);
-        } else {
-            $newFaqObj->setVar('status', _SF_STATUS_ASKED);
-        }
-
-        // Storing the FAQ object in the database
-        if (!$newFaqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
-        }
-
-        // Get the cateopry object related to that FAQ
-        // If autoapprove_requested
-        if ($xoopsModuleConfig['autoapprove_request'] == 1) {
-            // We do not not subscribe user to notification on publish since we publish it right away
-
-            // Send notifications
-            $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_PUBLISHED));
-
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
-        } else {
-            // Subscribe the user to On Published notification, if requested
-            if ($notifypub == 1) {
-                include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
-                $notificationHandler = xoops_getHandler('notification');
-                $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
+
+            // Putting the values about the FAQ in the FAQ object
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
+            $newFaqObj->setVar('uid', $uid);
+            $newFaqObj->setVar('question', $_POST['question']);
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
+            $newFaqObj->setVar('notifypub', $notifypub);
+
+            // Setting the status of the FAQ
+            if ($xoopsModuleConfig['autoapprove_request'] == 1) {
+                $newFaqObj->setVar('status', _SF_STATUS_OPENED);
+            } else {
+                $newFaqObj->setVar('status', _SF_STATUS_ASKED);
+            }
+
+            // Storing the FAQ object in the database
+            if (!$newFaqObj->store()) {
+                redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
             }
-            // Send notifications
-            $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_SUBMITTED));
 
-            $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
-        }
+            // Get the cateopry object related to that FAQ
+            // If autoapprove_requested
+            if ($xoopsModuleConfig['autoapprove_request'] == 1) {
+                // We do not not subscribe user to notification on publish since we publish it right away
+
+                // Send notifications
+                $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_PUBLISHED));
+
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_AND_PUBLISHED;
+            } else {
+                // Subscribe the user to On Published notification, if requested
+                if ($notifypub == 1) {
+                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    $notificationHandler = xoops_getHandler('notification');
+                    $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
+                }
+                // Send notifications
+                $newFaqObj->sendNotifications(array(_SF_NOT_QUESTION_SUBMITTED));
+
+                $redirect_msg = _MD_SF_REQUEST_RECEIVED_NEED_APPROVAL;
+            }
 
-        //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
-        redirect_header('index.php', 2, $redirect_msg);
-        break;
+            //redirect_header("javascript:history.go(-2)", 3, $redirect_msg);
+            redirect_header('index.php', 2, $redirect_msg);
+            break;
 
-    case 'form':
-    default:
+        case 'form':
+        default:
 
-        global $xoopsUser, $myts;
+            global $xoopsUser, $myts;
 
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
+            include_once XOOPS_ROOT_PATH . '/header.php';
+            include_once __DIR__ . '/footer.php';
 
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
 
-        $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
+            $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
 
-        include_once __DIR__ . '/include/request.inc.php';
+            include_once __DIR__ . '/include/request.inc.php';
 
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
+            $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
 
-        include_once __DIR__ . '/include/request.inc.php';
+            include_once __DIR__ . '/include/request.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+            include_once XOOPS_ROOT_PATH . '/footer.php';
 
-        break;
+            break;
 }

Spacing +11 added lines, -11 removed lines

@@ -6,8 +6,8 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
-include_once XOOPS_ROOT_PATH . '/header.php';
+include_once __DIR__.'/header.php';
+include_once XOOPS_ROOT_PATH.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -77,7 +77,7 @@ 
 
         // Storing the FAQ object in the database
         if (!$newFaqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR . sf_formatErrors($newFaqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_REQUEST_ERROR.sf_formatErrors($newFaqObj->getErrors()));
         }
 
         // Get the cateopry object related to that FAQ
@@ -92,7 +92,7 @@ 
         } else {
             // Subscribe the user to On Published notification, if requested
             if ($notifypub == 1) {
-                include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                 $notificationHandler = xoops_getHandler('notification');
                 $notificationHandler->subscribe('question', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
             }
@@ -112,27 +112,27 @@ 
         global $xoopsUser, $myts;
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        include_once XOOPS_ROOT_PATH . '/header.php';
-        include_once __DIR__ . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/header.php';
+        include_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_REQUEST);
 
         $xoopsTpl->assign('lang_intro_title', _MD_SF_REQUEST);
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . $myts->displayTarea($xoopsModuleConfig['requestintromsg']));
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, ".$myts->displayTarea($xoopsModuleConfig['requestintromsg']));
 
-        include_once __DIR__ . '/include/request.inc.php';
+        include_once __DIR__.'/include/request.inc.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
         $sectionname = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
 
-        include_once __DIR__ . '/include/request.inc.php';
+        include_once __DIR__.'/include/request.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
 
         break;
 }