Completed
Pull Request — master (#4)
by Michael
01:24
created
class/smarty/xoops_plugins/block.xoBlkTpl.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     </div>
28 28
 <{/xoBlkTpl}>
29 29
 */
30
-function smarty_block_xoBlkTpl ($params, $content, $smarty, &$repeat) {
30
+function smarty_block_xoBlkTpl($params, $content, $smarty, &$repeat) {
31 31
     static $old_block;
32 32
     /** @var Smarty $smarty */
33 33
     if (empty($content)) {
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             $var = $xoBlk->buildBlock();
45 45
         }
46 46
         if (isset($params['cachetime'])) {
47
-            XoopsCache::write($cache_key, $var, (int)$params['cachetime']);
47
+            XoopsCache::write($cache_key, $var, (int) $params['cachetime']);
48 48
         }
49 49
         $old_block = $smarty->get_template_vars('block');
50 50
         $smarty->assign('block', $var);
Please login to merge, or discard this patch.
modules/tools/language/english/modinfo.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
 //Help
28 28
 define('_MI_TOOLS_DIRNAME', basename(dirname(__DIR__, 2)));
29
-define('_MI_TOOLS_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
29
+define('_MI_TOOLS_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
30 30
 define('_MI_TOOLS_BACK_2_ADMIN', 'Back to Administration of ');
31 31
 define('_MI_TOOLS_OVERVIEW', 'Overview');
32 32
 
Please login to merge, or discard this patch.
modules/tools/xoops_version.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 // database tables, not applicable for this module
49 49
 $modversion['sqlfile']['mysql'] = 'sql/sql.sql';
50 50
 $modversion['tables']           = [
51
-    $moduleDirName . '_' . 'blocks',
51
+    $moduleDirName.'_'.'blocks',
52 52
 ];
53 53
 
54 54
 // Admin things, not applicable for this module
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 
75 75
 // ------------------- Templates ------------------- //
76 76
 $modversion['templates'] = [
77
-    ['file' => 'tools_admin_blockscall.tpl', 'description' => '',],
78
-    ['file' => 'tools_admin_blockscall_new.tpl', 'description' => '',],
79
-    ['file' => 'tools_admin_blockscall_edit.tpl', 'description' => '',],
77
+    ['file' => 'tools_admin_blockscall.tpl', 'description' => '', ],
78
+    ['file' => 'tools_admin_blockscall_new.tpl', 'description' => '', ],
79
+    ['file' => 'tools_admin_blockscall_edit.tpl', 'description' => '', ],
80 80
 ];
81 81
 
82 82
 // ------------------- Blocks ------------------- //
Please login to merge, or discard this patch.
modules/tools/admin/admin_footer.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
      . "  <div style='text-align: center;'>\n"
27 27
      . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
28 28
      . "  </div>\n"
29
-     . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
29
+     . '  '._AM_MODULEADMIN_ADMIN_FOOTER."\n"
30 30
      . '</div>';
31 31
 
32 32
 
Please login to merge, or discard this patch.
modules/tools/admin/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
     Utility
22 22
 };
23 23
 
24
-require_once __DIR__ . '/admin_header.php';
24
+require_once __DIR__.'/admin_header.php';
25 25
 // Display Admin header
26 26
 xoops_cp_header();
27 27
 $adminObject = Admin::getInstance();
@@ -39,4 +39,4 @@  discard block
 block discarded – undo
39 39
 /** @var Utility $utility */
40 40
 echo $utility::getServerStats();
41 41
 
42
-require_once __DIR__ . '/admin_footer.php';
42
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
modules/tools/admin/admin_header.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,10 +21,10 @@  discard block
 block discarded – undo
21 21
 use XoopsModules\Tools\{Helper
22 22
 };
23 23
 
24
-require dirname(__DIR__) . '/preloads/autoloader.php';
24
+require dirname(__DIR__).'/preloads/autoloader.php';
25 25
 
26
-require dirname(__DIR__, 3) . '/include/cp_header.php';
27
-require dirname(__DIR__) . '/include/common.php';
26
+require dirname(__DIR__, 3).'/include/cp_header.php';
27
+require dirname(__DIR__).'/include/common.php';
28 28
 
29 29
 $moduleDirName = \basename(\dirname(__DIR__));
30 30
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 $helper->loadLanguage('common');
41 41
 
42 42
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
43
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
43
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
44 44
     $xoopsTpl = new \XoopsTpl();
45 45
 }
46 46
 
Please login to merge, or discard this patch.
modules/tools/admin/about.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
  * @license      GNU GPL 2 or later (https://www.gnu.org/licenses/gpl-2.0.html)
15 15
  * @author       XOOPS Development Team
16 16
  */
17
-require_once __DIR__ . '/admin_header.php';
17
+require_once __DIR__.'/admin_header.php';
18 18
 xoops_cp_header();
19 19
 
20 20
 /** @var Admin $adminObject */
@@ -22,4 +22,4 @@  discard block
 block discarded – undo
22 22
 $adminObject::setPaypal('[email protected]');
23 23
 $adminObject->displayAbout(false);
24 24
 
25
-require_once __DIR__ . '/admin_footer.php';
25
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.
modules/tools/admin/menu.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 use Xmf\Module\Admin;
20 20
 use XoopsModules\Tools;
21 21
 
22
-include dirname(__DIR__) . '/preloads/autoloader.php';
22
+include dirname(__DIR__).'/preloads/autoloader.php';
23 23
 
24 24
 /** @var Tools\Helper $helper */
25 25
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 $helper->loadLanguage('feedback');
32 32
 
33 33
 $pathIcon32 = Admin::menuIconPath('');
34
-$pathModIcon32 = XOOPS_URL .   '/modules/' . $moduleDirName . '/assets/images/icons/32/';
34
+$pathModIcon32 = XOOPS_URL.'/modules/'.$moduleDirName.'/assets/images/icons/32/';
35 35
 if (is_object($helper->getModule()) && false !== $helper->getModule()->getInfo('modicons32')) {
36 36
     $pathModIcon32 = $helper->url($helper->getModule()->getInfo('modicons32'));
37 37
 }
@@ -39,25 +39,25 @@  discard block
 block discarded – undo
39 39
 $adminmenu[] = [
40 40
     'title' => _MI_TOOLS_MENU_HOME,
41 41
     'link'  => 'admin/index.php',
42
-    'icon'  => $pathIcon32 . '/home.png',
42
+    'icon'  => $pathIcon32.'/home.png',
43 43
 ];
44 44
 
45 45
 $adminmenu[] = [
46 46
     'title' => _MI_TOOLS_INDEX,
47 47
     'link'  => 'admin/main.php',
48
-    'icon'  => $pathIcon32 . '/update.png',
48
+    'icon'  => $pathIcon32.'/update.png',
49 49
 ];
50 50
 
51 51
 $adminmenu[] = [
52 52
     'title' => _MI_TOOLS_BLOCKS,
53 53
     'link'  => 'admin/blockscall.php',
54
-    'icon'  => $pathIcon32 . '/manage.png',
54
+    'icon'  => $pathIcon32.'/manage.png',
55 55
 ];
56 56
 
57 57
 $adminmenu[] = [
58 58
     'title' => _MI_TOOLS_MENU_ABOUT,
59 59
     'link'  => 'admin/about.php',
60
-    'icon'  => $pathIcon32 . '/about.png',
60
+    'icon'  => $pathIcon32.'/about.png',
61 61
 ];
62 62
 
63 63
 //$adminmenu[3]['title'] = _FOO_MI_;
Please login to merge, or discard this patch.
modules/tools/admin/blockscall.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 use Xmf\Request;
22 22
 /** @var Helper $helper */
23 23
 
24
-require_once __DIR__ . '/admin_header.php';
24
+require_once __DIR__.'/admin_header.php';
25 25
 xoops_cp_header();
26 26
 
27 27
 //loadModuleAdminMenu(2, '');
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
             '604800'  => _WEEK,
62 62
             '2592000' => _MONTH,
63 63
         ];
64
-        $cachemodel      = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
64
+        $cachemodel = ['0' => _AM_TOOLS_BC_GLOBAL, '1' => _AM_TOOLS_BC_GROUP, '2' => _AM_TOOLS_BC_USER];
65 65
         foreach ($blockscall_data as $k => $v) {
66 66
             $blockscall_data[$k]['mname']         = $generator_list[$v['mid']] ?? 'Not active';
67 67
             $blockscall_data[$k]['bcachetime']    = $cachetime[$v['bcachetime']];
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
         $block_data['edit_form'] = $blocksCallObj->getOptions();
148 148
 
149 149
         $blockoption = !empty($block_data['options']) ? "options=\"{$block_data['options']}\"" : '';
150
-        $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime=' . $block_data['bcachetime'] : '';
150
+        $cachetime   = 0 != $block_data['bcachetime'] ? ' cachetime='.$block_data['bcachetime'] : '';
151 151
         if ($cachetime) {
152 152
             switch ($block_data['bcachemodel']) {
153 153
                 case 0:
@@ -169,11 +169,11 @@  discard block
 block discarded – undo
169 169
 {$block_data['tpl_content']}
170 170
 <{/xoBlkTpl}>
171 171
 EOF;
172
-        $xoblk    = <<<EOF
172
+        $xoblk = <<<EOF
173 173
 <{xoBlk module="{$block_data['dirname']}" file="{$block_data['func_file']}" show_func="{$block_data['show_func']}" $blockoption template="{$block_data['template']}"$cachetime$cachemodel}>
174 174
 EOF;
175 175
 
176
-        require dirname(__DIR__) . '/include/blockform.php';
176
+        require dirname(__DIR__).'/include/blockform.php';
177 177
 
178 178
         $xoopsTpl->assign('xoblktpl', $xoblktpl);
179 179
         $xoopsTpl->assign('xoblk', $xoblk);
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
     case 'edittpl':
216 216
         $blocksCallObj = $blocksCallHandler->get($_REQUEST['bid']);
217 217
         $block_data    = $blocksCallObj->getValues(null, 'n');
218
-        require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
218
+        require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
219 219
         $form = new \XoopsThemeForm(_AM_TOOLS_BC_EDITTPL, 'form', 'blockscall.php', 'post', true);
220 220
         $form->addElement(new \XoopsFormLabel(_AM_TOOLS_BC_BLOCK, $block_data['name']));
221 221
         $form->addElement(new \XoopsFormTextArea(_AM_TOOLS_BC_TPLSOURCES, 'tpl_content', $block_data['tpl_content'], 10, 80));
@@ -243,6 +243,6 @@  discard block
 block discarded – undo
243 243
         }
244 244
         break;
245 245
 }
246
-$css = '<link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/modules/tools/templates/style.css">';
246
+$css = '<link rel="stylesheet" type="text/css" media="all" href="'.XOOPS_URL.'/modules/tools/templates/style.css">';
247 247
 $xoopsTpl->assign('css', $css);
248
-require_once __DIR__ . '/admin_footer.php';
248
+require_once __DIR__.'/admin_footer.php';
Please login to merge, or discard this patch.