XoopsModules25x / songlist

blocks/songlist_popular_albums.php

Spacing +2 added lines, -2 removed lines

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

blocks/songlist_popular_genres.php

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_songs.php

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

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

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

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

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

admin/migrate.php

Spacing +6 added lines, -6 removed lines

@@ -32,7 +32,7 @@ 
 /** @var Configurator $configurator */
 /** @var Migrate $migrator */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -74,27 +74,27 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
         break;
     case 'migrate':
         $migrator->synchronizeSchema();
-        $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_OK');
+        $message = constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_OK');
         break;
     case 'schema':
-        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_WARNING'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'));
+        xoops_confirm(['op' => 'confirmwrite'], 'migrate.php', constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_WARNING'), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'));
         break;
     case 'confirmwrite':
         if ($GLOBALS['xoopsSecurity']->check()) {
             $migrator->saveCurrentSchema();
 
-            $message = constant('CO_' . $moduleDirNameUpper . '_' . 'MIGRATE_SCHEMA_OK');
+            $message = constant('CO_'.$moduleDirNameUpper.'_'.'MIGRATE_SCHEMA_OK');
         }
         break;
 }
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/artists.php

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\ArtistsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -17,8 +17,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:
@@ -34,14 +34,14 @@ 
 
                 $criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $artistsHandler->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 ($artistsHandler->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='
@@ -51,16 +51,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', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -72,7 +72,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $artistsArray = $artistsHandler->getObjects($criteria, true);
@@ -113,17 +113,17 @@ 
                 $artist->setVars($_POST[$id]);
 
                 if (!$id = $artistsHandler->insert($artist)) {
-                    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_ARTISTS_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_ARTISTS_FAILEDTOSAVE);
                     exit(0);
                 }
-                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_ARTISTS_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_ARTISTS_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_ARTISTS_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -135,14 +135,14 @@ 
                     $artist->setVars($_POST[$id]);
                     if (!$artistsHandler->insert($artist)) {
                         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_ARTISTS_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_ARTISTS_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_ARTISTS_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -152,13 +152,13 @@ 
                     $artist = $artistsHandler->get($id);
                     if (!$artistsHandler->delete($artist)) {
                         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_ARTISTS_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_ARTISTS_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_ARTISTS_DELETED);
                     exit(0);
                 }
                 $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));