Completed
Push — master ( b0c184...5f4391 )
by Michael
20s queued 11s
created
admin/about.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,11 +20,11 @@
 block discarded – undo
20 20
  */
21 21
 
22 22
 // Call header
23
-require_once __DIR__ . '/admin_header.php';
23
+require_once __DIR__.'/admin_header.php';
24 24
 xoops_cp_header();
25 25
 
26 26
 $adminObject->displayNavigation(basename(__FILE__));
27 27
 $adminObject::setPaypal('[email protected]');
28 28
 $adminObject->displayAbout(false);
29 29
 
30
-require_once __DIR__ . '/admin_footer.php';
30
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
admin/admin_footer.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,10 +20,10 @@
 block discarded – undo
20 20
 $pathIcon32      = Xmf\Module\Admin::iconUrl('', 32);
21 21
 
22 22
 echo "<div class='adminfooter'>\n"
23
-     ."  <div style='text-align: center;'>\n"
24
-     ."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
25
-     ."  </div>\n"
26
-     .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
27
-     .'</div>';
23
+        ."  <div style='text-align: center;'>\n"
24
+        ."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
25
+        ."  </div>\n"
26
+        .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
27
+        .'</div>';
28 28
 
29 29
 xoops_cp_footer();
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,13 +17,13 @@
 block discarded – undo
17 17
  * @author     XOOPS Development Team
18 18
  */
19 19
 
20
-$pathIcon32      = Xmf\Module\Admin::iconUrl('', 32);
20
+$pathIcon32 = Xmf\Module\Admin::iconUrl('', 32);
21 21
 
22 22
 echo "<div class='adminfooter'>\n"
23 23
      ."  <div style='text-align: center;'>\n"
24 24
      ."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
25 25
      ."  </div>\n"
26
-     .'  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
26
+     .'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"
27 27
      .'</div>';
28 28
 
29 29
 xoops_cp_footer();
Please login to merge, or discard this patch.
admin/main.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,12 +25,12 @@  discard block
 block discarded – undo
25 25
 $helper = Contact\Helper::getInstance();
26 26
 
27 27
 // Call header
28
-require __DIR__ . '/admin_header.php';
28
+require __DIR__.'/admin_header.php';
29 29
 // Display Admin header
30 30
 xoops_cp_header();
31 31
 global $xoopsModuleConfig;
32 32
 // Define default value
33
-$level      = '';
33
+$level = '';
34 34
 
35 35
 $saveinfo = $helper->getConfig('saveinfo');
36 36
 $sendmail = $helper->getConfig('sendmail');
@@ -41,11 +41,11 @@  discard block
 block discarded – undo
41 41
 // Define scripts
42 42
 $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
43 43
 $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
44
-$GLOBALS['xoTheme']->addScript(XOOPS_URL . '/modules/contact/assets/js/admin.js');
44
+$GLOBALS['xoTheme']->addScript(XOOPS_URL.'/modules/contact/assets/js/admin.js');
45 45
 // Add module stylesheet
46
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/contact/assets/css/admin.css');
47
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
48
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
46
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/contact/assets/css/admin.css');
47
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
48
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
49 49
 
50 50
 switch ($op) {
51 51
     case 'list':
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
         $contacts        = $contactHandler->contactGetAdminList($contact, 'contact_cid');
65 65
 
66 66
         if ($contact_numrows > $contact['limit']) {
67
-            $contact_pagenav = new \XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
67
+            $contact_pagenav = new \XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit='.$contact['limit']);
68 68
             $contact_pagenav = $contact_pagenav->renderNav(4);
69 69
         } else {
70 70
             $contact_pagenav = '';
@@ -196,6 +196,6 @@  discard block
 block discarded – undo
196 196
 $GLOBALS['xoopsTpl']->assign('level', $level);
197 197
 
198 198
 // Call template file
199
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_main.tpl');
199
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_main.tpl');
200 200
 // Call footer
201
-require __DIR__ . '/admin_footer.php';
201
+require __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
xoops_version.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
 
23 23
 defined('XOOPS_ROOT_PATH') || die('Restricted access');
24 24
 
25
-include __DIR__ . '/preloads/autoloader.php';
25
+include __DIR__.'/preloads/autoloader.php';
26 26
 
27 27
 $moduleDirName = basename(__DIR__);
28 28
 
@@ -45,10 +45,10 @@  discard block
 block discarded – undo
45 45
     'help'                => 'page=help',
46 46
     // ------------------- Folders & Files -------------------
47 47
     'release_info'        => 'Changelog',
48
-    'release_file'        => XOOPS_URL . "/modules/$moduleDirName/docs/changelog.txt",
48
+    'release_file'        => XOOPS_URL."/modules/$moduleDirName/docs/changelog.txt",
49 49
     //
50 50
     'manual'              => 'link to manual file',
51
-    'manual_file'         => XOOPS_URL . "/modules/$moduleDirName/docs/install.txt",
51
+    'manual_file'         => XOOPS_URL."/modules/$moduleDirName/docs/install.txt",
52 52
     // images
53 53
     'image'               => 'assets/images/logoModule.png',
54 54
     'dirname'             => $moduleDirName,
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
     // -------------------  PayPal ---------------------------
82 82
     'paypal'              => [
83 83
         'business'      => '[email protected]',
84
-        'item_name'     => 'Donation : ' . _MI_CONTACT_NAME,
84
+        'item_name'     => 'Donation : '._MI_CONTACT_NAME,
85 85
         'amount'        => 0,
86 86
         'currency_code' => 'USD'
87 87
     ],
@@ -102,35 +102,35 @@  discard block
 block discarded – undo
102 102
 // Templates
103 103
 $modversion['templates'] = [
104 104
     [
105
-        'file'        => $moduleDirName . '_index.tpl',
105
+        'file'        => $moduleDirName.'_index.tpl',
106 106
         'description' => '_MI_CONTACT_TEMPLATES'
107 107
     ],
108 108
 ];
109 109
 
110 110
 // Blocks
111 111
 $modversion['blocks'][] = [
112
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
112
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
113 113
     'name'        => _MI_B_CONTACT_FORM,
114 114
     'description' => _MI_B_CONTACT_FORM_DESC,
115
-    'show_func'   => 'block_' . $moduleDirName . '_form_show',
115
+    'show_func'   => 'block_'.$moduleDirName.'_form_show',
116 116
     'options'     => '',
117
-    'template'    => 'block_' . $moduleDirName . '_form.tpl'
117
+    'template'    => 'block_'.$moduleDirName.'_form.tpl'
118 118
 ];
119 119
 $modversion['blocks'][] = [
120
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
120
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
121 121
     'name'        => _MI_B_CONTACT_MAP,
122 122
     'description' => _MI_B_CONTACT_MAP_DESC,
123
-    'show_func'   => 'block_' . $moduleDirName . '_map_show',
123
+    'show_func'   => 'block_'.$moduleDirName.'_map_show',
124 124
     'options'     => '',
125
-    'template'    => 'block_' . $moduleDirName . '_map.tpl'
125
+    'template'    => 'block_'.$moduleDirName.'_map.tpl'
126 126
 ];
127 127
 $modversion['blocks'][] = [
128
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
128
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
129 129
     'name'        => _MI_B_CONTACT_FORM_MAP,
130 130
     'description' => _MI_B_CONTACT_FORM_MAP_DESC,
131
-    'show_func'   => 'block_' . $moduleDirName . '_form_map_show',
131
+    'show_func'   => 'block_'.$moduleDirName.'_form_map_show',
132 132
     'options'     => '',
133
-    'template'    => 'block_' . $moduleDirName . '_form_map.tpl'
133
+    'template'    => 'block_'.$moduleDirName.'_form_map.tpl'
134 134
 ];
135 135
 
136 136
 // Settings
Please login to merge, or discard this patch.
send.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -25,10 +25,10 @@  discard block
 block discarded – undo
25 25
 /** @var Contact\Helper $helper */
26 26
 $helper = Contact\Helper::getInstance();
27 27
 
28
-include __DIR__ . '/header.php';
28
+include __DIR__.'/header.php';
29 29
 $GLOBALS['xoopsOption']['template_main'] = 'contact_index.tpl';
30 30
 //unset($_SESSION);
31
-include XOOPS_ROOT_PATH . '/header.php';
31
+include XOOPS_ROOT_PATH.'/header.php';
32 32
 
33 33
 /** reCaptcha by google **/
34 34
 global $xoopsConfig, $xoopsModuleConfig;
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 if (!$captcha && $helper->getConfig('recaptchause')) {
45 45
     redirect_header('index.php', 2, _MD_CONTACT_MES_NOCAPTCHA);
46 46
 } else {
47
-    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $helper->getConfig('recaptchakey') . '&response=' . $captcha . '&remoteip=' . $_SERVER['REMOTE_ADDR']);
47
+    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$helper->getConfig('recaptchakey').'&response='.$captcha.'&remoteip='.$_SERVER['REMOTE_ADDR']);
48 48
     if (false === $response['success'] && $helper->getConfig('recaptchause')) {
49 49
         redirect_header('index.php', 2, _MD_CONTACT_MES_CAPTCHAINCORRECT);
50 50
     } else {
@@ -90,4 +90,4 @@  discard block
 block discarded – undo
90 90
     }
91 91
 }
92 92
 
93
-include XOOPS_ROOT_PATH . '/footer.php';
93
+include XOOPS_ROOT_PATH.'/footer.php';
Please login to merge, or discard this patch.
include/oninstall.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 {
31 31
     $moduleDirName = basename(dirname(__DIR__));
32 32
     /** @var ContactUtility $utility */
33
-    $utility    = ucfirst($moduleDirName) . 'Utility';
33
+    $utility = ucfirst($moduleDirName).'Utility';
34 34
     if (!class_exists($utility)) {
35 35
         xoops_load('utility', $moduleDirName);
36 36
     }
@@ -38,10 +38,10 @@  discard block
 block discarded – undo
38 38
     $xoopsSuccess = $utility::checkVerXoops($module);
39 39
     $phpSuccess   = $utility::checkVerPhp($module);
40 40
 
41
-    if (false !== $xoopsSuccess && false !==  $phpSuccess) {
42
-        $mod_tables =& $module->getInfo('tables');
41
+    if (false !== $xoopsSuccess && false !== $phpSuccess) {
42
+        $mod_tables = & $module->getInfo('tables');
43 43
         foreach ($mod_tables as $table) {
44
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
44
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
45 45
         }
46 46
     }
47 47
     return $xoopsSuccess && $phpSuccess;
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
  */
57 57
 function xoops_module_install_contact(\XoopsModule $module)
58 58
 {
59
-    require_once  __DIR__ . '/../../../mainfile.php';
60
-    require_once  __DIR__ . '/../include/config.php';
59
+    require_once  __DIR__.'/../../../mainfile.php';
60
+    require_once  __DIR__.'/../include/config.php';
61 61
 
62 62
     $moduleDirName = basename(dirname(__DIR__));
63 63
 
@@ -70,16 +70,16 @@  discard block
 block discarded – undo
70 70
 
71 71
     // default Permission Settings ----------------------
72 72
 //    global $xoopsModule;
73
-    $moduleId     = $module->getVar('mid');
73
+    $moduleId = $module->getVar('mid');
74 74
 //    $moduleId2    = $helper->getModule()->mid();
75 75
     /** @var \XoopsGroupPermHandler $grouppermHandler */
76 76
     $grouppermHandler = xoops_getHandler('groupperm');
77 77
     // access rights ------------------------------------------
78
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
79
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
80
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
81
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
82
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
78
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
79
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
80
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
81
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
82
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
83 83
 
84 84
     //  ---  CREATE FOLDERS ---------------
85 85
     if (count($configurator->uploadFolders) > 0) {
@@ -91,9 +91,9 @@  discard block
 block discarded – undo
91 91
 
92 92
     //  ---  COPY blank.png FILES ---------------
93 93
     if (count($configurator->copyBlankFiles) > 0) {
94
-        $file = __DIR__ . '/../assets/images/blank.png';
94
+        $file = __DIR__.'/../assets/images/blank.png';
95 95
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
96
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
96
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
97 97
             $utility::copyFile($file, $dest);
98 98
         }
99 99
     }
Please login to merge, or discard this patch.
include/onupdate.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
25 25
     || !$GLOBALS['xoopsUser']->IsAdmin()
26 26
 ) {
27
-    exit('Restricted access' . PHP_EOL);
27
+    exit('Restricted access'.PHP_EOL);
28 28
 }
29 29
 
30 30
 /**
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
     $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
83 83
 
84 84
     if ($previousVersion < 180) {
85
-        $sql = 'CREATE TABLE ' . $xoopsDB->prefix('contact') . ' (
85
+        $sql = 'CREATE TABLE '.$xoopsDB->prefix('contact').' (
86 86
         contact_id int(10) unsigned NOT NULL auto_increment,
87 87
         contact_uid int(10) NOT NULL,
88 88
         contact_cid int(10) NOT NULL,
@@ -107,39 +107,39 @@  discard block
 block discarded – undo
107 107
 
108 108
     if ($previousVersion < 181) {
109 109
         // Add contact_platform
110
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . "` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
110
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact')."` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
111 111
         $xoopsDB->query($sql);
112 112
         // Add contact_type
113
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . "` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
113
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact')."` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
114 114
         $xoopsDB->query($sql);
115 115
         // Add index contact_uid
116
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_uid` ( `contact_uid` )';
116
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_uid` ( `contact_uid` )';
117 117
         $xoopsDB->query($sql);
118 118
         // Add index contact_cid
119
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_cid` ( `contact_cid` )';
119
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_cid` ( `contact_cid` )';
120 120
         $xoopsDB->query($sql);
121 121
         // Add index contact_create
122
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_create` ( `contact_create` )';
122
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_create` ( `contact_create` )';
123 123
         $xoopsDB->query($sql);
124 124
         // Add index contact_mail
125
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_mail` ( `contact_mail` )';
125
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_mail` ( `contact_mail` )';
126 126
         $xoopsDB->query($sql);
127 127
         // Add index contact_phone
128
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_phone` ( `contact_phone` )';
128
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_phone` ( `contact_phone` )';
129 129
         $xoopsDB->query($sql);
130 130
         // Add index contact_platform
131
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_platform` ( `contact_platform` )';
131
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_platform` ( `contact_platform` )';
132 132
         $xoopsDB->query($sql);
133 133
         // Add index contact_type
134
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_type` ( `contact_type` )';
134
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_type` ( `contact_type` )';
135 135
         $xoopsDB->query($sql);
136 136
     }
137 137
 
138 138
     if ($previousVersion < 227) {
139
-        require_once __DIR__ . '/config.php';
139
+        require_once __DIR__.'/config.php';
140 140
         $configurator = new ContactConfigurator();
141 141
         /** @var ContactUtility $utility */
142
-        $utility    = ucfirst($moduleDirName) . 'Utility';
142
+        $utility = ucfirst($moduleDirName).'Utility';
143 143
         if (!class_exists($utility)) {
144 144
             xoops_load('utility', $moduleDirName);
145 145
         }
@@ -147,14 +147,14 @@  discard block
 block discarded – undo
147 147
         //delete old HTML templates
148 148
         if (count($configurator->templateFolders) > 0) {
149 149
             foreach ($configurator->templateFolders as $folder) {
150
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
150
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
151 151
                 if (is_dir($templateFolder)) {
152 152
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
153 153
                     foreach ($templateList as $k => $v) {
154
-                        $fileInfo = new \SplFileInfo($templateFolder . $v);
154
+                        $fileInfo = new \SplFileInfo($templateFolder.$v);
155 155
                         if ('html' === $fileInfo->getExtension() && 'index.html' !== $fileInfo->getFilename()) {
156
-                            if (file_exists($templateFolder . $v)) {
157
-                                unlink($templateFolder . $v);
156
+                            if (file_exists($templateFolder.$v)) {
157
+                                unlink($templateFolder.$v);
158 158
                             }
159 159
                         }
160 160
                     }
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         if (count($configurator->oldFiles) > 0) {
167 167
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
168 168
             foreach (array_keys($configurator->oldFiles) as $i) {
169
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
169
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFiles[$i]);
170 170
                 if (is_file($tempFile)) {
171 171
                     unlink($tempFile);
172 172
                 }
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         if (count($configurator->oldFolders) > 0) {
179 179
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
180 180
             foreach (array_keys($configurator->oldFolders) as $i) {
181
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
181
+                $tempFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFolders[$i]);
182 182
                 /* @var $folderHandler XoopsObjectHandler */
183 183
                 $folderHandler = XoopsFile::getHandler('folder', $tempFolder);
184 184
                 $folderHandler->delete($tempFolder);
@@ -195,15 +195,15 @@  discard block
 block discarded – undo
195 195
 
196 196
         //  ---  COPY blank.png FILES ---------------
197 197
         if (count($configurator->copyBlankFiles) > 0) {
198
-            $file = __DIR__ . '/../assets/images/blank.png';
198
+            $file = __DIR__.'/../assets/images/blank.png';
199 199
             foreach (array_keys($configurator->copyBlankFiles) as $i) {
200
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
200
+                $dest = $configurator->copyBlankFiles[$i].'/blank.png';
201 201
                 $utility::copyFile($file, $dest);
202 202
             }
203 203
         }
204 204
 
205 205
         //delete .html entries from the tpl table
206
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
206
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n').'\' AND `tpl_file` LIKE \'%.html%\'';
207 207
         $GLOBALS['xoopsDB']->queryF($sql);
208 208
 
209 209
         /** @var XoopsGroupPermHandler $grouppermHandler */
Please login to merge, or discard this patch.
language/english/common.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -21,51 +21,51 @@
 block discarded – undo
21 21
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
22 22
 $moduleDirNameUpper = strtoupper($moduleDirName);
23 23
 
24
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
25
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
26
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
27
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
28
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
29
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
30
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
31
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
32
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
33
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
34
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
35
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
36
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
37
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
38
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
24
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
25
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
26
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
27
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
28
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
29
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
30
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
31
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
32
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
33
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
34
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
35
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
36
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
37
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
38
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
39 39
 
40
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
41
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
40
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
41
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
42 42
 
43 43
 
44
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
45
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
46
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
47
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
48
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
49
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
50
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
44
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
45
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
46
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
47
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
48
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
49
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
50
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
51 51
 
52
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
52
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
53 53
 
54 54
 // Error Msgs
55
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
56
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
57
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
55
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
56
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
57
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
58 58
 
59 59
 
60 60
 //Help
61
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
62
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
63
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
64
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
61
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
62
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
63
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
64
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
65 65
 
66 66
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
67 67
 
68 68
 //help multi-page
69
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
70
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
71
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
69
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
70
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
71
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
Please login to merge, or discard this patch.
preloads/core.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -28,6 +28,6 @@
 block discarded – undo
28 28
      */
29 29
     public static function eventCoreIncludeCommonEnd($args)
30 30
     {
31
-        include __DIR__ . '/autoloader.php';
31
+        include __DIR__.'/autoloader.php';
32 32
     }
33 33
 }
Please login to merge, or discard this patch.