XoopsModules25x / songlist

testdata/index.php

Indentation +152 added lines, -152 removed lines

@@ -37,122 +37,122 @@ 
 $helper->loadLanguage('common');
 
 switch ($op) {
-    case 'load':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            loadSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
-    case 'save':
-        saveSampleData();
-        break;
-    case 'clear':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            clearSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
+	case 'load':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			loadSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
+	case 'save':
+		saveSampleData();
+		break;
+	case 'clear':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			clearSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
 
 function loadSampleData(): void
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    $utility      = new Utility();
-    $configurator = new Configurator();
-
-    $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
-
-    $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
-    }
-
-    // load module tables
-    foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
-        TableLoad::truncateTable($table);
-        TableLoad::loadTableFromArray($table, $tabledata);
-    }
-
-    // load permissions
-    $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
-    $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
-    loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
-
-    //  ---  COPY test folder files ---------------
-    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
-        //        $file =  \dirname(__DIR__) . '/testdata/images/';
-        foreach (array_keys($configurator->copyTestFolders) as $i) {
-            $src  = $configurator->copyTestFolders[$i][0];
-            $dest = $configurator->copyTestFolders[$i][1];
-            $utility::rcopy($src, $dest);
-        }
-    }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	$utility      = new Utility();
+	$configurator = new Configurator();
+
+	$tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
+
+	$language = 'english/';
+	if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
+		$language = $xoopsConfig['language'] . '/';
+	}
+
+	// load module tables
+	foreach ($tables as $table) {
+		$tabledata = Yaml::readWrapped($language . $table . '.yml');
+		TableLoad::truncateTable($table);
+		TableLoad::loadTableFromArray($table, $tabledata);
+	}
+
+	// load permissions
+	$table     = 'group_permission';
+	$tabledata = Yaml::readWrapped($language . $table . '.yml');
+	$mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
+	loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
+
+	//  ---  COPY test folder files ---------------
+	if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+		//        $file =  \dirname(__DIR__) . '/testdata/images/';
+		foreach (array_keys($configurator->copyTestFolders) as $i) {
+			$src  = $configurator->copyTestFolders[$i][0];
+			$dest = $configurator->copyTestFolders[$i][1];
+			$utility::rcopy($src, $dest);
+		}
+	}
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData(): void
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    $tables             = $helper->getModule()->getInfo('tables');
-
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
-    }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
-    Utility::createFolder($exportFolder);
-
-    // save module tables
-    foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
-    }
-
-    // save permissions
-    $criteria = new \CriteriaCompo();
-    $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
-    $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
-    unset($criteria);
-
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	$tables             = $helper->getModule()->getInfo('tables');
+
+	$languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
+	if (!file_exists($languageFolder . '/')) {
+		Utility::createFolder($languageFolder . '/');
+	}
+	$exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+	Utility::createFolder($exportFolder);
+
+	// save module tables
+	foreach ($tables as $table) {
+		TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+	}
+
+	// save permissions
+	$criteria = new \CriteriaCompo();
+	$criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
+	$skipColumns[] = 'gperm_id';
+	TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+	unset($criteria);
+
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema(): void
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    try {
-        // TODO set exportSchema
-        //        $migrate = new Migrate($moduleDirName);
-        //        $migrate->saveCurrentSchema();
-        //
-        //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
-    } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
-    }
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	try {
+		// TODO set exportSchema
+		//        $migrate = new Migrate($moduleDirName);
+		//        $migrate->saveCurrentSchema();
+		//
+		//        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
+	} catch (\Throwable $e) {
+		exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+	}
 }
 
 /**
@@ -169,58 +169,58 @@ 
  */
 function loadTableFromArrayWithReplace($table, $data, $search, $replace): int
 {
-    /** @var \XoopsMySQLDatabase $db */
-    $db = \XoopsDatabaseFactory::getDatabaseConnection();
-
-    $prefixedTable = $db->prefix($table);
-    $count         = 0;
-
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
-
-    $result = $db->queryF($sql);
-
-    foreach ($data as $row) {
-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
-        $valueClause = ' VALUES (';
-        $first       = true;
-        foreach ($row as $column => $value) {
-            if ($first) {
-                $first = false;
-            } else {
-                $insertInto  .= ', ';
-                $valueClause .= ', ';
-            }
-
-            $insertInto .= $column;
-            if ($search === $column) {
-                $valueClause .= $db->quote($replace);
-            } else {
-                $valueClause .= $db->quote($value);
-            }
-        }
-
-        $sql = $insertInto . ') ' . $valueClause . ')';
-
-        $result = $db->queryF($sql);
-        if (false !== $result) {
-            ++$count;
-        }
-    }
-
-    return $count;
+	/** @var \XoopsMySQLDatabase $db */
+	$db = \XoopsDatabaseFactory::getDatabaseConnection();
+
+	$prefixedTable = $db->prefix($table);
+	$count         = 0;
+
+	$sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+
+	$result = $db->queryF($sql);
+
+	foreach ($data as $row) {
+		$insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+		$valueClause = ' VALUES (';
+		$first       = true;
+		foreach ($row as $column => $value) {
+			if ($first) {
+				$first = false;
+			} else {
+				$insertInto  .= ', ';
+				$valueClause .= ', ';
+			}
+
+			$insertInto .= $column;
+			if ($search === $column) {
+				$valueClause .= $db->quote($replace);
+			} else {
+				$valueClause .= $db->quote($value);
+			}
+		}
+
+		$sql = $insertInto . ') ' . $valueClause . ')';
+
+		$result = $db->queryF($sql);
+		if (false !== $result) {
+			++$count;
+		}
+	}
+
+	return $count;
 }
 
 function clearSampleData(): void
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    // Load language files
-    $helper->loadLanguage('common');
-    $tables = $helper->getModule()->getInfo('tables');
-    // truncate module tables
-    foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::truncateTable($table);
-    }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	// Load language files
+	$helper->loadLanguage('common');
+	$tables = $helper->getModule()->getInfo('tables');
+	// truncate module tables
+	foreach ($tables as $table) {
+		\Xmf\Database\TableLoad::truncateTable($table);
+	}
+	redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
 }

Spacing +26 added lines, -26 removed lines

@@ -24,8 +24,8 @@ 
 /** @var Helper $helper */
 /** @var Utility $utility */
 /** @var Configurator $configurator */
-require \dirname(__DIR__, 3) . '/include/cp_header.php';
-require \dirname(__DIR__) . '/preloads/autoloader.php';
+require \dirname(__DIR__, 3).'/include/cp_header.php';
+require \dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = Request::getCmd('op', '');
 
@@ -38,14 +38,14 @@ 
 
 switch ($op) {
     case 'load':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+        if (Request::hasVar('ok', 'REQUEST') && 1===Request::getInt('ok', 0)) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -53,14 +53,14 @@ 
         saveSampleData();
         break;
     case 'clear':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+        if (Request::hasVar('ok', 'REQUEST') && 1===Request::getInt('ok', 0)) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             clearSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -80,25 +80,25 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
     // load module tables
     foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
+        $tabledata = Yaml::readWrapped($language.$table.'.yml');
         TableLoad::truncateTable($table);
         TableLoad::loadTableFromArray($table, $tabledata);
     }
 
     // load permissions
     $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
+    $tabledata = Yaml::readWrapped($language.$table.'.yml');
     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
     loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
 
     //  ---  COPY test folder files ---------------
-    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders)>0) {
         //        $file =  \dirname(__DIR__) . '/testdata/images/';
         foreach (array_keys($configurator->copyTestFolders) as $i) {
             $src  = $configurator->copyTestFolders[$i][0];
@@ -106,7 +106,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData(): void
@@ -117,26 +117,26 @@ 
     $helper             = Helper::getInstance();
     $tables             = $helper->getModule()->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];
+    if (!file_exists($languageFolder.'/')) {
+        Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
     // save module tables
     foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
 
     // save permissions
     $criteria = new \CriteriaCompo();
     $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
     $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+    TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns);
     unset($criteria);
 
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema(): void
@@ -151,7 +151,7 @@ 
         //
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 }
 
@@ -175,12 +175,12 @@ 
     $prefixedTable = $db->prefix($table);
     $count         = 0;
 
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+    $sql = 'DELETE FROM '.$prefixedTable.' WHERE `'.$search.'`='.$db->quote($replace);
 
     $result = $db->queryF($sql);
 
     foreach ($data as $row) {
-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+        $insertInto  = 'INSERT INTO '.$prefixedTable.' (';
         $valueClause = ' VALUES (';
         $first       = true;
         foreach ($row as $column => $value) {
@@ -192,17 +192,17 @@ 
             }
 
             $insertInto .= $column;
-            if ($search === $column) {
+            if ($search===$column) {
                 $valueClause .= $db->quote($replace);
             } else {
                 $valueClause .= $db->quote($value);
             }
         }
 
-        $sql = $insertInto . ') ' . $valueClause . ')';
+        $sql = $insertInto.') '.$valueClause.')';
 
         $result = $db->queryF($sql);
-        if (false !== $result) {
+        if (false!==$result) {
             ++$count;
         }
     }
@@ -222,5 +222,5 @@ 
     foreach ($tables as $table) {
         \Xmf\Database\TableLoad::truncateTable($table);
     }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+    redirect_header($helper->url('admin/index.php'), 1, constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK'));
 }

index.php

Indentation +314 added lines, -314 removed lines

@@ -19,12 +19,12 @@ 
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
 if ($_SESSION['cid'] > 0) {
-    $cids[$_SESSION['cid']] = $_SESSION['cid'];
+	$cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
 if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+	$criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
 } else {
-    $criteria_cat->add(new \Criteria(''), 'OR');
+	$criteria_cat->add(new \Criteria(''), 'OR');
 }
 $criteria_cat->setSort('created');
 $criteria_cat->setOrder('ASC');
@@ -38,20 +38,20 @@ 
 $col = 1;
 $row = 1;
 foreach ($categories as $category) {
-    $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-        ++$row;
-        $col = 1;
-    }
+	$cat[$row][$col]          = $category->toArray(true);
+	$cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	++$col;
+	if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+		++$row;
+		$col = 1;
+	}
 }
 if (1 != $col) {
-    $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-        $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    }
+	$col--;
+	for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+		$cat[$row][$j][$categoryHandler->keyName] = 0;
+		$cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	}
 }
 
 $category_element = new SelectCategoryForm('', 'cid', ($_GET['cid'] ?? $cid));
@@ -61,324 +61,324 @@ 
 /** @var SongsHandler $songsHandler */
 $songsHandler = Helper::getInstance()->getHandler('Songs');
 switch ($op) {
-    case 'vote':
-        /** @var VotesHandler $votesHandler */
-        $votesHandler = Helper::getInstance()->getHandler('Votes');
-        $votesHandler->addVote($id, $value);
-        redirect_header($_POST['uri'], 10, _MD_SONGLIST_MSG_VOTED_ALREADY);
-    // no break
-    default:
-    case 'item':
-        switch ($fct) {
-            default:
-            case 'list':
-                $pagenav = new \XoopsPageNav($songsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+	case 'vote':
+		/** @var VotesHandler $votesHandler */
+		$votesHandler = Helper::getInstance()->getHandler('Votes');
+		$votesHandler->addVote($id, $value);
+		redirect_header($_POST['uri'], 10, _MD_SONGLIST_MSG_VOTED_ALREADY);
+	// no break
+	default:
+	case 'item':
+		switch ($fct) {
+			default:
+			case 'list':
+				$pagenav = new \XoopsPageNav($songsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
 
-                $criteria_cat->setLimit($limit);
-                $criteria_cat->setStart($start);
+				$criteria_cat->setLimit($limit);
+				$criteria_cat->setStart($start);
 
-                $songs = $songsHandler->getObjects($criteria_cat, false);
+				$songs = $songsHandler->getObjects($criteria_cat, false);
 
-                $url = $songsHandler->getURL();
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
+				$url = $songsHandler->getURL();
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
 
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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('categories', $cat);
-                $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']);
-                if (0 != $_SESSION['cid']) {
-                    $category = $categoryHandler->get($_SESSION['cid']);
-                    if (is_object($category)) {
-                        $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-            case 'item':
-                $song = $songsHandler->get($id);
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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('categories', $cat);
+				$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']);
+				if (0 != $_SESSION['cid']) {
+					$category = $categoryHandler->get($_SESSION['cid']);
+					if (is_object($category)) {
+						$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+			case 'item':
+				$song = $songsHandler->get($id);
 
-                $url = $song->getURL(true);
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
+				$url = $song->getURL(true);
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
 
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_item.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('songs', false);
-                $GLOBALS['xoopsTpl']->assign('song', $song->toArray(true));
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $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('uri', $_SERVER['REQUEST_URI']);
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
-        break;
-    case 'browseby':
-        switch ($fct) {
-            default:
-            case 'title':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteria);
-                break;
-            case 'lyrics':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('lyrics', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteria);
-                break;
-            case 'artist':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('name', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('name', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('name', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $artistsHandler   = Helper::getInstance()->getHandler('Artists');
-                $browse_criteriab = new \CriteriaCompo();
-                foreach ($artistsHandler->getObjects($browse_criteria, true) as $aid => $obj) {
-                    $browse_criteriab->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteriab);
-                break;
-            case 'album':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $ids           = [];
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-                foreach ($albumsHandler->getObjects($browse_criteria, true) as $id => $obj) {
-                    $ids[$id] = $id;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                if (count($ids) > 0) {
-                    $criteria->add(new \Criteria('abid', '(' . implode(',', $ids) . ')', 'IN'));
-                }
-                break;
-        }
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_item.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('songs', false);
+				$GLOBALS['xoopsTpl']->assign('song', $song->toArray(true));
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$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('uri', $_SERVER['REQUEST_URI']);
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
+		break;
+	case 'browseby':
+		switch ($fct) {
+			default:
+			case 'title':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteria);
+				break;
+			case 'lyrics':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('lyrics', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('lyrics', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('lyrics', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteria);
+				break;
+			case 'artist':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('name', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('name', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('name', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$artistsHandler   = Helper::getInstance()->getHandler('Artists');
+				$browse_criteriab = new \CriteriaCompo();
+				foreach ($artistsHandler->getObjects($browse_criteria, true) as $aid => $obj) {
+					$browse_criteriab->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteriab);
+				break;
+			case 'album':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$ids           = [];
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+				foreach ($albumsHandler->getObjects($browse_criteria, true) as $id => $obj) {
+					$ids[$id] = $id;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				if (count($ids) > 0) {
+					$criteria->add(new \Criteria('abid', '(' . implode(',', $ids) . ')', 'IN'));
+				}
+				break;
+		}
 
-        $pagenav = new \XoopsPageNav($songsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+		$pagenav = new \XoopsPageNav($songsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&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);
 
-        $url = $songsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+		$url = $songsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
 
-        $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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('categories', $cat);
-        $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']);
-        if (0 != $_SESSION['cid']) {
-            $category = $categoryHandler->get($_SESSION['cid']);
-            if (is_object($category)) {
-                $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-            }
-        }
-        $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-        require_once $GLOBALS['xoops']->path('/footer.php');
-        break;
-        break;
-    case 'search':
-        /** @var SongsHandler $songsHandler */
-        $songsHandler   = Helper::getInstance()->getHandler('Songs');
-        $artistsHandler = Helper::getInstance()->getHandler('Artists');
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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('categories', $cat);
+		$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']);
+		if (0 != $_SESSION['cid']) {
+			$category = $categoryHandler->get($_SESSION['cid']);
+			if (is_object($category)) {
+				$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+			}
+		}
+		$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+		require_once $GLOBALS['xoops']->path('/footer.php');
+		break;
+		break;
+	case 'search':
+		/** @var SongsHandler $songsHandler */
+		$songsHandler   = Helper::getInstance()->getHandler('Songs');
+		$artistsHandler = Helper::getInstance()->getHandler('Artists');
 
-        /** @var Utf8mapHandler $utf8mapHandler */
-        $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+		/** @var Utf8mapHandler $utf8mapHandler */
+		$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
 
-        $url = $songsHandler->getSearchURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+		$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 $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 $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&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_search_index.tpl';
+		require $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 $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&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

Spacing +54 added lines, -54 removed lines

@@ -10,7 +10,7 @@ 
 use XoopsModules\Songlist\Utf8mapHandler;
 
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $vcid, $start, $limit, $singer;
 
@@ -18,11 +18,11 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
-if ($_SESSION['cid'] > 0) {
+if ($_SESSION['cid']>0) {
     $cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
-if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+if (count($cids)>0 && 0!=$_SESSION['cid']) {
+    $criteria_cat->add(new \Criteria('cid', '('.implode(',', $cids).')', 'IN'), 'OR');
 } else {
     $criteria_cat->add(new \Criteria(''), 'OR');
 }
@@ -39,18 +39,18 @@ 
 $row = 1;
 foreach ($categories as $category) {
     $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+    $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
         ++$row;
         $col = 1;
     }
 }
-if (1 != $col) {
+if (1!=$col) {
     $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
         $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+        $cat[$row][$j]['width']                   = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     }
 }
 
@@ -82,17 +82,17 @@ 
                 $url = $songsHandler->getURL();
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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) {
@@ -105,7 +105,7 @@ 
                 $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
                 $GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
                 $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-                if (0 != $_SESSION['cid']) {
+                if (0!=$_SESSION['cid']) {
                     $category = $categoryHandler->get($_SESSION['cid']);
                     if (is_object($category)) {
                         $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
@@ -120,17 +120,17 @@ 
                 $url = $song->getURL(true);
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_item.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('songs', false);
@@ -151,13 +151,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('title', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -167,13 +167,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('lyrics', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('lyrics', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('lyrics', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -183,19 +183,19 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('name', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('name', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('name', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('name', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('name', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('name', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $artistsHandler   = Helper::getInstance()->getHandler('Artists');
                 $browse_criteriab = new \CriteriaCompo();
                 foreach ($artistsHandler->getObjects($browse_criteria, true) as $aid => $obj) {
-                    $browse_criteriab->add(new \Criteria('aids', '%"' . $aid . '"%', 'LIKE'), 'OR');
+                    $browse_criteriab->add(new \Criteria('aids', '%"'.$aid.'"%', 'LIKE'), 'OR');
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
                 $criteria->add($browse_criteriab);
@@ -204,13 +204,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('title', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $ids           = [];
@@ -219,8 +219,8 @@ 
                     $ids[$id] = $id;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                if (count($ids) > 0) {
-                    $criteria->add(new \Criteria('abid', '(' . implode(',', $ids) . ')', 'IN'));
+                if (count($ids)>0) {
+                    $criteria->add(new \Criteria('abid', '('.implode(',', $ids).')', 'IN'));
                 }
                 break;
         }
@@ -235,17 +235,17 @@ 
         $url = $songsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_songs_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) {
@@ -258,7 +258,7 @@ 
         $GLOBALS['xoopsTpl']->assign('genre_element', $genre_element->render());
         $GLOBALS['xoopsTpl']->assign('voice_element', $voice_element->render());
         $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-        if (0 != $_SESSION['cid']) {
+        if (0!=$_SESSION['cid']) {
             $category = $categoryHandler->get($_SESSION['cid']);
             if (is_object($category)) {
                 $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
@@ -279,7 +279,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);
         }
 
@@ -288,14 +288,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();
@@ -306,39 +306,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)));
         }
 
@@ -352,10 +352,10 @@ 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_search_index.tpl';
         require $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) {
@@ -380,5 +380,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit&cid=".$_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

language/english/directorychecker.php

Spacing +9 added lines, -9 removed lines

@@ -14,12 +14,12 @@
 $moduleDirName      = basename(dirname(__DIR__, 2));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_AVAILABLE', "<span style='color: green;'>Available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_CREATETHEDIR', 'Create it');
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_SETMPERM', 'Set the permission');
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRCREATED', 'The directory has been created');
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_DIRNOTCREATED', 'The directory cannot be created');
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMSET', 'The permission has been set');
-define('CO_' . $moduleDirNameUpper . '_' . 'DC_PERMNOTSET', 'The permission cannot be set');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_AVAILABLE', "<span style='color: green;'>Available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'DC_NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'DC_NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'DC_CREATETHEDIR', 'Create it');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_SETMPERM', 'Set the permission');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_DIRCREATED', 'The directory has been created');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_DIRNOTCREATED', 'The directory cannot be created');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_PERMSET', 'The permission has been set');
+define('CO_'.$moduleDirNameUpper.'_'.'DC_PERMNOTSET', 'The permission cannot be set');

language/english/forms.php

Spacing +1 added lines, -1 removed lines

@@ -201,7 +201,7 @@
 define('_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML', 'XML File to import');
 define('_FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC', 'SELECT the XML File you wish TO IMPORT FROM your SYSTEM.');
 define('_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML', 'Use Existing File instead of Uploading');
-define('_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC', 'Upload Existing XML file to: ' . $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']));
+define('_FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC', 'Upload Existing XML file to: '.$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']));
 
 //Import Wizard B
 define('_FRM_SONGLIST_FORM_ISNEW_ELEMENTS', 'Set XML Elements to Import');

language/english/filechecker.php

Spacing +10 added lines, -10 removed lines

@@ -14,13 +14,13 @@
 $moduleDirName      = basename(dirname(__DIR__, 2));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_AVAILABLE', "<span style='color: green;'>Available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_COPYTHEFILE', 'Copy it');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_CREATETHEFILE', 'Create it');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_SETMPERM', 'Set the permission');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_FILECOPIED', 'The file has been copied');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_FILENOTCOPIED', 'The file cannot be copied');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_PERMSET', 'The permission has been set');
-define('CO_' . $moduleDirNameUpper . '_' . 'FC_PERMNOTSET', 'The permission cannot be set');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_AVAILABLE', "<span style='color: green;'>Available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'FC_NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'FC_NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
+define('CO_'.$moduleDirNameUpper.'_'.'FC_COPYTHEFILE', 'Copy it');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_CREATETHEFILE', 'Create it');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_SETMPERM', 'Set the permission');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_FILECOPIED', 'The file has been copied');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_FILENOTCOPIED', 'The file cannot be copied');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_PERMSET', 'The permission has been set');
+define('CO_'.$moduleDirNameUpper.'_'.'FC_PERMNOTSET', 'The permission cannot be set');

language/english/feedback.php

Spacing +18 added lines, -18 removed lines

@@ -21,21 +21,21 @@
 $moduleDirName      = \basename(\dirname(__DIR__, 2));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE', 'Send a feedback');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT', 'Recipient');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME', 'Name');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER', 'Please enter your name');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE', 'Website');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER', 'Please enter your website');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL', 'Email');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER', 'Please enter your email');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE', 'Type of feedback');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION', 'Suggestions');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS', 'Bugs');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL', 'Testimonials');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES', 'Features');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS', 'Misc');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT', 'Feedback content');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR', 'Feedback for module ');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS', 'Feedback successfully sent');
-define('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR', 'An errror occured when feedback was sent!');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_FORM_TITLE', 'Send a feedback');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_RECIPIENT', 'Recipient');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_NAME', 'Name');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_NAME_PLACEHOLER', 'Please enter your name');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SITE', 'Website');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SITE_PLACEHOLER', 'Please enter your website');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL', 'Email');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL_PLACEHOLER', 'Please enter your email');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE', 'Type of feedback');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION', 'Suggestions');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS', 'Bugs');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL', 'Testimonials');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES', 'Features');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS', 'Misc');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT', 'Feedback content');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_FOR', 'Feedback for module ');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_SUCCESS', 'Feedback successfully sent');
+define('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_ERROR', 'An errror occured when feedback was sent!');

language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 //1.14
 //Help
 define('_MI_SONGLIST_DIRNAME', basename(dirname(__DIR__, 2)));
-define('_MI_SONGLIST_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
+define('_MI_SONGLIST_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
 define('_MI_SONGLIST_BACK_2_ADMIN', 'Back to Administration of ');
 define('_MI_SONGLIST_OVERVIEW', 'Overview');
 

language/english/common.php

Spacing +155 added lines, -155 removed lines

@@ -16,138 +16,138 @@ 
 $moduleDirName = basename(dirname(__DIR__, 2));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-\define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-\define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-\define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-\define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-\define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-\define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-\define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-\define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-\define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-\define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-\define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-\define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-\define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-\define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-\define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
-
-\define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-\define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
-
-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-\define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-\define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-\define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
-
-\define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+\define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+\define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+\define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+\define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+\define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+\define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+\define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+\define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+\define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+\define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+\define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+\define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+\define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+\define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+\define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+
+\define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+\define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+
+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+\define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+\define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+
+\define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-\define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-\define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+\define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-\define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__, 2)));
-\define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-\define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-\define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+\define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__, 2)));
+\define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+\define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+\define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //\define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-\define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-\define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-\define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+\define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+\define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+\define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
 
 //Sample Data
-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA', 'Clear the Sample Data');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA', 'Export DB Schema to YAML');
-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
-\define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons)');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM', 'Confirm');
+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM', 'Are you sure to Import Sample Data? (It will delete ALL current data)');
+\define('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS', 'Sample Date imported  successfully');
+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+\define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS', 'Export Tables to YAML successfully');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA', 'Clear the Sample Data');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK', 'The Sample Data has been cleared');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_CONFIRM', 'Are you sure to Clear Sample Data? (It will delete ALL current data)');
+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA', 'Export DB Schema to YAML');
+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
+\define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
+\define('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS', 'Hide the Import buttons)');
+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS', 'Show the Import buttons)');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIRM', 'Confirm');
 
 //letter choice
-\define('CO_' . $moduleDirNameUpper . '_' . 'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
-\define('CO_' . $moduleDirNameUpper . '_' . 'OTHER', 'Other');
-\define('CO_' . $moduleDirNameUpper . '_' . 'ALL', 'All');
+\define('CO_'.$moduleDirNameUpper.'_'.'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
+\define('CO_'.$moduleDirNameUpper.'_'.'OTHER', 'Other');
+\define('CO_'.$moduleDirNameUpper.'_'.'ALL', 'All');
 
 // block defines
-\define('CO_' . $moduleDirNameUpper . '_' . 'ACCESSRIGHTS', 'Access Rights');
-\define('CO_' . $moduleDirNameUpper . '_' . 'ACTION', 'Action');
-\define('CO_' . $moduleDirNameUpper . '_' . 'ACTIVERIGHTS', 'Active Rights');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BADMIN', 'Block Administration');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLKDESC', 'Description');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CBCENTER', 'Center Middle');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CBLEFT', 'Center Left');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CBRIGHT', 'Center Right');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SBLEFT', 'Left');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SBRIGHT', 'Right');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SIDE', 'Alignment');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TITLE', 'Title');
-\define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE', 'Visible');
-\define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN', 'Visible In');
-\define('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT', 'Weight');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMISSIONS', 'Permissions');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS', 'Blocks Admin');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_DESC', 'Blocks/Group Admin');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_MANAGMENT', 'Manage');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADDBLOCK', 'Add a new block');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_EDITBLOCK', 'Edit a block');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_CLONEBLOCK', 'Clone a block');
+\define('CO_'.$moduleDirNameUpper.'_'.'ACCESSRIGHTS', 'Access Rights');
+\define('CO_'.$moduleDirNameUpper.'_'.'ACTION', 'Action');
+\define('CO_'.$moduleDirNameUpper.'_'.'ACTIVERIGHTS', 'Active Rights');
+\define('CO_'.$moduleDirNameUpper.'_'.'BADMIN', 'Block Administration');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLKDESC', 'Description');
+\define('CO_'.$moduleDirNameUpper.'_'.'CBCENTER', 'Center Middle');
+\define('CO_'.$moduleDirNameUpper.'_'.'CBLEFT', 'Center Left');
+\define('CO_'.$moduleDirNameUpper.'_'.'CBRIGHT', 'Center Right');
+\define('CO_'.$moduleDirNameUpper.'_'.'SBLEFT', 'Left');
+\define('CO_'.$moduleDirNameUpper.'_'.'SBRIGHT', 'Right');
+\define('CO_'.$moduleDirNameUpper.'_'.'SIDE', 'Alignment');
+\define('CO_'.$moduleDirNameUpper.'_'.'TITLE', 'Title');
+\define('CO_'.$moduleDirNameUpper.'_'.'VISIBLE', 'Visible');
+\define('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN', 'Visible In');
+\define('CO_'.$moduleDirNameUpper.'_'.'WEIGHT', 'Weight');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'PERMISSIONS', 'Permissions');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS', 'Blocks Admin');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_DESC', 'Blocks/Group Admin');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_MANAGMENT', 'Manage');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADDBLOCK', 'Add a new block');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK', 'Edit a block');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK', 'Clone a block');
 
 //myblocksadmin
-\define('CO_' . $moduleDirNameUpper . '_' . 'AGDS', 'Admin Groups');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BCACHETIME', 'Cache Time');
-\define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_ADMIN', 'Blocks Admin');
-\define('CO_' . $moduleDirNameUpper . '_' . 'UPDATE_SUCCESS', 'Update successful');
+\define('CO_'.$moduleDirNameUpper.'_'.'AGDS', 'Admin Groups');
+\define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');
+\define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADMIN', 'Blocks Admin');
+\define('CO_'.$moduleDirNameUpper.'_'.'UPDATE_SUCCESS', 'Update successful');
 
 //Template Admin
-\define('CO_' . $moduleDirNameUpper . '_' . 'TPLSETS', 'Template Management');
-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE', 'Generate');
-\define('CO_' . $moduleDirNameUpper . '_' . 'FILENAME', 'File Name');
+\define('CO_'.$moduleDirNameUpper.'_'.'TPLSETS', 'Template Management');
+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE', 'Generate');
+\define('CO_'.$moduleDirNameUpper.'_'.'FILENAME', 'File Name');
 
 //Menu
-\define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE', 'Migrate');
-\define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_YES', 'Folder "%s" exist');
-\define('CO_' . $moduleDirNameUpper . '_' . 'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS', 'Show Development Tools Button?');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_FEEDBACK', 'Feedback');
-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK', 'Database migrated to current schema.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK', 'Current schema file written');
+\define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE', 'Migrate');
+\define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_YES', 'Folder "%s" exist');
+\define('CO_'.$moduleDirNameUpper.'_'.'FOLDER_NO', 'Folder "%s" does not exist. Create the specified folder with CHMOD 777.');
+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS', 'Show Development Tools Button?');
+\define('CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC', 'If yes, the "Migrate" Tab and other Development tools will be visible to the Admin.');
+\define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_FEEDBACK', 'Feedback');
+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_OK', 'Database migrated to current schema.');
+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_WARNING', 'Warning! This is intended for developers only. Confirm write schema file from current database.');
+\define('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_SCHEMA_OK', 'Current schema file written');
 
 //Latest Version Check
-\define('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION', 'New Version: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION', 'New Version: ');
 
 //DirectoryChecker
-\define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");
-\define('CO_' . $moduleDirNameUpper . '_' . 'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
-\define('CO_' . $moduleDirNameUpper . '_' . 'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
-\define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEDIR', 'Create it');
-\define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');
-\define('CO_' . $moduleDirNameUpper . '_' . 'DIRCREATED', 'The directory has been created');
-\define('CO_' . $moduleDirNameUpper . '_' . 'DIRNOTCREATED', 'The directory cannot be created');
-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');
-\define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
+\define('CO_'.$moduleDirNameUpper.'_'.'AVAILABLE', "<span style='color: green;'>Available</span>");
+\define('CO_'.$moduleDirNameUpper.'_'.'NOTAVAILABLE', "<span style='color: red;'>Not available</span>");
+\define('CO_'.$moduleDirNameUpper.'_'.'NOTWRITABLE', "<span style='color: red;'>Should have permission ( %d ), but it has ( %d )</span>");
+\define('CO_'.$moduleDirNameUpper.'_'.'CREATETHEDIR', 'Create it');
+\define('CO_'.$moduleDirNameUpper.'_'.'SETMPERM', 'Set the permission');
+\define('CO_'.$moduleDirNameUpper.'_'.'DIRCREATED', 'The directory has been created');
+\define('CO_'.$moduleDirNameUpper.'_'.'DIRNOTCREATED', 'The directory cannot be created');
+\define('CO_'.$moduleDirNameUpper.'_'.'PERMSET', 'The permission has been set');
+\define('CO_'.$moduleDirNameUpper.'_'.'PERMNOTSET', 'The permission cannot be set');
 
 //FileChecker
 //\define('CO_' . $moduleDirNameUpper . '_' . 'AVAILABLE', "<span style='color: green;'>Available</span>");
@@ -157,70 +157,70 @@ 
 //\define('CO_' . $moduleDirNameUpper . '_' . 'CREATETHEFILE', 'Create it');
 //\define('CO_' . $moduleDirNameUpper . '_' . 'SETMPERM', 'Set the permission');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'FILECOPIED', 'The file has been copied');
-\define('CO_' . $moduleDirNameUpper . '_' . 'FILENOTCOPIED', 'The file cannot be copied');
+\define('CO_'.$moduleDirNameUpper.'_'.'FILECOPIED', 'The file has been copied');
+\define('CO_'.$moduleDirNameUpper.'_'.'FILENOTCOPIED', 'The file cannot be copied');
 
 //\define('CO_' . $moduleDirNameUpper . '_' . 'PERMSET', 'The permission has been set');
 //\define('CO_' . $moduleDirNameUpper . '_' . 'PERMNOTSET', 'The permission cannot be set');
 
 //image config
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_EXT_IMAGE', 'EXTERNAL Image configuration');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_START', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">:: ');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_END', ' ::</span> ');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_DESC_START', '<span style="color: #FF0000; font-size: Small;">');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_DESC_END', '</span> ');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'PREFERENCE_BREAK_CONFIG_IMAGE', constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_START') . constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_EXT_IMAGE') . constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIG_STYLING_END'));
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH', 'Image Display Width');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC', 'Display width for image');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT', 'Image Display Height');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC', 'Display height for image');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC', '');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH', 'Image Upload path');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');
-
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');
-\define('CO_' . $moduleDirNameUpper . '_' . 'IMAGE_FILE_SIZE_DSC','The maximum file size of the image file (in Bytes)');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_EXT_IMAGE', 'EXTERNAL Image configuration');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_START', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">:: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_END', ' ::</span> ');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_DESC_START', '<span style="color: #FF0000; font-size: Small;">');
+\define('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_DESC_END', '</span> ');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'PREFERENCE_BREAK_CONFIG_IMAGE', constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_START').constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_EXT_IMAGE').constant('CO_'.$moduleDirNameUpper.'_'.'CONFIG_STYLING_END'));
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH', 'Image Display Width');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC', 'Display width for image');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT', 'Image Display Height');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC', 'Display height for image');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG', '<span style="color: #FF0000; font-size: Small;  font-weight: bold;">--- EXTERNAL Image configuration ---</span> ');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC', '');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH', 'Image Upload path');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC', 'Path for uploading images');
+
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE', 'Image File Size (in Bytes)');
+\define('CO_'.$moduleDirNameUpper.'_'.'IMAGE_FILE_SIZE_DSC', 'The maximum file size of the image file (in Bytes)');
 
 //Module Stats
-\define('CO_' . $moduleDirNameUpper . '_' . 'STATS_SUMMARY', 'Module Statistics');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_CATEGORIES', 'Categories:');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_ITEMS', 'Items');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_OFFLINE', 'Offline');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_PUBLISHED', 'Published');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_REJECTED', 'Rejected');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TOTAL_SUBMITTED', 'Submitted');
+\define('CO_'.$moduleDirNameUpper.'_'.'STATS_SUMMARY', 'Module Statistics');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_CATEGORIES', 'Categories:');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_ITEMS', 'Items');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_OFFLINE', 'Offline');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_PUBLISHED', 'Published');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_REJECTED', 'Rejected');
+\define('CO_'.$moduleDirNameUpper.'_'.'TOTAL_SUBMITTED', 'Submitted');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'ERROR403', 'You are not allowed to view this page!');
+\define('CO_'.$moduleDirNameUpper.'_'.'ERROR403', 'You are not allowed to view this page!');
 
 //Preferences
-\define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
-\define('CO_' . $moduleDirNameUpper . '_' . 'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
+\define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH', 'Number of Characters to truncate to the long text field');
+\define('CO_'.$moduleDirNameUpper.'_'.'TRUNCATE_LENGTH_DESC', 'Set the maximum number of characters to truncate the long text fields');
 
-\define('CO_' . $moduleDirNameUpper . '_' . 'DELETE_BLOCK_CONFIRM', 'Are you sure to delete this Block?');
+\define('CO_'.$moduleDirNameUpper.'_'.'DELETE_BLOCK_CONFIRM', 'Are you sure to delete this Block?');
 
 //Cloning
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE', 'Clone');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE', 'Clone %s');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME', 'Choose a name for the new module');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC', 'Do not use special characters! <br>Do not choose an existing module dirname or database table name!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!<br>You may want to make changes in language files.');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!');
-\define('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE', 'Clone');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_DSC', 'Cloning a module has never been this easy! Just type in the name you want for it and hit submit button!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_TITLE', 'Clone %s');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME', 'Choose a name for the new module');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME_DSC', 'Do not use special characters! <br>Do not choose an existing module dirname or database table name!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_INVALIDNAME', 'ERROR: Invalid module name, please try another one!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_EXISTS', 'ERROR: Module name already taken, please try another one!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_CONGRAT', 'Congratulations! %s was sucessfully created!<br>You may want to make changes in language files.');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_IMAGEFAIL', 'Attention, we failed creating the new module logo. Please consider modifying assets/images/logo_module.png manually!');
+\define('CO_'.$moduleDirNameUpper.'_'.'CLONE_FAIL', "Sorry, we failed in creating the new clone. Maybe you need to temporally set write permissions (CHMOD 777) to 'modules' folder and try again.");
 
 
 //JSON-LD generation of www.schema.org
-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE_JSONLD', 'Generate Schema Markup through JSON LD');
-\define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE_JSONLD_DESC', 'Mark up your module with structured data to help search engines better understand the content of your web page');
+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE_JSONLD', 'Generate Schema Markup through JSON LD');
+\define('CO_'.$moduleDirNameUpper.'_'.'GENERATE_JSONLD_DESC', 'Mark up your module with structured data to help search engines better understand the content of your web page');
 
 //Repository not found
-\define('CO_' . $moduleDirNameUpper . '_' . 'REPO_NOT_FOUND', 'Repository Not Found: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'REPO_NOT_FOUND', 'Repository Not Found: ');
 //Release not found
-\define('CO_' . $moduleDirNameUpper . '_' . 'NO_REL_FOUND', 'Released Version Not Found: ');
+\define('CO_'.$moduleDirNameUpper.'_'.'NO_REL_FOUND', 'Released Version Not Found: ');
 //rename upload folder on uninstall
-\define('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED', 'Could not rename upload folder, please rename manually');
+\define('CO_'.$moduleDirNameUpper.'_'.'ERROR_FOLDER_RENAME_FAILED', 'Could not rename upload folder, please rename manually');

albums.php

Indentation +190 added lines, -190 removed lines

@@ -13,12 +13,12 @@ 
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
 if ($_SESSION['cid'] > 0) {
-    $cids[$_SESSION['cid']] = $_SESSION['cid'];
+	$cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
 if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+	$criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
 } else {
-    $criteria_cat->add(new \Criteria(''), 'OR');
+	$criteria_cat->add(new \Criteria(''), 'OR');
 }
 $criteria_cat->setSort('created');
 $criteria_cat->setOrder('ASC');
@@ -32,198 +32,198 @@ 
 $col = 1;
 $row = 1;
 foreach ($categories as $category) {
-    $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-        ++$row;
-        $col = 1;
-    }
+	$cat[$row][$col]          = $category->toArray(true);
+	$cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	++$col;
+	if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+		++$row;
+		$col = 1;
+	}
 }
 if (1 != $col) {
-    $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-        $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-    }
+	$col--;
+	for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+		$cat[$row][$j][$categoryHandler->keyName] = 0;
+		$cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+	}
 }
 
 /** @var AlbumsHandler $albumsHandler */
 $albumsHandler = Helper::getInstance()->getHandler('Albums');
 switch ($op) {
-    default:
-    case 'item':
-        switch ($fct) {
-            default:
-            case 'list':
-                $pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
-
-                $criteria_cat->setLimit($limit);
-                $criteria_cat->setStart($start);
-
-                $albums = $albumsHandler->getObjects($criteria_cat, false);
-
-                $ret = [];
-                $col = 1;
-                $row = 1;
-                foreach ($albums as $album) {
-                    $ret[$row][$col]          = $album->toArray(true);
-                    $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-                    ++$col;
-                    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-                        ++$row;
-                        $col = 1;
-                    }
-                }
-                if (1 != $col) {
-                    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-                        $ret[$row][$j][$albumsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-                    }
-                }
-
-                $url = $albumsHandler->getURL();
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
-
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                if (0 != $_SESSION['cid']) {
-                    $category = $categoryHandler->get($_SESSION['cid']);
-                    $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-                }
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-            case 'item':
-                $album = $albumsHandler->get($id);
-
-                $url = $album->getURL(true);
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
-
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.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['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('songs', false);
-                $GLOBALS['xoopsTpl']->assign('album', $album->toArray(true));
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
-        break;
-    case 'browseby':
-        switch ($fct) {
-            default:
-            case 'title':
-            case 'lyrics':
-            case 'artist':
-            case 'album':
-                $browse_criteria = new \CriteriaCompo();
-                switch ($value) {
-                    case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
-                        }
-                        break;
-                    default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
-                        break;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteria);
-        }
-
-        $pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
-
-        $criteria->setLimit($limit);
-        $criteria->setStart($start);
-
-        $albums = $albumsHandler->getObjects($criteria, false);
-
-        $ret = [];
-        $col = 1;
-        $row = 1;
-        foreach ($albums as $album) {
-            $ret[$row][$col]          = $album->toArray(true);
-            $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-            ++$col;
-            if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
-                ++$row;
-                $col = 1;
-            }
-        }
-        if (1 != $col) {
-            $col--;
-            for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
-                $ret[$row][$j][$albumsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-            }
-        }
-
-        $url = $albumsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
-
-        $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
-        $GLOBALS['xoopsTpl']->assign('songs', false);
-        $GLOBALS['xoopsTpl']->assign('categories', $cat);
-        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        if (0 != $_SESSION['cid']) {
-            $category = $categoryHandler->get($_SESSION['cid']);
-            $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-        }
-        $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-        require_once $GLOBALS['xoops']->path('/footer.php');
-        break;
-        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=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+	default:
+	case 'item':
+		switch ($fct) {
+			default:
+			case 'list':
+				$pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+
+				$criteria_cat->setLimit($limit);
+				$criteria_cat->setStart($start);
+
+				$albums = $albumsHandler->getObjects($criteria_cat, false);
+
+				$ret = [];
+				$col = 1;
+				$row = 1;
+				foreach ($albums as $album) {
+					$ret[$row][$col]          = $album->toArray(true);
+					$ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+					++$col;
+					if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+						++$row;
+						$col = 1;
+					}
+				}
+				if (1 != $col) {
+					for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+						$ret[$row][$j][$albumsHandler->keyName] = 0;
+						$ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+					}
+				}
+
+				$url = $albumsHandler->getURL();
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
+
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				if (0 != $_SESSION['cid']) {
+					$category = $categoryHandler->get($_SESSION['cid']);
+					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+				}
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+			case 'item':
+				$album = $albumsHandler->get($id);
+
+				$url = $album->getURL(true);
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
+
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.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['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('songs', false);
+				$GLOBALS['xoopsTpl']->assign('album', $album->toArray(true));
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
+		break;
+	case 'browseby':
+		switch ($fct) {
+			default:
+			case 'title':
+			case 'lyrics':
+			case 'artist':
+			case 'album':
+				$browse_criteria = new \CriteriaCompo();
+				switch ($value) {
+					case '0':
+						for ($u = 0; $u < 10; ++$u) {
+							$browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+						}
+						break;
+					default:
+						$browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
+						$browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+						break;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteria);
+		}
+
+		$pagenav = new \XoopsPageNav($albumsHandler->getCount($criteria), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+
+		$criteria->setLimit($limit);
+		$criteria->setStart($start);
+
+		$albums = $albumsHandler->getObjects($criteria, false);
+
+		$ret = [];
+		$col = 1;
+		$row = 1;
+		foreach ($albums as $album) {
+			$ret[$row][$col]          = $album->toArray(true);
+			$ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+			++$col;
+			if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+				++$row;
+				$col = 1;
+			}
+		}
+		if (1 != $col) {
+			$col--;
+			for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+				$ret[$row][$j][$albumsHandler->keyName] = 0;
+				$ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+			}
+		}
+
+		$url = $albumsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
+
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
+		$GLOBALS['xoopsTpl']->assign('songs', false);
+		$GLOBALS['xoopsTpl']->assign('categories', $cat);
+		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+		if (0 != $_SESSION['cid']) {
+			$category = $categoryHandler->get($_SESSION['cid']);
+			$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+		}
+		$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+		require_once $GLOBALS['xoops']->path('/footer.php');
+		break;
+		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=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

Spacing +37 added lines, -37 removed lines

@@ -4,7 +4,7 @@ 
 use XoopsModules\Songlist\CategoryHandler;
 use XoopsModules\Songlist\AlbumsHandler;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
@@ -12,11 +12,11 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 $criteria_cat    = new \CriteriaCompo();
 $cids            = $categoryHandler->GetCatAndSubCat($_SESSION['cid']);
-if ($_SESSION['cid'] > 0) {
+if ($_SESSION['cid']>0) {
     $cids[$_SESSION['cid']] = $_SESSION['cid'];
 }
-if (count($cids) > 0 && 0 != $_SESSION['cid']) {
-    $criteria_cat->add(new \Criteria('cid', '(' . implode(',', $cids) . ')', 'IN'), 'OR');
+if (count($cids)>0 && 0!=$_SESSION['cid']) {
+    $criteria_cat->add(new \Criteria('cid', '('.implode(',', $cids).')', 'IN'), 'OR');
 } else {
     $criteria_cat->add(new \Criteria(''), 'OR');
 }
@@ -33,18 +33,18 @@ 
 $row = 1;
 foreach ($categories as $category) {
     $cat[$row][$col]          = $category->toArray(true);
-    $cat[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+    $cat[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     ++$col;
-    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
         ++$row;
         $col = 1;
     }
 }
-if (1 != $col) {
+if (1!=$col) {
     $col--;
-    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
         $cat[$row][$j][$categoryHandler->keyName] = 0;
-        $cat[$row][$j]['width']                   = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+        $cat[$row][$j]['width']                   = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
     }
 }
 
@@ -68,41 +68,41 @@ 
                 $row = 1;
                 foreach ($albums as $album) {
                     $ret[$row][$col]          = $album->toArray(true);
-                    $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                    $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     ++$col;
-                    if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+                    if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                         ++$row;
                         $col = 1;
                     }
                 }
-                if (1 != $col) {
-                    for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+                if (1!=$col) {
+                    for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                         $ret[$row][$j][$albumsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                        $ret[$row][$j]['width']                 = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     }
                 }
 
                 $url = $albumsHandler->getURL();
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
                 $GLOBALS['xoopsTpl']->assign('categories', $cat);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
                 $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                if (0 != $_SESSION['cid']) {
+                if (0!=$_SESSION['cid']) {
                     $category = $categoryHandler->get($_SESSION['cid']);
                     $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
                 }
@@ -114,19 +114,19 @@ 
                 $url = $album->getURL(true);
                 if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
                     header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
+                    header('Location: '.$url);
                     exit(0);
                 }
 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_item.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['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $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('songs', false);
@@ -147,13 +147,13 @@ 
                 $browse_criteria = new \CriteriaCompo();
                 switch ($value) {
                     case '0':
-                        for ($u = 0; $u < 10; ++$u) {
-                            $browse_criteria->add(new \Criteria('title', $u . '%', 'LIKE'), 'OR');
+                        for ($u = 0; $u<10; ++$u) {
+                            $browse_criteria->add(new \Criteria('title', $u.'%', 'LIKE'), 'OR');
                         }
                         break;
                     default:
-                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value) . '%', 'LIKE'), 'OR');
-                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value) . '%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtoupper($value).'%', 'LIKE'), 'OR');
+                        $browse_criteria->add(new \Criteria('title', \mb_strtolower($value).'%', 'LIKE'), 'OR');
                         break;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -172,42 +172,42 @@ 
         $row = 1;
         foreach ($albums as $album) {
             $ret[$row][$col]          = $album->toArray(true);
-            $ret[$row][$col]['width'] = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+            $ret[$row][$col]['width'] = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             ++$col;
-            if ($col > $GLOBALS['songlistModuleConfig']['cols']) {
+            if ($col>$GLOBALS['songlistModuleConfig']['cols']) {
                 ++$row;
                 $col = 1;
             }
         }
-        if (1 != $col) {
+        if (1!=$col) {
             $col--;
-            for ($j = $col; $j <= $GLOBALS['songlistModuleConfig']['cols']; ++$j) {
+            for ($j = $col; $j<=$GLOBALS['songlistModuleConfig']['cols']; ++$j) {
                 $ret[$row][$j][$albumsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                 = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                $ret[$row][$j]['width']                 = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             }
         }
 
         $url = $albumsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
         $GLOBALS['xoopsOption']['template_main'] = 'songlist_albums_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('results', $ret);
         $GLOBALS['xoopsTpl']->assign('songs', false);
         $GLOBALS['xoopsTpl']->assign('categories', $cat);
         $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        if (0 != $_SESSION['cid']) {
+        if (0!=$_SESSION['cid']) {
             $category = $categoryHandler->get($_SESSION['cid']);
             $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
         }
@@ -225,5 +225,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=0&value=%&start=$start&limit=$limit&cid=".$_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }