Completed
Push — master ( 48b96e...454ebd )
by Michael
02:08
created
admin/faq.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -548,11 +548,11 @@
 block discarded – undo
548 548
             $faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
549 549
             xoops_cp_header();
550 550
             xoops_confirm([
551
-                              'op'      => 'del',
552
-                              'faqid'   => $faqObj->faqid(),
553
-                              'confirm' => 1,
554
-                              'name'    => $faqObj->question()
555
-                          ], 'faq.php', _AM_SF_DELETETHISARTICLE . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
551
+                                'op'      => 'del',
552
+                                'faqid'   => $faqObj->faqid(),
553
+                                'confirm' => 1,
554
+                                'name'    => $faqObj->question()
555
+                            ], 'faq.php', _AM_SF_DELETETHISARTICLE . " <br>'" . $faqObj->question() . "'. <br> <br>", _AM_SF_DELETE);
556 556
             xoops_cp_footer();
557 557
         }
558 558
 
Please login to merge, or discard this patch.
language/english/modinfo.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
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(
117 117
     '_MI_SF_REQUESTINTROMSGDEF',
118
-       '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
+        '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!'
119 119
 );
120 120
 
121 121
 define('_MI_SF_OPENINTROMSG', 'Open Questions section introduction message:');
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 define('_MI_SF_HELP_PATH_SELECT', "Path of SmartFAQ's help files");
129 129
 define(
130 130
     '_MI_SF_HELP_PATH_SELECT_DSC',
131
-       "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'"
131
+        "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'"
132 132
 );
133 133
 
134 134
 define('_MI_SF_HELP_PATH_CUSTOM', "Custom path of SmartFAQ's help files");
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
 define('_MI_SF_DIR_ATTACHMENT', 'Attachments physical path.');
352 352
 define(
353 353
     '_MI_SF_DIR_ATTACHMENT_DESC',
354
-       "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'"
354
+        "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'"
355 355
 );
356 356
 define('_MI_SF_PATH_MAGICK', 'Path for ImageMagick');
357 357
 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.");
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
@@ -76,9 +76,9 @@  discard block
 block discarded – undo
76 76
 define('_MD_SF_MAINHEAD', 'Welcome to the');
77 77
 define(
78 78
     '_MD_SF_MAININTRO',
79
-       "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='"
80
-       . XOOPS_URL
81
-       . "/forms/askus/form.php'>Ask us a Question!</a>"
79
+        "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='"
80
+        . XOOPS_URL
81
+        . "/forms/askus/form.php'>Ask us a Question!</a>"
82 82
 );
83 83
 define('_MD_SF_MAINNOSELECTCAT', 'You did not select a valid category');
84 84
 define('_MD_SF_MAINNOFAQS', 'There are no Q&amp;As in this category');
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 define('_MD_SF_REQUEST_ERROR', 'An error occured. Your request was not sent.');
121 121
 define(
122 122
     '_MD_SF_REQUEST_INTRO',
123
-       '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!'
123
+        '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!'
124 124
 );
125 125
 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!');
126 126
 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!');
Please login to merge, or discard this patch.
language/english/admin.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 define('_AM_SF_CONTEXTMODULELINK', 'Contextually linked to this module');
79 79
 define(
80 80
     '_AM_SF_CONTEXTMODULELINK_FAQ',
81
-       "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
+        "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>"
82 82
 );
83 83
 define('_AM_SF_CONTEXTOPTIONS', 'Contextual options');
84 84
 define('_AM_SF_CONTEXTPAGE', 'Contextually linked to this URL');
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
 define('_AM_SF_ERROR_FAQ_NOT_SAVED', 'An error occured. The Q&amp;A was not saved in the database.');
122 122
 define(
123 123
     '_AM_SF_EXACTURL',
124
-       "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>"
124
+        "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>"
125 125
 );
126 126
 define('_AM_SF_FAQ_EDIT', 'Edit this Q&amp;A');
127 127
 define('_AM_SF_FAQ_NEW_ANSWER_PUBLISHED', 'The original answer was replaced by this answer.');
Please login to merge, or discard this patch.
admin/answer.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -110,18 +110,18 @@
 block discarded – undo
110 110
     foreach ($proposed_answers as $proposed_answer) {
111 111
         if (_SF_STATUS_NEW_ANSWER == $faqObj->status()) {
112 112
             $merge   = "<a href='faq.php?op=merge&amp;faqid="
113
-                       . $faqObj->faqid()
114
-                       . '&amp;answerid='
115
-                       . $proposed_answer->answerid()
116
-                       . "'><img src='"
117
-                       . XOOPS_URL
118
-                       . '/modules/'
119
-                       . $xoopsModule->dirname()
120
-                       . "/assets/images/icon/merge.gif' title='"
121
-                       . _AM_SF_FAQ_MERGE
122
-                       . "' alt='"
123
-                       . _AM_SF_FAQ_MERGE
124
-                       . "'></a>&nbsp;";
113
+                        . $faqObj->faqid()
114
+                        . '&amp;answerid='
115
+                        . $proposed_answer->answerid()
116
+                        . "'><img src='"
117
+                        . XOOPS_URL
118
+                        . '/modules/'
119
+                        . $xoopsModule->dirname()
120
+                        . "/assets/images/icon/merge.gif' title='"
121
+                        . _AM_SF_FAQ_MERGE
122
+                        . "' alt='"
123
+                        . _AM_SF_FAQ_MERGE
124
+                        . "'></a>&nbsp;";
125 125
             $approve = "<a href='answer.php?op=selectanswer&amp;faqid=" . $faqid . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/on.png' . "' title='" . _AM_SF_FAQ_APPROVE_NEW_ANSWER . "' alt='" . _AM_SF_APPROVESUB . "'></a>";
126 126
         }
127 127
         $modify = "<a href='faq.php?op=mod&amp;faqid=" . $faqObj->faqid() . '&amp;answerid=' . $proposed_answer->answerid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_FAQ_REVIEW . "' alt='" . _AM_SF_FAQ_REVIEW . "'></a>&nbsp;";
Please login to merge, or discard this patch.