Passed
Pull Request — master (#2)
by Michael
02:17
created
admin/index.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 use XoopsModules\Groupmanager\Common;
20 20
 
21
-require __DIR__ . '/admin_header.php';
21
+require __DIR__.'/admin_header.php';
22 22
 // Display Admin header
23 23
 xoops_cp_header();
24 24
 $adminObject = \Xmf\Module\Admin::getInstance();
@@ -41,20 +41,20 @@  discard block
 block discarded – undo
41 41
 //------------- Test Data ----------------------------
42 42
 
43 43
 if ($helper->getConfig('displaySampleButton')) {
44
-    $yamlFile            = dirname(__DIR__) . '/config/admin.yml';
44
+    $yamlFile            = dirname(__DIR__).'/config/admin.yml';
45 45
     $config              = loadAdminConfig($yamlFile);
46 46
     $displaySampleButton = $config['displaySampleButton'];
47 47
 
48 48
     if (1 == $displaySampleButton) {
49 49
         xoops_loadLanguage('admin/modulesadmin', 'system');
50
-        require __DIR__ . '/../testdata/index.php';
50
+        require __DIR__.'/../testdata/index.php';
51 51
 
52
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
53
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
52
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
53
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
54 54
         //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
55
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
55
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
56 56
     } else {
57
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
57
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
58 58
         $displaySampleButton = $config['displaySampleButton'];
59 59
     }
60 60
     $adminObject->displayButton('left', '');
@@ -107,4 +107,4 @@  discard block
 block discarded – undo
107 107
 
108 108
 echo $utility::getServerStats();
109 109
 
110
-require __DIR__ . '/admin_footer.php';
110
+require __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/perm.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
  * @since
18 18
  * @author       Kaotik, GigaPHP, XOOPS Development Team
19 19
  */
20
-require __DIR__ . '/admin_header.php';
20
+require __DIR__.'/admin_header.php';
21 21
 
22
-require_once XOOPS_ROOT_PATH . '/class/template.php';
22
+require_once XOOPS_ROOT_PATH.'/class/template.php';
23 23
 if (!isset($xoopsTpl)) {
24 24
     $xoopsTpl = new XoopsTpl();
25 25
 }
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 
31 31
 $adminObject->displayNavigation(basename(__FILE__));
32 32
 
33
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
33
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
34 34
 $module_id = $xoopsModule->getVar('mid');
35 35
 
36 36
 //$item_list = array('1' => 'Category 1', '2' => 'Category 2', '3' => 'Category 3');
Please login to merge, or discard this patch.
admin/main.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@  discard block
 block discarded – undo
17 17
  * @since
18 18
  * @author       Kaotik, GigaPHP, XOOPS Development Team
19 19
  */
20
-require __DIR__ . '/admin_header.php';
20
+require __DIR__.'/admin_header.php';
21 21
 
22
-require_once XOOPS_ROOT_PATH . '/class/template.php';
22
+require_once XOOPS_ROOT_PATH.'/class/template.php';
23 23
 if (!isset($xoopsTpl)) {
24 24
     $xoopsTpl = new XoopsTpl();
25 25
 }
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
31 31
 /** @var \XoopsMemberHandler $memberHandler */
32 32
 if (isset($_POST['add_x']) || isset($_POST['del_x'])) {
33 33
     if (isset($_POST['add_x'])) {
34
-        $memberHandler    = xoops_getHandler('member');
34
+        $memberHandler = xoops_getHandler('member');
35 35
         $membership = $memberHandler->addUserToGroup($_POST['groupid'], $_POST['all']);
36 36
     }
37 37
 
38 38
     if (isset($_POST['del_x'])) {
39
-        $memberHandler    = xoops_getHandler('member');
39
+        $memberHandler = xoops_getHandler('member');
40 40
         $membership = $memberHandler->removeUsersFromGroup($_POST['groupid'], [$_POST['curr']]);
41 41
     }
42 42
 }
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
     //----------------*/
100 100
 
101 101
     $uids     = $memberHandler->getUsersByGroup($id);
102
-    $criteria = new Criteria('uid', '(' . implode(',', $uids) . ')', 'IN');
102
+    $criteria = new Criteria('uid', '('.implode(',', $uids).')', 'IN');
103 103
     $criteria->setSort('uname');
104 104
     $users = $memberHandler->getUserList($criteria);
105 105
 
@@ -127,5 +127,5 @@  discard block
 block discarded – undo
127 127
 
128 128
 $xoopsTpl->display('db:gm_main.tpl');
129 129
 
130
-require_once __DIR__ . '/admin_footer.php';
130
+require_once __DIR__.'/admin_footer.php';
131 131
 //xoops_cp_footer();
Please login to merge, or discard this patch.
admin/about.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  * @since
17 17
  * @author       XOOPS Development Team
18 18
  */
19
-require __DIR__ . '/admin_header.php';
19
+require __DIR__.'/admin_header.php';
20 20
 
21 21
 xoops_cp_header();
22 22
 
@@ -24,4 +24,4 @@  discard block
 block discarded – undo
24 24
 $adminObject::setPaypal('[email protected]');
25 25
 $adminObject->displayAbout(false);
26 26
 
27
-require __DIR__ . '/admin_footer.php';
27
+require __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
config/imageconfig.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@  discard block
 block discarded – undo
6 6
 // extra module configs
7 7
 $modversion['config'][] = [
8 8
     'name'        => 'imageConfigs',
9
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
10
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
9
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG',
10
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC',
11 11
     'formtype'    => 'line_break',
12 12
     'valuetype'   => 'textbox',
13 13
     'default'     => 'head',
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
 
16 16
 $modversion['config'][] = [
17 17
     'name'        => 'imageWidth',
18
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
19
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
18
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH',
19
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC',
20 20
     'formtype'    => 'textbox',
21 21
     'valuetype'   => 'int',
22 22
     'default'     => 1200,
@@ -24,8 +24,8 @@  discard block
 block discarded – undo
24 24
 
25 25
 $modversion['config'][] = [
26 26
     'name'        => 'imageHeight',
27
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
28
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
27
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT',
28
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC',
29 29
     'formtype'    => 'textbox',
30 30
     'valuetype'   => 'int',
31 31
     'default'     => 800,
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 
34 34
 $modversion['config'][] = [
35 35
     'name'        => 'imageUploadPath',
36
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
37
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
36
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH',
37
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC',
38 38
     'formtype'    => 'textbox',
39 39
     'valuetype'   => 'text',
40
-    'default'     => 'uploads/' . $modversion['dirname'] . '/images',
40
+    'default'     => 'uploads/'.$modversion['dirname'].'/images',
41 41
 ];
Please login to merge, or discard this patch.
config/paths.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,19 +9,19 @@
 block discarded – undo
9 9
     $moduleDirNameUpper = mb_strtoupper($moduleDirName);
10 10
 
11 11
     return (object)[
12
-        'name'          => mb_strtoupper($moduleDirName) . ' PathConfigurator',
12
+        'name'          => mb_strtoupper($moduleDirName).' PathConfigurator',
13 13
         'paths'         => [
14 14
             'dirname'    => $moduleDirName,
15
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
16
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
17
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
18
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
19
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
15
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
16
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
17
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
18
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
19
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
20 20
         ],
21 21
         'uploadFolders' => [
22
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
23
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
24
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
22
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
23
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
24
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
25 25
             //XOOPS_UPLOAD_PATH . '/flags'
26 26
         ],
27 27
     ];
Please login to merge, or discard this patch.
config/config.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -20,32 +20,32 @@  discard block
 block discarded – undo
20 20
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
21 21
 
22 22
 return (object)[
23
-    'name'           => mb_strtoupper($moduleDirName) . ' ModuleConfigurator',
23
+    'name'           => mb_strtoupper($moduleDirName).' ModuleConfigurator',
24 24
     'paths'          => [
25 25
         'dirname'    => $moduleDirName,
26
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
27
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
28
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
29
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
30
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
26
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
27
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
28
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
29
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
30
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
31 31
     ],
32 32
     'uploadFolders'  => [
33
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
34
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
35
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
33
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
34
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
35
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
36 36
         //XOOPS_UPLOAD_PATH . '/flags'
37 37
     ],
38 38
     'copyBlankFiles' => [
39
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
40
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
41
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
39
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
40
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
41
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
42 42
         //XOOPS_UPLOAD_PATH . '/flags'
43 43
     ],
44 44
 
45 45
     'copyTestFolders' => [
46 46
         [
47
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
48
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
47
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
48
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
49 49
         ],
50 50
         //            [
51 51
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -82,5 +82,5 @@  discard block
 block discarded – undo
82 82
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
83 83
     ],
84 84
     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
85
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . "' alt='XOOPS Project'></a>",
85
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG')."' alt='XOOPS Project'></a>",
86 86
 ];
Please login to merge, or discard this patch.
config/icons.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -4,16 +4,16 @@
 block discarded – undo
4 4
 $moduleDirName = basename(dirname(__DIR__));
5 5
 
6 6
 return (object)[
7
-    'name'  => mb_strtoupper($moduleDirName) . ' IconConfigurator',
7
+    'name'  => mb_strtoupper($moduleDirName).' IconConfigurator',
8 8
     'icons' => [
9
-        'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
10
-        'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
11
-        'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
12
-        'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
13
-        'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
14
-        'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
15
-        'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
16
-        '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
17
-        '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
9
+        'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
10
+        'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
11
+        'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
12
+        'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
13
+        'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
14
+        'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
15
+        'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
16
+        '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
17
+        '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
18 18
     ],
19 19
 ];
Please login to merge, or discard this patch.