XoopsModules25x / songlist

xoops_version.php

Spacing +32 added lines, -32 removed lines

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

admin/songs.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 
 /** @var Songs $songs */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -23,8 +23,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:
@@ -40,14 +40,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='
@@ -57,16 +57,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']);
@@ -78,7 +78,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);
@@ -121,7 +121,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) {
@@ -143,11 +143,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__));
@@ -156,10 +156,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__));
@@ -169,7 +169,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);
@@ -177,19 +177,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);
 
@@ -201,7 +201,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) {
@@ -223,11 +223,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__));
@@ -236,10 +236,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__));
@@ -250,14 +250,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':
@@ -267,13 +267,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/artists.php

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Artists $artist */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -22,8 +22,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:
@@ -39,14 +39,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='
@@ -56,16 +56,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']);
@@ -77,7 +77,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);
@@ -118,17 +118,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);
 
@@ -140,14 +140,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':
@@ -157,13 +157,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'));

admin/utf8map.php

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Utf8map $utf8map */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -22,8 +22,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:
@@ -39,14 +39,14 @@ 
 
                 $criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $utf8mapHandler->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 ($utf8mapHandler->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='
@@ -56,16 +56,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', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -77,7 +77,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $utf8maps = $utf8mapHandler->getObjects($criteria, true);
@@ -118,17 +118,17 @@ 
                 $utf8map->setVars($_POST[$id]);
 
                 if (!$id = $utf8mapHandler->insert($utf8map)) {
-                    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_UTF8MAP_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_UTF8MAP_FAILEDTOSAVE);
                     exit(0);
                 }
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+                if ('new'===$_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_UTF8MAP_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_UTF8MAP_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_UTF8MAP_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -140,14 +140,14 @@ 
                     $utf8map->setVars($_POST[$id]);
                     if (!$utf8mapHandler->insert($utf8map)) {
                         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_UTF8MAP_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_UTF8MAP_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_UTF8MAP_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -157,13 +157,13 @@ 
                     $utf8map = $utf8mapHandler->get($id);
                     if (!$utf8mapHandler->delete($utf8map)) {
                         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_UTF8MAP_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_UTF8MAP_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_UTF8MAP_DELETED);
                     exit(0);
                 }
                 $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/export.php

Spacing +49 added lines, -49 removed lines

@@ -7,7 +7,7 @@ 
 use XoopsModules\Songlist\AlbumsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -18,8 +18,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';
 
 $albumsHandler = Helper::getInstance()->getHandler('Albums');
 $songsHandler    = Helper::getInstance()->getHandler('Songs');
@@ -34,7 +34,7 @@ 
             default:
             case 'actiona':
                 if (Request::hasVar('xmlfile', 'SESSION')) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $_SESSION['xmlfile'] . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$_SESSION['xmlfile'].'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                 }
                 $adminObject = Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -61,27 +61,27 @@ 
                     $uploader = new Uploader(
                         $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
                         ['application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'],
-                        1024 * 1024 * 32,
+                        1024*1024*32,
                         0,
                         0,
                         ['xml']
                     );
                     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('xmlfile')) {
                         if (!$uploader->upload()) {
                             echo $uploader->getErrors();
-                            require __DIR__ . '/admin_footer.php';
+                            require __DIR__.'/admin_footer.php';
                             exit(0);
                         }
                         $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $uploader->getSavedFileName() . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                        redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$uploader->getSavedFileName().'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                     } else {
                         echo $uploader->getErrors();
-                        require __DIR__ . '/admin_footer.php';
+                        require __DIR__.'/admin_footer.php';
                         exit(0);
                     }
                 }
@@ -96,22 +96,22 @@ 
                 break;
             case 'import':
 
-                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
-                $mb       = floor($filesize / 1024 / 1024);
-                if ($mb > 32) {
-                    ini_set('memory_limit', ($mb + 128) . 'M');
+                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
+                $mb       = floor($filesize/1024/1024);
+                if ($mb>32) {
+                    ini_set('memory_limit', ($mb+128).'M');
                 }
                 set_time_limit(3600);
 
-                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])), false, 'tag');
+                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag');
 
-                if (mb_strlen($_POST['collection']) > 0) {
+                if (mb_strlen($_POST['collection'])>0) {
                     foreach ($xmlarray[$_POST['collection']] as $id => $record) {
                         foreach ($record as $recid => $data) {
                             $gid = 0;
-                            if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+                            if (mb_strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                                if ($genreHandler->getCount($criteria) > 0) {
+                                if ($genreHandler->getCount($criteria)>0) {
                                     $objects = $genreHandler->getObjects($criteria, false);
                                     $gid     = $objects[0]->getVar('gid');
                                 } else {
@@ -122,9 +122,9 @@ 
                             }
 
                             $vid = 0;
-                            if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+                            if (mb_strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                                if ($voiceHandler->getCount($criteria) > 0) {
+                                if ($voiceHandler->getCount($criteria)>0) {
                                     $objects = $voiceHandler->getObjects($criteria, false);
                                     $gid     = $objects[0]->getVar('vid');
                                 } else {
@@ -135,9 +135,9 @@ 
                             }
 
                             $cid = 0;
-                            if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+                            if (mb_strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['category']]);
-                                if ($categoryHandler->getCount($criteria) > 0) {
+                                if ($categoryHandler->getCount($criteria)>0) {
                                     $objects = $categoryHandler->getObjects($criteria, false);
                                     $cid     = $objects[0]->getVar('cid');
                                 } else {
@@ -147,10 +147,10 @@ 
                                 }
                             }
                             $aids = [];
-                            if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+                            if (mb_strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
                                 foreach (explode(',', $data[$_POST['artist']]) as $artist) {
                                     $criteria = new \Criteria('name', $artist);
-                                    if ($artistsHandler->getCount($criteria) > 0) {
+                                    if ($artistsHandler->getCount($criteria)>0) {
                                         $objects                          = $artistsHandler->getObjects($criteria, false);
                                         $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                     } else {
@@ -171,9 +171,9 @@ 
                                 }
                             }
                             $abid = 0;
-                            if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+                            if (mb_strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
                                 $criteria = new \Criteria('name', $data[$_POST['album']]);
-                                if ($albumsHandler->getCount($criteria) > 0) {
+                                if ($albumsHandler->getCount($criteria)>0) {
                                     $objects = $albumsHandler->getObjects($criteria, false);
                                     $abid    = $objects[0]->getVar('aid');
                                 } else {
@@ -185,30 +185,30 @@ 
                                 }
                             }
                             $sid = 0;
-                            if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+                            if (mb_strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
                                 $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                                if ($songsHandler->getCount($criteria) > 0) {
+                                if ($songsHandler->getCount($criteria)>0) {
                                     $objects = $songsHandler->getObjects($criteria, false);
                                     $object  = $objects[0]->getVar('sid');
                                 } else {
                                     $object = $songsHandler->create();
                                 }
-                                if ($object->getVar('cid') > 0 && $cid > 0) {
+                                if ($object->getVar('cid')>0 && $cid>0) {
                                     $object->setVar('cid', $cid);
                                 } else {
                                     $object->setVar('cid', $cid);
                                 }
-                                if ($object->getVar('gid') > 0 && $gid > 0) {
+                                if ($object->getVar('gid')>0 && $gid>0) {
                                     $object->setVar('gid', $gid);
                                 } else {
                                     $object->setVar('gid', $gid);
                                 }
-                                if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
+                                if (count($object->getVar('aids'))>0 && count($aids)>0) {
                                     $object->setVar('aids', $aids);
                                 } else {
                                     $object->setVar('aids', $aids);
                                 }
-                                if ($object->getVar('abid') > 0 && $abid > 0) {
+                                if ($object->getVar('abid')>0 && $abid>0) {
                                     $object->setVar('abid', $abid);
                                 } else {
                                     $object->setVar('abid', $abid);
@@ -223,9 +223,9 @@ 
                 } else {
                     foreach ($xmlarray as $recid => $data) {
                         $gid = 0;
-                        if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+                        if (mb_strlen($_POST['genre'])>0 && !empty($data[$_POST['genre']])) {
                             $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                            if ($genreHandler->getCount($criteria) > 0) {
+                            if ($genreHandler->getCount($criteria)>0) {
                                 $objects = $genreHandler->getObjects($criteria, false);
                                 $gid     = $objects[0]->getVar('gid');
                             } else {
@@ -235,9 +235,9 @@ 
                             }
                         }
                         $vid = 0;
-                        if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+                        if (mb_strlen($_POST['voice'])>0 && !empty($data[$_POST['voice']])) {
                             $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                            if ($voiceHandler->getCount($criteria) > 0) {
+                            if ($voiceHandler->getCount($criteria)>0) {
                                 $objects = $voiceHandler->getObjects($criteria, false);
                                 $gid     = $objects[0]->getVar('vid');
                             } else {
@@ -247,9 +247,9 @@ 
                             }
                         }
                         $cid = 0;
-                        if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+                        if (mb_strlen($_POST['category'])>0 && !empty($data[$_POST['category']])) {
                             $criteria = new \Criteria('name', $data[$_POST['category']]);
-                            if ($categoryHandler->getCount($criteria) > 0) {
+                            if ($categoryHandler->getCount($criteria)>0) {
                                 $objects = $categoryHandler->getObjects($criteria, false);
                                 $cid     = $objects[0]->getVar('cid');
                             } else {
@@ -259,10 +259,10 @@ 
                             }
                         }
                         $aids = [];
-                        if (mb_strlen($_POST['artist']) > 0 && !empty($data[$_POST['artist']])) {
+                        if (mb_strlen($_POST['artist'])>0 && !empty($data[$_POST['artist']])) {
                             foreach (explode(',', $data[$_POST['artist']]) as $artist) {
                                 $criteria = new \Criteria('name', $artist);
-                                if ($artistsHandler->getCount($criteria) > 0) {
+                                if ($artistsHandler->getCount($criteria)>0) {
                                     $objects                          = $artistsHandler->getObjects($criteria, false);
                                     $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                 } else {
@@ -283,9 +283,9 @@ 
                             }
                         }
                         $abid = 0;
-                        if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+                        if (mb_strlen($_POST['album'])>0 && !empty($data[$_POST['album']])) {
                             $criteria = new \Criteria('name', $data[$_POST['album']]);
-                            if ($albumsHandler->getCount($criteria) > 0) {
+                            if ($albumsHandler->getCount($criteria)>0) {
                                 $objects = $albumsHandler->getObjects($criteria, false);
                                 $abid    = $objects[0]->getVar('aid');
                             } else {
@@ -297,30 +297,30 @@ 
                             }
                         }
                         $sid = 0;
-                        if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+                        if (mb_strlen($_POST['songid'])>0 && !empty($data[$_POST['songid']])) {
                             $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                            if ($songsHandler->getCount($criteria) > 0) {
+                            if ($songsHandler->getCount($criteria)>0) {
                                 $objects = $songsHandler->getObjects($criteria, false);
                                 $object  = $objects[0]->getVar('sid');
                             } else {
                                 $object = $songsHandler->create();
                             }
-                            if ($object->getVar('cid') > 0 && $cid > 0) {
+                            if ($object->getVar('cid')>0 && $cid>0) {
                                 $object->setVar('cid', $cid);
                             } else {
                                 $object->setVar('cid', $cid);
                             }
-                            if ($object->getVar('gid') > 0 && $gid > 0) {
+                            if ($object->getVar('gid')>0 && $gid>0) {
                                 $object->setVar('gid', $gid);
                             } else {
                                 $object->setVar('gid', $gid);
                             }
-                            if (count($object->getVar('aids')) > 0 && count($aids) > 0) {
+                            if (count($object->getVar('aids'))>0 && count($aids)>0) {
                                 $object->setVar('aids', $aids);
                             } else {
                                 $object->setVar('aids', $aids);
                             }
-                            if ($object->getVar('abid') > 0 && $abid > 0) {
+                            if ($object->getVar('abid')>0 && $abid>0) {
                                 $object->setVar('abid', $abid);
                             } else {
                                 $object->setVar('abid', $abid);
@@ -332,9 +332,9 @@ 
                         }
                     }
                 }
-                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
+                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
                 unset($_SESSION['xmlfile']);
-                redirect_header($_SERVER['SCRIPT_NAME'] . '&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
+                redirect_header($_SERVER['SCRIPT_NAME'].'&op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
                 break;
         }
         break;

admin/category.php

Spacing +22 added lines, -22 removed lines

@@ -12,7 +12,7 @@ 
 
 /** @var Category $category */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -23,8 +23,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:
@@ -40,14 +40,14 @@ 
 
                 $criteria        = $categoryHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $categoryHandler->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 ($categoryHandler->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='
@@ -57,16 +57,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', $categoryHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $categoryHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -78,7 +78,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $categorys = $categoryHandler->getObjects($criteria, true);
@@ -119,7 +119,7 @@ 
                 $category->setVars($_POST[$id]);
 
                 if (!$id = $categoryHandler->insert($category)) {
-                    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_CATEGORY_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_CATEGORY_FAILEDTOSAVE);
                     exit(0);
                 }
                 if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
@@ -145,7 +145,7 @@ 
                         explode('|', $GLOBALS['songlistModuleConfig']['allowed_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) {
                     }
 
@@ -154,11 +154,11 @@ 
                             $adminObject = Admin::getInstance();
                             $adminObject->displayNavigation(basename(__FILE__));
                             echo $uploader->getErrors();
-                            require __DIR__ . '/admin_footer.php';
+                            require __DIR__.'/admin_footer.php';
                             exit(0);
                         }
                         if (mb_strlen($category->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($category->getVar('path')) . $category->getVar('image'));
+                            unlink($GLOBALS['xoops']->path($category->getVar('path')).$category->getVar('image'));
                         }
 
                         $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
@@ -168,19 +168,19 @@ 
                         $adminObject = Admin::getInstance();
                         $adminObject->displayNavigation(basename(__FILE__));
                         echo $uploader->getErrors();
-                        require __DIR__ . '/admin_footer.php';
+                        require __DIR__.'/admin_footer.php';
                         exit(0);
                     }
                 }
 
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+                if ('new'===$_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_CATEGORY_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_CATEGORY_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_CATEGORY_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -192,14 +192,14 @@ 
                     $category->setVars($_POST[$id]);
                     if (!$categoryHandler->insert($category)) {
                         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_CATEGORY_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_CATEGORY_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_CATEGORY_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -209,13 +209,13 @@ 
                     $category = $categoryHandler->get($id);
                     if (!$categoryHandler->delete($category)) {
                         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_CATEGORY_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_CATEGORY_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_CATEGORY_DELETED);
                     exit(0);
                 }
                 $category = $categoryHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/voice.php

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Voice $voice */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -22,8 +22,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:
@@ -39,14 +39,14 @@ 
 
                 $criteria        = $voiceHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $voiceHandler->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 ($voiceHandler->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='
@@ -56,16 +56,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', $voiceHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $voiceHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -77,7 +77,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $voices = $voiceHandler->getObjects($criteria, true);
@@ -118,17 +118,17 @@ 
                 $voice->setVars($_POST[$id]);
 
                 if (!$id = $voiceHandler->insert($voice)) {
-                    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_VOICE_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_VOICE_FAILEDTOSAVE);
                     exit(0);
                 }
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+                if ('new'===$_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_VOICE_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_VOICE_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_VOICE_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -140,14 +140,14 @@ 
                     $voice->setVars($_POST[$id]);
                     if (!$voiceHandler->insert($voice)) {
                         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_VOICE_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_VOICE_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_VOICE_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -157,13 +157,13 @@ 
                     $voice = $voiceHandler->get($id);
                     if (!$voiceHandler->delete($voice)) {
                         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_VOICE_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_VOICE_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_VOICE_DELETED);
                     exit(0);
                 }
                 $voice = $voiceHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/import.php

Spacing +104 added lines, -104 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\Uploader;
 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  = $_REQUEST['order'] ?? 'DESC';
-$sort   = isset($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = isset($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = isset($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = isset($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 $file = '';
 
 switch ($op) {
@@ -28,7 +28,7 @@ 
             default:
             case 'actiona':
                 if (Request::hasVar('xmlfile', 'SESSION')) {
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $_SESSION['xmlfile'] . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$_SESSION['xmlfile'].'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                 }
                 $adminObject = Admin::getInstance();
                 $adminObject->displayNavigation(basename(__FILE__));
@@ -38,14 +38,14 @@ 
                 $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
                 break;
             case 'upload':
-                if ('' != $_POST['file']) {
+                if (''!=$_POST['file']) {
                     try {
-                        $file = mb_substr(md5((string)microtime(true)), random_int(0, 20), 13) . '.xml';
+                        $file = mb_substr(md5((string) microtime(true)), random_int(0, 20), 13).'.xml';
                     } catch (Exception $e) {
                     }
-                    copy($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']) . $_POST['file'], $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']) . $file);
+                    copy($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$_POST['file'], $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']).$file);
                     $_SESSION['xmlfile'] = $file;
-                    redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $file . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_COPIED);
+                    redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$file.'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_COPIED);
                 } elseif (Request::hasVar('xmlfile', 'FILES') && mb_strlen($_FILES['xmlfile']['name'])) {
 //                    if (!is_dir($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']))) {
 //                        foreach (explode('\\', $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $folders) {
@@ -62,13 +62,13 @@ 
                     $uploader = new Uploader(
                         $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
                         ['application/xml', 'text/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity', 'text/xml xml xsl', 'text/xml-external-parsed-entity'],
-                        1024 * 1024 * 1024 * 32,
+                        1024*1024*1024*32,
                         0,
                         0,
                         ['xml']
                     );
                     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) {
                     }
 
@@ -81,7 +81,7 @@ 
                             exit(0);
                         }
                         $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        redirect_header($_SERVER['SCRIPT_NAME'] . '?file=' . $uploader->getSavedFileName() . '&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
+                        redirect_header($_SERVER['SCRIPT_NAME'].'?file='.$uploader->getSavedFileName().'&op=import&fct=actionb', 10, _AM_SONGLIST_XMLFILE_UPLOADED);
                     } else {
                         $adminObject = Admin::getInstance();
                         $adminObject->displayNavigation(basename(__FILE__));
@@ -113,27 +113,27 @@ 
                 $voiceHandler    = Helper::getInstance()->getHandler('Voice');
                 $categoryHandler = Helper::getInstance()->getHandler('Category');
 
-                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
-                $mb       = floor($filesize / 1024 / 1024);
-                if ($mb > 32) {
-                    ini_set('memory_limit', ($mb + 128) . 'M');
+                $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
+                $mb       = floor($filesize/1024/1024);
+                if ($mb>32) {
+                    ini_set('memory_limit', ($mb+128).'M');
                 }
 
                 $record = 0;
 
                 set_time_limit(3600);
 
-                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])), false, 'tag');
+                $xmlarray = Utility::xml2array(file_get_contents($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])), false, 'tag');
 
-                if (!empty($_POST['collection']) && mb_strlen($_POST['collection']) > 0) {
-                    if (!empty($_POST['record']) && mb_strlen($_POST['record']) > 0) {
+                if (!empty($_POST['collection']) && mb_strlen($_POST['collection'])>0) {
+                    if (!empty($_POST['record']) && mb_strlen($_POST['record'])>0) {
                         foreach ($xmlarray[$_POST['collection']][$_POST['record']] as $recid => $data) {
                             if (Request::hasVar('limiting', 'POST')) {
-                                if (true === Request::getInt('limiting', 0, 'POST')) {
+                                if (true===Request::getInt('limiting', 0, 'POST')) {
                                     ++$record;
-                                    if ($record > Request::getInt('records', 0, 'POST')) {
+                                    if ($record>Request::getInt('records', 0, 'POST')) {
                                         $start = time();
-                                        while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+                                        while (time()-$start<Request::getInt('wait', 0, 'POST')) {
                                         }
                                         $records = 0;
                                     }
@@ -141,11 +141,11 @@ 
                             }
                             $gid  = 0;
                             $gids = [];
-                            if (!empty($_POST['genre']) && mb_strlen($_POST['genre']) > 1) {
-                                if (isset($data[$_POST['genre']]) && '' != trim($_POST['genre'])) {
+                            if (!empty($_POST['genre']) && mb_strlen($_POST['genre'])>1) {
+                                if (isset($data[$_POST['genre']]) && ''!=trim($_POST['genre'])) {
                                     foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
                                         $criteria = new \Criteria('name', trim($genre));
-                                        if ($genreHandler->getCount($criteria) > 0) {
+                                        if ($genreHandler->getCount($criteria)>0) {
                                             $objects = $genreHandler->getObjects($criteria, false);
                                             $gid     = $objects[0]->getVar('gid');
                                         } else {
@@ -158,10 +158,10 @@ 
                                 }
                             }
                             $vcid = 0;
-                            if (!empty($_POST['voice']) && mb_strlen($_POST['voice']) > 1) {
-                                if (isset($data[$_POST['voice']]) && '' != trim($_POST['voice'])) {
+                            if (!empty($_POST['voice']) && mb_strlen($_POST['voice'])>1) {
+                                if (isset($data[$_POST['voice']]) && ''!=trim($_POST['voice'])) {
                                     $criteria = new \Criteria('name', trim($data[$_POST['voice']]));
-                                    if ($voiceHandler->getCount($criteria) > 0) {
+                                    if ($voiceHandler->getCount($criteria)>0) {
                                         $objects = $voiceHandler->getObjects($criteria, false);
                                         $vcid    = $objects[0]->getVar('vcid');
                                     } else {
@@ -173,10 +173,10 @@ 
                             }
 
                             $cid = 0;
-                            if (!empty($_POST['category']) && mb_strlen($_POST['category']) > 1) {
-                                if (isset($data[$_POST['category']]) && '' != trim($_POST['category'])) {
+                            if (!empty($_POST['category']) && mb_strlen($_POST['category'])>1) {
+                                if (isset($data[$_POST['category']]) && ''!=trim($_POST['category'])) {
                                     $criteria = new \Criteria('name', trim($data[$_POST['category']]));
-                                    if ($categoryHandler->getCount($criteria) > 0) {
+                                    if ($categoryHandler->getCount($criteria)>0) {
                                         $objects = $categoryHandler->getObjects($criteria, false);
                                         $cid     = $objects[0]->getVar('cid');
                                     } else {
@@ -187,11 +187,11 @@ 
                                 }
                             }
                             $aids = [];
-                            if (!empty($_POST['artist']) && mb_strlen($_POST['artist']) > 1) {
-                                if (isset($data[$_POST['artist']]) && '' != $_POST['artist']) {
+                            if (!empty($_POST['artist']) && mb_strlen($_POST['artist'])>1) {
+                                if (isset($data[$_POST['artist']]) && ''!=$_POST['artist']) {
                                     foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
                                         $criteria = new \Criteria('name', trim($artist));
-                                        if ($artistsHandler->getCount($criteria) > 0) {
+                                        if ($artistsHandler->getCount($criteria)>0) {
                                             $objects                          = $artistsHandler->getObjects($criteria, false);
                                             $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                         } else {
@@ -204,10 +204,10 @@ 
                                 }
                             }
                             $abid = 0;
-                            if (!empty($_POST['album']) && mb_strlen($_POST['album']) > 1) {
-                                if (isset($data[$_POST['album']]) && '' != trim($_POST['album'])) {
+                            if (!empty($_POST['album']) && mb_strlen($_POST['album'])>1) {
+                                if (isset($data[$_POST['album']]) && ''!=trim($_POST['album'])) {
                                     $criteria = new \Criteria('title', trim($data[$_POST['album']]));
-                                    if ($albumsHandler->getCount($criteria) > 0) {
+                                    if ($albumsHandler->getCount($criteria)>0) {
                                         $objects = $albumsHandler->getObjects($criteria, false);
                                         $abid    = $objects[0]->getVar('abid');
                                     } else {
@@ -220,16 +220,16 @@ 
                                 }
                             }
                             $sid = 0;
-                            if ((!empty($_POST['songid']) && mb_strlen($_POST['songid']) > 1) || (!empty($_POST['title']) && mb_strlen($_POST['title']) > 1)) {
-                                if ((isset($data[$_POST['songid']]) && '' != $_POST['songid']) || (isset($data[$_POST['title']]) && '' != $_POST['title'])) {
+                            if ((!empty($_POST['songid']) && mb_strlen($_POST['songid'])>1) || (!empty($_POST['title']) && mb_strlen($_POST['title'])>1)) {
+                                if ((isset($data[$_POST['songid']]) && ''!=$_POST['songid']) || (isset($data[$_POST['title']]) && ''!=$_POST['title'])) {
                                     $criteria = new \CriteriaCompo();
-                                    if ('' != trim($data[$_POST['songid']])) {
+                                    if (''!=trim($data[$_POST['songid']])) {
                                         $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
                                     }
-                                    if ('' != trim($data[$_POST['title']])) {
+                                    if (''!=trim($data[$_POST['title']])) {
                                         $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
                                     }
-                                    if ($songsHandler->getCount($criteria) > 0) {
+                                    if ($songsHandler->getCount($criteria)>0) {
                                         $objects = $songsHandler->getObjects($criteria, false);
                                         $object  = $objects[0];
                                     } else {
@@ -248,7 +248,7 @@ 
                                     $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
                                     $sid = $songsHandler->insert($object);
 
-                                    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(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
                                     }
@@ -256,7 +256,7 @@ 
                                     $extrasHandler = Helper::getInstance()->getHandler('Extras');
                                     $fields        = $extrasHandler->getFields(null);
                                     $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                    if ($extrasHandler->getCount($criteria) > 0) {
+                                    if ($extrasHandler->getCount($criteria)>0) {
                                         $extras = $extrasHandler->getObjects($criteria, false);
                                         $extra  = $extras[0];
                                     } else {
@@ -264,13 +264,13 @@ 
                                     }
                                     $extra->setVar('sid', $sid);
                                     foreach ($fields as $field) {
-                                        if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')]) > 1) {
-                                            if (isset($data[$_POST[$field->getVar('field_name')]]) && '' != trim($_POST[$field->getVar('field_name')])) {
+                                        if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')])>1) {
+                                            if (isset($data[$_POST[$field->getVar('field_name')]]) && ''!=trim($_POST[$field->getVar('field_name')])) {
                                                 $extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
                                             }
                                         }
                                     }
-                                    foreach ($artistsHandler->getObjects(new \Criteria('aid', '(' . implode(',', $aids) . ')', 'IN'), true) as $aid => $artist) {
+                                    foreach ($artistsHandler->getObjects(new \Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
                                         $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
                                         $artistsHandler->insert($artist, true);
                                     }
@@ -280,11 +280,11 @@ 
                     } else {
                         foreach ($xmlarray[$_POST['collection']] as $id => $records) {
                             if (Request::hasVar('limiting', 'POST')) {
-                                if (true === Request::getInt('limiting', 0, 'POST')) {
+                                if (true===Request::getInt('limiting', 0, 'POST')) {
                                     ++$record;
-                                    if ($record > Request::getInt('records', 0, 'POST')) {
+                                    if ($record>Request::getInt('records', 0, 'POST')) {
                                         $start = time();
-                                        while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+                                        while (time()-$start<Request::getInt('wait', 0, 'POST')) {
                                         }
                                         $records = 0;
                                     }
@@ -292,11 +292,11 @@ 
                             }
                             $gid  = 0;
                             $gids = [];
-                            if (!empty($_POST['genre']) && mb_strlen($_POST['genre']) > 1) {
-                                if (isset($data[$_POST['genre']]) && '' != trim($_POST['genre'])) {
+                            if (!empty($_POST['genre']) && mb_strlen($_POST['genre'])>1) {
+                                if (isset($data[$_POST['genre']]) && ''!=trim($_POST['genre'])) {
                                     foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
                                         $criteria = new \Criteria('name', trim($genre));
-                                        if ($genreHandler->getCount($criteria) > 0) {
+                                        if ($genreHandler->getCount($criteria)>0) {
                                             $objects = $genreHandler->getObjects($criteria, false);
                                             $gid     = $objects[0]->getVar('gid');
                                         } else {
@@ -308,10 +308,10 @@ 
                                     }
                                 }
                             }
-                            if (!empty($_POST['voice']) && mb_strlen($_POST['voice']) > 1) {
-                                if (isset($data[$_POST['voice']]) && '' != trim($_POST['voice'])) {
+                            if (!empty($_POST['voice']) && mb_strlen($_POST['voice'])>1) {
+                                if (isset($data[$_POST['voice']]) && ''!=trim($_POST['voice'])) {
                                     $criteria = new \Criteria('name', trim($data[$_POST['voice']]));
-                                    if ($voiceHandler->getCount($criteria) > 0) {
+                                    if ($voiceHandler->getCount($criteria)>0) {
                                         $objects = $voiceHandler->getObjects($criteria, false);
                                         $vcid    = $objects[0]->getVar('vcid');
                                     } else {
@@ -322,10 +322,10 @@ 
                                 }
                             }
                             $cid = 0;
-                            if (!empty($_POST['category']) && mb_strlen($_POST['category']) > 1) {
-                                if (isset($data[$_POST['category']]) && '' != trim($_POST['category'])) {
+                            if (!empty($_POST['category']) && mb_strlen($_POST['category'])>1) {
+                                if (isset($data[$_POST['category']]) && ''!=trim($_POST['category'])) {
                                     $criteria = new \Criteria('name', trim($data[$_POST['category']]));
-                                    if ($categoryHandler->getCount($criteria) > 0) {
+                                    if ($categoryHandler->getCount($criteria)>0) {
                                         $objects = $categoryHandler->getObjects($criteria, false);
                                         $cid     = $objects[0]->getVar('cid');
                                     } else {
@@ -336,11 +336,11 @@ 
                                 }
                             }
                             $aids = [];
-                            if (!empty($_POST['artist']) && mb_strlen($_POST['artist']) > 1) {
-                                if (isset($data[$_POST['artist']]) && '' != $_POST['artist']) {
+                            if (!empty($_POST['artist']) && mb_strlen($_POST['artist'])>1) {
+                                if (isset($data[$_POST['artist']]) && ''!=$_POST['artist']) {
                                     foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
                                         $criteria = new \Criteria('name', trim($artist));
-                                        if ($artistsHandler->getCount($criteria) > 0) {
+                                        if ($artistsHandler->getCount($criteria)>0) {
                                             $objects                          = $artistsHandler->getObjects($criteria, false);
                                             $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                         } else {
@@ -354,10 +354,10 @@ 
                                 }
                             }
                             $abid = 0;
-                            if (!empty($_POST['album']) && mb_strlen($_POST['album']) > 1) {
-                                if (isset($data[$_POST['album']]) && '' != trim($_POST['album'])) {
+                            if (!empty($_POST['album']) && mb_strlen($_POST['album'])>1) {
+                                if (isset($data[$_POST['album']]) && ''!=trim($_POST['album'])) {
                                     $criteria = new \Criteria('title', trim($data[$_POST['album']]));
-                                    if ($albumsHandler->getCount($criteria) > 0) {
+                                    if ($albumsHandler->getCount($criteria)>0) {
                                         $objects = $albumsHandler->getObjects($criteria, false);
                                         $abid    = $objects[0]->getVar('abid');
                                     } else {
@@ -370,16 +370,16 @@ 
                                 }
                             }
                             $sid = 0;
-                            if ((!empty($_POST['songid']) && mb_strlen($_POST['songid']) > 1) || (!empty($_POST['title']) && mb_strlen($_POST['title']) > 1)) {
-                                if ((isset($data[$_POST['songid']]) && '' != $_POST['songid']) || (isset($data[$_POST['title']]) && '' != $_POST['title'])) {
+                            if ((!empty($_POST['songid']) && mb_strlen($_POST['songid'])>1) || (!empty($_POST['title']) && mb_strlen($_POST['title'])>1)) {
+                                if ((isset($data[$_POST['songid']]) && ''!=$_POST['songid']) || (isset($data[$_POST['title']]) && ''!=$_POST['title'])) {
                                     $criteria = new \CriteriaCompo();
-                                    if ('' != trim($data[$_POST['songid']])) {
+                                    if (''!=trim($data[$_POST['songid']])) {
                                         $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
                                     }
-                                    if ('' != trim($data[$_POST['title']])) {
+                                    if (''!=trim($data[$_POST['title']])) {
                                         $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
                                     }
-                                    if ($songsHandler->getCount($criteria) > 0) {
+                                    if ($songsHandler->getCount($criteria)>0) {
                                         $objects = $songsHandler->getObjects($criteria, false);
                                         $object  = $objects[0];
                                     } else {
@@ -398,7 +398,7 @@ 
                                     $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
                                     $sid = $songsHandler->insert($object);
 
-                                    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(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
                                     }
@@ -406,7 +406,7 @@ 
                                     $extrasHandler = Helper::getInstance()->getHandler('Extras');
                                     $fields        = $extrasHandler->getFields(null);
                                     $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                    if ($extrasHandler->getCount($criteria) > 0) {
+                                    if ($extrasHandler->getCount($criteria)>0) {
                                         $extras = $extrasHandler->getObjects($criteria, false);
                                         $extra  = $extras[0];
                                     } else {
@@ -414,14 +414,14 @@ 
                                     }
                                     $extra->setVar('sid', $sid);
                                     foreach ($fields as $field) {
-                                        if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')]) > 1) {
-                                            if (isset($data[$_POST[$field->getVar('field_name')]]) && '' != trim($_POST[$field->getVar('field_name')])) {
+                                        if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')])>1) {
+                                            if (isset($data[$_POST[$field->getVar('field_name')]]) && ''!=trim($_POST[$field->getVar('field_name')])) {
                                                 $extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
                                             }
                                         }
                                     }
                                     $extrasHandler->insert($extra, true);
-                                    foreach ($artistsHandler->getObjects(new \Criteria('aid', '(' . implode(',', $aids) . ')', 'IN'), true) as $aid => $artist) {
+                                    foreach ($artistsHandler->getObjects(new \Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
                                         $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
                                         $artistsHandler->insert($artist, true);
                                     }
@@ -437,11 +437,11 @@ 
                         $aids = [];
                         $abid = [];
                         if (Request::hasVar('limiting', 'POST')) {
-                            if (true === Request::getInt('limiting', 0, 'POST')) {
+                            if (true===Request::getInt('limiting', 0, 'POST')) {
                                 ++$record;
-                                if ($record > Request::getInt('records', 0, 'POST')) {
+                                if ($record>Request::getInt('records', 0, 'POST')) {
                                     $start = time();
-                                    while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+                                    while (time()-$start<Request::getInt('wait', 0, 'POST')) {
                                     }
                                     $records = 0;
                                 }
@@ -449,11 +449,11 @@ 
                         }
                         $gid  = 0;
                         $gids = [];
-                        if (!empty($_POST['genre']) && mb_strlen($_POST['genre']) > 1) {
-                            if (isset($data[$_POST['genre']]) && '' != trim($_POST['genre'])) {
+                        if (!empty($_POST['genre']) && mb_strlen($_POST['genre'])>1) {
+                            if (isset($data[$_POST['genre']]) && ''!=trim($_POST['genre'])) {
                                 foreach (explode(',', trim($data[$_POST['genre']])) as $genre) {
                                     $criteria = new \Criteria('name', trim($genre));
-                                    if ($genreHandler->getCount($criteria) > 0) {
+                                    if ($genreHandler->getCount($criteria)>0) {
                                         $objects = $genreHandler->getObjects($criteria, false);
                                         $gid     = $objects[0]->getVar('gid');
                                     } else {
@@ -467,10 +467,10 @@ 
                         }
 
                         $vcid = 0;
-                        if (!empty($_POST['voice']) && mb_strlen($_POST['voice']) > 1) {
-                            if (isset($data[$_POST['voice']]) && '' != trim($_POST['voice'])) {
+                        if (!empty($_POST['voice']) && mb_strlen($_POST['voice'])>1) {
+                            if (isset($data[$_POST['voice']]) && ''!=trim($_POST['voice'])) {
                                 $criteria = new \Criteria('name', trim($data[$_POST['voice']]));
-                                if ($voiceHandler->getCount($criteria) > 0) {
+                                if ($voiceHandler->getCount($criteria)>0) {
                                     $objects = $voiceHandler->getObjects($criteria, false);
                                     $vcid    = $objects[0]->getVar('vcid');
                                 } else {
@@ -481,10 +481,10 @@ 
                             }
                         }
                         $cid = 0;
-                        if (!empty($_POST['category']) && mb_strlen($_POST['category']) > 1) {
-                            if (isset($data[$_POST['category']]) && '' != trim($_POST['category'])) {
+                        if (!empty($_POST['category']) && mb_strlen($_POST['category'])>1) {
+                            if (isset($data[$_POST['category']]) && ''!=trim($_POST['category'])) {
                                 $criteria = new \Criteria('name', trim($data[$_POST['category']]));
-                                if ($categoryHandler->getCount($criteria) > 0) {
+                                if ($categoryHandler->getCount($criteria)>0) {
                                     $objects = $categoryHandler->getObjects($criteria, false);
                                     $cid     = $objects[0]->getVar('cid');
                                 } else {
@@ -495,11 +495,11 @@ 
                             }
                         }
                         $aids = [];
-                        if (!empty($_POST['artist']) && mb_strlen($_POST['artist']) > 1) {
-                            if (isset($data[$_POST['artist']]) && '' != $_POST['artist']) {
+                        if (!empty($_POST['artist']) && mb_strlen($_POST['artist'])>1) {
+                            if (isset($data[$_POST['artist']]) && ''!=$_POST['artist']) {
                                 foreach (explode(',', trim($data[$_POST['artist']])) as $artist) {
                                     $criteria = new \Criteria('name', trim($artist));
-                                    if ($artistsHandler->getCount($criteria) > 0) {
+                                    if ($artistsHandler->getCount($criteria)>0) {
                                         $objects                          = $artistsHandler->getObjects($criteria, false);
                                         $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
                                     } else {
@@ -513,10 +513,10 @@ 
                             }
                         }
                         $abid = 0;
-                        if (!empty($_POST['album']) && mb_strlen($_POST['album']) > 1) {
-                            if (isset($data[$_POST['album']]) && '' != trim($_POST['album'])) {
+                        if (!empty($_POST['album']) && mb_strlen($_POST['album'])>1) {
+                            if (isset($data[$_POST['album']]) && ''!=trim($_POST['album'])) {
                                 $criteria = new \Criteria('title', trim($data[$_POST['album']]));
-                                if ($albumsHandler->getCount($criteria) > 0) {
+                                if ($albumsHandler->getCount($criteria)>0) {
                                     $objects = $albumsHandler->getObjects($criteria, false);
                                     $abid    = $objects[0]->getVar('abid');
                                 } else {
@@ -529,16 +529,16 @@ 
                             }
                         }
                         $sid = 0;
-                        if ((!empty($_POST['songid']) && mb_strlen($_POST['songid']) > 1) || (!empty($_POST['title']) && mb_strlen($_POST['title']) > 1)) {
-                            if ((isset($data[$_POST['songid']]) && '' != $_POST['songid']) || (isset($data[$_POST['title']]) && '' != $_POST['title'])) {
+                        if ((!empty($_POST['songid']) && mb_strlen($_POST['songid'])>1) || (!empty($_POST['title']) && mb_strlen($_POST['title'])>1)) {
+                            if ((isset($data[$_POST['songid']]) && ''!=$_POST['songid']) || (isset($data[$_POST['title']]) && ''!=$_POST['title'])) {
                                 $criteria = new \CriteriaCompo();
-                                if ('' != trim($data[$_POST['songid']])) {
+                                if (''!=trim($data[$_POST['songid']])) {
                                     $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
                                 }
-                                if ('' != trim($data[$_POST['title']])) {
+                                if (''!=trim($data[$_POST['title']])) {
                                     $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
                                 }
-                                if ($songsHandler->getCount($criteria) > 0) {
+                                if ($songsHandler->getCount($criteria)>0) {
                                     $objects = $songsHandler->getObjects($criteria, false);
                                     $object  = $objects[0];
                                 } else {
@@ -557,7 +557,7 @@ 
                                 $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
                                 $sid = $songsHandler->insert($object);
 
-                                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(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
                                 }
@@ -565,7 +565,7 @@ 
                                 $extrasHandler = Helper::getInstance()->getHandler('Extras');
                                 $fields        = $extrasHandler->getFields(null);
                                 $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                if ($extrasHandler->getCount($criteria) > 0) {
+                                if ($extrasHandler->getCount($criteria)>0) {
                                     $extras = $extrasHandler->getObjects($criteria, false);
                                     $extra  = $extras[0];
                                 } else {
@@ -573,13 +573,13 @@ 
                                 }
                                 $extra->setVar('sid', $sid);
                                 foreach ($fields as $field) {
-                                    if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')]) > 1) {
-                                        if (isset($data[$_POST[$field->getVar('field_name')]]) && '' != trim($_POST[$field->getVar('field_name')])) {
+                                    if (!empty($_POST[$field->getVar('field_name')]) && mb_strlen($_POST[$field->getVar('field_name')])>1) {
+                                        if (isset($data[$_POST[$field->getVar('field_name')]]) && ''!=trim($_POST[$field->getVar('field_name')])) {
                                             $extra->setVar($field->getVar('field_name'), trim($data[$_POST[$field->getVar('field_name')]]));
                                         }
                                     }
                                 }
-                                foreach ($artistsHandler->getObjects(new \Criteria('aid', '(' . implode(',', $aids) . ')', 'IN'), true) as $aid => $artist) {
+                                foreach ($artistsHandler->getObjects(new \Criteria('aid', '('.implode(',', $aids).')', 'IN'), true) as $aid => $artist) {
                                     $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
                                     $artistsHandler->insert($artist, true);
                                 }
@@ -587,9 +587,9 @@ 
                         }
                     }
                 }
-                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile']));
+                unlink($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile']));
                 unset($_SESSION['xmlfile']);
-                redirect_header($_SERVER['SCRIPT_NAME'] . '?op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
+                redirect_header($_SERVER['SCRIPT_NAME'].'?op=import&fct=actiona', 10, _AM_SONGLIST_XMLFILE_COMPLETE);
                 break;
         }
         break;

admin/genre.php

Spacing +18 added lines, -18 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Genre $genre */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -22,8 +22,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:
@@ -39,14 +39,14 @@ 
 
                 $criteria        = $genreHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $genreHandler->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 ($genreHandler->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='
@@ -56,16 +56,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', $genreHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $genreHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
                 }
 
                 $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
@@ -77,7 +77,7 @@ 
 
                 $criteria->setStart($GLOBALS['start']);
                 $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
+                $criteria->setSort('`'.$GLOBALS['sort'].'`');
                 $criteria->setOrder($GLOBALS['order']);
 
                 $genres = $genreHandler->getObjects($criteria, true);
@@ -118,17 +118,17 @@ 
                 $genre->setVars($_POST[$id]);
 
                 if (!$id = $genreHandler->insert($genre)) {
-                    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_GENRE_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_GENRE_FAILEDTOSAVE);
                     exit(0);
                 }
-                if ('new' === $_REQUEST['state'][$_REQUEST['id']]) {
+                if ('new'===$_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_GENRE_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_GENRE_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_GENRE_SAVEDOKEY);
                 }
                 exit(0);
 
@@ -140,14 +140,14 @@ 
                     $genre->setVars($_POST[$id]);
                     if (!$genreHandler->insert($genre)) {
                         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_GENRE_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_GENRE_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_GENRE_SAVEDOKEY);
                 exit(0);
                 break;
             case 'delete':
@@ -157,13 +157,13 @@ 
                     $genre = $genreHandler->get($id);
                     if (!$genreHandler->delete($genre)) {
                         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_GENRE_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_GENRE_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_GENRE_DELETED);
                     exit(0);
                 }
                 $genre = $genreHandler->get(Request::getInt('id', 0, 'REQUEST'));