Completed
Pull Request — master (#1)
by
unknown
01:21
created
admin/category.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,9 +36,9 @@
 block discarded – undo
36 36
         $catId = Request::getInt('category_id', null);
37 37
         $obj   = $xfCatHandler->get($catId);
38 38
         if ($obj instanceof XoopsfaqCategory) {
39
-          $obj->displayForm();
39
+            $obj->displayForm();
40 40
         } else {
41
-          $xfCatHandler->displayError(_AM_XOOPSFAQ_ERROR_COULD_NOT_EDIT_CAT);
41
+            $xfCatHandler->displayError(_AM_XOOPSFAQ_ERROR_COULD_NOT_EDIT_CAT);
42 42
         }
43 43
         break;
44 44
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -80,8 +80,8 @@  discard block
 block discarded – undo
80 80
         break;
81 81
 
82 82
     case 'save':
83
-        if ( ($GLOBALS['xoopsSecurity'] instanceof XoopsSecurity) ) {
84
-            if ( !$GLOBALS['xoopsSecurity']->check() ) {
83
+        if (($GLOBALS['xoopsSecurity'] instanceof XoopsSecurity)) {
84
+            if (!$GLOBALS['xoopsSecurity']->check()) {
85 85
                 // failed xoops security check
86 86
                 $xfHelper->redirect('admin/index.php', 3, $GLOBALS['xoopsSecurity']->getErrors(true));
87 87
             }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
     case 'default':
110 110
     default:
111 111
         $adminObject->displayNavigation('category.php');
112
-        $adminObject->addItemButton(_XO_XOOPSFAQ_ADDCAT, 'category.php?op=edit', 'add' , '');
112
+        $adminObject->addItemButton(_XO_XOOPSFAQ_ADDCAT, 'category.php?op=edit', 'add', '');
113 113
         $adminObject->displayButton('left');
114 114
         $xfCatHandler->displayAdminListing('order');
115 115
         break;
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -66,8 +66,8 @@
 block discarded – undo
66 66
             $bodyWords = '';
67 67
             foreach ($contentsObj['list'] as $obj) {
68 68
                 $question = array('id' => $obj->getVar('contents_id'),
69
-                               'title' => $obj->getVar('contents_title'),
70
-                              'answer' => $obj->getVar('contents_contents')
69
+                                'title' => $obj->getVar('contents_title'),
70
+                                'answer' => $obj->getVar('contents_contents')
71 71
                 );
72 72
                 $GLOBALS['xoopsTpl']->append('questions', $question);
73 73
                 $bodyWords .= ' ' . $obj->getVar('contents_title') . ' ' . $obj->getVar('contents_contents');
Please login to merge, or discard this patch.
blocks/xoopsfaq_recent.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
                 );
93 93
             }
94 94
             $block['faq'][] = array('title' => $faqTitle,
95
-                                      'ans' => $faqAns,
95
+                                        'ans' => $faqAns,
96 96
                                 'published' => $faqObj->getPublished(_SHORTDATESTRING)
97 97
             );
98 98
         }
@@ -131,15 +131,15 @@  discard block
 block discarded – undo
131 131
     $nchck = !empty($ychck) ? '' : ' checked';
132 132
 
133 133
     $form = '<div class="line140">'
134
-          . _MB_XOOPSFAQ_NUM_FAQS . '&nbsp;'
135
-          . '<input type="number" name="options[0]" value="' . $options[0] . '" style="width: 5em;" min="0" class="right"><br>'
136
-          . _MB_XOOPSFAQ_CHARS . '&nbsp;<input type="number" name="options[1]" value="' . $options[1] . '" style="width: 5em;" min="0" class="right">&nbsp;'
137
-          . _MB_XOOPSFAQ_LENGTH . '<br>' . _MB_XOOPSFAQ_SHOW_DATE . '&nbsp;'
138
-          . '<label for="r0">' . _NO . '</label>'
139
-          . '<input type="radio" name="options[2]" id="r0" value="0"' . $nchck . '>&nbsp;'
140
-          . '<label for="r1">' . _YES . '</label>'
141
-          . '<input type="radio" name="options[2]" id="r1" value="1"' . $ychck
142
-          . '<br><br>' . _MB_XOOPSFAQ_ALL_CATS_INTRO . '&nbsp;&nbsp;' . $selectCat
143
-          . '</div>';
134
+            . _MB_XOOPSFAQ_NUM_FAQS . '&nbsp;'
135
+            . '<input type="number" name="options[0]" value="' . $options[0] . '" style="width: 5em;" min="0" class="right"><br>'
136
+            . _MB_XOOPSFAQ_CHARS . '&nbsp;<input type="number" name="options[1]" value="' . $options[1] . '" style="width: 5em;" min="0" class="right">&nbsp;'
137
+            . _MB_XOOPSFAQ_LENGTH . '<br>' . _MB_XOOPSFAQ_SHOW_DATE . '&nbsp;'
138
+            . '<label for="r0">' . _NO . '</label>'
139
+            . '<input type="radio" name="options[2]" id="r0" value="0"' . $nchck . '>&nbsp;'
140
+            . '<label for="r1">' . _YES . '</label>'
141
+            . '<input type="radio" name="options[2]" id="r1" value="1"' . $ychck
142
+            . '<br><br>' . _MB_XOOPSFAQ_ALL_CATS_INTRO . '&nbsp;&nbsp;' . $selectCat
143
+            . '</div>';
144 144
     return $form;
145 145
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
             $faqTitle = $myts->displayTarea($faqObj->getVar('contents_title'));
82 82
             if (!empty($options[1])) {
83 83
                 $txtAns   = strip_tags($faqObj->getVar('contents_contents')); // get rid of html for block
84
-                $faqAns   = $myts->displayTarea(xoops_substr($txtAns, 0, $options[1]), 0, 0 ,0 ,0 ,0);
84
+                $faqAns   = $myts->displayTarea(xoops_substr($txtAns, 0, $options[1]), 0, 0, 0, 0, 0);
85 85
             } else {
86 86
                 $faqAns   = $myts->displayTarea($faqObj->getVar('contents_contents'),
87 87
                             (int)$faqObj->getVar('dohtml'),
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
     $formSelect->addOptionArray($optionArray);
126 126
     $selOptions = (false === strpos($options[3], ',')) ? $options[3] : explode(',', $options[3]);
127 127
     $formSelect->setValue($selOptions);
128
-    $selectCat   = $formSelect->render();
128
+    $selectCat = $formSelect->render();
129 129
 
130 130
     $ychck = (isset($options[2]) && ($options[2] > 0)) ? ' checked' : '';
131 131
     $nchck = !empty($ychck) ? '' : ' checked';
Please login to merge, or discard this patch.
blocks/xoopsfaq_category.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -82,7 +82,7 @@
 block discarded – undo
82 82
         $block['title'] = _MB_XOOPSFAQ_CATTITLE;
83 83
         foreach ($catObjArray as $cId => $catObj) {
84 84
             $block['cat'][] = array('title' => $myts->displayTarea($catObj->getVar('category_title')),
85
-                                     'link' => $xfHelper->url('index.php?cat_id=' . $cId),
85
+                                        'link' => $xfHelper->url('index.php?cat_id=' . $cId),
86 86
             );
87 87
         }
88 88
     }
Please login to merge, or discard this patch.
blocks/xoopsfaq_rand.php 2 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -80,13 +80,13 @@  discard block
 block discarded – undo
80 80
         $catObj       = $xfCatHandler->get($xpFaqObj->getVar('contents_cid'));
81 81
         $cid          = $catObj->getVar('category_id');
82 82
         $block = array( 'title' => _MB_XOOPSFAQ_RANDOM_TITLE,
83
-                          'faq' => $faq,
84
-                       'faqans' => $faqAns,
85
-                     'morelink' => $xfHelper->url('index.php?cat_id=' . $cid . '#q' . $xpFaqObj->getVar('contents_id')),
86
-                      'linktxt' => _MB_XOOPSFAQ_SEE_MORE,
87
-                      'catlink' => $xfHelper->url('index.php?cat_id=' . $cid),
88
-                       'cattxt' => $catObj->getVar('category_title')
89
-                      );
83
+                            'faq' => $faq,
84
+                        'faqans' => $faqAns,
85
+                        'morelink' => $xfHelper->url('index.php?cat_id=' . $cid . '#q' . $xpFaqObj->getVar('contents_id')),
86
+                        'linktxt' => _MB_XOOPSFAQ_SEE_MORE,
87
+                        'catlink' => $xfHelper->url('index.php?cat_id=' . $cid),
88
+                        'cattxt' => $catObj->getVar('category_title')
89
+                        );
90 90
         unset($xpFaqObj, $catObj);
91 91
     }
92 92
     return $block;
@@ -117,9 +117,9 @@  discard block
 block discarded – undo
117 117
     $selectCat   = $formSelect->render();
118 118
 
119 119
     $form = '<div class="line140">'
120
-          . _MB_XOOPSFAQ_CHARS . '&nbsp;'
121
-          . '<input type="number" name="options[0]" value="' . $options[0] . '" style="width: 5em;" min="0" class="right">&nbsp;'
122
-          . _MB_XOOPSFAQ_LENGTH . '<br><br>' . _MB_XOOPSFAQ_ALL_CATS_INTRO . '&nbsp;&nbsp;' . $selectCat
123
-          . '</div>';
120
+            . _MB_XOOPSFAQ_CHARS . '&nbsp;'
121
+            . '<input type="number" name="options[0]" value="' . $options[0] . '" style="width: 5em;" min="0" class="right">&nbsp;'
122
+            . _MB_XOOPSFAQ_LENGTH . '<br><br>' . _MB_XOOPSFAQ_ALL_CATS_INTRO . '&nbsp;&nbsp;' . $selectCat
123
+            . '</div>';
124 124
     return $form;
125 125
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -74,12 +74,12 @@  discard block
 block discarded – undo
74 74
         $xpFaqObj = $xpFaqObjArray[$faqNum];
75 75
         $faq      = $myts->displayTarea($xpFaqObj->getVar('contents_title'));
76 76
         $txtAns   = strip_tags($xpFaqObj->getVar('contents_contents')); // get rid of html for block
77
-        $faqAns   = $myts->displayTarea(xoops_substr($txtAns, 0, $options[0]), 0, 0 ,0 ,0 ,0);
77
+        $faqAns   = $myts->displayTarea(xoops_substr($txtAns, 0, $options[0]), 0, 0, 0, 0, 0);
78 78
 
79 79
         $xfCatHandler = $xfHelper->getHandler('category');
80 80
         $catObj       = $xfCatHandler->get($xpFaqObj->getVar('contents_cid'));
81 81
         $cid          = $catObj->getVar('category_id');
82
-        $block = array( 'title' => _MB_XOOPSFAQ_RANDOM_TITLE,
82
+        $block = array('title' => _MB_XOOPSFAQ_RANDOM_TITLE,
83 83
                           'faq' => $faq,
84 84
                        'faqans' => $faqAns,
85 85
                      'morelink' => $xfHelper->url('index.php?cat_id=' . $cid . '#q' . $xpFaqObj->getVar('contents_id')),
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     $formSelect->addOptionArray($optionArray);
115 115
     $selOptions = (false === strpos($options[1], ',')) ? $options[1] : explode(',', $options[1]);
116 116
     $formSelect->setValue($selOptions);
117
-    $selectCat   = $formSelect->render();
117
+    $selectCat = $formSelect->render();
118 118
 
119 119
     $form = '<div class="line140">'
120 120
           . _MB_XOOPSFAQ_CHARS . '&nbsp;'
Please login to merge, or discard this patch.
xoops_version.php 2 patches
Indentation   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 // Help Files
53 53
 $modversion['help']                = 'page=help';
54 54
 $modversion['helpsection']         = array(array('name' => _MI_XOOPSFAQ_HELP_OVERVIEW,
55
-                                                 'link' => 'page=help'),
56
-                                           array('name' => _MI_XOOPSFAQ_HELP_TIPS,
57
-                                                 'link' => 'page=tips')
55
+                                                    'link' => 'page=help'),
56
+                                            array('name' => _MI_XOOPSFAQ_HELP_TIPS,
57
+                                                    'link' => 'page=tips')
58 58
 );
59 59
 
60 60
 // Module Sql
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 
63 63
 // Module SQL Tables
64 64
 $modversion['tables']              = array('xoopsfaq_contents',
65
-                                         'xoopsfaq_categories'
65
+                                            'xoopsfaq_categories'
66 66
 ) ;
67 67
 
68 68
 // Scripts to run upon installation or update
@@ -88,28 +88,28 @@  discard block
 block discarded – undo
88 88
 
89 89
 // Blocks
90 90
 $modversion['blocks']              = array(array('file' => 'xoopsfaq_rand.php',
91
-                                                 'name' => _MI_XOOPSFAQ_BNAME1,
92
-                                          'description' => _MI_XOOPSFAQ_BNAME1_DESC,
91
+                                                    'name' => _MI_XOOPSFAQ_BNAME1,
92
+                                            'description' => _MI_XOOPSFAQ_BNAME1_DESC,
93 93
                                             'show_func' => 'b_xoopsfaq_random_show',
94 94
                                             'edit_func' => 'b_xoopsfaq_rand_edit',
95
-                                              'options' => '100|0',
96
-                                             'template' => 'xoopsfaq_block_rand.tpl'),
95
+                                                'options' => '100|0',
96
+                                                'template' => 'xoopsfaq_block_rand.tpl'),
97 97
 
98
-                                           array('file' => 'xoopsfaq_recent.php',
99
-                                                 'name' => _MI_XOOPSFAQ_BNAME2,
100
-                                          'description' => _MI_XOOPSFAQ_BNAME2_DESC,
98
+                                            array('file' => 'xoopsfaq_recent.php',
99
+                                                    'name' => _MI_XOOPSFAQ_BNAME2,
100
+                                            'description' => _MI_XOOPSFAQ_BNAME2_DESC,
101 101
                                             'show_func' => 'b_xoopsfaq_recent_show',
102 102
                                             'edit_func' => 'b_xoopsfaq_recent_edit',
103
-                                              'options' => '10|100|1|0',
104
-                                             'template' => 'xoopsfaq_block_recent.tpl'),
103
+                                                'options' => '10|100|1|0',
104
+                                                'template' => 'xoopsfaq_block_recent.tpl'),
105 105
 
106
-                                           array('file' => 'xoopsfaq_category.php',
107
-                                                 'name' => _MI_XOOPSFAQ_BNAME3,
108
-                                          'description' => _MI_XOOPSFAQ_BNAME3_DESC,
106
+                                            array('file' => 'xoopsfaq_category.php',
107
+                                                    'name' => _MI_XOOPSFAQ_BNAME3,
108
+                                            'description' => _MI_XOOPSFAQ_BNAME3_DESC,
109 109
                                             'show_func' => 'b_xoopsfaq_category_show',
110 110
                                             'edit_func' => 'b_xoopsfaq_category_edit',
111
-                                              'options' => '1',
112
-                                             'template' => 'xoopsfaq_block_category.tpl')
111
+                                                'options' => '1',
112
+                                                'template' => 'xoopsfaq_block_category.tpl')
113 113
 );
114 114
 
115 115
 // Module Search
@@ -119,16 +119,16 @@  discard block
 block discarded – undo
119 119
 
120 120
 // Module Templates
121 121
 $modversion["templates"]           = array(array('file' => "{$moduleDirName}_index.tpl",
122
-                                          'description' => _MI_XOOPSFAQ_TPL_INDEX_DESC),
122
+                                            'description' => _MI_XOOPSFAQ_TPL_INDEX_DESC),
123 123
 
124
-                                           array('file' => "{$moduleDirName}_category.tpl",
125
-                                          'description' => _MI_XOOPSFAQ_TPL_CATEGORY_DESC)
124
+                                            array('file' => "{$moduleDirName}_category.tpl",
125
+                                            'description' => _MI_XOOPSFAQ_TPL_CATEGORY_DESC)
126 126
 );
127 127
 
128 128
 // Module Comments
129 129
 $modversion['hasComments']         = 1;
130 130
 $modversion['comments']            = array('itemName' => 'cat_id',
131
-                                           'pageName' => 'index.php'
131
+                                            'pageName' => 'index.php'
132 132
 );
133 133
 
134 134
 // Module Configs
@@ -138,9 +138,9 @@  discard block
 block discarded – undo
138 138
 
139 139
 $modversion['config']              = array(array('name' => 'use_wysiwyg',
140 140
                                                 'title' => '_MI_XOOPSFAQ_EDITORS',
141
-                                          'description' => '_MI_XOOPSFAQ_EDITORS_DESC',
142
-                                             'formtype' => 'select',
141
+                                            'description' => '_MI_XOOPSFAQ_EDITORS_DESC',
142
+                                                'formtype' => 'select',
143 143
                                             'valuetype' => 'text',
144
-                                              'options' => $editorList,
145
-                                              'default' => 'dhtmltextarea')
144
+                                                'options' => $editorList,
145
+                                                'default' => 'dhtmltextarea')
146 146
 );
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 // Module SQL Tables
64 64
 $modversion['tables']              = array('xoopsfaq_contents',
65 65
                                          'xoopsfaq_categories'
66
-) ;
66
+);
67 67
 
68 68
 // Scripts to run upon installation or update
69 69
 $modversion['onInstall']           = "include/oninstall.inc.php";
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 $editor_handler = XoopsEditorHandler::getInstance();
137 137
 $editorList     = array_flip($editor_handler->getList());
138 138
 
139
-$modversion['config']              = array(array('name' => 'use_wysiwyg',
139
+$modversion['config'] = array(array('name' => 'use_wysiwyg',
140 140
                                                 'title' => '_MI_XOOPSFAQ_EDITORS',
141 141
                                           'description' => '_MI_XOOPSFAQ_EDITORS_DESC',
142 142
                                              'formtype' => 'select',
Please login to merge, or discard this patch.
language/english/modinfo.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,8 @@
 block discarded – undo
27 27
  */
28 28
 define('_MI_XOOPSFAQ_NAME', 'XOOPS FAQ');
29 29
 define('_MI_XOOPSFAQ_DESC', 'This module is used to create Frequently Asked Questions (FAQs). You can use it to '
30
-                          . 'provide information on your website for your users. The module if very simple, but '
31
-                          . 'flexible enough to use for other purposes as well.'
30
+                            . 'provide information on your website for your users. The module if very simple, but '
31
+                            . 'flexible enough to use for other purposes as well.'
32 32
 );
33 33
 
34 34
 /**
Please login to merge, or discard this patch.