XoopsModules25x / songlist

blocks/songlist_popular_genre.php

Indentation +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@
  */
 function b_songlist_popular_genre_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Genre');
-    $objects = $handler->getTop(1);
-    if (is_object($objects[0])) {
-        return $objects[0]->toArray(true);
-    }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Genre');
+	$objects = $handler->getTop(1);
+	if (is_object($objects[0])) {
+		return $objects[0]->toArray(true);
+	}
 
-    return null;
+	return null;
 }
 
 /**

blocks/songlist_popular_song.php

Indentation +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@
  */
 function b_songlist_popular_song_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Songs');
-    $objects = $handler->getTop(1);
-    if (is_object($objects[0])) {
-        return $objects[0]->toArray(true);
-    }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Songs');
+	$objects = $handler->getTop(1);
+	if (is_object($objects[0])) {
+		return $objects[0]->toArray(true);
+	}
 
-    return null;
+	return null;
 }
 
 /**

blocks/songlist_popular_genres.php

Indentation +15 added lines, -15 removed lines

@@ -8,19 +8,19 @@ 
  */
 function b_songlist_popular_genres_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Genre');
-    $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
-        $ret = [];
-        foreach ($objects as $id => $object) {
-            $ret[$id] = $object->toArray(true);
-        }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Genre');
+	$objects = $handler->getTop($options[0]);
+	if (count($objects) > 0) {
+		$ret = [];
+		foreach ($objects as $id => $object) {
+			$ret[$id] = $object->toArray(true);
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    return null;
+	return null;
 }
 
 /**
@@ -29,9 +29,9 @@ 
  */
 function b_songlist_popular_genres_edit($options): string
 {
-    xoops_load('XoopsFormLoader');
-    xoops_loadLanguage('blocks', 'songlist');
-    $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
+	xoops_load('XoopsFormLoader');
+	xoops_loadLanguage('blocks', 'songlist');
+	$num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+	return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Genre');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

blocks/songlist_popular_album.php

Indentation +7 added lines, -7 removed lines

@@ -8,14 +8,14 @@
  */
 function b_songlist_popular_album_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Albums');
-    $objects = $handler->getTop(1);
-    if (is_object($objects[0])) {
-        return $objects[0]->toArray(true);
-    }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Albums');
+	$objects = $handler->getTop(1);
+	if (is_object($objects[0])) {
+		return $objects[0]->toArray(true);
+	}
 
-    return null;
+	return null;
 }
 
 /**

blocks/songlist_popular_songs.php

Indentation +15 added lines, -15 removed lines

@@ -8,19 +8,19 @@ 
  */
 function b_songlist_popular_songs_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Songs');
-    $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
-        $ret = [];
-        foreach ($objects as $id => $object) {
-            $ret[$id] = $object->toArray(true);
-        }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Songs');
+	$objects = $handler->getTop($options[0]);
+	if (count($objects) > 0) {
+		$ret = [];
+		foreach ($objects as $id => $object) {
+			$ret[$id] = $object->toArray(true);
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    return null;
+	return null;
 }
 
 /**
@@ -29,9 +29,9 @@ 
  */
 function b_songlist_popular_songs_edit($options): string
 {
-    xoops_load('XoopsFormLoader');
-    xoops_loadLanguage('blocks', 'songlist');
-    $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
+	xoops_load('XoopsFormLoader');
+	xoops_loadLanguage('blocks', 'songlist');
+	$num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+	return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Songs');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true);
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

blocks/songlist_popular_artists.php

Indentation +15 added lines, -15 removed lines

@@ -8,19 +8,19 @@ 
  */
 function b_songlist_popular_artists_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Artists');
-    $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
-        $ret = [];
-        foreach ($objects as $id => $object) {
-            $ret[$id] = $object->toArray(true); //TODO mb why do we need toArray()?
-        }
+	xoops_loadLanguage('blocks', 'songlist');
+	$handler = Helper::getInstance()->getHandler('Artists');
+	$objects = $handler->getTop($options[0]);
+	if (count($objects) > 0) {
+		$ret = [];
+		foreach ($objects as $id => $object) {
+			$ret[$id] = $object->toArray(true); //TODO mb why do we need toArray()?
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    return null;
+	return null;
 }
 
 /**
@@ -29,9 +29,9 @@ 
  */
 function b_songlist_popular_artists_edit($options): string
 {
-    xoops_load('XoopsFormLoader');
-    xoops_loadLanguage('blocks', 'songlist');
-    $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
+	xoops_load('XoopsFormLoader');
+	xoops_loadLanguage('blocks', 'songlist');
+	$num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+	return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $handler = Helper::getInstance()->getHandler('Artists');
     $objects = $handler->getTop($options[0]);
-    if (count($objects) > 0) {
+    if (count($objects)>0) {
         $ret = [];
         foreach ($objects as $id => $object) {
             $ret[$id] = $object->toArray(true); //TODO mb why do we need toArray()?
@@ -33,5 +33,5 @@ 
     xoops_loadLanguage('blocks', 'songlist');
     $num = new \XoopsformText('', 'options[0]', 10, 10, $options[0]);
 
-    return _BL_SONGLIST_NUMBEROFITEMS . $num->render();
+    return _BL_SONGLIST_NUMBEROFITEMS.$num->render();
 }

artists.php

Indentation +191 added lines, -191 removed lines

@@ -13,14 +13,14 @@ 
 $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']) {
-    foreach ($cids as $cid) {
-        $criteria_cat->add(new \Criteria('`cids`', '%"' . $cid . '"%', 'LIKE'), 'OR');
-    }
+	foreach ($cids as $cid) {
+		$criteria_cat->add(new \Criteria('`cids`', '%"' . $cid . '"%', 'LIKE'), 'OR');
+	}
 } else {
-    $criteria_cat->add(new \Criteria(''), 'OR');
+	$criteria_cat->add(new \Criteria(''), 'OR');
 }
 
 $criteria_cat->setSort('created');
@@ -35,197 +35,197 @@ 
 $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 ArtistsHandler $artistsHandler */
 $artistsHandler = Helper::getInstance()->getHandler('Artists');
 switch ((string)$GLOBALS['op']) {
-    default:
-    case 'item':
-        switch ($fct) {
-            default:
-            case 'list':
-                $pagenav = new \XoopsPageNav($artistsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
-
-                $criteria_cat->setLimit($limit);
-                $criteria_cat->setStart($start);
-
-                $artists = $artistsHandler->getObjects($criteria_cat, false);
-
-                $ret = [];
-                $col = 1;
-                $row = 1;
-                foreach ($artists as $artist) {
-                    $ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-                    }
-                }
-
-                $url = $artistsHandler->getURL(false);
-                if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-                    header('HTTP/1.1 301 Moved Permanently');
-                    header('Location: ' . $url);
-                    exit(0);
-                }
-
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_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']);
-                $GLOBALS['xoopsTpl']->assign('results', $ret);
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-                $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-                if (0 != $_SESSION['cid']) {
-                    $category = $categoryHandler->get($_SESSION['cid']);
-                    $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-                }
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                require $GLOBALS['xoops']->path('/footer.php');
-                break;
-            case 'item':
-                $artist = $artistsHandler->get($id);
-
-                $url = $artist->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_artists_item.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']);
-                $GLOBALS['xoopsTpl']->assign('songs', false);
-                $GLOBALS['xoopsTpl']->assign('artist', $artist->toArray(true));
-                $GLOBALS['xoopsTpl']->assign('categories', $cat);
-                $GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
-                require $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('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;
-                }
-                $criteria = new \CriteriaCompo($criteria_cat, 'AND');
-                $criteria->add($browse_criteria);
-        }
-
-        $pagenav = new \XoopsPageNav($artistsHandler->getCount($criteria), $limit, $start, 'start', "op={$GLOBALS['op']}&fct=$fct&id=$id&value=$value&limit=$limit");
-
-        $criteria->setLimit($limit);
-        $criteria->setStart($start);
-
-        $artists = $artistsHandler->getObjects($criteria, false);
-
-        $ret = [];
-        $col = 1;
-        $row = 1;
-        foreach ($artists as $artist) {
-            $ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
-            }
-        }
-
-        $url = $artistsHandler->getURL(false);
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
-
-        $GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_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']);
-        $GLOBALS['xoopsTpl']->assign('results', $ret);
-        $GLOBALS['xoopsTpl']->assign('categories', $cat);
-        $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-        $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-        if (0 != $_SESSION['cid']) {
-            $category = $categoryHandler->get($_SESSION['cid']);
-            $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
-        }
-        $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=0&value=%&start=0&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+	default:
+	case 'item':
+		switch ($fct) {
+			default:
+			case 'list':
+				$pagenav = new \XoopsPageNav($artistsHandler->getCount($criteria_cat), $limit, $start, 'start', "op=$op&fct=$fct&id=$id&value=$value&limit=$limit");
+
+				$criteria_cat->setLimit($limit);
+				$criteria_cat->setStart($start);
+
+				$artists = $artistsHandler->getObjects($criteria_cat, false);
+
+				$ret = [];
+				$col = 1;
+				$row = 1;
+				foreach ($artists as $artist) {
+					$ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
+						$ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+					}
+				}
+
+				$url = $artistsHandler->getURL(false);
+				if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+					header('HTTP/1.1 301 Moved Permanently');
+					header('Location: ' . $url);
+					exit(0);
+				}
+
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_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']);
+				$GLOBALS['xoopsTpl']->assign('results', $ret);
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+				$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
+				if (0 != $_SESSION['cid']) {
+					$category = $categoryHandler->get($_SESSION['cid']);
+					$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+				}
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				require $GLOBALS['xoops']->path('/footer.php');
+				break;
+			case 'item':
+				$artist = $artistsHandler->get($id);
+
+				$url = $artist->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_artists_item.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']);
+				$GLOBALS['xoopsTpl']->assign('songs', false);
+				$GLOBALS['xoopsTpl']->assign('artist', $artist->toArray(true));
+				$GLOBALS['xoopsTpl']->assign('categories', $cat);
+				$GLOBALS['xoopsTpl']->assign('uri', $_SERVER['REQUEST_URI']);
+				require $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('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;
+				}
+				$criteria = new \CriteriaCompo($criteria_cat, 'AND');
+				$criteria->add($browse_criteria);
+		}
+
+		$pagenav = new \XoopsPageNav($artistsHandler->getCount($criteria), $limit, $start, 'start', "op={$GLOBALS['op']}&fct=$fct&id=$id&value=$value&limit=$limit");
+
+		$criteria->setLimit($limit);
+		$criteria->setStart($start);
+
+		$artists = $artistsHandler->getObjects($criteria, false);
+
+		$ret = [];
+		$col = 1;
+		$row = 1;
+		foreach ($artists as $artist) {
+			$ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
+				$ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+			}
+		}
+
+		$url = $artistsHandler->getURL(false);
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI'])) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
+
+		$GLOBALS['xoopsOption']['template_main'] = 'songlist_artists_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']);
+		$GLOBALS['xoopsTpl']->assign('results', $ret);
+		$GLOBALS['xoopsTpl']->assign('categories', $cat);
+		$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+		$GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
+		if (0 != $_SESSION['cid']) {
+			$category = $categoryHandler->get($_SESSION['cid']);
+			$GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
+		}
+		$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=0&value=%&start=0&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

Spacing +36 added lines, -36 removed lines

@@ -4,7 +4,7 @@ 
 use XoopsModules\Songlist\CategoryHandler;
 use XoopsModules\Songlist\ArtistsHandler;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
@@ -12,12 +12,12 @@ 
 $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']) {
+if (count($cids)>0 && 0!=$_SESSION['cid']) {
     foreach ($cids as $cid) {
-        $criteria_cat->add(new \Criteria('`cids`', '%"' . $cid . '"%', 'LIKE'), 'OR');
+        $criteria_cat->add(new \Criteria('`cids`', '%"'.$cid.'"%', 'LIKE'), 'OR');
     }
 } else {
     $criteria_cat->add(new \Criteria(''), 'OR');
@@ -36,24 +36,24 @@ 
 $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']).'%';
     }
 }
 
 /** @var ArtistsHandler $artistsHandler */
 $artistsHandler = Helper::getInstance()->getHandler('Artists');
-switch ((string)$GLOBALS['op']) {
+switch ((string) $GLOBALS['op']) {
     default:
     case 'item':
         switch ($fct) {
@@ -71,41 +71,41 @@ 
                 $row = 1;
                 foreach ($artists as $artist) {
                     $ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
-                        $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                        $ret[$row][$j]['width']                  = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
                     }
                 }
 
                 $url = $artistsHandler->getURL(false);
                 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_artists_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']);
                 $GLOBALS['xoopsTpl']->assign('results', $ret);
                 $GLOBALS['xoopsTpl']->assign('categories', $cat);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
                 $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-                if (0 != $_SESSION['cid']) {
+                if (0!=$_SESSION['cid']) {
                     $category = $categoryHandler->get($_SESSION['cid']);
                     $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
                 }
@@ -118,17 +118,17 @@ 
                 $url = $artist->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_artists_item.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']);
                 $GLOBALS['xoopsTpl']->assign('songs', false);
@@ -149,13 +149,13 @@ 
                 $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;
                 }
                 $criteria = new \CriteriaCompo($criteria_cat, 'AND');
@@ -174,42 +174,42 @@ 
         $row = 1;
         foreach ($artists as $artist) {
             $ret[$row][$col]          = $artist->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][$artistsHandler->keyName] = 0;
-                $ret[$row][$j]['width']                  = floor(100 / $GLOBALS['songlistModuleConfig']['cols']) . '%';
+                $ret[$row][$j]['width']                  = floor(100/$GLOBALS['songlistModuleConfig']['cols']).'%';
             }
         }
 
         $url = $artistsHandler->getURL(false);
         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_artists_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']);
         $GLOBALS['xoopsTpl']->assign('results', $ret);
         $GLOBALS['xoopsTpl']->assign('categories', $cat);
         $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
         $GLOBALS['xoopsTpl']->assign('cid', $_SESSION['cid']);
-        if (0 != $_SESSION['cid']) {
+        if (0!=$_SESSION['cid']) {
             $category = $categoryHandler->get($_SESSION['cid']);
             $GLOBALS['xoopsTpl']->assign('category', $category->toArray(true));
         }
@@ -227,5 +227,5 @@ 
                 unset($_SESSION['cid']);
                 break;
         }
-        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=0&value=%&start=0&limit=$limit&cid=" . $_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
+        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=0&value=%&start=0&limit=$limit&cid=".$_SESSION['cid'], 10, _MD_SONGLIST_MSG_CATEGORYCHANGED);
 }

xoops_version.php

Indentation +306 added lines, -306 removed lines

@@ -12,7 +12,7 @@ 
 $configHandler             = xoops_getHandler('config');
 $GLOBALS['songlistModule'] = $moduleHandler->getByDirname('songlist');
 if (is_object($GLOBALS['songlistModule'])) {
-    $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+	$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
 }
 
 // $Id: xoops_version.php,v 4.04 2008/06/05 15:35:59 wishcraft Exp $
@@ -50,23 +50,23 @@ 
 $modversion['submit_bug']          = 'https://www.chronolabs.coop/';
 
 $modversion = [
-    // ------------------- Mysql -----------------------------
-    'sqlfile' => ['mysql' => 'sql/mysql.sql'],
-    // ------------------- Tables ----------------------------
-    'tables'  => [
-        $moduleDirName . '_' . 'albums',
-        $moduleDirName . '_' . 'artists',
-        $moduleDirName . '_' . 'category',
-        $moduleDirName . '_' . 'extra',
-        $moduleDirName . '_' . 'field',
-        $moduleDirName . '_' . 'genre',
-        $moduleDirName . '_' . 'voice',
-        $moduleDirName . '_' . 'requests',
-        $moduleDirName . '_' . 'songs',
-        $moduleDirName . '_' . 'utf8map',
-        $moduleDirName . '_' . 'visibility',
-        $moduleDirName . '_' . 'votes',
-    ],
+	// ------------------- Mysql -----------------------------
+	'sqlfile' => ['mysql' => 'sql/mysql.sql'],
+	// ------------------- Tables ----------------------------
+	'tables'  => [
+		$moduleDirName . '_' . 'albums',
+		$moduleDirName . '_' . 'artists',
+		$moduleDirName . '_' . 'category',
+		$moduleDirName . '_' . 'extra',
+		$moduleDirName . '_' . 'field',
+		$moduleDirName . '_' . 'genre',
+		$moduleDirName . '_' . 'voice',
+		$moduleDirName . '_' . 'requests',
+		$moduleDirName . '_' . 'songs',
+		$moduleDirName . '_' . 'utf8map',
+		$moduleDirName . '_' . 'visibility',
+		$moduleDirName . '_' . 'votes',
+	],
 ];
 
 // Admin things
@@ -97,52 +97,52 @@ 
 
 // ------------------- Help files ------------------- //
 $modversion['helpsection'] = [
-    ['name' => _MI_SONGLIST_OVERVIEW, 'link' => 'page=help'],
-    ['name' => _MI_SONGLIST_DISCLAIMER, 'link' => 'page=disclaimer'],
-    ['name' => _MI_SONGLIST_LICENSE, 'link' => 'page=license'],
-    ['name' => _MI_SONGLIST_SUPPORT, 'link' => 'page=support'],
+	['name' => _MI_SONGLIST_OVERVIEW, 'link' => 'page=help'],
+	['name' => _MI_SONGLIST_DISCLAIMER, 'link' => 'page=disclaimer'],
+	['name' => _MI_SONGLIST_LICENSE, 'link' => 'page=license'],
+	['name' => _MI_SONGLIST_SUPPORT, 'link' => 'page=support'],
 ];
 
 // ------------------- Templates ------------------- //
 $modversion['templates'] = [
-    ['file' => 'songlist_albums_index.tpl', 'description' => ''],
-    ['file' => 'songlist_albums_item.tpl', 'description' => ''],
-    ['file' => 'songlist_albums_list.tpl', 'description' => ''],
-    ['file' => 'songlist_alpha_browse.tpl', 'description' => ''],
-    ['file' => 'songlist_artists_index.tpl', 'description' => ''],
-    ['file' => 'songlist_artists_item.tpl', 'description' => ''],
-    ['file' => 'songlist_artists_list.tpl', 'description' => ''],
-    ['file' => 'songlist_category_item.tpl', 'description' => ''],
-    ['file' => 'songlist_category_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_albums_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_albums_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_artists_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_artists_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_category_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_category_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_fieldlist.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_genre_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_genre_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_import_actiona.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_import_actionb.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_requests_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_requests_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_songs_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_songs_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_utf8map_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_utf8map_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_visibility.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_voice_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_voice_list.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_votes_edit.tpl', 'description' => ''],
-    ['file' => 'songlist_cpanel_votes_list.tpl', 'description' => ''],
-    ['file' => 'songlist_requests_index.tpl', 'description' => ''],
-    ['file' => 'songlist_search_index.tpl', 'description' => ''],
-    ['file' => 'songlist_search_results.tpl', 'description' => ''],
-    ['file' => 'songlist_search_search.tpl', 'description' => ''],
-    ['file' => 'songlist_songs_index.tpl', 'description' => ''],
-    ['file' => 'songlist_songs_item.tpl', 'description' => ''],
-    ['file' => 'songlist_songs_list.tpl', 'description' => ''],
+	['file' => 'songlist_albums_index.tpl', 'description' => ''],
+	['file' => 'songlist_albums_item.tpl', 'description' => ''],
+	['file' => 'songlist_albums_list.tpl', 'description' => ''],
+	['file' => 'songlist_alpha_browse.tpl', 'description' => ''],
+	['file' => 'songlist_artists_index.tpl', 'description' => ''],
+	['file' => 'songlist_artists_item.tpl', 'description' => ''],
+	['file' => 'songlist_artists_list.tpl', 'description' => ''],
+	['file' => 'songlist_category_item.tpl', 'description' => ''],
+	['file' => 'songlist_category_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_albums_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_albums_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_artists_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_artists_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_category_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_category_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_fieldlist.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_genre_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_genre_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_import_actiona.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_import_actionb.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_requests_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_requests_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_songs_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_songs_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_utf8map_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_utf8map_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_visibility.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_voice_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_voice_list.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_votes_edit.tpl', 'description' => ''],
+	['file' => 'songlist_cpanel_votes_list.tpl', 'description' => ''],
+	['file' => 'songlist_requests_index.tpl', 'description' => ''],
+	['file' => 'songlist_search_index.tpl', 'description' => ''],
+	['file' => 'songlist_search_results.tpl', 'description' => ''],
+	['file' => 'songlist_search_search.tpl', 'description' => ''],
+	['file' => 'songlist_songs_index.tpl', 'description' => ''],
+	['file' => 'songlist_songs_item.tpl', 'description' => ''],
+	['file' => 'songlist_songs_list.tpl', 'description' => ''],
 ];
 
 // Submenus
@@ -151,11 +151,11 @@ 
 $modversion['sub'][$i]['url']  = 'artists.php';
 ++$i;
 if (isset($GLOBALS['songlistModuleConfig']['album'])) {
-    if ($GLOBALS['songlistModuleConfig']['album']) {
-        $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS;
-        $modversion['sub'][$i]['url']  = 'albums.php';
-        ++$i;
-    }
+	if ($GLOBALS['songlistModuleConfig']['album']) {
+		$modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_ALBUMS;
+		$modversion['sub'][$i]['url']  = 'albums.php';
+		++$i;
+	}
 }
 $modversion['sub'][$i]['name'] = _MI_SONGLIST_MENU_SEARCH;
 $modversion['sub'][$i]['url']  = 'search.php';
@@ -167,90 +167,90 @@ 
 $i = 0;
 // ------------------- Blocks ------------------- //
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_artist.php',
-    'name'        => _MI_SONGLIST_BLOCK_TOP_ARTIST,
-    'description' => 'Shows top artist',
-    'show_func'   => 'b_songlist_popular_artist_show',
-    'options'     => '',
-    'edit_func'   => 'b_songlist_popular_artist_edit',
-    'template'    => 'songlist_popular_artist.tpl',
+	'file'        => 'songlist_popular_artist.php',
+	'name'        => _MI_SONGLIST_BLOCK_TOP_ARTIST,
+	'description' => 'Shows top artist',
+	'show_func'   => 'b_songlist_popular_artist_show',
+	'options'     => '',
+	'edit_func'   => 'b_songlist_popular_artist_edit',
+	'template'    => 'songlist_popular_artist.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_artists.php',
-    'name'        => _MI_SONGLIST_BLOCK_POPULAR_ARTISTS,
-    'description' => 'Shows popular artists',
-    'show_func'   => 'b_songlist_popular_artists_show',
-    'options'     => '6',
-    'edit_func'   => 'b_songlist_popular_artists_edit',
-    'template'    => 'songlist_popular_artists.tpl',
+	'file'        => 'songlist_popular_artists.php',
+	'name'        => _MI_SONGLIST_BLOCK_POPULAR_ARTISTS,
+	'description' => 'Shows popular artists',
+	'show_func'   => 'b_songlist_popular_artists_show',
+	'options'     => '6',
+	'edit_func'   => 'b_songlist_popular_artists_edit',
+	'template'    => 'songlist_popular_artists.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_album.php',
-    'name'        => _MI_SONGLIST_BLOCK_TOP_ALBUM,
-    'description' => 'Shows top album',
-    'show_func'   => 'b_songlist_popular_album_show',
-    'options'     => '',
-    'edit_func'   => 'b_songlist_popular_album_edit',
-    'template'    => 'songlist_popular_album.tpl',
+	'file'        => 'songlist_popular_album.php',
+	'name'        => _MI_SONGLIST_BLOCK_TOP_ALBUM,
+	'description' => 'Shows top album',
+	'show_func'   => 'b_songlist_popular_album_show',
+	'options'     => '',
+	'edit_func'   => 'b_songlist_popular_album_edit',
+	'template'    => 'songlist_popular_album.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_albums.php',
-    'name'        => _MI_SONGLIST_BLOCK_POPULAR_ALBUMS,
-    'description' => 'Shows popular albums',
-    'show_func'   => 'b_songlist_popular_albums_show',
-    'options'     => '6',
-    'edit_func'   => 'b_songlist_popular_albums_edit',
-    'template'    => 'songlist_popular_albums.tpl',
+	'file'        => 'songlist_popular_albums.php',
+	'name'        => _MI_SONGLIST_BLOCK_POPULAR_ALBUMS,
+	'description' => 'Shows popular albums',
+	'show_func'   => 'b_songlist_popular_albums_show',
+	'options'     => '6',
+	'edit_func'   => 'b_songlist_popular_albums_edit',
+	'template'    => 'songlist_popular_albums.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_genre.php',
-    'name'        => _MI_SONGLIST_BLOCK_TOP_GENRE,
-    'description' => 'Shows top genre',
-    'show_func'   => 'b_songlist_popular_genre_show',
-    'options'     => '',
-    'edit_func'   => 'b_songlist_popular_genre_edit',
-    'template'    => 'songlist_popular_genre.tpl',
+	'file'        => 'songlist_popular_genre.php',
+	'name'        => _MI_SONGLIST_BLOCK_TOP_GENRE,
+	'description' => 'Shows top genre',
+	'show_func'   => 'b_songlist_popular_genre_show',
+	'options'     => '',
+	'edit_func'   => 'b_songlist_popular_genre_edit',
+	'template'    => 'songlist_popular_genre.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_genres.php',
-    'name'        => _MI_SONGLIST_BLOCK_POPULAR_GENRES,
-    'description' => 'Shows popular genres',
-    'show_func'   => 'b_songlist_popular_genres_show',
-    'options'     => '6',
-    'edit_func'   => 'b_songlist_popular_genres_edit',
-    'template'    => 'songlist_popular_genres.tpl',
+	'file'        => 'songlist_popular_genres.php',
+	'name'        => _MI_SONGLIST_BLOCK_POPULAR_GENRES,
+	'description' => 'Shows popular genres',
+	'show_func'   => 'b_songlist_popular_genres_show',
+	'options'     => '6',
+	'edit_func'   => 'b_songlist_popular_genres_edit',
+	'template'    => 'songlist_popular_genres.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_song.php',
-    'name'        => _MI_SONGLIST_BLOCK_TOP_SONG,
-    'description' => 'Shows top song',
-    'show_func'   => 'b_songlist_popular_song_show',
-    'options'     => '',
-    'edit_func'   => 'b_songlist_popular_song_edit',
-    'template'    => 'songlist_popular_song.tpl',
+	'file'        => 'songlist_popular_song.php',
+	'name'        => _MI_SONGLIST_BLOCK_TOP_SONG,
+	'description' => 'Shows top song',
+	'show_func'   => 'b_songlist_popular_song_show',
+	'options'     => '',
+	'edit_func'   => 'b_songlist_popular_song_edit',
+	'template'    => 'songlist_popular_song.tpl',
 ];
 
 ++$i;
 $modversion['blocks'][$i] = [
-    'file'        => 'songlist_popular_songs.php',
-    'name'        => _MI_SONGLIST_BLOCK_POPULAR_SONGS,
-    'description' => 'Shows popular songs',
-    'show_func'   => 'b_songlist_popular_songs_show',
-    'options'     => '6',
-    'edit_func'   => 'b_songlist_popular_songs_edit',
-    'template'    => 'songlist_popular_songs.tpl',
+	'file'        => 'songlist_popular_songs.php',
+	'name'        => _MI_SONGLIST_BLOCK_POPULAR_SONGS,
+	'description' => 'Shows popular songs',
+	'show_func'   => 'b_songlist_popular_songs_show',
+	'options'     => '6',
+	'edit_func'   => 'b_songlist_popular_songs_edit',
+	'template'    => 'songlist_popular_songs.tpl',
 ];
 
 // default admin editor
@@ -259,127 +259,127 @@ 
 $editorList    = array_flip($editorHandler->getList());
 
 $modversion['config'][] = [
-    'name'        => 'editor',
-    'title'       => '_MI_SONGLIST_EDITORS',
-    'description' => '_MI_SONGLIST_EDITORS_DESC',
-    'formtype'    => 'select',
-    'valuetype'   => 'text',
-    'default'     => 'tinymce',
-    'options'     => $editorList,
+	'name'        => 'editor',
+	'title'       => '_MI_SONGLIST_EDITORS',
+	'description' => '_MI_SONGLIST_EDITORS_DESC',
+	'formtype'    => 'select',
+	'valuetype'   => 'text',
+	'default'     => 'tinymce',
+	'options'     => $editorList,
 ];
 
 $modversion['config'][] = [
-    'name'        => 'salt',
-    'title'       => '_MI_SONGLIST_SALT',
-    'description' => '_MI_SONGLIST_SALT_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'text',
-    'default'     => (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : ''),
-
-    'options' => [],
+	'name'        => 'salt',
+	'title'       => '_MI_SONGLIST_SALT',
+	'description' => '_MI_SONGLIST_SALT_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'text',
+	'default'     => (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
+					 . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : ''),
+
+	'options' => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'cols',
-    'title'       => '_MI_SONGLIST_COLS',
-    'description' => '_MI_SONGLIST_COLS_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 4,
-    'options'     => [],
+	'name'        => 'cols',
+	'title'       => '_MI_SONGLIST_COLS',
+	'description' => '_MI_SONGLIST_COLS_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 4,
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'rows',
-    'title'       => '_MI_SONGLIST_ROWS',
-    'description' => '_MI_SONGLIST_ROWS_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 4,
-    'options'     => [],
+	'name'        => 'rows',
+	'title'       => '_MI_SONGLIST_ROWS',
+	'description' => '_MI_SONGLIST_ROWS_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 4,
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'email',
-    'title'       => '_MI_SONGLIST_EMAIL',
-    'description' => '_MI_SONGLIST_EMAIL_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => $GLOBALS['xoopsConfig']['adminmail'],
-    'options'     => [],
+	'name'        => 'email',
+	'title'       => '_MI_SONGLIST_EMAIL',
+	'description' => '_MI_SONGLIST_EMAIL_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => $GLOBALS['xoopsConfig']['adminmail'],
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'mp3_filesize',
-    'title'       => '_MI_SONGLIST_MP3FILESIZE',
-    'description' => '_MI_SONGLIST_MP3FILESIZE_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => '195035100',
+	'name'        => 'mp3_filesize',
+	'title'       => '_MI_SONGLIST_MP3FILESIZE',
+	'description' => '_MI_SONGLIST_MP3FILESIZE_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => '195035100',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'mp3_mimetype',
-    'title'       => '_MI_SONGLIST_MP3MIMETYPE',
-    'description' => '_MI_SONGLIST_MP3MIMETYPE_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => 'audio/mpeg|audio/x-mpeg|audio/mp3|audio/x-mp3|audio/mpeg3|audio/x-mpeg3|audio/mpg|audio/x-mpg|audio/x-mpegaudio',
+	'name'        => 'mp3_mimetype',
+	'title'       => '_MI_SONGLIST_MP3MIMETYPE',
+	'description' => '_MI_SONGLIST_MP3MIMETYPE_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => 'audio/mpeg|audio/x-mpeg|audio/mp3|audio/x-mp3|audio/mpeg3|audio/x-mpeg3|audio/mpg|audio/x-mpg|audio/x-mpegaudio',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'mp3_extensions',
-    'title'       => '_MI_SONGLIST_MP3EXTENSIONS',
-    'description' => '_MI_SONGLIST_MP3EXTENSIONS_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => 'mp3',
+	'name'        => 'mp3_extensions',
+	'title'       => '_MI_SONGLIST_MP3EXTENSIONS',
+	'description' => '_MI_SONGLIST_MP3EXTENSIONS_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => 'mp3',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'filesize_upload',
-    'title'       => '_MI_SONGLIST_FILESIZEUPLD',
-    'description' => '_MI_SONGLIST_FILESIZEUPLD_DESC',
-    'formtype'    => 'textbox',
-    'valuetype'   => 'int',
-    'default'     => '1950351',
+	'name'        => 'filesize_upload',
+	'title'       => '_MI_SONGLIST_FILESIZEUPLD',
+	'description' => '_MI_SONGLIST_FILESIZEUPLD_DESC',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'int',
+	'default'     => '1950351',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'allowed_mimetype',
-    'title'       => '_MI_SONGLIST_ALLOWEDMIMETYPE',
-    'description' => '_MI_SONGLIST_ALLOWEDMIMETYPE_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => 'image/gif|image/pjpeg|image/jpeg|image/x-png|image/png',
+	'name'        => 'allowed_mimetype',
+	'title'       => '_MI_SONGLIST_ALLOWEDMIMETYPE',
+	'description' => '_MI_SONGLIST_ALLOWEDMIMETYPE_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => 'image/gif|image/pjpeg|image/jpeg|image/x-png|image/png',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'allowed_extensions',
-    'title'       => '_MI_SONGLIST_ALLOWEDEXTENSIONS',
-    'description' => '_MI_SONGLIST_ALLOWEDEXTENSIONS_DESC',
-    'formtype'    => 'textarea',
-    'valuetype'   => 'text',
-    'default'     => 'gif|pjpeg|jpeg|jpg|png',
+	'name'        => 'allowed_extensions',
+	'title'       => '_MI_SONGLIST_ALLOWEDEXTENSIONS',
+	'description' => '_MI_SONGLIST_ALLOWEDEXTENSIONS_DESC',
+	'formtype'    => 'textarea',
+	'valuetype'   => 'text',
+	'default'     => 'gif|pjpeg|jpeg|jpg|png',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'upload_areas',
-    'title'       => '_MI_SONGLIST_UPLOADAREAS',
-    'description' => '_MI_SONGLIST_UPLOADAREAS_DESC',
+	'name'        => 'upload_areas',
+	'title'       => '_MI_SONGLIST_UPLOADAREAS',
+	'description' => '_MI_SONGLIST_UPLOADAREAS_DESC',
 //    'formtype'    => 'select',
 //    'valuetype'   => 'text',
 //    'default'     => 'uploads' . DS . 'songlist' . DS,
@@ -387,45 +387,45 @@ 
 //        'uploads' . DS                   => 'uploads' . DS,
 //        'uploads' . DS . 'songlist' . DS => 'uploads' . DS . 'songlist' . DS,
 //],
-    'formtype'    => 'textbox',
-    'valuetype'   => 'text',
-    'default'     => '/uploads/songlist/',
+	'formtype'    => 'textbox',
+	'valuetype'   => 'text',
+	'default'     => '/uploads/songlist/',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'album',
-    'title'       => '_MI_SONGLIST_ALBUM',
-    'description' => '_MI_SONGLIST_ALBUM_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'album',
+	'title'       => '_MI_SONGLIST_ALBUM',
+	'description' => '_MI_SONGLIST_ALBUM_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'genre',
-    'title'       => '_MI_SONGLIST_GENRE',
-    'description' => '_MI_SONGLIST_GENRE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'genre',
+	'title'       => '_MI_SONGLIST_GENRE',
+	'description' => '_MI_SONGLIST_GENRE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'voice',
-    'title'       => '_MI_SONGLIST_VOICE',
-    'description' => '_MI_SONGLIST_VOICE_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'voice',
+	'title'       => '_MI_SONGLIST_VOICE',
+	'description' => '_MI_SONGLIST_VOICE_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'lyrics',
-    'title'       => '_MI_SONGLIST_LYRICS',
-    'description' => '_MI_SONGLIST_LYRICS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'lyrics',
+	'title'       => '_MI_SONGLIST_LYRICS',
+	'description' => '_MI_SONGLIST_LYRICS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 /*
@@ -440,110 +440,110 @@ 
 */
 
 $modversion['config'][] = [
-    'name'        => 'htaccess',
-    'title'       => '_MI_SONGLIST_HTACCESS',
-    'description' => '_MI_SONGLIST_HTACCESS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'htaccess',
+	'title'       => '_MI_SONGLIST_HTACCESS',
+	'description' => '_MI_SONGLIST_HTACCESS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'baseofurl',
-    'title'       => '_MI_SONGLIST_HTACCESS_BASEOFURL',
-    'description' => '_MI_SONGLIST_HTACCESS_BASEOFURL_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'text',
-    'default'     => 'songlist',
+	'name'        => 'baseofurl',
+	'title'       => '_MI_SONGLIST_HTACCESS_BASEOFURL',
+	'description' => '_MI_SONGLIST_HTACCESS_BASEOFURL_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'text',
+	'default'     => 'songlist',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'endofurl',
-    'title'       => '_MI_SONGLIST_HTACCESS_ENDOFURL',
-    'description' => '_MI_SONGLIST_HTACCESS_ENDOFURL_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'text',
-    'default'     => '.tpl',
+	'name'        => 'endofurl',
+	'title'       => '_MI_SONGLIST_HTACCESS_ENDOFURL',
+	'description' => '_MI_SONGLIST_HTACCESS_ENDOFURL_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'text',
+	'default'     => '.tpl',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'tags',
-    'title'       => '_MI_SONGLIST_TAGS',
-    'description' => '_MI_SONGLIST_TAGS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => '0',
+	'name'        => 'tags',
+	'title'       => '_MI_SONGLIST_TAGS',
+	'description' => '_MI_SONGLIST_TAGS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => '0',
 ];
 
 $modversion['config'][] = [
-    'name'        => 'force_jquery',
-    'title'       => '_MI_SONGLIST_FORCE_JQUERY',
-    'description' => '_MI_SONGLIST_FORCE_JQUERY_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => true,
+	'name'        => 'force_jquery',
+	'title'       => '_MI_SONGLIST_FORCE_JQUERY',
+	'description' => '_MI_SONGLIST_FORCE_JQUERY_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => true,
 ];
 
 $modversion['config'][] = [
-    'name'        => 'memory_admin',
-    'title'       => '_MI_SONGLIST_MEMORY_ADMIN',
-    'description' => '_MI_SONGLIST_MEMORY_ADMIN_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 128,
-    'options'     => [],
+	'name'        => 'memory_admin',
+	'title'       => '_MI_SONGLIST_MEMORY_ADMIN',
+	'description' => '_MI_SONGLIST_MEMORY_ADMIN_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 128,
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'memory_user',
-    'title'       => '_MI_SONGLIST_MEMORY_USER',
-    'description' => '_MI_SONGLIST_MEMORY_USER_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 128,
-    'options'     => [],
+	'name'        => 'memory_user',
+	'title'       => '_MI_SONGLIST_MEMORY_USER',
+	'description' => '_MI_SONGLIST_MEMORY_USER_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 128,
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'time_admin',
-    'title'       => '_MI_SONGLIST_TIME_ADMIN',
-    'description' => '_MI_SONGLIST_TIME_ADMIN_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 360,
-    'options'     => [],
+	'name'        => 'time_admin',
+	'title'       => '_MI_SONGLIST_TIME_ADMIN',
+	'description' => '_MI_SONGLIST_TIME_ADMIN_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 360,
+	'options'     => [],
 ];
 
 $modversion['config'][] = [
-    'name'        => 'time_user',
-    'title'       => '_MI_SONGLIST_TIME_USER',
-    'description' => '_MI_SONGLIST_TIME_USER_DESC',
-    'formtype'    => 'text',
-    'valuetype'   => 'int',
-    'default'     => 360,
-    'options'     => [],
+	'name'        => 'time_user',
+	'title'       => '_MI_SONGLIST_TIME_USER',
+	'description' => '_MI_SONGLIST_TIME_USER_DESC',
+	'formtype'    => 'text',
+	'valuetype'   => 'int',
+	'default'     => 360,
+	'options'     => [],
 ];
 
 /**
  * Make Sample button visible?
  */
 $modversion['config'][] = [
-    'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 1,
+	'name'        => 'displaySampleButton',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 1,
 ];
 
 /**
  * Show Developer Tools?
  */
 $modversion['config'][] = [
-    'name'        => 'displayDeveloperTools',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC',
-    'formtype'    => 'yesno',
-    'valuetype'   => 'int',
-    'default'     => 0,
+	'name'        => 'displayDeveloperTools',
+	'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS',
+	'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC',
+	'formtype'    => 'yesno',
+	'valuetype'   => 'int',
+	'default'     => 0,
 ];

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 error_reporting(E_ALL);
 $moduleDirName      = basename(__DIR__);
@@ -31,7 +31,7 @@ 
 $modversion['releasedate']         = 'Thursday, 03rd July, 2022';
 $modversion['website']             = 'www.chronolabs.coop';
 $modversion['release_info']        = 'Stable 2012/08/16';
-$modversion['release_file']        = XOOPS_URL . '/modules/xforum/docs/changelog.txt';
+$modversion['release_file']        = XOOPS_URL.'/modules/xforum/docs/changelog.txt';
 $modversion['author_realname']     = 'Wishcraft';
 $modversion['author_website_url']  = 'https://www.chronolabs.coop';
 $modversion['author_website_name'] = 'Chronolabs';
@@ -54,18 +54,18 @@ 
     'sqlfile' => ['mysql' => 'sql/mysql.sql'],
     // ------------------- Tables ----------------------------
     'tables'  => [
-        $moduleDirName . '_' . 'albums',
-        $moduleDirName . '_' . 'artists',
-        $moduleDirName . '_' . 'category',
-        $moduleDirName . '_' . 'extra',
-        $moduleDirName . '_' . 'field',
-        $moduleDirName . '_' . 'genre',
-        $moduleDirName . '_' . 'voice',
-        $moduleDirName . '_' . 'requests',
-        $moduleDirName . '_' . 'songs',
-        $moduleDirName . '_' . 'utf8map',
-        $moduleDirName . '_' . 'visibility',
-        $moduleDirName . '_' . 'votes',
+        $moduleDirName.'_'.'albums',
+        $moduleDirName.'_'.'artists',
+        $moduleDirName.'_'.'category',
+        $moduleDirName.'_'.'extra',
+        $moduleDirName.'_'.'field',
+        $moduleDirName.'_'.'genre',
+        $moduleDirName.'_'.'voice',
+        $moduleDirName.'_'.'requests',
+        $moduleDirName.'_'.'songs',
+        $moduleDirName.'_'.'utf8map',
+        $moduleDirName.'_'.'visibility',
+        $moduleDirName.'_'.'votes',
     ],
 ];
 
@@ -274,20 +274,20 @@ 
     'description' => '_MI_SONGLIST_SALT_DESC',
     'formtype'    => 'text',
     'valuetype'   => 'text',
-    'default'     => (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : '')
-                     . (2 != random_int(0, 4) ? chr(random_int(32, 190)) : ''),
+    'default'     => (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : '')
+                     . (2!=random_int(0, 4) ? chr(random_int(32, 190)) : ''),
 
     'options' => [],
 ];
@@ -529,8 +529,8 @@ 
  */
 $modversion['config'][] = [
     'name'        => 'displaySampleButton',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 1,
@@ -541,8 +541,8 @@ 
  */
 $modversion['config'][] = [
     'name'        => 'displayDeveloperTools',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_DEV_TOOLS_DESC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_DEV_TOOLS_DESC',
     'formtype'    => 'yesno',
     'valuetype'   => 'int',
     'default'     => 0,

admin/songs.php

Indentation +216 added lines, -216 removed lines

@@ -23,101 +23,101 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'songs':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+	default:
+	case 'songs':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-            /** @var SongsHandler $songsHandler */
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
+			/** @var SongsHandler $songsHandler */
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
 
-                $criteria        = $songsHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $songsHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+				$criteria        = $songsHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $songsHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
 
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 
-                foreach ($songsHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $songsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
+				foreach ($songsHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $songsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
 
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
 
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
 
-                $songss = $songsHandler->getObjects($criteria, true);
-                foreach ($songss as $cid => $songs) {
-                    if (is_object($songs)) {
-                        $GLOBALS['xoopsTpl']->append('songs', $songs->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormSongs(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_songs_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+				$songss = $songsHandler->getObjects($criteria, true);
+				foreach ($songss as $cid => $songs) {
+					if (is_object($songs)) {
+						$GLOBALS['xoopsTpl']->append('songs', $songs->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormSongs(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_songs_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                require_once $GLOBALS['xoops']->path('/class/pagenav.php');
+				require_once $GLOBALS['xoops']->path('/class/pagenav.php');
 
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $songs = $songsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $songs = $songsHandler->create();
-                }
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$songs = $songsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$songs = $songsHandler->create();
+				}
 
-                $GLOBALS['xoopsTpl']->assign('form', $songs->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_songs_edit.tpl');
-                break;
-            case 'save':
-                $songsHandler  = Helper::getInstance()->getHandler('Songs');
-                $extrasHandler = Helper::getInstance()->getHandler('Extras');
-                $id            = 0;
-                $id            = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $songs = $songsHandler->get($id);
-                } else {
-                    $songs = $songsHandler->create();
-                }
-                $songs->setVars($_POST[$id]);
+				$GLOBALS['xoopsTpl']->assign('form', $songs->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_songs_edit.tpl');
+				break;
+			case 'save':
+				$songsHandler  = Helper::getInstance()->getHandler('Songs');
+				$extrasHandler = Helper::getInstance()->getHandler('Extras');
+				$id            = 0;
+				$id            = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$songs = $songsHandler->get($id);
+				} else {
+					$songs = $songsHandler->create();
+				}
+				$songs->setVars($_POST[$id]);
 
-                if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
+				if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
 //                    if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
 //                        foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
 //                            foreach (explode('/', $folders) as $folder) {
@@ -130,74 +130,74 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $uploader = new Uploader(
-                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
-                        explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']),
-                        $GLOBALS['songlistModuleConfig']['mp3_filesize'],
-                        0,
-                        0,
-                        explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
-                    );
-                    try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                    } catch (Exception $e) {
-                    }
+					$uploader = new Uploader(
+						$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
+						explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']),
+						$GLOBALS['songlistModuleConfig']['mp3_filesize'],
+						0,
+						0,
+						explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
+					);
+					try {
+						$uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+					} catch (Exception $e) {
+					}
 
-                    if ($uploader->fetchMedia('mp3' . $id)) {
-                        if (!$uploader->upload()) {
-                            $adminObject = Admin::getInstance();
-                            $adminObject->displayNavigation(basename(__FILE__));
-                            echo $uploader->getErrors();
-                            xoops_cp_footer();
-                            exit(0);
-                        }
-                        if (mb_strlen($songs->getVar('mp3'))) {
-                            unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
-                        }
+					if ($uploader->fetchMedia('mp3' . $id)) {
+						if (!$uploader->upload()) {
+							$adminObject = Admin::getInstance();
+							$adminObject->displayNavigation(basename(__FILE__));
+							echo $uploader->getErrors();
+							xoops_cp_footer();
+							exit(0);
+						}
+						if (mb_strlen($songs->getVar('mp3'))) {
+							unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
+						}
 
-                        $songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
-                    } else {
-                        $adminObject = Admin::getInstance();
-                        $adminObject->displayNavigation(basename(__FILE__));
-                        echo $uploader->getErrors();
-                        xoops_cp_footer();
-                        exit(0);
-                    }
-                }
-                if (!$id = $songsHandler->insert($songs)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE);
-                    exit(0);
-                }
-                $extra = $extrasHandler->get($id);
-                $extra->setVars($_POST[$id]);
-                $extra->setVar('sid', $id);
-                $extrasHandler->insert($extra);
+						$songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
+					} else {
+						$adminObject = Admin::getInstance();
+						$adminObject->displayNavigation(basename(__FILE__));
+						echo $uploader->getErrors();
+						xoops_cp_footer();
+						exit(0);
+					}
+				}
+				if (!$id = $songsHandler->insert($songs)) {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE);
+					exit(0);
+				}
+				$extra = $extrasHandler->get($id);
+				$extra->setVars($_POST[$id]);
+				$extra->setVar('sid', $id);
+				$extrasHandler->insert($extra);
 
-                if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
-                    $tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
-                    $tagHandler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar('dirname'), $songs->getVar('cid'));
-                }
+				if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
+					$tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
+					$tagHandler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar('dirname'), $songs->getVar('cid'));
+				}
 
-                if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
-                    redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                        10,
-                        _AM_SONGLIST_MSG_SONGS_SAVEDOKEY
-                    );
-                } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
-                }
-                exit(0);
+				if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
+					redirect_header(
+						$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+						10,
+						_AM_SONGLIST_MSG_SONGS_SAVEDOKEY
+					);
+				} else {
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
+				}
+				exit(0);
 
-                break;
-            case 'savelist':
-                print_r($_FILES);
-                exit;
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
-                foreach ($_REQUEST['id'] as $id) {
-                    $songs = $songsHandler->get($id);
-                    $songs->setVars($_POST[$id]);
-                    if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
+				break;
+			case 'savelist':
+				print_r($_FILES);
+				exit;
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
+				foreach ($_REQUEST['id'] as $id) {
+					$songs = $songsHandler->get($id);
+					$songs->setVars($_POST[$id]);
+					if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
 //                        if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
 //                            foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
 //                                foreach (explode('/', $folders) as $folder) {
@@ -210,78 +210,78 @@ 
 //                        }
 
 //                        require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                        $uploader = new Uploader(
-                            $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
-                            explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']),
-                            $GLOBALS['songlistModuleConfig']['mp3_filesize'],
-                            0,
-                            0,
-                            explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
-                        );
-                        try {
-                            $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                        } catch (Exception $e) {
-                        }
+						$uploader = new Uploader(
+							$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
+							explode('|', $GLOBALS['songlistModuleConfig']['mp3_mimetype']),
+							$GLOBALS['songlistModuleConfig']['mp3_filesize'],
+							0,
+							0,
+							explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
+						);
+						try {
+							$uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+						} catch (Exception $e) {
+						}
 
-                        if ($uploader->fetchMedia('mp3' . $id)) {
-                            if (!$uploader->upload()) {
-                                $adminObject = Admin::getInstance();
-                                $adminObject->displayNavigation(basename(__FILE__));
-                                echo $uploader->getErrors();
-                                xoops_cp_footer();
-                                exit(0);
-                            }
-                            if (mb_strlen($songs->getVar('mp3'))) {
-                                unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
-                            }
+						if ($uploader->fetchMedia('mp3' . $id)) {
+							if (!$uploader->upload()) {
+								$adminObject = Admin::getInstance();
+								$adminObject->displayNavigation(basename(__FILE__));
+								echo $uploader->getErrors();
+								xoops_cp_footer();
+								exit(0);
+							}
+							if (mb_strlen($songs->getVar('mp3'))) {
+								unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
+							}
 
-                            $songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
-                        } else {
-                            $adminObject = Admin::getInstance();
-                            $adminObject->displayNavigation(basename(__FILE__));
-                            echo $uploader->getErrors();
-                            xoops_cp_footer();
-                            exit(0);
-                        }
-                    }
-                    if (!$songsHandler->insert($songs)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE
-                        );
-                        exit(0);
-                    }
-                }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
-                exit(0);
-                break;
-            case 'delete':
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
-                $id           = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $songs = $songsHandler->get($id);
-                    if (!$songsHandler->delete($songs)) {
-                        redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                            10,
-                            _AM_SONGLIST_MSG_SONGS_FAILEDTODELETE
-                        );
-                        exit(0);
-                    }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_DELETED);
-                    exit(0);
-                }
-                $songs = $songsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_SONGS_DELETE, $songs->getVar('name'))
-                );
+							$songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
+						} else {
+							$adminObject = Admin::getInstance();
+							$adminObject->displayNavigation(basename(__FILE__));
+							echo $uploader->getErrors();
+							xoops_cp_footer();
+							exit(0);
+						}
+					}
+					if (!$songsHandler->insert($songs)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE
+						);
+						exit(0);
+					}
+				}
+				redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
+				exit(0);
+				break;
+			case 'delete':
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
+				$id           = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$songs = $songsHandler->get($id);
+					if (!$songsHandler->delete($songs)) {
+						redirect_header(
+							$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+							10,
+							_AM_SONGLIST_MSG_SONGS_FAILEDTODELETE
+						);
+						exit(0);
+					}
+					redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_DELETED);
+					exit(0);
+				}
+				$songs = $songsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_SONGS_DELETE, $songs->getVar('name'))
+				);
 
-                break;
-        }
-        break;
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +29 added lines, -29 removed lines

@@ -8,7 +8,7 @@ 
 use XoopsModules\Songlist\Form\FormController;
 
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -19,8 +19,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 switch ($op) {
     default:
@@ -36,14 +36,14 @@ 
 
                 $criteria        = $songsHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $songsHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 
                 foreach ($songsHandler->filterFields() as $id => $key) {
                     $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
+                        \mb_strtolower(str_replace('-', '_', $key).'_th'),
                         '<a href="'
                         . $_SERVER['SCRIPT_NAME']
                         . '?start='
@@ -53,16 +53,16 @@ 
                         . '&sort='
                         . $key
                         . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+                        . (($key==$GLOBALS['sort']) ? ('DESC'===$GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
                         . '&op='
                         . $GLOBALS['op']
                         . '&filter='
                         . $GLOBALS['filter']
                         . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+                        . (defined('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key)))
                         . '</a>'
                     );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $songsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $songsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -74,7 +74,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $songss = $songsHandler->getObjects($criteria, true);
@@ -117,7 +117,7 @@ 
                 }
                 $songs->setVars($_POST[$id]);
 
-                if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
+                if (Request::hasVar('mp3'.$id, 'FILES') && !empty($_FILES['mp3'.$id]['title'])) {
 //                    if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
 //                        foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
 //                            foreach (explode('/', $folders) as $folder) {
@@ -139,11 +139,11 @@ 
                         explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
                     );
                     try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+                        $uploader->setPrefix(mb_substr(md5((string) microtime(true)), random_int(0, 20), 13));
                     } catch (Exception $e) {
                     }
 
-                    if ($uploader->fetchMedia('mp3' . $id)) {
+                    if ($uploader->fetchMedia('mp3'.$id)) {
                         if (!$uploader->upload()) {
                             $adminObject = Admin::getInstance();
                             $adminObject->displayNavigation(basename(__FILE__));
@@ -152,10 +152,10 @@ 
                             exit(0);
                         }
                         if (mb_strlen($songs->getVar('mp3'))) {
-                            unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
+                            unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
                         }
 
-                        $songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
+                        $songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName());
                     } else {
                         $adminObject = Admin::getInstance();
                         $adminObject->displayNavigation(basename(__FILE__));
@@ -165,7 +165,7 @@ 
                     }
                 }
                 if (!$id = $songsHandler->insert($songs)) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE);
                     exit(0);
                 }
                 $extra = $extrasHandler->get($id);
@@ -173,19 +173,19 @@ 
                 $extra->setVar('sid', $id);
                 $extrasHandler->insert($extra);
 
-                if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH . '/modules/tag/class/tag.php')) {
+                if ($GLOBALS['songlistModuleConfig']['tags'] && file_exists(XOOPS_ROOT_PATH.'/modules/tag/class/tag.php')) {
                     $tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
                     $tagHandler->updateByItem($_POST['tags'], $id, $GLOBALS['songlistModule']->getVar('dirname'), $songs->getVar('cid'));
                 }
 
-                if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
+                if ('new'===isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']] : '') {
                     redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                        $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=edit&id='.$_REQUEST['id'].'&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                         10,
                         _AM_SONGLIST_MSG_SONGS_SAVEDOKEY
                     );
                 } else {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -197,7 +197,7 @@ 
                 foreach ($_REQUEST['id'] as $id) {
                     $songs = $songsHandler->get($id);
                     $songs->setVars($_POST[$id]);
-                    if (Request::hasVar('mp3' . $id, 'FILES') && !empty($_FILES['mp3' . $id]['title'])) {
+                    if (Request::hasVar('mp3'.$id, 'FILES') && !empty($_FILES['mp3'.$id]['title'])) {
 //                        if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
 //                            foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
 //                                foreach (explode('/', $folders) as $folder) {
@@ -219,11 +219,11 @@ 
                             explode('|', $GLOBALS['songlistModuleConfig']['mp3_extensions'])
                         );
                         try {
-                            $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+                            $uploader->setPrefix(mb_substr(md5((string) microtime(true)), random_int(0, 20), 13));
                         } catch (Exception $e) {
                         }
 
-                        if ($uploader->fetchMedia('mp3' . $id)) {
+                        if ($uploader->fetchMedia('mp3'.$id)) {
                             if (!$uploader->upload()) {
                                 $adminObject = Admin::getInstance();
                                 $adminObject->displayNavigation(basename(__FILE__));
@@ -232,10 +232,10 @@ 
                                 exit(0);
                             }
                             if (mb_strlen($songs->getVar('mp3'))) {
-                                unlink($GLOBALS['xoops']->path($songs->getVar('path')) . basename($songs->getVar('mp3')));
+                                unlink($GLOBALS['xoops']->path($songs->getVar('path')).basename($songs->getVar('mp3')));
                             }
 
-                            $songs->setVar('mp3', XOOPS_URL . '/' . str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']) . $uploader->getSavedFileName());
+                            $songs->setVar('mp3', XOOPS_URL.'/'.str_replace(DS, '/', $GLOBALS['songlistModuleConfig']['upload_areas']).$uploader->getSavedFileName());
                         } else {
                             $adminObject = Admin::getInstance();
                             $adminObject->displayNavigation(basename(__FILE__));
@@ -246,14 +246,14 @@ 
                     }
                     if (!$songsHandler->insert($songs)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_SONGS_FAILEDTOSAVE
                         );
                         exit(0);
                     }
                 }
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
+                redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -263,13 +263,13 @@ 
                     $songs = $songsHandler->get($id);
                     if (!$songsHandler->delete($songs)) {
                         redirect_header(
-                            $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+                            $_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'],
                             10,
                             _AM_SONGLIST_MSG_SONGS_FAILEDTODELETE
                         );
                         exit(0);
                     }
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=list&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_DELETED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?op='.$GLOBALS['op'].'&fct=list&limit='.$GLOBALS['limit'].'&start='.$GLOBALS['start'].'&order='.$GLOBALS['order'].'&sort='.$GLOBALS['sort'].'&filter='.$GLOBALS['filter'], 10, _AM_SONGLIST_MSG_SONGS_DELETED);
                     exit(0);
                 }
                 $songs = $songsHandler->get(Request::getInt('id', 0, 'REQUEST'));