XoopsModules25x / myiframe

header.php

Spacing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@
 };
 /** @var Helper $helper */
 
-require dirname(__DIR__, 2) . '/mainfile.php';
-require XOOPS_ROOT_PATH . '/header.php';
+require dirname(__DIR__, 2).'/mainfile.php';
+require XOOPS_ROOT_PATH.'/header.php';
 
-require __DIR__ . '/preloads/autoloader.php';
+require __DIR__.'/preloads/autoloader.php';
 
 $moduleDirName = basename(__DIR__);
 

config/config.php

Spacing +16 added lines, -16 removed lines

@@ -20,33 +20,33 @@ 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
     'copyTestFolders' => [
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
         ],
         //            [
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -85,5 +85,5 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright'  => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];

config/icons.php

Spacing +10 added lines, -10 removed lines

@@ -6,14 +6,14 @@
 $moduleDirName = \basename(\dirname(__DIR__));
 
 return [
-    'name'    => \mb_strtoupper($moduleDirName) . ' IconConfigurator',
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . ' title=' . _EDIT . " align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt=" . _DELETE . ' title=' . _DELETE . " align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt=" . _CLONE . ' title=' . _CLONE . " align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt=" . _PREVIEW . ' title=' . _PREVIEW . " align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt=" . _PRINT . ' title=' . _PRINT . " align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt=" . _PDF . ' title=' . _PDF . " align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt=" . _ADD . ' title=' . _ADD . " align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt=" . 0 . ' title=' . _OFF . " align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt=" . 1 . ' title=' . _ON . " align='middle'>",
+    'name'    => \mb_strtoupper($moduleDirName).' IconConfigurator',
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT.' title='._EDIT." align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt="._DELETE.' title='._DELETE." align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt="._CLONE.' title='._CLONE." align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt="._PREVIEW.' title='._PREVIEW." align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt="._PRINT.' title='._PRINT." align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt="._PDF.' title='._PDF." align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt="._ADD.' title='._ADD." align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt=".0.' title='._OFF." align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt=".1.' title='._ON." align='middle'>",
 ];

config/paths.php

Spacing +9 added lines, -9 removed lines

@@ -5,17 +5,17 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 return [
-    'name'          => \mb_strtoupper($moduleDirName) . ' PathConfigurator',
+    'name'          => \mb_strtoupper($moduleDirName).' PathConfigurator',
     'dirname'       => $moduleDirName,
-    'admin'         => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-    'modPath'       => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-    'modUrl'        => XOOPS_URL . '/modules/' . $moduleDirName,
-    'uploadPath'    => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-    'uploadUrl'     => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+    'admin'         => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+    'modPath'       => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+    'modUrl'        => XOOPS_URL.'/modules/'.$moduleDirName,
+    'uploadPath'    => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+    'uploadUrl'     => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     'uploadFolders' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 ];

config/imageconfig.php

Spacing +9 added lines, -9 removed lines

@@ -6,8 +6,8 @@ 
 // extra module configs
 $modversion['config'][] = [
     'name'        => 'imageConfigs',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC',
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'head',
@@ -15,8 +15,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageWidth',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 1200,
@@ -24,8 +24,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageHeight',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 800,
@@ -33,9 +33,9 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageUploadPath',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'uploads/' . $modversion['dirname'] . '/images',
+    'default'     => 'uploads/'.$modversion['dirname'].'/images',
 ];

preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -4,12 +4,12 @@ 
  * @see https://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class): void {
+    static function($class): void {
         // project-specific namespace prefix
-        $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+        $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
         // base directory for the namespace prefix
-        $baseDir = \dirname(__DIR__) . '/class/';
+        $baseDir = \dirname(__DIR__).'/class/';
 
         // does the class use the namespace prefix?
         $len = mb_strlen($prefix);
@@ -24,7 +24,7 @@ 
         // replace the namespace prefix with the base directory, replace namespace
         // separators with directory separators in the relative class name, append
         // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+        $file = $baseDir.str_replace('\\', '/', $relativeClass).'.php';
 
         // if the file exists, require it
         if (is_file($file)) {

preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args): void
     {
-        require_once __DIR__ . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }

include/config.php

Spacing +14 added lines, -14 removed lines

@@ -20,26 +20,26 @@ 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
@@ -79,5 +79,5 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];

include/common.php

Spacing +25 added lines, -25 removed lines

@@ -18,7 +18,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Myiframe;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -37,20 +37,20 @@ 
 //$categoryHandler     = new Myiframe\CategoryHandler($db);
 //$downloadHandler     = new Myiframe\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -59,15 +59,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -86,6 +86,6 @@ 
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }