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

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

admin/field.php

Indentation +282 added lines, -282 removed lines

@@ -10,84 +10,84 @@ 
 
 $op           = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? 'edit' : 'list')));
 $fieldHandler = Helper::getInstance()
-                      ->getHandler('Field');
+					  ->getHandler('Field');
 switch ($op) {
-    default:
-    case 'list':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
+	default:
+	case 'list':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        $fields = $fieldHandler->getObjects(null, false, false);
+		$fields = $fieldHandler->getObjects(null, false, false);
 
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $modules       = $moduleHandler->getObjects(null, true);
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$modules       = $moduleHandler->getObjects(null, true);
 
-        $categories = [];
-        $weights    = [];
+		$categories = [];
+		$weights    = [];
 
-        $GLOBALS['categoryHandler'] = Helper::getInstance()
-                                            ->getHandler('Category');
-        $criteria                   = new \CriteriaCompo();
-        $criteria->setSort('weight');
-        $category        = $GLOBALS['categoryHandler']->getObjects($criteria, true);
-        $fieldcategories = [];
-        if ($category) {
-            unset($criteria);
+		$GLOBALS['categoryHandler'] = Helper::getInstance()
+											->getHandler('Category');
+		$criteria                   = new \CriteriaCompo();
+		$criteria->setSort('weight');
+		$category        = $GLOBALS['categoryHandler']->getObjects($criteria, true);
+		$fieldcategories = [];
+		if ($category) {
+			unset($criteria);
 
-            $categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
-            if (count($category) > 0) {
-                foreach (array_keys($category) as $i) {
-                    $categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
-                }
-            }
-            $GLOBALS['xoopsTpl']->assign('categories', $categories);
-        }
+			$categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
+			if (count($category) > 0) {
+				foreach (array_keys($category) as $i) {
+					$categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
+				}
+			}
+			$GLOBALS['xoopsTpl']->assign('categories', $categories);
+		}
 
-        $valuetypes = [
-            XOBJ_DTYPE_ARRAY   => _AM_SONGLIST_FIELDS_ARRAY,
-            XOBJ_DTYPE_EMAIL   => _AM_SONGLIST_FIELDS_EMAIL,
-            XOBJ_DTYPE_INT     => _AM_SONGLIST_FIELDS_INT,
-            XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
-            XOBJ_DTYPE_TXTBOX  => _AM_SONGLIST_FIELDS_TXTBOX,
-            XOBJ_DTYPE_URL     => _AM_SONGLIST_FIELDS_URL,
-            XOBJ_DTYPE_OTHER   => _AM_SONGLIST_FIELDS_OTHER,
-            XOBJ_DTYPE_MTIME   => _AM_SONGLIST_FIELDS_DATE,
-        ];
+		$valuetypes = [
+			XOBJ_DTYPE_ARRAY   => _AM_SONGLIST_FIELDS_ARRAY,
+			XOBJ_DTYPE_EMAIL   => _AM_SONGLIST_FIELDS_EMAIL,
+			XOBJ_DTYPE_INT     => _AM_SONGLIST_FIELDS_INT,
+			XOBJ_DTYPE_TXTAREA => _AM_SONGLIST_FIELDS_TXTAREA,
+			XOBJ_DTYPE_TXTBOX  => _AM_SONGLIST_FIELDS_TXTBOX,
+			XOBJ_DTYPE_URL     => _AM_SONGLIST_FIELDS_URL,
+			XOBJ_DTYPE_OTHER   => _AM_SONGLIST_FIELDS_OTHER,
+			XOBJ_DTYPE_MTIME   => _AM_SONGLIST_FIELDS_DATE,
+		];
 
-        $fieldtypes = [
-            'checkbox'     => _AM_SONGLIST_FIELDS_CHECKBOX,
-            'group'        => _AM_SONGLIST_FIELDS_GROUP,
-            'group_multi'  => _AM_SONGLIST_FIELDS_GROUPMULTI,
-            'language'     => _AM_SONGLIST_FIELDS_LANGUAGE,
-            'radio'        => _AM_SONGLIST_FIELDS_RADIO,
-            'select'       => _AM_SONGLIST_FIELDS_SELECT,
-            'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
-            'textarea'     => _AM_SONGLIST_FIELDS_TEXTAREA,
-            'dhtml'        => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
-            'editor'       => _AM_SONGLIST_FIELDS_EDITOR,
-            'textbox'      => _AM_SONGLIST_FIELDS_TEXTBOX,
-            'timezone'     => _AM_SONGLIST_FIELDS_TIMEZONE,
-            'yesno'        => _AM_SONGLIST_FIELDS_YESNO,
-            'date'         => _AM_SONGLIST_FIELDS_DATE,
-            'datetime'     => _AM_SONGLIST_FIELDS_DATETIME,
-            'longdate'     => _AM_SONGLIST_FIELDS_LONGDATE,
-            'theme'        => _AM_SONGLIST_FIELDS_THEME,
-            'autotext'     => _AM_SONGLIST_FIELDS_AUTOTEXT,
-            'rank'         => _AM_SONGLIST_FIELDS_RANK,
-        ];
+		$fieldtypes = [
+			'checkbox'     => _AM_SONGLIST_FIELDS_CHECKBOX,
+			'group'        => _AM_SONGLIST_FIELDS_GROUP,
+			'group_multi'  => _AM_SONGLIST_FIELDS_GROUPMULTI,
+			'language'     => _AM_SONGLIST_FIELDS_LANGUAGE,
+			'radio'        => _AM_SONGLIST_FIELDS_RADIO,
+			'select'       => _AM_SONGLIST_FIELDS_SELECT,
+			'select_multi' => _AM_SONGLIST_FIELDS_SELECTMULTI,
+			'textarea'     => _AM_SONGLIST_FIELDS_TEXTAREA,
+			'dhtml'        => _AM_SONGLIST_FIELDS_DHTMLTEXTAREA,
+			'editor'       => _AM_SONGLIST_FIELDS_EDITOR,
+			'textbox'      => _AM_SONGLIST_FIELDS_TEXTBOX,
+			'timezone'     => _AM_SONGLIST_FIELDS_TIMEZONE,
+			'yesno'        => _AM_SONGLIST_FIELDS_YESNO,
+			'date'         => _AM_SONGLIST_FIELDS_DATE,
+			'datetime'     => _AM_SONGLIST_FIELDS_DATETIME,
+			'longdate'     => _AM_SONGLIST_FIELDS_LONGDATE,
+			'theme'        => _AM_SONGLIST_FIELDS_THEME,
+			'autotext'     => _AM_SONGLIST_FIELDS_AUTOTEXT,
+			'rank'         => _AM_SONGLIST_FIELDS_RANK,
+		];
 
-        foreach (array_keys($fields) as $i) {
-            $fields[$i]['canEdit']   = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
-            $fields[$i]['canDelete'] = $fields[$i]['field_config'];
-            $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
-            $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
-            $fieldcategories[$i][]   = $fields[$i];
-            $weights[$i]             = $fields[$i]['field_weight'];
-        }
-        //sort fields order in categories
+		foreach (array_keys($fields) as $i) {
+			$fields[$i]['canEdit']   = $fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit'];
+			$fields[$i]['canDelete'] = $fields[$i]['field_config'];
+			$fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']];
+			$fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']];
+			$fieldcategories[$i][]   = $fields[$i];
+			$weights[$i]             = $fields[$i]['field_weight'];
+		}
+		//sort fields order in categories
 //        ray('$fields', $fields);
-        foreach (array_keys($fields) as $i) {
+		foreach (array_keys($fields) as $i) {
 //            ray('$i = ' . $i)->red();
 //            ray('$weights: <br>' , $weights)->red();
 //            ray('$fieldcategories: <br>' , $fieldcategories)->red();
@@ -95,237 +95,237 @@ 
 //            ray('$categories: <br>', $categories)->red();
 //            ray('$categories[$i]: <br>', $categories[$i])->red();
 
-            array_multisort(
-                $weights
-                ,
-                SORT_ASC
-                ,
-                array_keys($fieldcategories)
-                ,
-                SORT_ASC
-                ,
-                $categories[$i]
-            );
+			array_multisort(
+				$weights
+				,
+				SORT_ASC
+				,
+				array_keys($fieldcategories)
+				,
+				SORT_ASC
+				,
+				$categories[$i]
+			);
 //            ray($i)->blue();
 //            ray('$weights: <br>', $weights)->blue();
 //            ray('$fieldcategories: <br>', $fieldcategories)->blue();
 //            ray(array_keys($fieldcategories))->blue();
 //            ray('Categories: <br>', $categories)->blue();
 //            ray('$categories[$i]: <br>', $categories[$i])->blue();
-        }
+		}
 
-        ksort($categories);
-        $GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
-        $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
-        $template_main = 'songlist_cpanel_fieldlist.tpl';
-        break;
-    case 'new':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        $obj  = $fieldHandler->create();
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'edit':
-        $adminObject = Admin::getInstance();
-        $adminObject->displayNavigation(basename(__FILE__));
-        $obj = $fieldHandler->get($_REQUEST['id']);
-        if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
-            redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-        }
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'reorder':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
+		ksort($categories);
+		$GLOBALS['xoopsTpl']->assign('fieldcategories', $fieldcategories);
+		$GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML());
+		$template_main = 'songlist_cpanel_fieldlist.tpl';
+		break;
+	case 'new':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		$obj  = $fieldHandler->create();
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'edit':
+		$adminObject = Admin::getInstance();
+		$adminObject->displayNavigation(basename(__FILE__));
+		$obj = $fieldHandler->get($_REQUEST['id']);
+		if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+			redirect_header('field.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+		}
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'reorder':
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
 
-        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
-            $oldweight     = $_POST['oldweight'];
-            $oldcat        = $_POST['oldcat'];
-            $oldcategories = $_POST['oldcategories'];
-            $categories    = $_POST['categories'];
-            $weight        = $_POST['weight'];
-            $ids           = [];
-            foreach ($_POST['field_ids'] as $field_id) {
-                if ($oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id] || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id])))) {
-                    //if field has changed
-                    $ids[] = (int)$field_id;
-                }
-            }
-            if (count($ids) > 0) {
-                $errors = [];
-                //if there are changed fields, fetch the fieldcategory objects
-                $fieldHandler = Helper::getInstance()
-                                      ->getHandler('Field');
-                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
-                foreach ($ids as $i) {
-                    $fields[$i]->setVar('field_weight', (int)$weight[$i]);
-                    $fields[$i]->setVar('cids', $categories[$i]);
-                    if (!$fieldHandler->insert($fields[$i])) {
-                        $errors = array_merge($errors, $fields[$i]->getErrors());
-                    }
-                }
-                if (0 == count($errors)) {
-                    //no errors
-                    redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
-                } else {
-                    redirect_header('field.php', 3, implode('<br>', $errors));
-                }
-            }
-        }
-        redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
-        break;
-    case 'save':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $redirect_to_edit = false;
-        if (Request::hasVar('id', 'REQUEST')) {
-            $obj = $fieldHandler->get($_REQUEST['id']);
-            if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
-                redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-            }
-        } else {
-            $obj = $fieldHandler->create();
-            $obj->setVar('field_name', $_REQUEST['field_name']);
-            $obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
-            $obj->setVar('field_show', 1);
-            $obj->setVar('field_edit', 1);
-            $obj->setVar('field_config', 1);
-            $redirect_to_edit = true;
-        }
-        $obj->setVar('field_title', $_REQUEST['field_title']);
-        $obj->setVar('field_description', $_REQUEST['field_description']);
-        if ($obj->getVar('field_config')) {
-            $obj->setVar('field_type', $_REQUEST['field_type']);
-            if (Request::hasVar('field_valuetype', 'REQUEST')) {
-                $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
-            }
-            $options = $obj->getVar('field_options');
+		if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
+			$oldweight     = $_POST['oldweight'];
+			$oldcat        = $_POST['oldcat'];
+			$oldcategories = $_POST['oldcategories'];
+			$categories    = $_POST['categories'];
+			$weight        = $_POST['weight'];
+			$ids           = [];
+			foreach ($_POST['field_ids'] as $field_id) {
+				if ($oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id] || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id])))) {
+					//if field has changed
+					$ids[] = (int)$field_id;
+				}
+			}
+			if (count($ids) > 0) {
+				$errors = [];
+				//if there are changed fields, fetch the fieldcategory objects
+				$fieldHandler = Helper::getInstance()
+									  ->getHandler('Field');
+				$fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
+				foreach ($ids as $i) {
+					$fields[$i]->setVar('field_weight', (int)$weight[$i]);
+					$fields[$i]->setVar('cids', $categories[$i]);
+					if (!$fieldHandler->insert($fields[$i])) {
+						$errors = array_merge($errors, $fields[$i]->getErrors());
+					}
+				}
+				if (0 == count($errors)) {
+					//no errors
+					redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
+				} else {
+					redirect_header('field.php', 3, implode('<br>', $errors));
+				}
+			}
+		}
+		redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
+		break;
+	case 'save':
+		if (!$GLOBALS['xoopsSecurity']->check()) {
+			redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+		}
+		$redirect_to_edit = false;
+		if (Request::hasVar('id', 'REQUEST')) {
+			$obj = $fieldHandler->get($_REQUEST['id']);
+			if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist
+				redirect_header('fields.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+			}
+		} else {
+			$obj = $fieldHandler->create();
+			$obj->setVar('field_name', $_REQUEST['field_name']);
+			$obj->setVar('field_moduleid', $GLOBALS['songlistModule']->getVar('mid'));
+			$obj->setVar('field_show', 1);
+			$obj->setVar('field_edit', 1);
+			$obj->setVar('field_config', 1);
+			$redirect_to_edit = true;
+		}
+		$obj->setVar('field_title', $_REQUEST['field_title']);
+		$obj->setVar('field_description', $_REQUEST['field_description']);
+		if ($obj->getVar('field_config')) {
+			$obj->setVar('field_type', $_REQUEST['field_type']);
+			if (Request::hasVar('field_valuetype', 'REQUEST')) {
+				$obj->setVar('field_valuetype', $_REQUEST['field_valuetype']);
+			}
+			$options = $obj->getVar('field_options');
 
-            if (Request::hasVar('removeOptions', 'REQUEST') && is_array($_REQUEST['removeOptions'])) {
-                foreach ($_REQUEST['removeOptions'] as $index) {
-                    unset($options[$index]);
-                }
-                $redirect_to_edit = true;
-            }
+			if (Request::hasVar('removeOptions', 'REQUEST') && is_array($_REQUEST['removeOptions'])) {
+				foreach ($_REQUEST['removeOptions'] as $index) {
+					unset($options[$index]);
+				}
+				$redirect_to_edit = true;
+			}
 
-            if (Request::hasVar('addOption', 'REQUEST')) {
-                foreach ($_REQUEST['addOption'] as $option) {
-                    if (empty($option['value'])) {
-                        continue;
-                    }
-                    $options[$option['key']] = $option['value'];
-                    $redirect_to_edit        = true;
-                }
-            }
-            $obj->setVar('field_options', $options);
-        }
-        if ($obj->getVar('field_edit')) {
-            $required = Request::getInt('field_required', 0, 'REQUEST');
-            $obj->setVar('field_required', $required); //0 = no, 1 = yes
-            if (Request::hasVar('field_maxlength', 'REQUEST')) {
-                $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
-            }
-            if (Request::hasVar('field_default', 'REQUEST')) {
-                $field_default = $obj->getValueForSave($_REQUEST['field_default']);
-                //Check for multiple selections
-                if (is_array($field_default)) {
-                    $obj->setVar('field_default', serialize($field_default));
-                } else {
-                    $obj->setVar('field_default', $field_default);
-                }
-            }
-        }
+			if (Request::hasVar('addOption', 'REQUEST')) {
+				foreach ($_REQUEST['addOption'] as $option) {
+					if (empty($option['value'])) {
+						continue;
+					}
+					$options[$option['key']] = $option['value'];
+					$redirect_to_edit        = true;
+				}
+			}
+			$obj->setVar('field_options', $options);
+		}
+		if ($obj->getVar('field_edit')) {
+			$required = Request::getInt('field_required', 0, 'REQUEST');
+			$obj->setVar('field_required', $required); //0 = no, 1 = yes
+			if (Request::hasVar('field_maxlength', 'REQUEST')) {
+				$obj->setVar('field_maxlength', $_REQUEST['field_maxlength']);
+			}
+			if (Request::hasVar('field_default', 'REQUEST')) {
+				$field_default = $obj->getValueForSave($_REQUEST['field_default']);
+				//Check for multiple selections
+				if (is_array($field_default)) {
+					$obj->setVar('field_default', serialize($field_default));
+				} else {
+					$obj->setVar('field_default', $field_default);
+				}
+			}
+		}
 
-        $obj->setVar('field_weight', $_REQUEST['field_weight']);
-        $obj->setVar('cids', $_REQUEST['cids']);
+		$obj->setVar('field_weight', $_REQUEST['field_weight']);
+		$obj->setVar('cids', $_REQUEST['cids']);
 
-        if ($fieldHandler->insert($obj)) {
-            /** @var \XoopsGroupPermHandler $grouppermHandler */
-            $grouppermHandler = xoops_getHandler('groupperm');
+		if ($fieldHandler->insert($obj)) {
+			/** @var \XoopsGroupPermHandler $grouppermHandler */
+			$grouppermHandler = xoops_getHandler('groupperm');
 
-            $perm_arr = [];
-            if ($obj->getVar('field_show')) {
-                $perm_arr[] = 'songlist_show';
-                $perm_arr[] = 'songlist_visible';
-            }
-            if ($obj->getVar('field_edit')) {
-                $perm_arr[] = 'songlist_edit';
-            }
-            if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
-                $perm_arr[] = 'songlist_search';
-            }
-            if (count($perm_arr) > 0) {
-                foreach ($perm_arr as $perm) {
-                    $criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
-                    $criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
-                    $criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
-                    if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
-                        $perms = $grouppermHandler->getObjects($criteria);
-                        if (count($perms) > 0) {
-                            foreach (array_keys($perms) as $i) {
-                                $groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
-                            }
-                        } else {
-                            $groups = [];
-                        }
-                        foreach ($_REQUEST[$perm] as $grouoid) {
-                            $grouoid = (int)$grouoid;
-                            if (!isset($groups[$grouoid])) {
-                                $perm_obj = $grouppermHandler->create();
-                                $perm_obj->setVar('gperm_name', $perm);
-                                $perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
-                                $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
-                                $perm_obj->setVar('gperm_groupid', $grouoid);
-                                $grouppermHandler->insert($perm_obj);
-                                unset($perm_obj);
-                            }
-                        }
-                        $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
-                        if (count($removed_groups) > 0) {
-                            $criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $removed_groups) . ')', 'IN'));
-                            $grouppermHandler->deleteAll($criteria);
-                        }
-                        unset($groups);
-                    } else {
-                        $grouppermHandler->deleteAll($criteria);
-                    }
-                    unset($criteria);
-                }
-            }
-            $url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
-            redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
-        }
+			$perm_arr = [];
+			if ($obj->getVar('field_show')) {
+				$perm_arr[] = 'songlist_show';
+				$perm_arr[] = 'songlist_visible';
+			}
+			if ($obj->getVar('field_edit')) {
+				$perm_arr[] = 'songlist_edit';
+			}
+			if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
+				$perm_arr[] = 'songlist_search';
+			}
+			if (count($perm_arr) > 0) {
+				foreach ($perm_arr as $perm) {
+					$criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
+					$criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
+					$criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
+					if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
+						$perms = $grouppermHandler->getObjects($criteria);
+						if (count($perms) > 0) {
+							foreach (array_keys($perms) as $i) {
+								$groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
+							}
+						} else {
+							$groups = [];
+						}
+						foreach ($_REQUEST[$perm] as $grouoid) {
+							$grouoid = (int)$grouoid;
+							if (!isset($groups[$grouoid])) {
+								$perm_obj = $grouppermHandler->create();
+								$perm_obj->setVar('gperm_name', $perm);
+								$perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
+								$perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
+								$perm_obj->setVar('gperm_groupid', $grouoid);
+								$grouppermHandler->insert($perm_obj);
+								unset($perm_obj);
+							}
+						}
+						$removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
+						if (count($removed_groups) > 0) {
+							$criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $removed_groups) . ')', 'IN'));
+							$grouppermHandler->deleteAll($criteria);
+						}
+						unset($groups);
+					} else {
+						$grouppermHandler->deleteAll($criteria);
+					}
+					unset($criteria);
+				}
+			}
+			$url = $redirect_to_edit ? 'field.php?op=edit&amp;id=' . $obj->getVar('field_id') : 'field.php';
+			redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
+		}
 
-        echo $obj->getHtmlErrors();
-        $form = FormController::getFieldForm($obj);
-        $form->display();
-        break;
-    case 'delete':
-        $obj = $fieldHandler->get($_REQUEST['id']);
-        if (!$obj->getVar('field_config')) {
-            redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
-        }
-        if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            if ($fieldHandler->delete($obj)) {
-                redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
-            } else {
-                echo $obj->getHtmlErrors();
-            }
-        } else {
-            xoops_confirm(['ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
-        }
-        break;
+		echo $obj->getHtmlErrors();
+		$form = FormController::getFieldForm($obj);
+		$form->display();
+		break;
+	case 'delete':
+		$obj = $fieldHandler->get($_REQUEST['id']);
+		if (!$obj->getVar('field_config')) {
+			redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
+		}
+		if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			if ($fieldHandler->delete($obj)) {
+				redirect_header('field.php', 3, sprintf(_AM_SONGLIST_FIELDS_DELETEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
+			} else {
+				echo $obj->getHtmlErrors();
+			}
+		} else {
+			xoops_confirm(['ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'], $_SERVER['REQUEST_URI'], sprintf(_AM_SONGLIST_FIELDS_RUSUREDEL, $obj->getVar('field_title')));
+		}
+		break;
 }
 
 if (isset($template_main)) {
-    $GLOBALS['xoopsTpl']->display("db:{$template_main}");
+	$GLOBALS['xoopsTpl']->display("db:{$template_main}");
 }
 
 xoops_cp_footer();

Spacing +19 added lines, -19 removed lines

@@ -5,7 +5,7 @@ 
 use XoopsModules\Songlist\Helper;
 use XoopsModules\Songlist\Form\FormController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_cp_header();
 
 $op           = (!empty($_GET['op']) ? $_GET['op'] : (!empty($_POST['op']) ? $_POST['op'] : (!empty($_REQUEST['id']) ? 'edit' : 'list')));
@@ -36,7 +36,7 @@ 
             unset($criteria);
 
             $categories[0] = ['cid' => 0, 'name' => _AM_SONGLIST_FIELDS_DEFAULT];
-            if (count($category) > 0) {
+            if (count($category)>0) {
                 foreach (array_keys($category) as $i) {
                     $categories[$category[$i]->getVar('cid')] = ['cid' => $category[$i]->getVar('cid'), 'name' => $category[$i]->getVar('name')];
                 }
@@ -141,7 +141,7 @@ 
             redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
         }
 
-        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids']) > 0) {
+        if (Request::hasVar('field_ids', 'POST') && count($_POST['field_ids'])>0) {
             $oldweight     = $_POST['oldweight'];
             $oldcat        = $_POST['oldcat'];
             $oldcategories = $_POST['oldcategories'];
@@ -149,25 +149,25 @@ 
             $weight        = $_POST['weight'];
             $ids           = [];
             foreach ($_POST['field_ids'] as $field_id) {
-                if ($oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id] || count($oldcategories[$field_id]) != count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id])))) {
+                if ($oldweight[$field_id]!=$weight[$field_id] || $oldcat[$field_id]!=$category[$field_id] || count($oldcategories[$field_id])!=count(array_unique(array_merge($categories[$field_id], $oldcategories[$field_id])))) {
                     //if field has changed
-                    $ids[] = (int)$field_id;
+                    $ids[] = (int) $field_id;
                 }
             }
-            if (count($ids) > 0) {
+            if (count($ids)>0) {
                 $errors = [];
                 //if there are changed fields, fetch the fieldcategory objects
                 $fieldHandler = Helper::getInstance()
                                       ->getHandler('Field');
-                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '(' . implode(',', $ids) . ')', 'IN'), true);
+                $fields       = $fieldHandler->getObjects(new \Criteria('field_id', '('.implode(',', $ids).')', 'IN'), true);
                 foreach ($ids as $i) {
-                    $fields[$i]->setVar('field_weight', (int)$weight[$i]);
+                    $fields[$i]->setVar('field_weight', (int) $weight[$i]);
                     $fields[$i]->setVar('cids', $categories[$i]);
                     if (!$fieldHandler->insert($fields[$i])) {
                         $errors = array_merge($errors, $fields[$i]->getErrors());
                     }
                 }
-                if (0 == count($errors)) {
+                if (0==count($errors)) {
                     //no errors
                     redirect_header('field.php', 2, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELDS));
                 } else {
@@ -258,14 +258,14 @@ 
             if ($obj->getVar('field_edit') || $obj->getVar('field_show')) {
                 $perm_arr[] = 'songlist_search';
             }
-            if (count($perm_arr) > 0) {
+            if (count($perm_arr)>0) {
                 foreach ($perm_arr as $perm) {
                     $criteria = new \CriteriaCompo(new \Criteria('gperm_name', $perm));
-                    $criteria->add(new \Criteria('gperm_itemid', (int)$obj->getVar('field_id')));
-                    $criteria->add(new \Criteria('gperm_modid', (int)$GLOBALS['songlistModule']->getVar('mid')));
+                    $criteria->add(new \Criteria('gperm_itemid', (int) $obj->getVar('field_id')));
+                    $criteria->add(new \Criteria('gperm_modid', (int) $GLOBALS['songlistModule']->getVar('mid')));
                     if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) {
                         $perms = $grouppermHandler->getObjects($criteria);
-                        if (count($perms) > 0) {
+                        if (count($perms)>0) {
                             foreach (array_keys($perms) as $i) {
                                 $groups[$perms[$i]->getVar('gperm_groupid')] = $perms[$i];
                             }
@@ -273,11 +273,11 @@ 
                             $groups = [];
                         }
                         foreach ($_REQUEST[$perm] as $grouoid) {
-                            $grouoid = (int)$grouoid;
+                            $grouoid = (int) $grouoid;
                             if (!isset($groups[$grouoid])) {
                                 $perm_obj = $grouppermHandler->create();
                                 $perm_obj->setVar('gperm_name', $perm);
-                                $perm_obj->setVar('gperm_itemid', (int)$obj->getVar('field_id'));
+                                $perm_obj->setVar('gperm_itemid', (int) $obj->getVar('field_id'));
                                 $perm_obj->setVar('gperm_modid', $GLOBALS['songlistModule']->getVar('mid'));
                                 $perm_obj->setVar('gperm_groupid', $grouoid);
                                 $grouppermHandler->insert($perm_obj);
@@ -285,8 +285,8 @@ 
                             }
                         }
                         $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]);
-                        if (count($removed_groups) > 0) {
-                            $criteria->add(new \Criteria('gperm_groupid', '(' . implode(',', $removed_groups) . ')', 'IN'));
+                        if (count($removed_groups)>0) {
+                            $criteria->add(new \Criteria('gperm_groupid', '('.implode(',', $removed_groups).')', 'IN'));
                             $grouppermHandler->deleteAll($criteria);
                         }
                         unset($groups);
@@ -296,7 +296,7 @@ 
                     unset($criteria);
                 }
             }
-            $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php';
+            $url = $redirect_to_edit ? 'field.php?op=edit&id='.$obj->getVar('field_id') : 'field.php';
             redirect_header($url, 3, sprintf(_AM_SONGLIST_FIELDS_SAVEDSUCCESS, _AM_SONGLIST_FIELDS_FIELD));
         }
 
@@ -309,7 +309,7 @@ 
         if (!$obj->getVar('field_config')) {
             redirect_header('index.php', 2, _AM_SONGLIST_FIELDS_FIELDNOTCONFIGURABLE);
         }
-        if (Request::hasVar('ok', 'REQUEST') && 1 == $_REQUEST['ok']) {
+        if (Request::hasVar('ok', 'REQUEST') && 1==$_REQUEST['ok']) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }