Completed
Pull Request — master (#144)
by Michael
03:13
created
preloads/core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,6 +27,6 @@
 block discarded – undo
27 27
      */
28 28
     public static function eventCoreIncludeCommonEnd($args)
29 29
     {
30
-        include __DIR__ . '/autoloader.php';
30
+        include __DIR__.'/autoloader.php';
31 31
     }
32 32
 }
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 $modversion['release_info']        = 'README';
43 43
 $modversion['release_file']        = 'https://github.com/txmodxoops/tdmcreate-1.91/releases';
44 44
 $modversion['manual']              = 'MANUAL';
45
-$modversion['manual_file']         = XOOPS_URL . "/modules/{$moduleDirName}/docs/manual.txt";
45
+$modversion['manual_file']         = XOOPS_URL."/modules/{$moduleDirName}/docs/manual.txt";
46 46
 $modversion['image']               = "assets/images/{$moduleDirName}_logo.png";
47 47
 $modversion['dirname']             = $moduleDirName;
48 48
 // Frameworks icons
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 // Module icons
53 53
 $modversion['modicons16']          = 'assets/images/icons/16';
54 54
 $modversion['modicons32']          = 'assets/images/icons/32';
55
-$modversion['targetdir']           = XOOPS_UPLOAD_PATH . "/{$moduleDirName}/repository/";
55
+$modversion['targetdir']           = XOOPS_UPLOAD_PATH."/{$moduleDirName}/repository/";
56 56
 $modversion['module_website_url']  = 'https://github.com/txmodxoops/tdmcreate-1.91';
57 57
 $modversion['module_website_name'] = 'GitHub Txmodx Xoops';
58 58
 $modversion['min_php']             = '5.5';
@@ -88,17 +88,17 @@  discard block
 block discarded – undo
88 88
 $modversion['sqlfile']['mysql'] = 'sql/mysql.sql';
89 89
 // Tables created by sql file (without prefix!)
90 90
 $modversion['tables'] = [
91
-    $moduleDirName . '_' . 'settings',
92
-    $moduleDirName . '_' . 'modules',
93
-    $moduleDirName . '_' . 'tables',
94
-    $moduleDirName . '_' . 'fields',
95
-    $moduleDirName . '_' . 'languages',
96
-    $moduleDirName . '_' . 'fieldtype',
97
-    $moduleDirName . '_' . 'fieldattributes',
98
-    $moduleDirName . '_' . 'fieldnull',
99
-    $moduleDirName . '_' . 'fieldkey',
100
-    $moduleDirName . '_' . 'fieldelements',
101
-    $moduleDirName . '_' . 'morefiles',
91
+    $moduleDirName.'_'.'settings',
92
+    $moduleDirName.'_'.'modules',
93
+    $moduleDirName.'_'.'tables',
94
+    $moduleDirName.'_'.'fields',
95
+    $moduleDirName.'_'.'languages',
96
+    $moduleDirName.'_'.'fieldtype',
97
+    $moduleDirName.'_'.'fieldattributes',
98
+    $moduleDirName.'_'.'fieldnull',
99
+    $moduleDirName.'_'.'fieldkey',
100
+    $moduleDirName.'_'.'fieldelements',
101
+    $moduleDirName.'_'.'morefiles',
102 102
 ];
103 103
 // Scripts to run upon installation or update
104 104
 $modversion['onInstall'] = 'include/install.php';
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 $c = 1;
110 110
 
111 111
 $modversion['config'][] = [
112
-    'name'        => 'break' . $c,
112
+    'name'        => 'break'.$c,
113 113
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_GENERAL',
114 114
     'description' => '_MI_TDMCREATE_CONFIG_',
115 115
     'formtype'    => 'line_break',
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
 
198 198
 ++$c;
199 199
 $modversion['config'][] = [
200
-    'name'        => 'break' . $c,
200
+    'name'        => 'break'.$c,
201 201
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_REQUIRED',
202 202
     'description' => '_MI_TDMCREATE_CONFIG_',
203 203
     'formtype'    => 'line_break',
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
 
379 379
 ++$c;
380 380
 $modversion['config'][] = [
381
-    'name'        => 'break' . $c,
381
+    'name'        => 'break'.$c,
382 382
     'title'       => '_MI_TDMCREATE_CONFIG_BREAK_OPTIONAL',
383 383
     'description' => '_MI_TDMCREATE_CONFIG_',
384 384
     'formtype'    => 'line_break',
@@ -582,8 +582,8 @@  discard block
 block discarded – undo
582 582
  */
583 583
 $modversion['config'][] = [
584 584
     'name'        => 'displaySampleButton',
585
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
586
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
585
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',
586
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',
587 587
     'formtype'    => 'yesno',
588 588
     'valuetype'   => 'int',
589 589
     'default'     => 1,
@@ -594,8 +594,8 @@  discard block
 block discarded – undo
594 594
  */
595 595
 $modversion['config'][] = [
596 596
     'name'        => 'displayDeveloperTools',
597
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS',
598
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC',
597
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS',
598
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC',
599 599
     'formtype'    => 'yesno',
600 600
     'valuetype'   => 'int',
601 601
     'default'     => 0,
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/Building.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
         $form->addElement($mod_select, true);
71 71
 
72 72
         $form->addElement(new \XoopsFormHidden('op', 'build'));
73
-        $form->addElement(new \XoopsFormButton(_REQUIRED . ' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
73
+        $form->addElement(new \XoopsFormButton(_REQUIRED.' <sup class="red bold">*</sup>', 'submit', _SUBMIT, 'submit'));
74 74
 
75 75
         return $form;
76 76
     }
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
     public function clearDir($dir, $pattern = '*')
83 83
     {
84 84
         // Find all files and folders matching pattern
85
-        $files = glob($dir . "/$pattern");
85
+        $files = glob($dir."/$pattern");
86 86
         // Interate thorugh the files and folders
87 87
         foreach ($files as $file) {
88 88
             // if it's a directory then re-call clearDir function to delete files inside this directory
@@ -109,12 +109,12 @@  discard block
 block discarded – undo
109 109
         }
110 110
         while (false !== ($file = readdir($dir))) {
111 111
             if (('.' !== $file) && ('..' !== $file)) {
112
-                if (is_dir($src . '/' . $file)) {
112
+                if (is_dir($src.'/'.$file)) {
113 113
                     // Copy the directory itself
114
-                    $this->copyDir($src . '/' . $file, $dst . '/' . $file);
114
+                    $this->copyDir($src.'/'.$file, $dst.'/'.$file);
115 115
                 } else {
116 116
                     // Make sure you copy the current script
117
-                    copy($src . '/' . $file, $dst . '/' . $file);
117
+                    copy($src.'/'.$file, $dst.'/'.$file);
118 118
                 }
119 119
             }
120 120
         }
Please login to merge, or discard this patch.
class/Files/CreateStructure.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -213,9 +213,9 @@
 block discarded – undo
213 213
         $this->setFolderName($folderName);
214 214
         if ($fileName) {
215 215
             $this->setFileName($fileName);
216
-            $ret = $this->getUploadPath() . DS . $this->getModuleName() . DS . $this->getFolderName() . DS . $this->getFileName();
216
+            $ret = $this->getUploadPath().DS.$this->getModuleName().DS.$this->getFolderName().DS.$this->getFileName();
217 217
         } else {
218
-            $ret = $this->getUploadPath() . DS . $this->getModuleName() . DS . $this->getFolderName();
218
+            $ret = $this->getUploadPath().DS.$this->getModuleName().DS.$this->getFolderName();
219 219
         }
220 220
 
221 221
         return $ret;
Please login to merge, or discard this patch.
class/Files/User/UserPdf.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -206,7 +206,7 @@
 block discarded – undo
206 206
         $ret .= $this->phpcode->getPhpCodeCommentLine('Pdf Filename');
207 207
         $ret .= $this->phpcode->getPhpCodeCommentLine('Output');
208 208
         $ret .= $this->xc->getXcTplAssign('pdfoutput', "\$pdf->Output('{$tableName}.pdf', 'I')");
209
-        $ret .= $this->xc->getXcTplDisplay($moduleDirname . '_pdf.tpl', '', false);
209
+        $ret .= $this->xc->getXcTplDisplay($moduleDirname.'_pdf.tpl', '', false);
210 210
 
211 211
         return $ret;
212 212
     }
Please login to merge, or discard this patch.
class/Files/Language/LanguageDefines.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@
 block discarded – undo
91 91
         if ($usedoubleqoute) {
92 92
             $ret = $this->phpcode->getPhpCodeDefine("{$language}{$defined}", "\"{$description}\"");
93 93
         } else {
94
-            $ret = $this->phpcode->getPhpCodeDefine("{$language}{$defined}", "'" . $description . "'");
94
+            $ret = $this->phpcode->getPhpCodeDefine("{$language}{$defined}", "'".$description."'");
95 95
         }
96 96
 
97 97
         return $ret;
Please login to merge, or discard this patch.
class/Files/Classes/ClassXoopsCode.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -74,8 +74,8 @@
 block discarded – undo
74 74
      */
75 75
     public function getClassCriteria($var, $param1, $param2 = '', $param3 = '', $isParam = false, $t = '')
76 76
     {
77
-        $params = ('' != $param2) ? ', ' . $param2 : '';
78
-        $params .= ('' != $param3) ? ', ' . $param3 : '';
77
+        $params = ('' != $param2) ? ', '.$param2 : '';
78
+        $params .= ('' != $param3) ? ', '.$param3 : '';
79 79
 
80 80
         if (false === $isParam) {
81 81
             $ret = "{$t}\${$var} = new \Criteria( {$param1}{$params} );\n";
Please login to merge, or discard this patch.