Completed
Pull Request — master (#144)
by Michael
04:31
created
admin/menu.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  * @version         $Id: menu.php 11084 2013-02-23 15:44:20Z timgno $
24 24
  */
25 25
 
26
-include dirname(__DIR__) . '/preloads/autoloader.php';
26
+include dirname(__DIR__).'/preloads/autoloader.php';
27 27
 
28 28
 $moduleDirName      = basename(dirname(__DIR__));
29 29
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
@@ -47,62 +47,62 @@  discard block
 block discarded – undo
47 47
 $adminmenu[] = [
48 48
     'title' => _MI_TDMCREATE_ADMENU1,
49 49
     'link'  => 'admin/index.php',
50
-    'icon'  => $pathIcon32 . '/dashboard.png',
50
+    'icon'  => $pathIcon32.'/dashboard.png',
51 51
 ];
52 52
 
53 53
 $adminmenu[] = [
54 54
     'title' => _MI_TDMCREATE_ADMENU2,
55 55
     'link'  => 'admin/settings.php',
56
-    'icon'  => $modPathIcon32 . '/settings.png',
56
+    'icon'  => $modPathIcon32.'/settings.png',
57 57
 ];
58 58
 
59 59
 $adminmenu[] = [
60 60
     'title' => _MI_TDMCREATE_ADMENU3,
61 61
     'link'  => 'admin/modules.php',
62
-    'icon'  => $modPathIcon32 . '/addmodule.png',
62
+    'icon'  => $modPathIcon32.'/addmodule.png',
63 63
 ];
64 64
 
65 65
 $adminmenu[] = [
66 66
     'title' => _MI_TDMCREATE_ADMENU4,
67 67
     'link'  => 'admin/tables.php',
68
-    'icon'  => $modPathIcon32 . '/addtable.png',
68
+    'icon'  => $modPathIcon32.'/addtable.png',
69 69
 ];
70 70
 
71 71
 $adminmenu[] = [
72 72
     'title' => _MI_TDMCREATE_ADMENU5,
73 73
     'link'  => 'admin/fields.php',
74
-    'icon'  => $modPathIcon32 . '/fields.png',
74
+    'icon'  => $modPathIcon32.'/fields.png',
75 75
 ];
76 76
 
77 77
 $adminmenu[] = [
78 78
     'title' => _MI_TDMCREATE_ADMENU6,
79 79
     'link'  => 'admin/morefiles.php',
80
-    'icon'  => $modPathIcon32 . '/files.png',
80
+    'icon'  => $modPathIcon32.'/files.png',
81 81
 ];
82 82
 
83 83
 $adminmenu[] = [
84 84
     'title' => _MI_TDMCREATE_ADMENU7,
85 85
     'link'  => 'admin/building.php',
86
-    'icon'  => $modPathIcon32 . '/builder.png',
86
+    'icon'  => $modPathIcon32.'/builder.png',
87 87
 ];
88 88
 
89 89
 //Feedback
90 90
 $adminmenu[] = [
91
-    'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK'),
91
+    'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK'),
92 92
     'link'  => 'admin/feedback.php',
93
-    'icon'  => $pathIcon32 . 'mail_foward.png',
93
+    'icon'  => $pathIcon32.'mail_foward.png',
94 94
 ];
95 95
 
96 96
 if ($helper->getConfig('displayDeveloperTools')) {
97 97
     $adminmenu[] = [
98
-        'title' => constant('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE'),
98
+        'title' => constant('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE'),
99 99
         'link' => 'admin/migrate.php',
100
-        'icon' => $pathIcon32 . 'database_go.png',
100
+        'icon' => $pathIcon32.'database_go.png',
101 101
     ];
102 102
 }
103 103
 
104 104
 $adminmenu[] = [
105 105
     'title' => _MI_TDMCREATE_ABOUT,
106 106
     'link'  => 'admin/about.php',
107
-    'icon'  => $pathIcon32 . 'about.png',
107
+    'icon'  => $pathIcon32.'about.png',
108 108
 ];
Please login to merge, or discard this patch.
admin/footer.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@
 block discarded – undo
25 25
 $pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
26 26
 
27 27
 echo "<div class='adminfooter'>\n"
28
-     . "  <div style='text-align: center;'>\n"
29
-     . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
30
-     . "  </div>\n"
31
-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
32
-     . '</div>';
28
+        . "  <div style='text-align: center;'>\n"
29
+        . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
30
+        . "  </div>\n"
31
+        . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
32
+        . '</div>';
33 33
 
34 34
 xoops_cp_footer();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@
 block discarded – undo
28 28
      . "  <div style='text-align: center;'>\n"
29 29
      . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
30 30
      . "  </div>\n"
31
-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
31
+     . '  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"
32 32
      . '</div>';
33 33
 
34 34
 xoops_cp_footer();
Please login to merge, or discard this patch.
admin/header.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -22,10 +22,10 @@  discard block
 block discarded – undo
22 22
  * @version         $Id: header.php 12258 2014-01-02 09:33:29Z timgno $
23 23
  */
24 24
 
25
-include dirname(__DIR__) . '/preloads/autoloader.php';
25
+include dirname(__DIR__).'/preloads/autoloader.php';
26 26
 
27
-include_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
28
-include_once dirname(__DIR__) . '/include/common.php';
27
+include_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
28
+include_once dirname(__DIR__).'/include/common.php';
29 29
 
30 30
 $thisDirname = $GLOBALS['xoopsModule']->getVar('dirname');
31 31
 // Link System Icons
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 // MyTextSanitizer
43 43
 $myts = MyTextSanitizer::getInstance();
44 44
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
45
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
45
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
46 46
     $xoopsTpl = new \XoopsTpl();
47 47
 }
48 48
 // System Icons
Please login to merge, or discard this patch.
include/functions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 {
33 33
     $donationform = [
34 34
         0 => '<form name="donation" id="donation" action="http://www.txmodxoops.org/modules/xdonations/" method="post" onsubmit="return xoopsFormValidate_donation();">',
35
-        1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">' . _AM_TDMCREATE_ABOUT_MAKE_DONATION . '</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">' . _AM_TDMCREATE_DONATION_AMOUNT . '</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="' . _SUBMIT . '" title="' . _SUBMIT . '" type="submit"></td></tr></tbody></table>',
35
+        1 => '<table class="outer" cellspacing="1" width="100%"><tbody><tr><th colspan="2">'._AM_TDMCREATE_ABOUT_MAKE_DONATION.'</th></tr><tr align="left" valign="top"><td class="head"><div class="xoops-form-element-caption-required"><span class="caption-text">'._AM_TDMCREATE_DONATION_AMOUNT.'</span><span class="caption-marker">*</span></div></td><td class="even"><select size="1" name="item[A][amount]" id="item[A][amount]" title="Donation Amount"><option value="5">5.00 EUR</option><option value="10">10.00 EUR</option><option value="20">20.00 EUR</option><option value="40">40.00 EUR</option><option value="60">60.00 EUR</option><option value="80">80.00 EUR</option><option value="90">90.00 EUR</option><option value="100">100.00 EUR</option><option value="200">200.00 EUR</option></select></td></tr><tr align="left" valign="top"><td class="head"></td><td class="even"><input class="formButton" name="submit" id="submit" value="'._SUBMIT.'" title="'._SUBMIT.'" type="submit"></td></tr></tbody></table>',
36 36
         2 => '<input name="op" id="op" value="createinvoice" type="hidden"><input name="plugin" id="plugin" value="donations" type="hidden"><input name="donation" id="donation" value="1" type="hidden"><input name="drawfor" id="drawfor" value="Chronolabs Co-Operative" type="hidden"><input name="drawto" id="drawto" value="%s" type="hidden"><input name="drawto_email" id="drawto_email" value="%s" type="hidden"><input name="key" id="key" value="%s" type="hidden"><input name="currency" id="currency" value="EUR" type="hidden"><input name="weight_unit" id="weight_unit" value="kgs" type="hidden"><input name="item[A][cat]" id="item[A][cat]" value="XDN%s" type="hidden"><input name="item[A][name]" id="item[A][name]" value="Donation for %s" type="hidden"><input name="item[A][quantity]" id="item[A][quantity]" value="1" type="hidden"><input name="item[A][shipping]" id="item[A][shipping]" value="0" type="hidden"><input name="item[A][handling]" id="item[A][handling]" value="0" type="hidden"><input name="item[A][weight]" id="item[A][weight]" value="0" type="hidden"><input name="item[A][tax]" id="item[A][tax]" value="0" type="hidden"><input name="return" id="return" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"><input name="cancel" id="cancel" value="http://www.txmodxoops.org/modules/xdonations/success.php" type="hidden"></form>', 'D' => '',
37 37
         3 => '',
38 38
         4 => '<!-- Start Form Validation JavaScript //-->
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
     for ($key = 0; $key <= 4; ++$key) {
56 56
         switch ($key) {
57 57
             case 2:
58
-                $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'] . ' - ' . ('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name') . ' [' . $GLOBALS['xoopsUser']->getVar('uname') . ']' : $GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')), mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')) . ' ' . $GLOBALS['xoopsModule']->getVar('name'));
58
+                $donationform[$key] = sprintf($donationform[$key], $GLOBALS['xoopsConfig']['sitename'].' - '.('' != $GLOBALS['xoopsUser']->getVar('name') ? $GLOBALS['xoopsUser']->getVar('name').' ['.$GLOBALS['xoopsUser']->getVar('uname').']' : $GLOBALS['xoopsUser']->getVar('uname')), $GLOBALS['xoopsUser']->getVar('email'), XOOPS_LICENSE_KEY, mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')), mb_strtoupper($GLOBALS['xoopsModule']->getVar('dirname')).' '.$GLOBALS['xoopsModule']->getVar('name'));
59 59
                 break;
60 60
         }
61 61
     }
Please login to merge, or discard this patch.
include/update.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 {
57 57
     global $xoopsDB;
58 58
     $result = $xoopsDB->query(
59
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile')
59
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile')
60 60
         . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
61 61
     );
62 62
     $tplids = [];
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
     if (count($tplids) > 0) {
67 67
         $tplfileHandler = xoops_getHandler('tplfile');
68 68
         $duplicate_files = $tplfileHandler->getObjects(
69
-            new \Criteria('tpl_id', '(' . implode(',', $tplids) . ')', 'IN')
69
+            new \Criteria('tpl_id', '('.implode(',', $tplids).')', 'IN')
70 70
         );
71 71
 
72 72
         if (count($duplicate_files) > 0) {
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
             }
76 76
         }
77 77
     }
78
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
78
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
79 79
     if (!$result = $xoopsDB->queryF($sql)) {
80
-        xoops_error($this->db->error() . '<br />' . $sql);
80
+        xoops_error($this->db->error().'<br />'.$sql);
81 81
 
82 82
         return false;
83 83
     }
@@ -92,10 +92,10 @@  discard block
 block discarded – undo
92 92
 
93 93
         return true;
94 94
     }
95
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile')
95
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile')
96 96
         . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
97 97
     if (!$result = $xoopsDB->queryF($sql)) {
98
-        xoops_error($xoopsDB->error() . '<br />' . $sql);
98
+        xoops_error($xoopsDB->error().'<br />'.$sql);
99 99
         $module->setErrors(
100 100
             "'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index."
101 101
         );
Please login to merge, or discard this patch.
config/icons.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -3,20 +3,20 @@
 block discarded – undo
3 3
 function getIcons()
4 4
 {
5 5
     $pathIcon16 = \Xmf\Module\Admin::iconUrl('', 16);
6
-    $moduleDirName      = basename(dirname(__DIR__));
6
+    $moduleDirName = basename(dirname(__DIR__));
7 7
 
8 8
     return (object)[
9
-        'name'          => mb_strtoupper($moduleDirName) . ' IconConfigurator',
9
+        'name'          => mb_strtoupper($moduleDirName).' IconConfigurator',
10 10
         'icons'         => [
11
-            'edit' => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
12
-            'delete' => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
13
-            'clone' => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
14
-            'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
15
-            'print' => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
16
-            'pdf' => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
17
-            'add' => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
18
-            '0' => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
19
-            '1' => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
11
+            'edit' => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
12
+            'delete' => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
13
+            'clone' => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
14
+            'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
15
+            'print' => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
16
+            'pdf' => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
17
+            'add' => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
18
+            '0' => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
19
+            '1' => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
20 20
         ],
21 21
     ];
22 22
 }
Please login to merge, or discard this patch.
config/config.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -21,30 +21,30 @@  discard block
 block discarded – undo
21 21
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
22 22
 
23 23
 return (object)[
24
-    'name'           => mb_strtoupper($moduleDirName) . ' ModuleConfigurator',
24
+    'name'           => mb_strtoupper($moduleDirName).' ModuleConfigurator',
25 25
     'paths'          => [
26 26
         'dirname'    => $moduleDirName,
27
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
28
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
29
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
30
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
31
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
27
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
28
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
29
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
30
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
31
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
32 32
     ],
33 33
     'uploadFolders'  => [
34
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
35
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
34
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
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 . '/screenshots',
39
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
40
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
41 41
         //XOOPS_UPLOAD_PATH . '/flags'
42 42
     ],
43 43
 
44 44
     'copyTestFolders' => [
45 45
         [
46
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
47
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
46
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
47
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
48 48
         ],
49 49
         //            [
50 50
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -81,6 +81,6 @@  discard block
 block discarded – undo
81 81
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
82 82
     ],
83 83
     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
84
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . "' alt='XOOPS Project'></a>",
84
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG')."' alt='XOOPS Project'></a>",
85 85
 ];
86 86
 
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
@@ -6,19 +6,19 @@
 block discarded – undo
6 6
     $moduleDirNameUpper = mb_strtoupper($moduleDirName);
7 7
 
8 8
     return (object)[
9
-        'name'          => mb_strtoupper($moduleDirName) . ' PathConfigurator',
9
+        'name'          => mb_strtoupper($moduleDirName).' PathConfigurator',
10 10
         'paths'         => [
11 11
             'dirname'    => $moduleDirName,
12
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
13
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
14
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
15
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
16
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
12
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
13
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
14
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
15
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
16
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
17 17
         ],
18 18
         'uploadFolders' => [
19
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
20
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
21
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
19
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
20
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
21
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
22 22
             //XOOPS_UPLOAD_PATH . '/flags'
23 23
         ],
24 24
     ];
Please login to merge, or discard this patch.
class/Settings.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
         $isNew = $this->isNew();
146 146
         $title = $isNew ? sprintf(_AM_TDMCREATE_SETTING_NEW) : sprintf(_AM_TDMCREATE_SETTING_EDIT);
147 147
 
148
-        include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
148
+        include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
149 149
 
150 150
         $form = new \XoopsThemeForm($title, 'settingform', $action, 'post', true);
151 151
         $form->setExtra('enctype="multipart/form-data"');
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
         $checkbox = new \XoopsFormCheckbox(' ', 'setting_option', $settingOption, '<br>');
175 175
         $checkbox->setDescription(_AM_TDMCREATE_OPTIONS_DESC);
176 176
         foreach ($this->options as $option) {
177
-            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_' . mb_strtoupper($option)));
177
+            $checkbox->addOption($option, self::getDefinedLanguage('_AM_TDMCREATE_SETTING_'.mb_strtoupper($option)));
178 178
         }
179 179
         $optionsTray->addElement($checkbox);
180 180
 
@@ -183,17 +183,17 @@  discard block
 block discarded – undo
183 183
         $modImage = $this->getVar('set_image');
184 184
         $modImage = $modImage ?: $set['image'];
185 185
 
186
-        $uploadDirectory = 'uploads/' . $GLOBALS['xoopsModule']->dirname() . '/images/modules';
186
+        $uploadDirectory = 'uploads/'.$GLOBALS['xoopsModule']->dirname().'/images/modules';
187 187
         $imgtray = new \XoopsFormElementTray(_AM_TDMCREATE_SETTING_IMAGE, '<br>');
188
-        $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './' . mb_strtolower($uploadDirectory) . '/');
188
+        $imgpath = sprintf(_AM_TDMCREATE_FORMIMAGE_PATH, './'.mb_strtolower($uploadDirectory).'/');
189 189
         $imageSelect = new \XoopsFormSelect($imgpath, 'set_image', $modImage);
190 190
         $modImage_array = \XoopsLists::getImgListAsArray(TDMC_UPLOAD_IMGMOD_PATH);
191 191
         foreach ($modImage_array as $image) {
192 192
             $imageSelect->addOption($image, $image);
193 193
         }
194
-        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_image\", \"" . $uploadDirectory . '", "", "' . XOOPS_URL . "\")'");
194
+        $imageSelect->setExtra("onchange='showImgSelected(\"image3\", \"set_image\", \"".$uploadDirectory.'", "", "'.XOOPS_URL."\")'");
195 195
         $imgtray->addElement($imageSelect);
196
-        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='" . TDMC_UPLOAD_IMGMOD_URL . '/' . $modImage . "' name='image3' id='image3' alt='' /><br>"));
196
+        $imgtray->addElement(new \XoopsFormLabel('', "<br><img src='".TDMC_UPLOAD_IMGMOD_URL.'/'.$modImage."' name='image3' id='image3' alt='' /><br>"));
197 197
 
198 198
         $fileseltray = new \XoopsFormElementTray('', '<br>');
199 199
         $fileseltray->addElement(new \XoopsFormFile(_AM_TDMCREATE_FORMUPLOAD, 'attachedfile', $helper->getConfig('maxsize')));
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_PAYPAL_BUTTON, 'set_donations', 50, 255, $this->getVar('set_donations')));
222 222
         $form->addElement(new \XoopsFormText(_AM_TDMCREATE_SETTING_SUBVERSION, 'set_subversion', 50, 255, $this->getVar('set_subversion')));
223 223
 
224
-        $buttonTray = new \XoopsFormElementTray(_REQUIRED . ' <sup class="red bold">*</sup>', '');
224
+        $buttonTray = new \XoopsFormElementTray(_REQUIRED.' <sup class="red bold">*</sup>', '');
225 225
         $buttonTray->addElement(new \XoopsFormHidden('op', 'save'));
226 226
         $buttonTray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
227 227
         $form->addElement($buttonTray);
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
     {
262 262
         $retSet = [];
263 263
         foreach ($this->options as $option) {
264
-            if (1 == $this->getVar('set_' . $option)) {
264
+            if (1 == $this->getVar('set_'.$option)) {
265 265
                 $retSet[] = $option;
266 266
             }
267 267
         }
Please login to merge, or discard this patch.