Completed
Pull Request — master (#1)
by
unknown
02:32
created
include/search.inc.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
     $totalLimit = (int)$limit - $catCount;
71 71
     foreach ($catArray as $cId => $cat) {
72 72
         $ret[] = array ('image' => 'assets/images/folder.png',
73
-                         'link' => $xfHelper->url('index.php?cat_id=' . $cId),
73
+                            'link' => $xfHelper->url('index.php?cat_id=' . $cId),
74 74
                         'title' => $cat['category_title'],
75 75
         );
76 76
     }
@@ -100,9 +100,9 @@  discard block
 block discarded – undo
100 100
     $contentArray = $xfFaqHandler->getAll($criteria, $contentFields, false);
101 101
     foreach ($contentArray as $content) {
102 102
         $ret[] = array ('image' => 'assets/images/question2.gif',
103
-                         'link' => $xfHelper->url('index.php?cat_id=' . $content['contents_cid'] . '#q' . $content['contents_id']),
103
+                            'link' => $xfHelper->url('index.php?cat_id=' . $content['contents_cid'] . '#q' . $content['contents_id']),
104 104
                         'title' => $content['contents_title'],
105
-                         'time' => $content['contents_publish'],
105
+                            'time' => $content['contents_publish'],
106 106
         );
107 107
     }
108 108
     unset($contentArray);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
         return $ret;
44 44
     }
45 45
 
46
-    $moduleDirName = basename(dirname(__DIR__)) ;
46
+    $moduleDirName = basename(dirname(__DIR__));
47 47
     xoops_load('constants', $moduleDirName);
48 48
 
49 49
     $xfHelper = Xmf\Module\Helper::getHelper($moduleDirName);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
     $catCount   = !empty($catArray) ? count($catArray) : 0;
70 70
     $totalLimit = (int)$limit - $catCount;
71 71
     foreach ($catArray as $cId => $cat) {
72
-        $ret[] = array ('image' => 'assets/images/folder.png',
72
+        $ret[] = array('image' => 'assets/images/folder.png',
73 73
                          'link' => $xfHelper->url('index.php?cat_id=' . $cId),
74 74
                         'title' => $cat['category_title'],
75 75
         );
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     }
100 100
     $contentArray = $xfFaqHandler->getAll($criteria, $contentFields, false);
101 101
     foreach ($contentArray as $content) {
102
-        $ret[] = array ('image' => 'assets/images/question2.gif',
102
+        $ret[] = array('image' => 'assets/images/question2.gif',
103 103
                          'link' => $xfHelper->url('index.php?cat_id=' . $content['contents_cid'] . '#q' . $content['contents_id']),
104 104
                         'title' => $content['contents_title'],
105 105
                          'time' => $content['contents_publish'],
Please login to merge, or discard this patch.
include/sitemap.plugin.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,8 +33,8 @@
 block discarded – undo
33 33
     $retVal = array() ;
34 34
     foreach ($catList as $id=>$title){
35 35
         $retVal['parent'][] = array('id' => $id,
36
-                                 'title' => $myts->htmlSpecialChars($title),
37
-                                   'url' => $xfHelper->url('index.php?cat_id=' . $id)
36
+                                    'title' => $myts->htmlSpecialChars($title),
37
+                                    'url' => $xfHelper->url('index.php?cat_id=' . $id)
38 38
         );
39 39
     }
40 40
     return $retVal;
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,13 +25,13 @@
 block discarded – undo
25 25
 
26 26
     $myts = MyTextSanitizer::getInstance();
27 27
 
28
-    $moduleDirName = basename(dirname(__DIR__)) ;
28
+    $moduleDirName = basename(dirname(__DIR__));
29 29
     $xfHelper      = Xmf\Module\Helper::getHelper($moduleDirName);
30 30
     $xfCatHandler  = $xfHelper->getHandler('category');
31 31
     $catList       = $xfCatHandler->getList();
32 32
 
33
-    $retVal = array() ;
34
-    foreach ($catList as $id=>$title){
33
+    $retVal = array();
34
+    foreach ($catList as $id=>$title) {
35 35
         $retVal['parent'][] = array('id' => $id,
36 36
                                  'title' => $myts->htmlSpecialChars($title),
37 37
                                    'url' => $xfHelper->url('index.php?cat_id=' . $id)
Please login to merge, or discard this patch.
include/rss.inc.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -53,7 +53,7 @@
 block discarded – undo
53 53
 
54 54
     foreach ($contentObjs as $contentObj) {
55 55
         $retVal[] = array ('image' => '',
56
-                           'title' => $contentObj->getVar('contents_title'),
56
+                            'title' => $contentObj->getVar('contents_title'),
57 57
                             'link' => $contentObj->getVar('contents_contents'),
58 58
                             'time' => $contentObj->getVar('contents_publish'),
59 59
                             'desc' => '',
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
     $retVal = array();
53 53
 
54 54
     foreach ($contentObjs as $contentObj) {
55
-        $retVal[] = array ('image' => '',
55
+        $retVal[] = array('image' => '',
56 56
                            'title' => $contentObj->getVar('contents_title'),
57 57
                             'link' => $contentObj->getVar('contents_contents'),
58 58
                             'time' => $contentObj->getVar('contents_publish'),
Please login to merge, or discard this patch.
admin/menu.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -28,23 +28,23 @@
 block discarded – undo
28 28
 
29 29
 $adminmenu = array(
30 30
     array('title' => _MI_XOOPSFAQ_MENU_ADMIN_INDEX,
31
-           'link' => 'admin/index.php',
32
-           'desc' => _MI_XOOPSFAQ_ADMIN_INDEX_DESC,
33
-           'icon' => Admin::menuIconPath('home.png', '32')
31
+            'link' => 'admin/index.php',
32
+            'desc' => _MI_XOOPSFAQ_ADMIN_INDEX_DESC,
33
+            'icon' => Admin::menuIconPath('home.png', '32')
34 34
     ),
35 35
     array('title' => _MI_XOOPSFAQ_MENU_ADMIN_CATEGORY,
36
-           'link' => 'admin/category.php',
37
-           'desc' => _MI_XOOPSFAQ_ADMIN_CATEGORY_DESC,
38
-           'icon' => Admin::menuIconPath('category.png', '32')
36
+            'link' => 'admin/category.php',
37
+            'desc' => _MI_XOOPSFAQ_ADMIN_CATEGORY_DESC,
38
+            'icon' => Admin::menuIconPath('category.png', '32')
39 39
     ),
40 40
     array('title' => _MI_XOOPSFAQ_MENU_ADMIN_FAQ,
41
-           'link' => 'admin/main.php',
42
-           'desc' => _MI_XOOPSFAQ_ADMIN_FAQ_DESC,
43
-           'icon' => Admin::menuIconPath('faq.png', '32')
41
+            'link' => 'admin/main.php',
42
+            'desc' => _MI_XOOPSFAQ_ADMIN_FAQ_DESC,
43
+            'icon' => Admin::menuIconPath('faq.png', '32')
44 44
     ),
45 45
     array('title' => _MI_XOOPSFAQ_MENU_ADMIN_ABOUT,
46
-           'link' => 'admin/about.php',
47
-           'desc' => _MI_XOOPSFAQ_ADMIN_ABOUT_DESC,
48
-           'icon' => Admin::menuIconPath('about.png', '32')
46
+            'link' => 'admin/about.php',
47
+            'desc' => _MI_XOOPSFAQ_ADMIN_ABOUT_DESC,
48
+            'icon' => Admin::menuIconPath('about.png', '32')
49 49
     )
50 50
 );
Please login to merge, or discard this patch.
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.
admin/main.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -74,15 +74,15 @@
 block discarded – undo
74 74
         if (is_object($obj) && $obj instanceof XoopsfaqContents) {
75 75
             $contents_publish = strtotime(Request::getString('contents_publish', time(), 'POST'));
76 76
             $obj->setVars(array('contents_cid' => Request::getInt('contents_cid', XoopsfaqConstants::DEFAULT_CATEGORY, 'POST'),
77
-                              'contents_title' => Request::getString('contents_title', '', 'POST'),
78
-                           'contents_contents' => $contents_contents,
79
-                             'contents_weight' => Request::getInt('contents_weight', XoopsfaqConstants::DEFAULT_WEIGHT, 'POST'),
80
-                             'contents_active' => Request::getInt('contents_active', XoopsfaqConstants::ACTIVE, 'POST'),
77
+                                'contents_title' => Request::getString('contents_title', '', 'POST'),
78
+                            'contents_contents' => $contents_contents,
79
+                                'contents_weight' => Request::getInt('contents_weight', XoopsfaqConstants::DEFAULT_WEIGHT, 'POST'),
80
+                                'contents_active' => Request::getInt('contents_active', XoopsfaqConstants::ACTIVE, 'POST'),
81 81
                             'contents_publish' => $contents_publish,
82
-                                      'dohtml' => isset($_POST['dohtml']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
82
+                                        'dohtml' => isset($_POST['dohtml']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
83 83
                                     'dosmiley' => isset($_POST['dosmiley']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
84
-                                     'doxcode' => isset($_POST['doxcode']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
85
-                                     'doimage' => isset($_POST['doimage']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
84
+                                        'doxcode' => isset($_POST['doxcode']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
85
+                                        'doimage' => isset($_POST['doimage']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET,
86 86
                                         'dobr' => isset($_POST['dobr']) ? XoopsfaqConstants::SET : XoopsfaqConstants::NOTSET)
87 87
             );
88 88
             $ret = $xfFaqHandler->insert($obj, true);
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -99,7 +99,7 @@
 block discarded – undo
99 99
         $catCount = $xfCatHandler->getCount();
100 100
         $adminObject->displayNavigation(basename(__FILE__));
101 101
         if (!empty($catCount)) {
102
-            $adminObject->addItemButton(_AM_XOOPSFAQ_CREATE_NEW, basename(__FILE__) . '?op=edit', 'add' , '');
102
+            $adminObject->addItemButton(_AM_XOOPSFAQ_CREATE_NEW, basename(__FILE__) . '?op=edit', 'add', '');
103 103
             $adminObject->displayButton('left');
104 104
         }
105 105
         $xfFaqHandler->displayAdminListing('weight');
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.