XoopsModules25x / songlist

blocks/songlist_popular_albums.php

Indentation +15 added lines, -15 removed lines

@@ -8,19 +8,19 @@ 
  */
 function b_songlist_popular_albums_show($options): ?array
 {
-    xoops_loadLanguage('blocks', 'songlist');
-    $handler = Helper::getInstance()->getHandler('Albums');
-    $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('Albums');
+	$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_albums_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('Albums');
     $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_artist.php

Indentation +7 added lines, -7 removed lines

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

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);
 }