XoopsModules25x / songlist

request.php

Indentation +42 added lines, -42 removed lines

@@ -19,48 +19,48 @@
 $requestsHandler = Helper::getInstance()->getHandler('Requests');
 
 switch ($op) {
-    default:
-    case 'request':
-        $url = $requestsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+	default:
+	case 'request':
+		$url = $requestsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
 
-        switch ($fct) {
-            case 'save':
-                if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
-                    $request = $requestsHandler->create();
-                    $request->setVars($_POST[0]);
-                    $rid = $requestsHandler->insert($request);
-                    if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
-                    } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
-                    }
-                    exit;
-                    break;
-                }
-                $error = _MD_SONGLIST_MSG_EMAILNOTSET;
+		switch ($fct) {
+			case 'save':
+				if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
+					$request = $requestsHandler->create();
+					$request->setVars($_POST[0]);
+					$rid = $requestsHandler->insert($request);
+					if ($rid) {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+					} else {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+					}
+					exit;
+					break;
+				}
+				$error = _MD_SONGLIST_MSG_EMAILNOTSET;
 
-            // no break
-            default:
-            case 'list':
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
-                require_once $GLOBALS['xoops']->path('/header.php');
-                if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-                    $GLOBALS['loaded_jquery'] = true;
-                }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
-                if (mb_strlen($error ?? '')) {
-                    xoops_error($error);
-                }
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
+			// no break
+			default:
+			case 'list':
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
+				require_once $GLOBALS['xoops']->path('/header.php');
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+					$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+					$GLOBALS['loaded_jquery'] = true;
+				}
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
+				if (mb_strlen($error ?? '')) {
+					xoops_error($error);
+				}
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
 }

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\RequestsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit;
 
@@ -24,7 +24,7 @@ 
         $url = $requestsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
@@ -35,9 +35,9 @@ 
                     $request->setVars($_POST[0]);
                     $rid = $requestsHandler->insert($request);
                     if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
                     } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
                     }
                     exit;
                     break;
@@ -50,10 +50,10 @@ 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
                 require_once $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));

view.tag.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
+require_once __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/tag/view.tag.php';

preloads/autoloader.php

Indentation +21 added lines, -21 removed lines

@@ -4,31 +4,31 @@
  * @see https://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class): void {
-        // project-specific namespace prefix
-        $prefix = 'XoopsModules\\Songlist\\';
+	static function ($class): void {
+		// project-specific namespace prefix
+		$prefix = 'XoopsModules\\Songlist\\';
 
-        // base directory for the namespace prefix
-        $baseDir = \dirname(__DIR__) . '/class/';
+		// base directory for the namespace prefix
+		$baseDir = \dirname(__DIR__) . '/class/';
 
-        // does the class use the namespace prefix?
-        $len = mb_strlen($prefix);
+		// does the class use the namespace prefix?
+		$len = mb_strlen($prefix);
 
-        if (0 !== strncmp($prefix, $class, $len)) {
-            return;
-        }
+		if (0 !== strncmp($prefix, $class, $len)) {
+			return;
+		}
 
-        // get the relative class name
-        $relativeClass = mb_substr($class, $len);
+		// get the relative class name
+		$relativeClass = mb_substr($class, $len);
 
-        // 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';
+		// 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';
 
-        // if the file exists, require it
-        if (is_file($file)) {
-            require_once $file;
-        }
-    }
+		// if the file exists, require it
+		if (is_file($file)) {
+			require_once $file;
+		}
+	}
 );

Spacing +4 added lines, -4 removed lines

@@ -4,17 +4,17 @@ 
  * @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\\Songlist\\';
 
         // 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);
 
-        if (0 !== strncmp($prefix, $class, $len)) {
+        if (0!==strncmp($prefix, $class, $len)) {
             return;
         }
 
@@ -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

Indentation +8 added lines, -8 removed lines

@@ -20,12 +20,12 @@
  */
 class SonglistCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args): void
-    {
-        require_once __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args): void
+	{
+		require_once __DIR__ . '/autoloader.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';
     }
 }

config/paths.php

Indentation +13 added lines, -13 removed lines

@@ -5,17 +5,17 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 return [
-    '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,
-    'uploadFolders' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'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,
+	'uploadFolders' => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 ];

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/icons.php

Indentation +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'>",
 ];

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/config.php

Indentation +61 added lines, -61 removed lines

@@ -21,69 +21,69 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 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,
-    ],
-    'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/albums',
-    ],
-    'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/albums',
-    ],
+	'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,
+	],
+	'uploadFolders'  => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/albums',
+	],
+	'copyBlankFiles' => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/albums',
+	],
 
-    'copyTestFolders' => [
-        [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        ],
-        //            [
-        //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
-        //                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
-        //            ],
-    ],
+	'copyTestFolders' => [
+		[
+			XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
+			XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		],
+		//            [
+		//                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
+		//                XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/thumbs',
+		//            ],
+	],
 
-    'templateFolders' => [
-        '/templates/',
-        //            '/templates/blocks/',
-        //            '/templates/admin/'
-    ],
-    'oldFiles'        => [
-        '/class/request.php',
-        '/class/registry.php',
-        '/class/utilities.php',
-        '/class/util.php',
-        //            '/include/constants.php',
-        //            '/include/functions.php',
-        '/ajaxrating.txt',
-    ],
-    'oldFolders'      => [
-        '/images',
-        '/css',
-        '/js',
-        '/tcpdf',
-    ],
+	'templateFolders' => [
+		'/templates/',
+		//            '/templates/blocks/',
+		//            '/templates/admin/'
+	],
+	'oldFiles'        => [
+		'/class/request.php',
+		'/class/registry.php',
+		'/class/utilities.php',
+		'/class/util.php',
+		//            '/include/constants.php',
+		//            '/include/functions.php',
+		'/ajaxrating.txt',
+	],
+	'oldFolders'      => [
+		'/images',
+		'/css',
+		'/js',
+		'/tcpdf',
+	],
 
-    'renameTables'  => [//         'XX_archive'     => 'ZZZZ_archive',
-    ],
-    'renameColumns' => [//        'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
-    ],
-    'moduleStats'   => [
-        //            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
-        //            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
-        //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
-    ],
-    'modCopyright'  => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+	'renameTables'  => [//         'XX_archive'     => 'ZZZZ_archive',
+	],
+	'renameColumns' => [//        'extcal_event' => ['from' => 'event_etablissement', 'to' => 'event_location'],
+	],
+	'moduleStats'   => [
+		//            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
+		//            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
+		//            '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>",
 ];

Spacing +18 added lines, -18 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 . '/albums',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/albums',
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/albums',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/albums',
     ],
 
     '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/imageconfig.php

Indentation +24 added lines, -24 removed lines

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

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',
 ];

search.php

Indentation +99 added lines, -99 removed lines

@@ -27,111 +27,111 @@
 $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
 
 switch ($op) {
-    default:
-    case 'search':
-        $url = $songsHandler->getSearchURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+	default:
+	case 'search':
+		$url = $songsHandler->getSearchURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
 
-        switch ($fct) {
-            default:
-            case 'titleandlyrics':
-                $criteria = new \CriteriaCompo();
-                foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                    $criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                }
-                break;
-            case 'albums':
-                $criteria = new \CriteriaCompo();
-                foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                }
-                $albums   = $albumsHandler->getObjects($criteria, true);
-                $criteria = new \CriteriaCompo();
-                foreach ($albums as $abid => $album) {
-                    $criteria->add(new \Criteria('abid', $abid), 'OR');
-                }
-                break;
-            case 'artists':
-                $criteria = new \CriteriaCompo();
-                foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('name', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                }
-                $artists  = $artistsHandler->getObjects($criteria, true);
-                $criteria = new \CriteriaCompo();
-                if (is_array($artists)) {
-                    foreach ($artists as $aid => $artist) {
-                        $criteria->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
-                    }
-                }
-                break;
-            case 'lyrics':
-                $criteria = new \CriteriaCompo();
-                foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                }
-                break;
-            case 'title':
-                $criteria = new \CriteriaCompo();
-                foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                }
-                break;
-        }
+		switch ($fct) {
+			default:
+			case 'titleandlyrics':
+				$criteria = new \CriteriaCompo();
+				foreach (explode(' ', $value) as $keyword) {
+					$criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+					$criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+				}
+				break;
+			case 'albums':
+				$criteria = new \CriteriaCompo();
+				foreach (explode(' ', $value) as $keyword) {
+					$criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+				}
+				$albums   = $albumsHandler->getObjects($criteria, true);
+				$criteria = new \CriteriaCompo();
+				foreach ($albums as $abid => $album) {
+					$criteria->add(new \Criteria('abid', $abid), 'OR');
+				}
+				break;
+			case 'artists':
+				$criteria = new \CriteriaCompo();
+				foreach (explode(' ', $value) as $keyword) {
+					$criteria->add(new \Criteria('name', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+				}
+				$artists  = $artistsHandler->getObjects($criteria, true);
+				$criteria = new \CriteriaCompo();
+				if (is_array($artists)) {
+					foreach ($artists as $aid => $artist) {
+						$criteria->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
+					}
+				}
+				break;
+			case 'lyrics':
+				$criteria = new \CriteriaCompo();
+				foreach (explode(' ', $value) as $keyword) {
+					$criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+				}
+				break;
+			case 'title':
+				$criteria = new \CriteriaCompo();
+				foreach (explode(' ', $value) as $keyword) {
+					$criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+				}
+				break;
+		}
 
-        if (0 != $gid && $GLOBALS['songlistModuleConfig']['genre']) {
-            $criteria->add(new \Criteria('gids', '%"' . $gid . '"%', 'LIKE'));
-        }
+		if (0 != $gid && $GLOBALS['songlistModuleConfig']['genre']) {
+			$criteria->add(new \Criteria('gids', '%"' . $gid . '"%', 'LIKE'));
+		}
 
-        if (0 != $vcid && $GLOBALS['songlistModuleConfig']['voice']) {
-            $criteria->add(new \Criteria('vcid', $vcid));
-        }
+		if (0 != $vcid && $GLOBALS['songlistModuleConfig']['voice']) {
+			$criteria->add(new \Criteria('vcid', $vcid));
+		}
 
-        if (0 != ($_GET['cid'] ?? $cid)) {
-            $criteria->add(new \Criteria('cid', ($_GET['cid'] ?? $cid)));
-        }
+		if (0 != ($_GET['cid'] ?? $cid)) {
+			$criteria->add(new \Criteria('cid', ($_GET['cid'] ?? $cid)));
+		}
 
-        $pagenav = new \XoopsPageNav($songsHandler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&gid=$gid&vcid=$vcid&value=$value&limit=$limit");
+		$pagenav = new \XoopsPageNav($songsHandler->getCount($criteria), $limit, $start, 'start', "?op=$op&fct=$fct&gid=$gid&vcid=$vcid&value=$value&limit=$limit");
 
-        $criteria->setLimit($limit);
-        $criteria->setStart($start);
+		$criteria->setLimit($limit);
+		$criteria->setStart($start);
 
-        $songs = $songsHandler->getObjects($criteria, false);
+		$songs = $songsHandler->getObjects($criteria, false);
 
-        $GLOBALS['xoopsOption']['template_main'] = 'songlist_search_index.tpl';
-        require_once $GLOBALS['xoops']->path('/header.php');
-        if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-            $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-            $GLOBALS['loaded_jquery'] = true;
-        }
-        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-        $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-        $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-        foreach ($songs as $song) {
-            $GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
-        }
-        $GLOBALS['xoopsTpl']->assign('songs', true);
-        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        $GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
-        $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
-        $GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
-        $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-        $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-        require_once $GLOBALS['xoops']->path('/footer.php');
-        break;
-    case 'category':
-        switch ($fct) {
-            default:
-            case 'set':
-                $_SESSION['cid'] = $id;
-                break;
-            case 'home':
-                unset($_SESSION['cid']);
-                break;
-        }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_search_index.tpl';
+		require_once $GLOBALS['xoops']->path('/header.php');
+		if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+			$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+			$GLOBALS['loaded_jquery'] = true;
+		}
+		$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+		$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+		$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+		foreach ($songs as $song) {
+			$GLOBALS['xoopsTpl']->append('results', $song->toArray(true));
+		}
+		$GLOBALS['xoopsTpl']->assign('songs', true);
+		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+		$GLOBALS['xoopsTpl']->assign('category_element', $category_element->render());
+		$GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
+		$GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
+		$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
+		$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+		require_once $GLOBALS['xoops']->path('/footer.php');
+		break;
+	case 'category':
+		switch ($fct) {
+			default:
+			case 'set':
+				$_SESSION['cid'] = $id;
+				break;
+			case 'home':
+				unset($_SESSION['cid']);
+				break;
+		}
+		redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

Spacing +16 added lines, -16 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Songlist\SongsHandler;
 use XoopsModules\Songlist\Utf8mapHandler;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit, $singer;
 
@@ -32,7 +32,7 @@ 
         $url = $songsHandler->getSearchURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
@@ -41,14 +41,14 @@ 
             case 'titleandlyrics':
                 $criteria = new \CriteriaCompo();
                 foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
-                    $criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+                    $criteria->add(new \Criteria('title', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
+                    $criteria->add(new \Criteria('lyrics', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
                 }
                 break;
             case 'albums':
                 $criteria = new \CriteriaCompo();
                 foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+                    $criteria->add(new \Criteria('title', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
                 }
                 $albums   = $albumsHandler->getObjects($criteria, true);
                 $criteria = new \CriteriaCompo();
@@ -59,39 +59,39 @@ 
             case 'artists':
                 $criteria = new \CriteriaCompo();
                 foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('name', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+                    $criteria->add(new \Criteria('name', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
                 }
                 $artists  = $artistsHandler->getObjects($criteria, true);
                 $criteria = new \CriteriaCompo();
                 if (is_array($artists)) {
                     foreach ($artists as $aid => $artist) {
-                        $criteria->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
+                        $criteria->add(new \Criteria('aids', '%"'.$aid.'"%', 'LIKE'), 'OR');
                     }
                 }
                 break;
             case 'lyrics':
                 $criteria = new \CriteriaCompo();
                 foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('lyrics', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+                    $criteria->add(new \Criteria('lyrics', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
                 }
                 break;
             case 'title':
                 $criteria = new \CriteriaCompo();
                 foreach (explode(' ', $value) as $keyword) {
-                    $criteria->add(new \Criteria('title', '%' . $utf8mapHandler->convert($keyword) . '%', 'LIKE'));
+                    $criteria->add(new \Criteria('title', '%'.$utf8mapHandler->convert($keyword).'%', 'LIKE'));
                 }
                 break;
         }
 
-        if (0 != $gid && $GLOBALS['songlistModuleConfig']['genre']) {
-            $criteria->add(new \Criteria('gids', '%"' . $gid . '"%', 'LIKE'));
+        if (0!=$gid && $GLOBALS['songlistModuleConfig']['genre']) {
+            $criteria->add(new \Criteria('gids', '%"'.$gid.'"%', 'LIKE'));
         }
 
-        if (0 != $vcid && $GLOBALS['songlistModuleConfig']['voice']) {
+        if (0!=$vcid && $GLOBALS['songlistModuleConfig']['voice']) {
             $criteria->add(new \Criteria('vcid', $vcid));
         }
 
-        if (0 != ($_GET['cid'] ?? $cid)) {
+        if (0!=($_GET['cid'] ?? $cid)) {
             $criteria->add(new \Criteria('cid', ($_GET['cid'] ?? $cid)));
         }
 
@@ -105,10 +105,10 @@ 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_search_index.tpl';
         require_once $GLOBALS['xoops']->path('/header.php');
         if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-            $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+            $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
             $GLOBALS['loaded_jquery'] = true;
         }
-        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+        $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
         $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
         $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
         foreach ($songs as $song) {
@@ -133,5 +133,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }