XoopsModules25x / songlist

xoops_version.php

Indentation +301 added lines, -301 removed lines

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

Spacing +32 added lines, -32 removed lines

@@ -1,6 +1,6 @@ 
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 error_reporting(E_ALL);
 $moduleDirName      = basename(__DIR__);
@@ -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

Indentation +221 added lines, -221 removed lines

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

Spacing +29 added lines, -29 removed lines

@@ -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

Indentation +154 added lines, -154 removed lines

@@ -3,10 +3,10 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Artists,
-    ArtistsHandler
+	Form\FormController,
+	Helper,
+	Artists,
+	ArtistsHandler
 };
 
 /** @var Artists $artist */
@@ -26,156 +26,156 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'artists':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var ArtistsHandler $artistsHandler */
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-
-                $criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $artistsHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($artistsHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $artistsArray = $artistsHandler->getObjects($criteria, true);
-                foreach ($artistsArray as $cid => $artist) {
-                    if (is_object($artist)) {
-                        $GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormArtists(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $artist = $artistsHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $artist->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.tpl');
-                break;
-            case 'save':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                $id             = 0;
-                $id             = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $artist = $artistsHandler->get($id);
-                } else {
-                    $artist = $artistsHandler->create();
-                }
-                $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);
-                    exit(0);
-                }
-                if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
-                    redirect_header(
-                        $_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
-                        10,
-                        _AM_SONGLIST_MSG_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);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                foreach ($_REQUEST['id'] as $id) {
-                    $artist = $artistsHandler->get($id);
-                    $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'],
-                            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);
-                exit(0);
-                break;
-            case 'delete':
-                $artistsHandler = Helper::getInstance()->getHandler('Artists');
-                $id             = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $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'],
-                            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);
-                    exit(0);
-                }
-                $artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artist->getVar('name'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'artists':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var ArtistsHandler $artistsHandler */
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+
+				$criteria        = $artistsHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $artistsHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($artistsHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $artistsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$artistsArray = $artistsHandler->getObjects($criteria, true);
+				foreach ($artistsArray as $cid => $artist) {
+					if (is_object($artist)) {
+						$GLOBALS['xoopsTpl']->append('artists', $artist->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormArtists(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$artist = $artistsHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $artist->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_artists_edit.tpl');
+				break;
+			case 'save':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				$id             = 0;
+				$id             = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$artist = $artistsHandler->get($id);
+				} else {
+					$artist = $artistsHandler->create();
+				}
+				$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);
+					exit(0);
+				}
+				if ('new' === isset($_REQUEST['state']) ? $_REQUEST['state'][$_REQUEST['id']]:'') {
+					redirect_header(
+						$_SERVER['SCRIPT_NAME'] . '?op=' . $GLOBALS['op'] . '&fct=edit&id=' . $_REQUEST['id'] . '&limit=' . $GLOBALS['limit'] . '&start=' . $GLOBALS['start'] . '&order=' . $GLOBALS['order'] . '&sort=' . $GLOBALS['sort'] . '&filter=' . $GLOBALS['filter'],
+						10,
+						_AM_SONGLIST_MSG_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);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				foreach ($_REQUEST['id'] as $id) {
+					$artist = $artistsHandler->get($id);
+					$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'],
+							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);
+				exit(0);
+				break;
+			case 'delete':
+				$artistsHandler = Helper::getInstance()->getHandler('Artists');
+				$id             = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$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'],
+							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);
+					exit(0);
+				}
+				$artist = $artistsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_ARTISTS_DELETE, $artist->getVar('name'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +154 added lines, -154 removed lines

@@ -3,10 +3,10 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Utf8map,
-    Utf8mapHandler,
+	Form\FormController,
+	Helper,
+	Utf8map,
+	Utf8mapHandler,
 };
 
 /** @var Utf8map $utf8map */
@@ -26,156 +26,156 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'utf8map':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var Utf8mapHandler $utf8mapHandler */
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-
-                $criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $utf8mapHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($utf8mapHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $utf8maps = $utf8mapHandler->getObjects($criteria, true);
-                foreach ($utf8maps as $cid => $utf8map) {
-                    if (is_object($utf8map)) {
-                        $GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormUtf8map(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $utf8map = $utf8mapHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $utf8map->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_edit.tpl');
-                break;
-            case 'save':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                $id             = 0;
-                $id             = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $utf8map = $utf8mapHandler->get($id);
-                } else {
-                    $utf8map = $utf8mapHandler->create();
-                }
-                $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);
-                    exit(0);
-                }
-                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'],
-                        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);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                foreach ($_REQUEST['id'] as $id) {
-                    $utf8map = $utf8mapHandler->get($id);
-                    $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'],
-                            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);
-                exit(0);
-                break;
-            case 'delete':
-                $utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
-                $id             = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $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'],
-                            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);
-                    exit(0);
-                }
-                $utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_UTF8MAP_DELETE, $utf8map->getVar('from'), $utf8map->getVar('to'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'utf8map':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var Utf8mapHandler $utf8mapHandler */
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+
+				$criteria        = $utf8mapHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $utf8mapHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($utf8mapHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $utf8mapHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$utf8maps = $utf8mapHandler->getObjects($criteria, true);
+				foreach ($utf8maps as $cid => $utf8map) {
+					if (is_object($utf8map)) {
+						$GLOBALS['xoopsTpl']->append('utf8map', $utf8map->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormUtf8map(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$utf8map = $utf8mapHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $utf8map->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_utf8map_edit.tpl');
+				break;
+			case 'save':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				$id             = 0;
+				$id             = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$utf8map = $utf8mapHandler->get($id);
+				} else {
+					$utf8map = $utf8mapHandler->create();
+				}
+				$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);
+					exit(0);
+				}
+				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'],
+						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);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				foreach ($_REQUEST['id'] as $id) {
+					$utf8map = $utf8mapHandler->get($id);
+					$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'],
+							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);
+				exit(0);
+				break;
+			case 'delete':
+				$utf8mapHandler = Helper::getInstance()->getHandler('Utf8map');
+				$id             = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$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'],
+							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);
+					exit(0);
+				}
+				$utf8map = $utf8mapHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_UTF8MAP_DELETE, $utf8map->getVar('from'), $utf8map->getVar('to'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +289 added lines, -289 removed lines

@@ -29,22 +29,22 @@ 
 $categoryHandler = Helper::getInstance()->getHandler('Category');
 
 switch ($op) {
-    case 'import':
-        switch ($fct) {
-            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);
-                }
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+	case 'import':
+		switch ($fct) {
+			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);
+				}
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
-                break;
-            case 'upload':
-                if (Request::hasVar('xmlfile', 'FILES') && !empty($_FILES['xmlfile']['title'])) {
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
+				break;
+			case 'upload':
+				if (Request::hasVar('xmlfile', 'FILES') && !empty($_FILES['xmlfile']['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) {
@@ -57,287 +57,287 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $albums   = $albumsHandler->get($id);
-                    $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,
-                        0,
-                        0,
-                        ['xml']
-                    );
-                    try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                    } catch (Exception $e) {
-                    }
+					$albums   = $albumsHandler->get($id);
+					$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,
+						0,
+						0,
+						['xml']
+					);
+					try {
+						$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';
-                            exit(0);
-                        }
-                        $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        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';
-                        exit(0);
-                    }
-                }
-                break;
-            case 'actionb':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+					if ($uploader->fetchMedia('xmlfile')) {
+						if (!$uploader->upload()) {
+							echo $uploader->getErrors();
+							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);
+					} else {
+						echo $uploader->getErrors();
+						require __DIR__ . '/admin_footer.php';
+						exit(0);
+					}
+				}
+				break;
+			case 'actionb':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
-                break;
-            case 'import':
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
+				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');
-                }
-                set_time_limit(3600);
+				$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) {
-                    foreach ($xmlarray[$_POST['collection']] as $id => $record) {
-                        foreach ($record as $recid => $data) {
-                            $gid = 0;
-                            if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                                if ($genreHandler->getCount($criteria) > 0) {
-                                    $objects = $genreHandler->getObjects($criteria, false);
-                                    $gid     = $objects[0]->getVar('gid');
-                                } else {
-                                    $object = $genreHandler->create();
-                                    $object->setVar('name', $data[$_POST['genre']]);
-                                    $gid = $genreHandler->insert($object);
-                                }
-                            }
+				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']])) {
+								$criteria = new \Criteria('name', $data[$_POST['genre']]);
+								if ($genreHandler->getCount($criteria) > 0) {
+									$objects = $genreHandler->getObjects($criteria, false);
+									$gid     = $objects[0]->getVar('gid');
+								} else {
+									$object = $genreHandler->create();
+									$object->setVar('name', $data[$_POST['genre']]);
+									$gid = $genreHandler->insert($object);
+								}
+							}
 
-                            $vid = 0;
-                            if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                                if ($voiceHandler->getCount($criteria) > 0) {
-                                    $objects = $voiceHandler->getObjects($criteria, false);
-                                    $gid     = $objects[0]->getVar('vid');
-                                } else {
-                                    $object = $voiceHandler->create();
-                                    $object->setVar('name', $data[$_POST['voice']]);
-                                    $gid = $voiceHandler->insert($object);
-                                }
-                            }
+							$vid = 0;
+							if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+								$criteria = new \Criteria('name', $data[$_POST['voice']]);
+								if ($voiceHandler->getCount($criteria) > 0) {
+									$objects = $voiceHandler->getObjects($criteria, false);
+									$gid     = $objects[0]->getVar('vid');
+								} else {
+									$object = $voiceHandler->create();
+									$object->setVar('name', $data[$_POST['voice']]);
+									$gid = $voiceHandler->insert($object);
+								}
+							}
 
-                            $cid = 0;
-                            if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['category']]);
-                                if ($categoryHandler->getCount($criteria) > 0) {
-                                    $objects = $categoryHandler->getObjects($criteria, false);
-                                    $cid     = $objects[0]->getVar('cid');
-                                } else {
-                                    $object = $categoryHandler->create();
-                                    $object->setVar('name', $data[$_POST['category']]);
-                                    $cid = $categoryHandler->insert($object);
-                                }
-                            }
-                            $aids = [];
-                            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) {
-                                        $objects                          = $artistsHandler->getObjects($criteria, false);
-                                        $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                    } else {
-                                        $object = $artistsHandler->create();
-                                        $object->setVar('cid', $cid);
-                                        switch ($data[$_POST['singer']]) {
-                                            case $_POST['duet']:
-                                                $object->setVar('singer', '_ENUM_SONGLIST_DUET');
-                                                break;
-                                            case $_POST['solo']:
-                                                $object->setVar('singer', '_ENUM_SONGLIST_SOLO');
-                                                break;
-                                        }
-                                        $object->setVar('name', $data[$_POST['artist']]);
-                                        $aid        = $artistsHandler->insert($object);
-                                        $aids[$aid] = $aid;
-                                    }
-                                }
-                            }
-                            $abid = 0;
-                            if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
-                                $criteria = new \Criteria('name', $data[$_POST['album']]);
-                                if ($albumsHandler->getCount($criteria) > 0) {
-                                    $objects = $albumsHandler->getObjects($criteria, false);
-                                    $abid    = $objects[0]->getVar('aid');
-                                } else {
-                                    $object = $albumsHandler->create();
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('aids', $aids);
-                                    $object->setVar('name', $data[$_POST['album']]);
-                                    $abid = $albumsHandler->insert($object);
-                                }
-                            }
-                            $sid = 0;
-                            if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
-                                $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                                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) {
-                                    $object->setVar('cid', $cid);
-                                } else {
-                                    $object->setVar('cid', $cid);
-                                }
-                                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) {
-                                    $object->setVar('aids', $aids);
-                                } else {
-                                    $object->setVar('aids', $aids);
-                                }
-                                if ($object->getVar('abid') > 0 && $abid > 0) {
-                                    $object->setVar('abid', $abid);
-                                } else {
-                                    $object->setVar('abid', $abid);
-                                }
-                                $object->setVar('songid', $data[$_POST['songid']]);
-                                $object->setVar('title', $data[$_POST['title']]);
-                                $object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
-                                $sid = $songsHandler->insert($object);
-                            }
-                        }
-                    }
-                } else {
-                    foreach ($xmlarray as $recid => $data) {
-                        $gid = 0;
-                        if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['genre']]);
-                            if ($genreHandler->getCount($criteria) > 0) {
-                                $objects = $genreHandler->getObjects($criteria, false);
-                                $gid     = $objects[0]->getVar('gid');
-                            } else {
-                                $object = $genreHandler->create();
-                                $object->setVar('name', $data[$_POST['genre']]);
-                                $gid = $genreHandler->insert($object);
-                            }
-                        }
-                        $vid = 0;
-                        if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['voice']]);
-                            if ($voiceHandler->getCount($criteria) > 0) {
-                                $objects = $voiceHandler->getObjects($criteria, false);
-                                $gid     = $objects[0]->getVar('vid');
-                            } else {
-                                $object = $voiceHandler->create();
-                                $object->setVar('name', $data[$_POST['voice']]);
-                                $gid = $voiceHandler->insert($object);
-                            }
-                        }
-                        $cid = 0;
-                        if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['category']]);
-                            if ($categoryHandler->getCount($criteria) > 0) {
-                                $objects = $categoryHandler->getObjects($criteria, false);
-                                $cid     = $objects[0]->getVar('cid');
-                            } else {
-                                $object = $categoryHandler->create();
-                                $object->setVar('name', $data[$_POST['category']]);
-                                $cid = $categoryHandler->insert($object);
-                            }
-                        }
-                        $aids = [];
-                        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) {
-                                    $objects                          = $artistsHandler->getObjects($criteria, false);
-                                    $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                } else {
-                                    $object = $artistsHandler->create();
-                                    switch ($data[$_POST['singer']]) {
-                                        case $_POST['duet']:
-                                            $object->setVar('singer', '_ENUM_SONGLIST_DUET');
-                                            break;
-                                        case $_POST['solo']:
-                                            $object->setVar('singer', '_ENUM_SONGLIST_SOLO');
-                                            break;
-                                    }
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('name', $data[$_POST['artist']]);
-                                    $aid        = $artistsHandler->insert($object);
-                                    $aids[$aid] = $aid;
-                                }
-                            }
-                        }
-                        $abid = 0;
-                        if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
-                            $criteria = new \Criteria('name', $data[$_POST['album']]);
-                            if ($albumsHandler->getCount($criteria) > 0) {
-                                $objects = $albumsHandler->getObjects($criteria, false);
-                                $abid    = $objects[0]->getVar('aid');
-                            } else {
-                                $object = $albumsHandler->create();
-                                $object->setVar('cid', $cid);
-                                $object->setVar('aids', $aids);
-                                $object->setVar('name', $data[$_POST['album']]);
-                                $abid = $albumsHandler->insert($object);
-                            }
-                        }
-                        $sid = 0;
-                        if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
-                            $criteria = new \Criteria('songid', $data[$_POST['songid']]);
-                            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) {
-                                $object->setVar('cid', $cid);
-                            } else {
-                                $object->setVar('cid', $cid);
-                            }
-                            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) {
-                                $object->setVar('aids', $aids);
-                            } else {
-                                $object->setVar('aids', $aids);
-                            }
-                            if ($object->getVar('abid') > 0 && $abid > 0) {
-                                $object->setVar('abid', $abid);
-                            } else {
-                                $object->setVar('abid', $abid);
-                            }
-                            $object->setVar('songid', $data[$_POST['songid']]);
-                            $object->setVar('title', $data[$_POST['title']]);
-                            $object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
-                            $sid = $songsHandler->insert($object);
-                        }
-                    }
-                }
-                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);
-                break;
-        }
-        break;
+							$cid = 0;
+							if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+								$criteria = new \Criteria('name', $data[$_POST['category']]);
+								if ($categoryHandler->getCount($criteria) > 0) {
+									$objects = $categoryHandler->getObjects($criteria, false);
+									$cid     = $objects[0]->getVar('cid');
+								} else {
+									$object = $categoryHandler->create();
+									$object->setVar('name', $data[$_POST['category']]);
+									$cid = $categoryHandler->insert($object);
+								}
+							}
+							$aids = [];
+							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) {
+										$objects                          = $artistsHandler->getObjects($criteria, false);
+										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+									} else {
+										$object = $artistsHandler->create();
+										$object->setVar('cid', $cid);
+										switch ($data[$_POST['singer']]) {
+											case $_POST['duet']:
+												$object->setVar('singer', '_ENUM_SONGLIST_DUET');
+												break;
+											case $_POST['solo']:
+												$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
+												break;
+										}
+										$object->setVar('name', $data[$_POST['artist']]);
+										$aid        = $artistsHandler->insert($object);
+										$aids[$aid] = $aid;
+									}
+								}
+							}
+							$abid = 0;
+							if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+								$criteria = new \Criteria('name', $data[$_POST['album']]);
+								if ($albumsHandler->getCount($criteria) > 0) {
+									$objects = $albumsHandler->getObjects($criteria, false);
+									$abid    = $objects[0]->getVar('aid');
+								} else {
+									$object = $albumsHandler->create();
+									$object->setVar('cid', $cid);
+									$object->setVar('aids', $aids);
+									$object->setVar('name', $data[$_POST['album']]);
+									$abid = $albumsHandler->insert($object);
+								}
+							}
+							$sid = 0;
+							if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+								$criteria = new \Criteria('songid', $data[$_POST['songid']]);
+								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) {
+									$object->setVar('cid', $cid);
+								} else {
+									$object->setVar('cid', $cid);
+								}
+								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) {
+									$object->setVar('aids', $aids);
+								} else {
+									$object->setVar('aids', $aids);
+								}
+								if ($object->getVar('abid') > 0 && $abid > 0) {
+									$object->setVar('abid', $abid);
+								} else {
+									$object->setVar('abid', $abid);
+								}
+								$object->setVar('songid', $data[$_POST['songid']]);
+								$object->setVar('title', $data[$_POST['title']]);
+								$object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
+								$sid = $songsHandler->insert($object);
+							}
+						}
+					}
+				} else {
+					foreach ($xmlarray as $recid => $data) {
+						$gid = 0;
+						if (mb_strlen($_POST['genre']) > 0 && !empty($data[$_POST['genre']])) {
+							$criteria = new \Criteria('name', $data[$_POST['genre']]);
+							if ($genreHandler->getCount($criteria) > 0) {
+								$objects = $genreHandler->getObjects($criteria, false);
+								$gid     = $objects[0]->getVar('gid');
+							} else {
+								$object = $genreHandler->create();
+								$object->setVar('name', $data[$_POST['genre']]);
+								$gid = $genreHandler->insert($object);
+							}
+						}
+						$vid = 0;
+						if (mb_strlen($_POST['voice']) > 0 && !empty($data[$_POST['voice']])) {
+							$criteria = new \Criteria('name', $data[$_POST['voice']]);
+							if ($voiceHandler->getCount($criteria) > 0) {
+								$objects = $voiceHandler->getObjects($criteria, false);
+								$gid     = $objects[0]->getVar('vid');
+							} else {
+								$object = $voiceHandler->create();
+								$object->setVar('name', $data[$_POST['voice']]);
+								$gid = $voiceHandler->insert($object);
+							}
+						}
+						$cid = 0;
+						if (mb_strlen($_POST['category']) > 0 && !empty($data[$_POST['category']])) {
+							$criteria = new \Criteria('name', $data[$_POST['category']]);
+							if ($categoryHandler->getCount($criteria) > 0) {
+								$objects = $categoryHandler->getObjects($criteria, false);
+								$cid     = $objects[0]->getVar('cid');
+							} else {
+								$object = $categoryHandler->create();
+								$object->setVar('name', $data[$_POST['category']]);
+								$cid = $categoryHandler->insert($object);
+							}
+						}
+						$aids = [];
+						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) {
+									$objects                          = $artistsHandler->getObjects($criteria, false);
+									$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+								} else {
+									$object = $artistsHandler->create();
+									switch ($data[$_POST['singer']]) {
+										case $_POST['duet']:
+											$object->setVar('singer', '_ENUM_SONGLIST_DUET');
+											break;
+										case $_POST['solo']:
+											$object->setVar('singer', '_ENUM_SONGLIST_SOLO');
+											break;
+									}
+									$object->setVar('cid', $cid);
+									$object->setVar('name', $data[$_POST['artist']]);
+									$aid        = $artistsHandler->insert($object);
+									$aids[$aid] = $aid;
+								}
+							}
+						}
+						$abid = 0;
+						if (mb_strlen($_POST['album']) > 0 && !empty($data[$_POST['album']])) {
+							$criteria = new \Criteria('name', $data[$_POST['album']]);
+							if ($albumsHandler->getCount($criteria) > 0) {
+								$objects = $albumsHandler->getObjects($criteria, false);
+								$abid    = $objects[0]->getVar('aid');
+							} else {
+								$object = $albumsHandler->create();
+								$object->setVar('cid', $cid);
+								$object->setVar('aids', $aids);
+								$object->setVar('name', $data[$_POST['album']]);
+								$abid = $albumsHandler->insert($object);
+							}
+						}
+						$sid = 0;
+						if (mb_strlen($_POST['songid']) > 0 && !empty($data[$_POST['songid']])) {
+							$criteria = new \Criteria('songid', $data[$_POST['songid']]);
+							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) {
+								$object->setVar('cid', $cid);
+							} else {
+								$object->setVar('cid', $cid);
+							}
+							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) {
+								$object->setVar('aids', $aids);
+							} else {
+								$object->setVar('aids', $aids);
+							}
+							if ($object->getVar('abid') > 0 && $abid > 0) {
+								$object->setVar('abid', $abid);
+							} else {
+								$object->setVar('abid', $abid);
+							}
+							$object->setVar('songid', $data[$_POST['songid']]);
+							$object->setVar('title', $data[$_POST['title']]);
+							$object->setVar('lyrics', str_replace("\n", "<br>\n", $data[$_POST['lyrics']]));
+							$sid = $songsHandler->insert($object);
+						}
+					}
+				}
+				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);
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +194 added lines, -194 removed lines

@@ -3,11 +3,11 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Category,
-    CategoryHandler,
-    Uploader
+	Form\FormController,
+	Helper,
+	Category,
+	CategoryHandler,
+	Uploader
 };
 
 /** @var Category $category */
@@ -27,102 +27,102 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'category':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var CategoryHandler $categoryHandler */
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
-
-                $criteria        = $categoryHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $categoryHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($categoryHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $categoryHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $categorys = $categoryHandler->getObjects($criteria, true);
-                foreach ($categorys as $cid => $category) {
-                    if (is_object($category)) {
-                        $GLOBALS['xoopsTpl']->append('categories', $category->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormCategory(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $category = $categoryHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $category = $categoryHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $category->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.tpl');
-                break;
-            case 'save':
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
-                $id              = 0;
-                $id              = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $category = $categoryHandler->get($id);
-                } else {
-                    $category = $categoryHandler->create();
-                }
-                $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);
-                    exit(0);
-                }
-                if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
+	default:
+	case 'category':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var CategoryHandler $categoryHandler */
+				$categoryHandler = Helper::getInstance()->getHandler('Category');
+
+				$criteria        = $categoryHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $categoryHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($categoryHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $categoryHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$categorys = $categoryHandler->getObjects($criteria, true);
+				foreach ($categorys as $cid => $category) {
+					if (is_object($category)) {
+						$GLOBALS['xoopsTpl']->append('categories', $category->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormCategory(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$categoryHandler = Helper::getInstance()->getHandler('Category');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$category = $categoryHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$category = $categoryHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $category->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_category_edit.tpl');
+				break;
+			case 'save':
+				$categoryHandler = Helper::getInstance()->getHandler('Category');
+				$id              = 0;
+				$id              = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$category = $categoryHandler->get($id);
+				} else {
+					$category = $categoryHandler->create();
+				}
+				$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);
+					exit(0);
+				}
+				if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
 //                    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) {
@@ -135,99 +135,99 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $category = $categoryHandler->get($id);
-                    $uploader = new Uploader(
-                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
-                        explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']),
-                        $GLOBALS['songlistModuleConfig']['filesize_upload'],
-                        0,
-                        0,
-                        explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])
-                    );
-                    try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                    } catch (Exception $e) {
-                    }
-
-                    if ($uploader->fetchMedia('image')) {
-                        if (!$uploader->upload()) {
-                            $adminObject = Admin::getInstance();
-                            $adminObject->displayNavigation(basename(__FILE__));
-                            echo $uploader->getErrors();
-                            require __DIR__ . '/admin_footer.php';
-                            exit(0);
-                        }
-                        if (mb_strlen($category->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($category->getVar('path')) . $category->getVar('image'));
-                        }
-
-                        $category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
-                        $category->setVar('image', $uploader->getSavedFileName());
-                        @$categoryHandler->insert($category);
-                    } else {
-                        $adminObject = Admin::getInstance();
-                        $adminObject->displayNavigation(basename(__FILE__));
-                        echo $uploader->getErrors();
-                        require __DIR__ . '/admin_footer.php';
-                        exit(0);
-                    }
-                }
-
-                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'],
-                        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);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
-                foreach ($_REQUEST['id'] as $id) {
-                    $category = $categoryHandler->get($id);
-                    $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'],
-                            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);
-                exit(0);
-                break;
-            case 'delete':
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
-                $id              = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $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'],
-                            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);
-                    exit(0);
-                }
-                $category = $categoryHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))
-                );
-
-                break;
-        }
-        break;
+					$category = $categoryHandler->get($id);
+					$uploader = new Uploader(
+						$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
+						explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']),
+						$GLOBALS['songlistModuleConfig']['filesize_upload'],
+						0,
+						0,
+						explode('|', $GLOBALS['songlistModuleConfig']['allowed_extensions'])
+					);
+					try {
+						$uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+					} catch (Exception $e) {
+					}
+
+					if ($uploader->fetchMedia('image')) {
+						if (!$uploader->upload()) {
+							$adminObject = Admin::getInstance();
+							$adminObject->displayNavigation(basename(__FILE__));
+							echo $uploader->getErrors();
+							require __DIR__ . '/admin_footer.php';
+							exit(0);
+						}
+						if (mb_strlen($category->getVar('image'))) {
+							unlink($GLOBALS['xoops']->path($category->getVar('path')) . $category->getVar('image'));
+						}
+
+						$category->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
+						$category->setVar('image', $uploader->getSavedFileName());
+						@$categoryHandler->insert($category);
+					} else {
+						$adminObject = Admin::getInstance();
+						$adminObject->displayNavigation(basename(__FILE__));
+						echo $uploader->getErrors();
+						require __DIR__ . '/admin_footer.php';
+						exit(0);
+					}
+				}
+
+				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'],
+						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);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$categoryHandler = Helper::getInstance()->getHandler('Category');
+				foreach ($_REQUEST['id'] as $id) {
+					$category = $categoryHandler->get($id);
+					$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'],
+							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);
+				exit(0);
+				break;
+			case 'delete':
+				$categoryHandler = Helper::getInstance()->getHandler('Category');
+				$id              = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$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'],
+							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);
+					exit(0);
+				}
+				$category = $categoryHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_CATEGORY_DELETE, $category->getVar('name'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +154 added lines, -154 removed lines

@@ -3,10 +3,10 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Voice,
-    VoiceHandler,
+	Form\FormController,
+	Helper,
+	Voice,
+	VoiceHandler,
 };
 
 /** @var Voice $voice */
@@ -26,156 +26,156 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'voice':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var VoiceHandler $voiceHandler */
-                $voiceHandler = Helper::getInstance()->getHandler('Voice');
-
-                $criteria        = $voiceHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $voiceHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($voiceHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $voiceHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $voices = $voiceHandler->getObjects($criteria, true);
-                foreach ($voices as $cid => $voice) {
-                    if (is_object($voice)) {
-                        $GLOBALS['xoopsTpl']->append('voice', $voice->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormVoice(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_voice_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $voiceHandler = Helper::getInstance()->getHandler('Voice');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $voice = $voiceHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $voice = $voiceHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $voice->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_voice_edit.tpl');
-                break;
-            case 'save':
-                $voiceHandler = Helper::getInstance()->getHandler('Voice');
-                $id           = 0;
-                $id           = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $voice = $voiceHandler->get($id);
-                } else {
-                    $voice = $voiceHandler->create();
-                }
-                $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);
-                    exit(0);
-                }
-                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'],
-                        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);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $voiceHandler = Helper::getInstance()->getHandler('Voice');
-                foreach ($_REQUEST['id'] as $id) {
-                    $voice = $voiceHandler->get($id);
-                    $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'],
-                            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);
-                exit(0);
-                break;
-            case 'delete':
-                $voiceHandler = Helper::getInstance()->getHandler('Voice');
-                $id           = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $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'],
-                            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);
-                    exit(0);
-                }
-                $voice = $voiceHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_VOICE_DELETE, $voice->getVar('name'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'voice':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var VoiceHandler $voiceHandler */
+				$voiceHandler = Helper::getInstance()->getHandler('Voice');
+
+				$criteria        = $voiceHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $voiceHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($voiceHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $voiceHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$voices = $voiceHandler->getObjects($criteria, true);
+				foreach ($voices as $cid => $voice) {
+					if (is_object($voice)) {
+						$GLOBALS['xoopsTpl']->append('voice', $voice->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormVoice(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_voice_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$voiceHandler = Helper::getInstance()->getHandler('Voice');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$voice = $voiceHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$voice = $voiceHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $voice->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_voice_edit.tpl');
+				break;
+			case 'save':
+				$voiceHandler = Helper::getInstance()->getHandler('Voice');
+				$id           = 0;
+				$id           = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$voice = $voiceHandler->get($id);
+				} else {
+					$voice = $voiceHandler->create();
+				}
+				$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);
+					exit(0);
+				}
+				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'],
+						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);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$voiceHandler = Helper::getInstance()->getHandler('Voice');
+				foreach ($_REQUEST['id'] as $id) {
+					$voice = $voiceHandler->get($id);
+					$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'],
+							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);
+				exit(0);
+				break;
+			case 'delete':
+				$voiceHandler = Helper::getInstance()->getHandler('Voice');
+				$id           = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$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'],
+							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);
+					exit(0);
+				}
+				$voice = $voiceHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_VOICE_DELETE, $voice->getVar('name'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +543 added lines, -543 removed lines

@@ -22,31 +22,31 @@ 
 $file = '';
 
 switch ($op) {
-    default:
-    case 'import':
-        switch ($fct) {
-            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);
-                }
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+	default:
+	case 'import':
+		switch ($fct) {
+			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);
+				}
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
-                break;
-            case 'upload':
-                if ('' != $_POST['file']) {
-                    try {
-                        $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);
-                    $_SESSION['xmlfile'] = $file;
-                    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'])) {
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImport(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actiona.tpl');
+				break;
+			case 'upload':
+				if ('' != $_POST['file']) {
+					try {
+						$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);
+					$_SESSION['xmlfile'] = $file;
+					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) {
 //                            foreach (explode('/', $folders) as $folder) {
@@ -59,540 +59,540 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $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,
-                        0,
-                        0,
-                        ['xml']
-                    );
-                    try {
-                        $uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
-                    } catch (Exception $e) {
-                    }
+					$uploader = new Uploader(
+						$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']),
+						['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,
+						0,
+						0,
+						['xml']
+					);
+					try {
+						$uploader->setPrefix(mb_substr(md5((string)microtime(true)), random_int(0, 20), 13));
+					} catch (Exception $e) {
+					}
 
-                    if ($uploader->fetchMedia('xmlfile')) {
-                        if (!$uploader->upload()) {
-                            $adminObject = Admin::getInstance();
-                            $adminObject->displayNavigation(basename(__FILE__));
-                            echo $uploader->getErrors();
-                            xoops_cp_footer();
-                            exit(0);
-                        }
-                        $_SESSION['xmlfile'] = $uploader->getSavedFileName();
-                        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__));
-                        echo $uploader->getErrors();
-                        xoops_cp_footer();
-                        exit(0);
-                    }
-                } else {
-                    $adminObject = Admin::getInstance();
-                    $adminObject->displayNavigation(basename(__FILE__));
-                    echo _AM_SONGLIST_IMPORT_NOFILE;
-                    xoops_cp_footer();
-                    exit(0);
-                }
-                break;
-            case 'actionb':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
+					if ($uploader->fetchMedia('xmlfile')) {
+						if (!$uploader->upload()) {
+							$adminObject = Admin::getInstance();
+							$adminObject->displayNavigation(basename(__FILE__));
+							echo $uploader->getErrors();
+							xoops_cp_footer();
+							exit(0);
+						}
+						$_SESSION['xmlfile'] = $uploader->getSavedFileName();
+						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__));
+						echo $uploader->getErrors();
+						xoops_cp_footer();
+						exit(0);
+					}
+				} else {
+					$adminObject = Admin::getInstance();
+					$adminObject->displayNavigation(basename(__FILE__));
+					echo _AM_SONGLIST_IMPORT_NOFILE;
+					xoops_cp_footer();
+					exit(0);
+				}
+				break;
+			case 'actionb':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
 
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
-                break;
-            case 'import':
-                $songsHandler    = Helper::getInstance()->getHandler('Songs');
-                $albumsHandler   = Helper::getInstance()->getHandler('Albums');
-                $artistsHandler  = Helper::getInstance()->getHandler('Artists');
-                $genreHandler    = Helper::getInstance()->getHandler('Genre');
-                $voiceHandler    = Helper::getInstance()->getHandler('Voice');
-                $categoryHandler = Helper::getInstance()->getHandler('Category');
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormImportb($_SESSION['xmlfile']));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_import_actionb.tpl');
+				break;
+			case 'import':
+				$songsHandler    = Helper::getInstance()->getHandler('Songs');
+				$albumsHandler   = Helper::getInstance()->getHandler('Albums');
+				$artistsHandler  = Helper::getInstance()->getHandler('Artists');
+				$genreHandler    = Helper::getInstance()->getHandler('Genre');
+				$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;
+				$record = 0;
 
-                set_time_limit(3600);
+				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) {
-                        foreach ($xmlarray[$_POST['collection']][$_POST['record']] as $recid => $data) {
-                            if (Request::hasVar('limiting', 'POST')) {
-                                if (true === Request::getInt('limiting', 0, 'POST')) {
-                                    ++$record;
-                                    if ($record > Request::getInt('records', 0, 'POST')) {
-                                        $start = time();
-                                        while (time() - $start < Request::getInt('wait', 0, 'POST')) {
-                                        }
-                                        $records = 0;
-                                    }
-                                }
-                            }
-                            $gid  = 0;
-                            $gids = [];
-                            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) {
-                                            $objects = $genreHandler->getObjects($criteria, false);
-                                            $gid     = $objects[0]->getVar('gid');
-                                        } else {
-                                            $object = $genreHandler->create();
-                                            $object->setVar('name', trim($genre));
-                                            $gid = $genreHandler->insert($object);
-                                        }
-                                        $gids[$gid] = $gid;
-                                    }
-                                }
-                            }
-                            $vcid = 0;
-                            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) {
-                                        $objects = $voiceHandler->getObjects($criteria, false);
-                                        $vcid    = $objects[0]->getVar('vcid');
-                                    } else {
-                                        $object = $voiceHandler->create();
-                                        $object->setVar('name', trim($data[$_POST['voice']]));
-                                        $vcid = $voiceHandler->insert($object);
-                                    }
-                                }
-                            }
+				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')) {
+									++$record;
+									if ($record > Request::getInt('records', 0, 'POST')) {
+										$start = time();
+										while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+										}
+										$records = 0;
+									}
+								}
+							}
+							$gid  = 0;
+							$gids = [];
+							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) {
+											$objects = $genreHandler->getObjects($criteria, false);
+											$gid     = $objects[0]->getVar('gid');
+										} else {
+											$object = $genreHandler->create();
+											$object->setVar('name', trim($genre));
+											$gid = $genreHandler->insert($object);
+										}
+										$gids[$gid] = $gid;
+									}
+								}
+							}
+							$vcid = 0;
+							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) {
+										$objects = $voiceHandler->getObjects($criteria, false);
+										$vcid    = $objects[0]->getVar('vcid');
+									} else {
+										$object = $voiceHandler->create();
+										$object->setVar('name', trim($data[$_POST['voice']]));
+										$vcid = $voiceHandler->insert($object);
+									}
+								}
+							}
 
-                            $cid = 0;
-                            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) {
-                                        $objects = $categoryHandler->getObjects($criteria, false);
-                                        $cid     = $objects[0]->getVar('cid');
-                                    } else {
-                                        $object = $categoryHandler->create();
-                                        $object->setVar('name', trim($data[$_POST['category']]));
-                                        $cid = $categoryHandler->insert($object);
-                                    }
-                                }
-                            }
-                            $aids = [];
-                            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) {
-                                            $objects                          = $artistsHandler->getObjects($criteria, false);
-                                            $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                        } else {
-                                            $object = $artistsHandler->create(); // added PL
-                                            $object->setVar('name', trim($artist));
-                                            $aid        = $artistsHandler->insert($object);
-                                            $aids[$aid] = $aid;
-                                        }
-                                    }
-                                }
-                            }
-                            $abid = 0;
-                            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) {
-                                        $objects = $albumsHandler->getObjects($criteria, false);
-                                        $abid    = $objects[0]->getVar('abid');
-                                    } else {
-                                        $object = $albumsHandler->create();
-                                        $object->setVar('cid', $cid);
-                                        $object->setVar('aids', $aids);
-                                        $object->setVar('title', trim($data[$_POST['album']]));
-                                        $abid = $albumsHandler->insert($object);
-                                    }
-                                }
-                            }
-                            $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'])) {
-                                    $criteria = new \CriteriaCompo();
-                                    if ('' != trim($data[$_POST['songid']])) {
-                                        $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
-                                    }
-                                    if ('' != trim($data[$_POST['title']])) {
-                                        $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
-                                    }
-                                    if ($songsHandler->getCount($criteria) > 0) {
-                                        $objects = $songsHandler->getObjects($criteria, false);
-                                        $object  = $objects[0];
-                                    } else {
-                                        $object = $songsHandler->create();
-                                    }
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('gids', $gids);
-                                    $object->setVar('vcid', $vcid);
-                                    $object->setVar('aids', $aids);
-                                    $object->setVar('abid', $abid);
-                                    $object->setVar('songid', trim($data[$_POST['songid']]));
-                                    $object->setVar('traxid', trim($data[$_POST['traxid']]));
-                                    $object->setVar('title', trim($data[$_POST['title']]));
-                                    $object->setVar('tags', trim($data[$_POST['tags']]));
-                                    $object->setVar('mp3', trim($data[$_POST['mp3']]));
-                                    $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
-                                    $sid = $songsHandler->insert($object);
+							$cid = 0;
+							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) {
+										$objects = $categoryHandler->getObjects($criteria, false);
+										$cid     = $objects[0]->getVar('cid');
+									} else {
+										$object = $categoryHandler->create();
+										$object->setVar('name', trim($data[$_POST['category']]));
+										$cid = $categoryHandler->insert($object);
+									}
+								}
+							}
+							$aids = [];
+							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) {
+											$objects                          = $artistsHandler->getObjects($criteria, false);
+											$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+										} else {
+											$object = $artistsHandler->create(); // added PL
+											$object->setVar('name', trim($artist));
+											$aid        = $artistsHandler->insert($object);
+											$aids[$aid] = $aid;
+										}
+									}
+								}
+							}
+							$abid = 0;
+							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) {
+										$objects = $albumsHandler->getObjects($criteria, false);
+										$abid    = $objects[0]->getVar('abid');
+									} else {
+										$object = $albumsHandler->create();
+										$object->setVar('cid', $cid);
+										$object->setVar('aids', $aids);
+										$object->setVar('title', trim($data[$_POST['album']]));
+										$abid = $albumsHandler->insert($object);
+									}
+								}
+							}
+							$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'])) {
+									$criteria = new \CriteriaCompo();
+									if ('' != trim($data[$_POST['songid']])) {
+										$criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
+									}
+									if ('' != trim($data[$_POST['title']])) {
+										$criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
+									}
+									if ($songsHandler->getCount($criteria) > 0) {
+										$objects = $songsHandler->getObjects($criteria, false);
+										$object  = $objects[0];
+									} else {
+										$object = $songsHandler->create();
+									}
+									$object->setVar('cid', $cid);
+									$object->setVar('gids', $gids);
+									$object->setVar('vcid', $vcid);
+									$object->setVar('aids', $aids);
+									$object->setVar('abid', $abid);
+									$object->setVar('songid', trim($data[$_POST['songid']]));
+									$object->setVar('traxid', trim($data[$_POST['traxid']]));
+									$object->setVar('title', trim($data[$_POST['title']]));
+									$object->setVar('tags', trim($data[$_POST['tags']]));
+									$object->setVar('mp3', trim($data[$_POST['mp3']]));
+									$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')) {
-                                        $tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
-                                        $tagHandler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
-                                    }
+									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);
+									}
 
-                                    $extrasHandler = Helper::getInstance()->getHandler('Extras');
-                                    $fields        = $extrasHandler->getFields(null);
-                                    $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                    if ($extrasHandler->getCount($criteria) > 0) {
-                                        $extras = $extrasHandler->getObjects($criteria, false);
-                                        $extra  = $extras[0];
-                                    } else {
-                                        $extra = $extrasHandler->create();
-                                    }
-                                    $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')])) {
-                                                $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) {
-                                        $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
-                                        $artistsHandler->insert($artist, true);
-                                    }
-                                }
-                            }
-                        }
-                    } else {
-                        foreach ($xmlarray[$_POST['collection']] as $id => $records) {
-                            if (Request::hasVar('limiting', 'POST')) {
-                                if (true === Request::getInt('limiting', 0, 'POST')) {
-                                    ++$record;
-                                    if ($record > Request::getInt('records', 0, 'POST')) {
-                                        $start = time();
-                                        while (time() - $start < Request::getInt('wait', 0, 'POST')) {
-                                        }
-                                        $records = 0;
-                                    }
-                                }
-                            }
-                            $gid  = 0;
-                            $gids = [];
-                            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) {
-                                            $objects = $genreHandler->getObjects($criteria, false);
-                                            $gid     = $objects[0]->getVar('gid');
-                                        } else {
-                                            $object = $genreHandler->create();
-                                            $object->setVar('name', trim($genre));
-                                            $gid = $genreHandler->insert($object);
-                                        }
-                                        $gids[$gid] = $gid;
-                                    }
-                                }
-                            }
-                            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) {
-                                        $objects = $voiceHandler->getObjects($criteria, false);
-                                        $vcid    = $objects[0]->getVar('vcid');
-                                    } else {
-                                        $object = $voiceHandler->create();
-                                        $object->setVar('name', trim($data[$_POST['voice']]));
-                                        $vcid = $voiceHandler->insert($object);
-                                    }
-                                }
-                            }
-                            $cid = 0;
-                            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) {
-                                        $objects = $categoryHandler->getObjects($criteria, false);
-                                        $cid     = $objects[0]->getVar('cid');
-                                    } else {
-                                        $object = $categoryHandler->create();
-                                        $object->setVar('name', trim($data[$_POST['category']]));
-                                        $cid = $categoryHandler->insert($object);
-                                    }
-                                }
-                            }
-                            $aids = [];
-                            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) {
-                                            $objects                          = $artistsHandler->getObjects($criteria, false);
-                                            $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                        } else {
-                                            $object = $artistsHandler->create(); //added PL
-                                            $object->setVar('cid', $cid);
-                                            $object->setVar('name', trim($data[$_POST['artist']]));
-                                            $aid        = $artistsHandler->insert($object);
-                                            $aids[$aid] = $aid;
-                                        }
-                                    }
-                                }
-                            }
-                            $abid = 0;
-                            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) {
-                                        $objects = $albumsHandler->getObjects($criteria, false);
-                                        $abid    = $objects[0]->getVar('abid');
-                                    } else {
-                                        $object = $albumsHandler->create();
-                                        $object->setVar('cid', $cid);
-                                        $object->setVar('aids', $aids);
-                                        $object->setVar('title', trim($data[$_POST['album']]));
-                                        $abid = $albumsHandler->insert($object);
-                                    }
-                                }
-                            }
-                            $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'])) {
-                                    $criteria = new \CriteriaCompo();
-                                    if ('' != trim($data[$_POST['songid']])) {
-                                        $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
-                                    }
-                                    if ('' != trim($data[$_POST['title']])) {
-                                        $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
-                                    }
-                                    if ($songsHandler->getCount($criteria) > 0) {
-                                        $objects = $songsHandler->getObjects($criteria, false);
-                                        $object  = $objects[0];
-                                    } else {
-                                        $object = $songsHandler->create();
-                                    }
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('gids', $gids);
-                                    $object->setVar('vcid', $vcid);
-                                    $object->setVar('aids', $aids);
-                                    $object->setVar('abid', $abid);
-                                    $object->setVar('songid', trim($data[$_POST['songid']]));
-                                    $object->setVar('traxid', trim($data[$_POST['traxid']]));
-                                    $object->setVar('tags', trim($data[$_POST['tags']]));
-                                    $object->setVar('mp3', trim($data[$_POST['mp3']]));
-                                    $object->setVar('title', trim($data[$_POST['title']]));
-                                    $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
-                                    $sid = $songsHandler->insert($object);
+									$extrasHandler = Helper::getInstance()->getHandler('Extras');
+									$fields        = $extrasHandler->getFields(null);
+									$criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
+									if ($extrasHandler->getCount($criteria) > 0) {
+										$extras = $extrasHandler->getObjects($criteria, false);
+										$extra  = $extras[0];
+									} else {
+										$extra = $extrasHandler->create();
+									}
+									$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')])) {
+												$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) {
+										$artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
+										$artistsHandler->insert($artist, true);
+									}
+								}
+							}
+						}
+					} else {
+						foreach ($xmlarray[$_POST['collection']] as $id => $records) {
+							if (Request::hasVar('limiting', 'POST')) {
+								if (true === Request::getInt('limiting', 0, 'POST')) {
+									++$record;
+									if ($record > Request::getInt('records', 0, 'POST')) {
+										$start = time();
+										while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+										}
+										$records = 0;
+									}
+								}
+							}
+							$gid  = 0;
+							$gids = [];
+							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) {
+											$objects = $genreHandler->getObjects($criteria, false);
+											$gid     = $objects[0]->getVar('gid');
+										} else {
+											$object = $genreHandler->create();
+											$object->setVar('name', trim($genre));
+											$gid = $genreHandler->insert($object);
+										}
+										$gids[$gid] = $gid;
+									}
+								}
+							}
+							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) {
+										$objects = $voiceHandler->getObjects($criteria, false);
+										$vcid    = $objects[0]->getVar('vcid');
+									} else {
+										$object = $voiceHandler->create();
+										$object->setVar('name', trim($data[$_POST['voice']]));
+										$vcid = $voiceHandler->insert($object);
+									}
+								}
+							}
+							$cid = 0;
+							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) {
+										$objects = $categoryHandler->getObjects($criteria, false);
+										$cid     = $objects[0]->getVar('cid');
+									} else {
+										$object = $categoryHandler->create();
+										$object->setVar('name', trim($data[$_POST['category']]));
+										$cid = $categoryHandler->insert($object);
+									}
+								}
+							}
+							$aids = [];
+							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) {
+											$objects                          = $artistsHandler->getObjects($criteria, false);
+											$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+										} else {
+											$object = $artistsHandler->create(); //added PL
+											$object->setVar('cid', $cid);
+											$object->setVar('name', trim($data[$_POST['artist']]));
+											$aid        = $artistsHandler->insert($object);
+											$aids[$aid] = $aid;
+										}
+									}
+								}
+							}
+							$abid = 0;
+							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) {
+										$objects = $albumsHandler->getObjects($criteria, false);
+										$abid    = $objects[0]->getVar('abid');
+									} else {
+										$object = $albumsHandler->create();
+										$object->setVar('cid', $cid);
+										$object->setVar('aids', $aids);
+										$object->setVar('title', trim($data[$_POST['album']]));
+										$abid = $albumsHandler->insert($object);
+									}
+								}
+							}
+							$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'])) {
+									$criteria = new \CriteriaCompo();
+									if ('' != trim($data[$_POST['songid']])) {
+										$criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
+									}
+									if ('' != trim($data[$_POST['title']])) {
+										$criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
+									}
+									if ($songsHandler->getCount($criteria) > 0) {
+										$objects = $songsHandler->getObjects($criteria, false);
+										$object  = $objects[0];
+									} else {
+										$object = $songsHandler->create();
+									}
+									$object->setVar('cid', $cid);
+									$object->setVar('gids', $gids);
+									$object->setVar('vcid', $vcid);
+									$object->setVar('aids', $aids);
+									$object->setVar('abid', $abid);
+									$object->setVar('songid', trim($data[$_POST['songid']]));
+									$object->setVar('traxid', trim($data[$_POST['traxid']]));
+									$object->setVar('tags', trim($data[$_POST['tags']]));
+									$object->setVar('mp3', trim($data[$_POST['mp3']]));
+									$object->setVar('title', trim($data[$_POST['title']]));
+									$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')) {
-                                        $tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
-                                        $tagHandler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
-                                    }
+									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);
+									}
 
-                                    $extrasHandler = Helper::getInstance()->getHandler('Extras');
-                                    $fields        = $extrasHandler->getFields(null);
-                                    $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                    if ($extrasHandler->getCount($criteria) > 0) {
-                                        $extras = $extrasHandler->getObjects($criteria, false);
-                                        $extra  = $extras[0];
-                                    } else {
-                                        $extra = $extrasHandler->create();
-                                    }
-                                    $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')])) {
-                                                $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) {
-                                        $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
-                                        $artistsHandler->insert($artist, true);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } else {
-                    foreach ($xmlarray as $recid => $data) {
-                        $cid  = 0;
-                        $gid  = 0;
-                        $vcid = 0;
-                        $aids = [];
-                        $abid = [];
-                        if (Request::hasVar('limiting', 'POST')) {
-                            if (true === Request::getInt('limiting', 0, 'POST')) {
-                                ++$record;
-                                if ($record > Request::getInt('records', 0, 'POST')) {
-                                    $start = time();
-                                    while (time() - $start < Request::getInt('wait', 0, 'POST')) {
-                                    }
-                                    $records = 0;
-                                }
-                            }
-                        }
-                        $gid  = 0;
-                        $gids = [];
-                        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) {
-                                        $objects = $genreHandler->getObjects($criteria, false);
-                                        $gid     = $objects[0]->getVar('gid');
-                                    } else {
-                                        $object = $genreHandler->create();
-                                        $object->setVar('name', trim($genre));
-                                        $gid = $genreHandler->insert($object);
-                                    }
-                                    $gids[$gid] = $gid;
-                                }
-                            }
-                        }
+									$extrasHandler = Helper::getInstance()->getHandler('Extras');
+									$fields        = $extrasHandler->getFields(null);
+									$criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
+									if ($extrasHandler->getCount($criteria) > 0) {
+										$extras = $extrasHandler->getObjects($criteria, false);
+										$extra  = $extras[0];
+									} else {
+										$extra = $extrasHandler->create();
+									}
+									$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')])) {
+												$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) {
+										$artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
+										$artistsHandler->insert($artist, true);
+									}
+								}
+							}
+						}
+					}
+				} else {
+					foreach ($xmlarray as $recid => $data) {
+						$cid  = 0;
+						$gid  = 0;
+						$vcid = 0;
+						$aids = [];
+						$abid = [];
+						if (Request::hasVar('limiting', 'POST')) {
+							if (true === Request::getInt('limiting', 0, 'POST')) {
+								++$record;
+								if ($record > Request::getInt('records', 0, 'POST')) {
+									$start = time();
+									while (time() - $start < Request::getInt('wait', 0, 'POST')) {
+									}
+									$records = 0;
+								}
+							}
+						}
+						$gid  = 0;
+						$gids = [];
+						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) {
+										$objects = $genreHandler->getObjects($criteria, false);
+										$gid     = $objects[0]->getVar('gid');
+									} else {
+										$object = $genreHandler->create();
+										$object->setVar('name', trim($genre));
+										$gid = $genreHandler->insert($object);
+									}
+									$gids[$gid] = $gid;
+								}
+							}
+						}
 
-                        $vcid = 0;
-                        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) {
-                                    $objects = $voiceHandler->getObjects($criteria, false);
-                                    $vcid    = $objects[0]->getVar('vcid');
-                                } else {
-                                    $object = $voiceHandler->create();
-                                    $object->setVar('name', trim($data[$_POST['voice']]));
-                                    $vcid = $voiceHandler->insert($object);
-                                }
-                            }
-                        }
-                        $cid = 0;
-                        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) {
-                                    $objects = $categoryHandler->getObjects($criteria, false);
-                                    $cid     = $objects[0]->getVar('cid');
-                                } else {
-                                    $object = $categoryHandler->create();
-                                    $object->setVar('name', trim($data[$_POST['category']]));
-                                    $cid = $categoryHandler->insert($object);
-                                }
-                            }
-                        }
-                        $aids = [];
-                        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) {
-                                        $objects                          = $artistsHandler->getObjects($criteria, false);
-                                        $aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
-                                    } else {
-                                        $object = $artistsHandler->create(); //Added PL
-                                        $object->setVar('cid', $cid);
-                                        $object->setVar('name', trim($data[$_POST['artist']]));
-                                        $aid        = $artistsHandler->insert($object);
-                                        $aids[$aid] = $aid;
-                                    }
-                                }
-                            }
-                        }
-                        $abid = 0;
-                        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) {
-                                    $objects = $albumsHandler->getObjects($criteria, false);
-                                    $abid    = $objects[0]->getVar('abid');
-                                } else {
-                                    $object = $albumsHandler->create();
-                                    $object->setVar('cid', $cid);
-                                    $object->setVar('aids', $aids);
-                                    $object->setVar('title', trim($data[$_POST['album']]));
-                                    $abid = $albumsHandler->insert($object);
-                                }
-                            }
-                        }
-                        $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'])) {
-                                $criteria = new \CriteriaCompo();
-                                if ('' != trim($data[$_POST['songid']])) {
-                                    $criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
-                                }
-                                if ('' != trim($data[$_POST['title']])) {
-                                    $criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
-                                }
-                                if ($songsHandler->getCount($criteria) > 0) {
-                                    $objects = $songsHandler->getObjects($criteria, false);
-                                    $object  = $objects[0];
-                                } else {
-                                    $object = $songsHandler->create();
-                                }
-                                $object->setVar('cid', $cid);
-                                $object->setVar('gids', $gids);
-                                $object->setVar('vcid', $vcid);
-                                $object->setVar('aids', $aids);
-                                $object->setVar('abid', $abid);
-                                $object->setVar('songid', trim($data[$_POST['songid']]));
-                                $object->setVar('traxid', trim($data[$_POST['traxid']]));
-                                $object->setVar('title', trim($data[$_POST['title']]));
-                                $object->setVar('tags', trim($data[$_POST['tags']]));
-                                $object->setVar('mp3', trim($data[$_POST['mp3']]));
-                                $object->setVar('lyrics', str_replace("\n", "<br>\n", trim($data[$_POST['lyrics']])));
-                                $sid = $songsHandler->insert($object);
+						$vcid = 0;
+						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) {
+									$objects = $voiceHandler->getObjects($criteria, false);
+									$vcid    = $objects[0]->getVar('vcid');
+								} else {
+									$object = $voiceHandler->create();
+									$object->setVar('name', trim($data[$_POST['voice']]));
+									$vcid = $voiceHandler->insert($object);
+								}
+							}
+						}
+						$cid = 0;
+						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) {
+									$objects = $categoryHandler->getObjects($criteria, false);
+									$cid     = $objects[0]->getVar('cid');
+								} else {
+									$object = $categoryHandler->create();
+									$object->setVar('name', trim($data[$_POST['category']]));
+									$cid = $categoryHandler->insert($object);
+								}
+							}
+						}
+						$aids = [];
+						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) {
+										$objects                          = $artistsHandler->getObjects($criteria, false);
+										$aids[$objects[0]->getVar('aid')] = $objects[0]->getVar('aid');
+									} else {
+										$object = $artistsHandler->create(); //Added PL
+										$object->setVar('cid', $cid);
+										$object->setVar('name', trim($data[$_POST['artist']]));
+										$aid        = $artistsHandler->insert($object);
+										$aids[$aid] = $aid;
+									}
+								}
+							}
+						}
+						$abid = 0;
+						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) {
+									$objects = $albumsHandler->getObjects($criteria, false);
+									$abid    = $objects[0]->getVar('abid');
+								} else {
+									$object = $albumsHandler->create();
+									$object->setVar('cid', $cid);
+									$object->setVar('aids', $aids);
+									$object->setVar('title', trim($data[$_POST['album']]));
+									$abid = $albumsHandler->insert($object);
+								}
+							}
+						}
+						$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'])) {
+								$criteria = new \CriteriaCompo();
+								if ('' != trim($data[$_POST['songid']])) {
+									$criteria->add(new \Criteria('songid', trim($data[$_POST['songid']])));
+								}
+								if ('' != trim($data[$_POST['title']])) {
+									$criteria->add(new \Criteria('title', trim($data[$_POST['title']])));
+								}
+								if ($songsHandler->getCount($criteria) > 0) {
+									$objects = $songsHandler->getObjects($criteria, false);
+									$object  = $objects[0];
+								} else {
+									$object = $songsHandler->create();
+								}
+								$object->setVar('cid', $cid);
+								$object->setVar('gids', $gids);
+								$object->setVar('vcid', $vcid);
+								$object->setVar('aids', $aids);
+								$object->setVar('abid', $abid);
+								$object->setVar('songid', trim($data[$_POST['songid']]));
+								$object->setVar('traxid', trim($data[$_POST['traxid']]));
+								$object->setVar('title', trim($data[$_POST['title']]));
+								$object->setVar('tags', trim($data[$_POST['tags']]));
+								$object->setVar('mp3', trim($data[$_POST['mp3']]));
+								$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')) {
-                                    $tagHandler = \XoopsModules\Tag\Helper::getInstance()->getHandler('Tag');
-                                    $tagHandler->updateByItem(trim($data[$_POST['tags']]), $sid, $GLOBALS['songlistModule']->getVar('dirname'), $cid);
-                                }
+								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);
+								}
 
-                                $extrasHandler = Helper::getInstance()->getHandler('Extras');
-                                $fields        = $extrasHandler->getFields(null);
-                                $criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
-                                if ($extrasHandler->getCount($criteria) > 0) {
-                                    $extras = $extrasHandler->getObjects($criteria, false);
-                                    $extra  = $extras[0];
-                                } else {
-                                    $extra = $extrasHandler->create();
-                                }
-                                $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')])) {
-                                            $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) {
-                                    $artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
-                                    $artistsHandler->insert($artist, true);
-                                }
-                            }
-                        }
-                    }
-                }
-                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);
-                break;
-        }
-        break;
+								$extrasHandler = Helper::getInstance()->getHandler('Extras');
+								$fields        = $extrasHandler->getFields(null);
+								$criteria      = new \CriteriaCompo(new \Criteria('sid', $sid));
+								if ($extrasHandler->getCount($criteria) > 0) {
+									$extras = $extrasHandler->getObjects($criteria, false);
+									$extra  = $extras[0];
+								} else {
+									$extra = $extrasHandler->create();
+								}
+								$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')])) {
+											$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) {
+									$artist->setVar('sids', array_merge($artist->getVar('sids'), [$sid => $sid]));
+									$artistsHandler->insert($artist, true);
+								}
+							}
+						}
+					}
+				}
+				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);
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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

Indentation +154 added lines, -154 removed lines

@@ -3,10 +3,10 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Helper,
-    Genre,
-    GenreHandler,
-    Form\FormController
+	Helper,
+	Genre,
+	GenreHandler,
+	Form\FormController
 };
 
 /** @var Genre $genre */
@@ -26,156 +26,156 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 switch ($op) {
-    default:
-    case 'genre':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var GenreHandler $genreHandler */
-                $genreHandler = Helper::getInstance()->getHandler('Genre');
-
-                $criteria        = $genreHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $genreHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($genreHandler->filterFields() as $id => $key) {
-                    $GLOBALS['xoopsTpl']->assign(
-                        \mb_strtolower(str_replace('-', '_', $key) . '_th'),
-                        '<a href="'
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?start='
-                        . $GLOBALS['start']
-                        . '&limit='
-                        . $GLOBALS['limit']
-                        . '&sort='
-                        . $key
-                        . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
-                        . '&op='
-                        . $GLOBALS['op']
-                        . '&filter='
-                        . $GLOBALS['filter']
-                        . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
-                        . '</a>'
-                    );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $genreHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
-                }
-
-                $GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
-                $GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
-                $GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
-                $GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
-                $GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-
-                $criteria->setStart($GLOBALS['start']);
-                $criteria->setLimit($GLOBALS['limit']);
-                $criteria->setSort('`' . $GLOBALS['sort'] . '`');
-                $criteria->setOrder($GLOBALS['order']);
-
-                $genres = $genreHandler->getObjects($criteria, true);
-                foreach ($genres as $cid => $genre) {
-                    if (is_object($genre)) {
-                        $GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormGenre(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_genre_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $genreHandler = Helper::getInstance()->getHandler('Genre');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $genre = $genreHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $genre = $genreHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $genre->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_genre_edit.tpl');
-                break;
-            case 'save':
-                $genreHandler = Helper::getInstance()->getHandler('Genre');
-                $id           = 0;
-                $id           = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $genre = $genreHandler->get($id);
-                } else {
-                    $genre = $genreHandler->create();
-                }
-                $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);
-                    exit(0);
-                }
-                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'],
-                        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);
-                }
-                exit(0);
-
-                break;
-            case 'savelist':
-                $genreHandler = Helper::getInstance()->getHandler('Genre');
-                foreach ($_REQUEST['id'] as $id) {
-                    $genre = $genreHandler->get($id);
-                    $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'],
-                            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);
-                exit(0);
-                break;
-            case 'delete':
-                $genreHandler = Helper::getInstance()->getHandler('Genre');
-                $id           = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $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'],
-                            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);
-                    exit(0);
-                }
-                $genre = $genreHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                xoops_confirm(
-                    ['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
-                    $_SERVER['SCRIPT_NAME'],
-                    sprintf(_AM_SONGLIST_MSG_GENRE_DELETE, $genre->getVar('name'))
-                );
-
-                break;
-        }
-        break;
+	default:
+	case 'genre':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var GenreHandler $genreHandler */
+				$genreHandler = Helper::getInstance()->getHandler('Genre');
+
+				$criteria        = $genreHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $genreHandler->getCount($criteria);
+				$GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($genreHandler->filterFields() as $id => $key) {
+					$GLOBALS['xoopsTpl']->assign(
+						\mb_strtolower(str_replace('-', '_', $key) . '_th'),
+						'<a href="'
+						. $_SERVER['SCRIPT_NAME']
+						. '?start='
+						. $GLOBALS['start']
+						. '&limit='
+						. $GLOBALS['limit']
+						. '&sort='
+						. $key
+						. '&order='
+						. (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+						. '&op='
+						. $GLOBALS['op']
+						. '&filter='
+						. $GLOBALS['filter']
+						. '">'
+						. (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+						. '</a>'
+					);
+					$GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $genreHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+				}
+
+				$GLOBALS['xoopsTpl']->assign('limit', $GLOBALS['limit']);
+				$GLOBALS['xoopsTpl']->assign('start', $GLOBALS['start']);
+				$GLOBALS['xoopsTpl']->assign('order', $GLOBALS['order']);
+				$GLOBALS['xoopsTpl']->assign('sort', $GLOBALS['sort']);
+				$GLOBALS['xoopsTpl']->assign('filter', $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+
+				$criteria->setStart($GLOBALS['start']);
+				$criteria->setLimit($GLOBALS['limit']);
+				$criteria->setSort('`' . $GLOBALS['sort'] . '`');
+				$criteria->setOrder($GLOBALS['order']);
+
+				$genres = $genreHandler->getObjects($criteria, true);
+				foreach ($genres as $cid => $genre) {
+					if (is_object($genre)) {
+						$GLOBALS['xoopsTpl']->append('genre', $genre->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormGenre(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_genre_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$genreHandler = Helper::getInstance()->getHandler('Genre');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$genre = $genreHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$genre = $genreHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $genre->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_genre_edit.tpl');
+				break;
+			case 'save':
+				$genreHandler = Helper::getInstance()->getHandler('Genre');
+				$id           = 0;
+				$id           = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$genre = $genreHandler->get($id);
+				} else {
+					$genre = $genreHandler->create();
+				}
+				$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);
+					exit(0);
+				}
+				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'],
+						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);
+				}
+				exit(0);
+
+				break;
+			case 'savelist':
+				$genreHandler = Helper::getInstance()->getHandler('Genre');
+				foreach ($_REQUEST['id'] as $id) {
+					$genre = $genreHandler->get($id);
+					$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'],
+							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);
+				exit(0);
+				break;
+			case 'delete':
+				$genreHandler = Helper::getInstance()->getHandler('Genre');
+				$id           = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$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'],
+							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);
+					exit(0);
+				}
+				$genre = $genreHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				xoops_confirm(
+					['id' => $_REQUEST['id'], 'op' => $_REQUEST['op'], 'fct' => $_REQUEST['fct'], 'limit' => $_REQUEST['limit'], 'start' => $_REQUEST['start'], 'order' => $_REQUEST['order'], 'sort' => $_REQUEST['sort'], 'filter' => $_REQUEST['filter']],
+					$_SERVER['SCRIPT_NAME'],
+					sprintf(_AM_SONGLIST_MSG_GENRE_DELETE, $genre->getVar('name'))
+				);
+
+				break;
+		}
+		break;
 }
 
 xoops_cp_footer();

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