XoopsModules25x / songlist

admin/category.php

Indentation +190 added lines, -190 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 = Request::getString('filter', '1,1', 'REQUEST');
 
 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'] = Request::getString('sort', 'created', 'REQUEST');;
-
-                $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'] = Request::getString('sort', 'created', 'REQUEST');;
+
+				$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,95 +135,95 @@ 
 //                    }
 
 //                    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);
-            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);
-            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;
-        }
+					$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);
+			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);
+			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;
+		}
 }
 
 xoops_cp_footer();

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
 
 /** @var Category $category */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -40,14 +40,14 @@ 
 
                 $criteria        = $categoryHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $categoryHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST'); ;
 
-                $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);
             case 'savelist':
@@ -190,14 +190,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);
             case 'delete':
                 $categoryHandler = Helper::getInstance()->getHandler('Category');
@@ -206,13 +206,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 +150 added lines, -150 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,152 +26,152 @@ 
 $filter = Request::getString('filter', '1,1', 'REQUEST');
 
 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'] = Request::getString('sort', 'created', 'REQUEST');;
-
-                $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);
-            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);
-            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;
-        }
+	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'] = Request::getString('sort', 'created', 'REQUEST');;
+
+				$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);
+			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);
+			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;
+		}
 }
 
 xoops_cp_footer();

Spacing +16 added lines, -16 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Voice $voice */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -39,14 +39,14 @@ 
 
                 $criteria        = $voiceHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $voiceHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST'); ;
 
-                $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);
             case 'savelist':
@@ -138,14 +138,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);
             case 'delete':
                 $voiceHandler = Helper::getInstance()->getHandler('Voice');
@@ -154,13 +154,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/genre.php

Indentation +150 added lines, -150 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,152 +26,152 @@ 
 $filter = Request::getString('filter', '1,1', 'REQUEST');
 
 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'] = Request::getString('sort', 'created', 'REQUEST');;
-
-                $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);
-            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);
-            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;
-        }
+	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'] = Request::getString('sort', 'created', 'REQUEST');;
+
+				$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);
+			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);
+			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;
+		}
 }
 
 xoops_cp_footer();

Spacing +16 added lines, -16 removed lines

@@ -11,7 +11,7 @@ 
 
 /** @var Genre $genre */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -39,14 +39,14 @@ 
 
                 $criteria        = $genreHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $genreHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST'); ;
 
-                $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);
             case 'savelist':
@@ -138,14 +138,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);
             case 'delete':
                 $genreHandler = Helper::getInstance()->getHandler('Genre');
@@ -154,13 +154,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'));

admin/albums.php

Indentation +190 added lines, -190 removed lines

@@ -3,11 +3,11 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Uploader,
-    Albums,
-    AlbumsHandler
+	Form\FormController,
+	Helper,
+	Uploader,
+	Albums,
+	AlbumsHandler
 };
 
 /** @var Albums $album */
@@ -27,102 +27,102 @@ 
 $filter = Request::getString('filter', '1,1', 'REQUEST');
 
 switch ($op) {
-    default:
-    case 'albums':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var AlbumsHandler $albumsHandler */
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-
-                $criteria        = $albumsHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $albumsHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');
-
-                $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 ($albumsHandler->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', $albumsHandler->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']);
-
-            $albumsArray = $albumsHandler->getObjects($criteria, true);
-                foreach ($albumsArray as $cid => $album) {
-                    if (is_object($album)) {
-                        $GLOBALS['xoopsTpl']->append('albums', $album->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormAlbums(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $album = $albumsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $album = $albumsHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $album->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.tpl');
-                break;
-            case 'save':
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-                $id            = 0;
-                $id            = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $album = $albumsHandler->get($id);
-                } else {
-                    $album = $albumsHandler->create();
-                }
-                $album->setVars($_POST[$id]);
-
-                if (!$id = $albumsHandler->insert($album)) {
-                    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_ALBUMS_FAILEDTOSAVE);
-                    exit(0);
-                }
-                if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
+	default:
+	case 'albums':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var AlbumsHandler $albumsHandler */
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+
+				$criteria        = $albumsHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $albumsHandler->getCount($criteria);
+				$GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');
+
+				$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 ($albumsHandler->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', $albumsHandler->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']);
+
+			$albumsArray = $albumsHandler->getObjects($criteria, true);
+				foreach ($albumsArray as $cid => $album) {
+					if (is_object($album)) {
+						$GLOBALS['xoopsTpl']->append('albums', $album->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormAlbums(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$album = $albumsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$album = $albumsHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $album->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_albums_edit.tpl');
+				break;
+			case 'save':
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+				$id            = 0;
+				$id            = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$album = $albumsHandler->get($id);
+				} else {
+					$album = $albumsHandler->create();
+				}
+				$album->setVars($_POST[$id]);
+
+				if (!$id = $albumsHandler->insert($album)) {
+					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_ALBUMS_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,95 +135,95 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $album    = $albumsHandler->get($id);
-                    $uploader = new Uploader(
-                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']. 'albums'),
-                        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($album->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($album->getVar('path')) . $album->getVar('image'));
-                        }
-
-                        $album->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']. 'albums/') ;
-                        $album->setVar('image', $uploader->getSavedFileName());
-                        @$albumsHandler->insert($album);
-                    } 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_ALBUMS_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_ALBUMS_SAVEDOKEY);
-                }
-                exit(0);
-            case 'savelist':
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-                foreach ($_REQUEST['id'] as $id) {
-                    $album = $albumsHandler->get($id);
-                    $album->setVars($_POST[$id]);
-                    if (!$albumsHandler->insert($album)) {
-                        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_ALBUMS_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_ALBUMS_SAVEDOKEY);
-                exit(0);
-            case 'delete':
-                $albumsHandler = Helper::getInstance()->getHandler('Albums');
-                $id            = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $album = $albumsHandler->get($id);
-                    if (!$albumsHandler->delete($album)) {
-                        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_ALBUMS_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_ALBUMS_DELETED);
-                    exit(0);
-                }
-                $album = $albumsHandler->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_ALBUMS_DELETE, $album->getVar('title'))
-                );
-
-                break;
-        }
+					$album    = $albumsHandler->get($id);
+					$uploader = new Uploader(
+						$GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']. 'albums'),
+						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($album->getVar('image'))) {
+							unlink($GLOBALS['xoops']->path($album->getVar('path')) . $album->getVar('image'));
+						}
+
+						$album->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']. 'albums/') ;
+						$album->setVar('image', $uploader->getSavedFileName());
+						@$albumsHandler->insert($album);
+					} 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_ALBUMS_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_ALBUMS_SAVEDOKEY);
+				}
+				exit(0);
+			case 'savelist':
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+				foreach ($_REQUEST['id'] as $id) {
+					$album = $albumsHandler->get($id);
+					$album->setVars($_POST[$id]);
+					if (!$albumsHandler->insert($album)) {
+						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_ALBUMS_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_ALBUMS_SAVEDOKEY);
+				exit(0);
+			case 'delete':
+				$albumsHandler = Helper::getInstance()->getHandler('Albums');
+				$id            = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$album = $albumsHandler->get($id);
+					if (!$albumsHandler->delete($album)) {
+						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_ALBUMS_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_ALBUMS_DELETED);
+					exit(0);
+				}
+				$album = $albumsHandler->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_ALBUMS_DELETE, $album->getVar('title'))
+				);
+
+				break;
+		}
 }
 
 xoops_cp_footer();

Spacing +21 added lines, -21 removed lines

@@ -12,7 +12,7 @@ 
 
 /** @var Albums $album */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -42,12 +42,12 @@ 
                 $ttl             = $albumsHandler->getCount($criteria);
                 $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');
 
-                $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 ($albumsHandler->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', $albumsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $albumsHandler->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']);
 
             $albumsArray = $albumsHandler->getObjects($criteria, true);
@@ -119,7 +119,7 @@ 
                 $album->setVars($_POST[$id]);
 
                 if (!$id = $albumsHandler->insert($album)) {
-                    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_ALBUMS_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_ALBUMS_FAILEDTOSAVE);
                     exit(0);
                 }
                 if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
@@ -137,7 +137,7 @@ 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
                     $album    = $albumsHandler->get($id);
                     $uploader = new Uploader(
-                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas']. 'albums'),
+                        $GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].'albums'),
                         explode('|', $GLOBALS['songlistModuleConfig']['allowed_mimetype']),
                         $GLOBALS['songlistModuleConfig']['filesize_upload'],
                         0,
@@ -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,33 +154,33 @@ 
                             $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($album->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($album->getVar('path')) . $album->getVar('image'));
+                            unlink($GLOBALS['xoops']->path($album->getVar('path')).$album->getVar('image'));
                         }
 
-                        $album->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']. 'albums/') ;
+                        $album->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas'].'albums/');
                         $album->setVar('image', $uploader->getSavedFileName());
                         @$albumsHandler->insert($album);
                     } else {
                         $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_ALBUMS_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_ALBUMS_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_ALBUMS_SAVEDOKEY);
                 }
                 exit(0);
             case 'savelist':
@@ -190,14 +190,14 @@ 
                     $album->setVars($_POST[$id]);
                     if (!$albumsHandler->insert($album)) {
                         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_ALBUMS_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_ALBUMS_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_ALBUMS_SAVEDOKEY);
                 exit(0);
             case 'delete':
                 $albumsHandler = Helper::getInstance()->getHandler('Albums');
@@ -206,13 +206,13 @@ 
                     $album = $albumsHandler->get($id);
                     if (!$albumsHandler->delete($album)) {
                         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_ALBUMS_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_ALBUMS_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_ALBUMS_DELETED);
                     exit(0);
                 }
                 $album = $albumsHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/votes.php

Indentation +190 added lines, -190 removed lines

@@ -3,11 +3,11 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Votes,
-    VotesHandler,
-    Uploader
+	Form\FormController,
+	Helper,
+	Votes,
+	VotesHandler,
+	Uploader
 };
 
 /** @var Votes $votes */
@@ -27,102 +27,102 @@ 
 $filter = Request::getString('filter', '1,1', 'REQUEST');
 
 switch ($op) {
-    default:
-    case 'votes':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                /** @var VotesHandler $votesHandler */
-                $votesHandler = Helper::getInstance()->getHandler('Votes');
-
-                $criteria        = $votesHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $votesHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
-
-                $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 ($votesHandler->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', $votesHandler->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']);
-
-                $votess = $votesHandler->getObjects($criteria, true);
-                foreach ($votess as $cid => $votes) {
-                    if (is_object($votes)) {
-                        $GLOBALS['xoopsTpl']->append('categories', $votes->toArray());
-                    }
-                }
-                //$GLOBALS['xoopsTpl']->assign('form', FormController::votes_get_form(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_votes_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $votesHandler = Helper::getInstance()->getHandler('Votes');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $votes = $votesHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $votes = $votesHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $votes->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_votes_edit.tpl');
-                break;
-            case 'save':
-                $votesHandler = Helper::getInstance()->getHandler('Votes');
-                $id           = 0;
-                $id           = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $votes = $votesHandler->get($id);
-                } else {
-                    $votes = $votesHandler->create();
-                }
-                $votes->setVars($_POST[$id]);
-
-                if (!$id = $votesHandler->insert($votes)) {
-                    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_VOTES_FAILEDTOSAVE);
-                    exit(0);
-                }
-                if (Request::hasVar('image', 'FILES') && !empty($_FILES['image']['name'])) {
+	default:
+	case 'votes':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				/** @var VotesHandler $votesHandler */
+				$votesHandler = Helper::getInstance()->getHandler('Votes');
+
+				$criteria        = $votesHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $votesHandler->getCount($criteria);
+				$GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+
+				$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 ($votesHandler->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', $votesHandler->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']);
+
+				$votess = $votesHandler->getObjects($criteria, true);
+				foreach ($votess as $cid => $votes) {
+					if (is_object($votes)) {
+						$GLOBALS['xoopsTpl']->append('categories', $votes->toArray());
+					}
+				}
+				//$GLOBALS['xoopsTpl']->assign('form', FormController::votes_get_form(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_votes_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$votesHandler = Helper::getInstance()->getHandler('Votes');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$votes = $votesHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$votes = $votesHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $votes->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_votes_edit.tpl');
+				break;
+			case 'save':
+				$votesHandler = Helper::getInstance()->getHandler('Votes');
+				$id           = 0;
+				$id           = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$votes = $votesHandler->get($id);
+				} else {
+					$votes = $votesHandler->create();
+				}
+				$votes->setVars($_POST[$id]);
+
+				if (!$id = $votesHandler->insert($votes)) {
+					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_VOTES_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,95 +135,95 @@ 
 //                    }
 
 //                    require_once $GLOBALS['xoops']->path('modules/songlist/include/uploader.php');
-                    $votes    = $votesHandler->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($votes->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($votes->getVar('path')) . $votes->getVar('image'));
-                        }
-
-                        $votes->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
-                        $votes->setVar('image', $uploader->getSavedFileName());
-                        @$votesHandler->insert($votes);
-                    } 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_VOTES_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_VOTES_SAVEDOKEY);
-                }
-                exit(0);
-            case 'savelist':
-                $votesHandler = Helper::getInstance()->getHandler('Votes');
-                foreach ($_REQUEST['id'] as $id) {
-                    $votes = $votesHandler->get($id);
-                    $votes->setVars($_POST[$id]);
-                    if (!$votesHandler->insert($votes)) {
-                        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_VOTES_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_VOTES_SAVEDOKEY);
-                exit(0);
-            case 'delete':
-                $votesHandler = Helper::getInstance()->getHandler('Votes');
-                $id           = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $votes = $votesHandler->get($id);
-                    if (!$votesHandler->delete($votes)) {
-                        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_VOTES_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_VOTES_DELETED);
-                    exit(0);
-                }
-                $votes = $votesHandler->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_VOTES_DELETE, $votes->getVar('name'))
-                );
-
-                break;
-        }
+					$votes    = $votesHandler->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($votes->getVar('image'))) {
+							unlink($GLOBALS['xoops']->path($votes->getVar('path')) . $votes->getVar('image'));
+						}
+
+						$votes->setVar('path', $GLOBALS['songlistModuleConfig']['upload_areas']);
+						$votes->setVar('image', $uploader->getSavedFileName());
+						@$votesHandler->insert($votes);
+					} 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_VOTES_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_VOTES_SAVEDOKEY);
+				}
+				exit(0);
+			case 'savelist':
+				$votesHandler = Helper::getInstance()->getHandler('Votes');
+				foreach ($_REQUEST['id'] as $id) {
+					$votes = $votesHandler->get($id);
+					$votes->setVars($_POST[$id]);
+					if (!$votesHandler->insert($votes)) {
+						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_VOTES_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_VOTES_SAVEDOKEY);
+				exit(0);
+			case 'delete':
+				$votesHandler = Helper::getInstance()->getHandler('Votes');
+				$id           = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$votes = $votesHandler->get($id);
+					if (!$votesHandler->delete($votes)) {
+						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_VOTES_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_VOTES_DELETED);
+					exit(0);
+				}
+				$votes = $votesHandler->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_VOTES_DELETE, $votes->getVar('name'))
+				);
+
+				break;
+		}
 }
 
 xoops_cp_footer();

Spacing +20 added lines, -20 removed lines

@@ -12,7 +12,7 @@ 
 
 /** @var Votes $votes */
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -40,14 +40,14 @@ 
 
                 $criteria        = $votesHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $votesHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST'); ;
 
-                $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 ($votesHandler->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', $votesHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $votesHandler->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']);
 
                 $votess = $votesHandler->getObjects($criteria, true);
@@ -119,7 +119,7 @@ 
                 $votes->setVars($_POST[$id]);
 
                 if (!$id = $votesHandler->insert($votes)) {
-                    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_VOTES_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_VOTES_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($votes->getVar('image'))) {
-                            unlink($GLOBALS['xoops']->path($votes->getVar('path')) . $votes->getVar('image'));
+                            unlink($GLOBALS['xoops']->path($votes->getVar('path')).$votes->getVar('image'));
                         }
 
                         $votes->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_VOTES_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_VOTES_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_VOTES_SAVEDOKEY);
                 }
                 exit(0);
             case 'savelist':
@@ -190,14 +190,14 @@ 
                     $votes->setVars($_POST[$id]);
                     if (!$votesHandler->insert($votes)) {
                         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_VOTES_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_VOTES_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_VOTES_SAVEDOKEY);
                 exit(0);
             case 'delete':
                 $votesHandler = Helper::getInstance()->getHandler('Votes');
@@ -206,13 +206,13 @@ 
                     $votes = $votesHandler->get($id);
                     if (!$votesHandler->delete($votes)) {
                         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_VOTES_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_VOTES_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_VOTES_DELETED);
                     exit(0);
                 }
                 $votes = $votesHandler->get(Request::getInt('id', 0, 'REQUEST'));

admin/requests.php

Indentation +150 added lines, -150 removed lines

@@ -3,10 +3,10 @@ 
 use Xmf\Module\Admin;
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Form\FormController,
-    Helper,
-    Requests,
-    RequestsHandler,
+	Form\FormController,
+	Helper,
+	Requests,
+	RequestsHandler,
 };
 
 /** @var Requests $requests */
@@ -27,152 +27,152 @@ 
 $filter = Request::getString('filter', '1,1', 'REQUEST');
 
 switch ($op) {
-    default:
-    case 'requests':
-        switch ($fct) {
-            default:
-            case 'list':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-            /** @var RequestsHandler $requestsHandler */
-            $requestsHandler = Helper::getInstance()->getHandler('Requests');
-
-                $criteria        = $requestsHandler->getFilterCriteria($GLOBALS['filter']);
-                $ttl             = $requestsHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
-
-                $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 ($requestsHandler->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', $requestsHandler->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']);
-
-                $requestss = $requestsHandler->getObjects($criteria, true);
-                foreach ($requestss as $cid => $requests) {
-                    if (is_object($requests)) {
-                        $GLOBALS['xoopsTpl']->append('requests', $requests->toArray());
-                    }
-                }
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false));
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_requests_list.tpl');
-                break;
-            case 'new':
-            case 'edit':
-                $adminObject = Admin::getInstance();
-                $adminObject->displayNavigation(basename(__FILE__));
-
-                $requestsHandler = Helper::getInstance()->getHandler('Requests');
-                if (Request::hasVar('id', 'REQUEST')) {
-                    $requests = $requestsHandler->get(Request::getInt('id', 0, 'REQUEST'));
-                } else {
-                    $requests = $requestsHandler->create();
-                }
-
-                $GLOBALS['xoopsTpl']->assign('form', $requests->getForm());
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->display('db:songlist_cpanel_requests_edit.tpl');
-                break;
-            case 'save':
-                $requestsHandler = Helper::getInstance()->getHandler('Requests');
-                $id              = 0;
-                $id              = Request::getInt('id', 0, 'REQUEST');
-                if ($id) {
-                    $requests = $requestsHandler->get($id);
-                } else {
-                    $requests = $requestsHandler->create();
-                }
-                $requests->setVars($_POST[$id]);
-
-                if (!$id = $requestsHandler->insert($requests)) {
-                    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_REQUESTS_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_REQUESTS_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_REQUESTS_SAVEDOKEY);
-                }
-                exit(0);
-            case 'savelist':
-                $requestsHandler = Helper::getInstance()->getHandler('Requests');
-                foreach ($_REQUEST['id'] as $id) {
-                    $requests = $requestsHandler->get($id);
-                    $requests->setVars($_POST[$id]);
-                    if (!$requestsHandler->insert($requests)) {
-                        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_REQUESTS_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_REQUESTS_SAVEDOKEY);
-                exit(0);
-            case 'delete':
-                $requestsHandler = Helper::getInstance()->getHandler('Requests');
-                $id              = 0;
-                if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
-                    $requests = $requestsHandler->get($id);
-                    if (!$requestsHandler->delete($requests)) {
-                        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_REQUESTS_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_REQUESTS_DELETED);
-                    exit(0);
-                }
-                $requests = $requestsHandler->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_REQUESTS_DELETE, $requests->getVar('name'))
-                );
-
-                break;
-        }
+	default:
+	case 'requests':
+		switch ($fct) {
+			default:
+			case 'list':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+			/** @var RequestsHandler $requestsHandler */
+			$requestsHandler = Helper::getInstance()->getHandler('Requests');
+
+				$criteria        = $requestsHandler->getFilterCriteria($GLOBALS['filter']);
+				$ttl             = $requestsHandler->getCount($criteria);
+				$GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+
+				$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 ($requestsHandler->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', $requestsHandler->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']);
+
+				$requestss = $requestsHandler->getObjects($criteria, true);
+				foreach ($requestss as $cid => $requests) {
+					if (is_object($requests)) {
+						$GLOBALS['xoopsTpl']->append('requests', $requests->toArray());
+					}
+				}
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false));
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_requests_list.tpl');
+				break;
+			case 'new':
+			case 'edit':
+				$adminObject = Admin::getInstance();
+				$adminObject->displayNavigation(basename(__FILE__));
+
+				$requestsHandler = Helper::getInstance()->getHandler('Requests');
+				if (Request::hasVar('id', 'REQUEST')) {
+					$requests = $requestsHandler->get(Request::getInt('id', 0, 'REQUEST'));
+				} else {
+					$requests = $requestsHandler->create();
+				}
+
+				$GLOBALS['xoopsTpl']->assign('form', $requests->getForm());
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->display('db:songlist_cpanel_requests_edit.tpl');
+				break;
+			case 'save':
+				$requestsHandler = Helper::getInstance()->getHandler('Requests');
+				$id              = 0;
+				$id              = Request::getInt('id', 0, 'REQUEST');
+				if ($id) {
+					$requests = $requestsHandler->get($id);
+				} else {
+					$requests = $requestsHandler->create();
+				}
+				$requests->setVars($_POST[$id]);
+
+				if (!$id = $requestsHandler->insert($requests)) {
+					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_REQUESTS_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_REQUESTS_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_REQUESTS_SAVEDOKEY);
+				}
+				exit(0);
+			case 'savelist':
+				$requestsHandler = Helper::getInstance()->getHandler('Requests');
+				foreach ($_REQUEST['id'] as $id) {
+					$requests = $requestsHandler->get($id);
+					$requests->setVars($_POST[$id]);
+					if (!$requestsHandler->insert($requests)) {
+						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_REQUESTS_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_REQUESTS_SAVEDOKEY);
+				exit(0);
+			case 'delete':
+				$requestsHandler = Helper::getInstance()->getHandler('Requests');
+				$id              = 0;
+				if (Request::hasVar('id', 'POST') && $id = Request::getInt('id', 0, 'POST')) {
+					$requests = $requestsHandler->get($id);
+					if (!$requestsHandler->delete($requests)) {
+						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_REQUESTS_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_REQUESTS_DELETED);
+					exit(0);
+				}
+				$requests = $requestsHandler->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_REQUESTS_DELETE, $requests->getVar('name'))
+				);
+
+				break;
+		}
 }
 
 xoops_cp_footer();

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 /** @var Requests $requests */
 
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -40,14 +40,14 @@ 
 
                 $criteria        = $requestsHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $requestsHandler->getCount($criteria);
-                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST');;
+                $GLOBALS['sort'] = Request::getString('sort', 'created', 'REQUEST'); ;
 
-                $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 ($requestsHandler->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', $requestsHandler->getFilterForm($GLOBALS['filter'], $key, $GLOBALS['sort'], $GLOBALS['op'], $GLOBALS['fct']));
+                    $GLOBALS['xoopsTpl']->assign('filter_'.\mb_strtolower(str_replace('-', '_', $key)).'_th', $requestsHandler->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']);
 
                 $requestss = $requestsHandler->getObjects($criteria, true);
@@ -119,17 +119,17 @@ 
                 $requests->setVars($_POST[$id]);
 
                 if (!$id = $requestsHandler->insert($requests)) {
-                    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_REQUESTS_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_REQUESTS_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_REQUESTS_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_REQUESTS_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_REQUESTS_SAVEDOKEY);
                 }
                 exit(0);
             case 'savelist':
@@ -139,14 +139,14 @@ 
                     $requests->setVars($_POST[$id]);
                     if (!$requestsHandler->insert($requests)) {
                         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_REQUESTS_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_REQUESTS_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_REQUESTS_SAVEDOKEY);
                 exit(0);
             case 'delete':
                 $requestsHandler = Helper::getInstance()->getHandler('Requests');
@@ -155,13 +155,13 @@ 
                     $requests = $requestsHandler->get($id);
                     if (!$requestsHandler->delete($requests)) {
                         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_REQUESTS_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_REQUESTS_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_REQUESTS_DELETED);
                     exit(0);
                 }
                 $requests = $requestsHandler->get(Request::getInt('id', 0, 'REQUEST'));

include/common.php

Indentation +31 added lines, -31 removed lines

@@ -39,19 +39,19 @@ 
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -77,23 +77,23 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', $helper->url());
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3LanguageManager.class.php';
-    $langman = D3LanguageManager::getInstance();
-    $langman->read('main.php', $moduleDirName);
+	require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3LanguageManager.class.php';
+	$langman = D3LanguageManager::getInstance();
+	$langman->read('main.php', $moduleDirName);
 }

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
 use XoopsModules\Songlist;
 use XoopsModules\Songlist\Helper;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -38,20 +38,20 @@ 
 //$categoryHandler     = new Songlist\CategoryHandler($db);
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -87,13 +87,13 @@ 
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . '/libs/altsys/class/D3LanguageManager.class.php';
+    require_once XOOPS_TRUST_PATH.'/libs/altsys/class/D3LanguageManager.class.php';
     $langman = D3LanguageManager::getInstance();
     $langman->read('main.php', $moduleDirName);
 }

request.php

Indentation +41 added lines, -41 removed lines

@@ -19,47 +19,47 @@
 $requestsHandler = Helper::getInstance()->getHandler('Requests');
 
 switch ($op) {
-    default:
-    case 'request':
-        $url = $requestsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+	default:
+	case 'request':
+		$url = $requestsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
 
-        switch ($fct) {
-            case 'save':
-                if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
-                    $request = $requestsHandler->create();
-                    $request->setVars($_POST[0]);
-                    $rid = $requestsHandler->insert($request);
-                    if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
-                    } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
-                    }
-                    exit;
-                }
-                $error = _MD_SONGLIST_MSG_EMAILNOTSET;
+		switch ($fct) {
+			case 'save':
+				if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
+					$request = $requestsHandler->create();
+					$request->setVars($_POST[0]);
+					$rid = $requestsHandler->insert($request);
+					if ($rid) {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+					} else {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+					}
+					exit;
+				}
+				$error = _MD_SONGLIST_MSG_EMAILNOTSET;
 
-            // no break
-            default:
-            case 'list':
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
-                require_once $GLOBALS['xoops']->path('/header.php');
-                if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-                    $GLOBALS['loaded_jquery'] = true;
-                }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
-                if (mb_strlen($error ?? '')) {
-                    xoops_error($error);
-                }
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
+			// no break
+			default:
+			case 'list':
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
+				require_once $GLOBALS['xoops']->path('/header.php');
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+					$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+					$GLOBALS['loaded_jquery'] = true;
+				}
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
+				if (mb_strlen($error ?? '')) {
+					xoops_error($error);
+				}
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
 }

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\RequestsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit;
 
@@ -24,7 +24,7 @@ 
         $url = $requestsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
@@ -35,9 +35,9 @@ 
                     $request->setVars($_POST[0]);
                     $rid = $requestsHandler->insert($request);
                     if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
                     } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
                     }
                     exit;
                 }
@@ -49,10 +49,10 @@ 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
                 require_once $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));

testdata/index.php

Indentation +152 added lines, -152 removed lines

@@ -37,33 +37,33 @@ 
 $helper->loadLanguage('common');
 
 switch ($op) {
-    case 'load':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            loadSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
-    case 'save':
-        saveSampleData();
-        break;
-    case 'clear':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
-            if (!$GLOBALS['xoopsSecurity']->check()) {
-                redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
-            }
-            clearSampleData();
-        } else {
-            xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
-            xoops_cp_footer();
-        }
-        break;
+	case 'load':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			loadSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
+	case 'save':
+		saveSampleData();
+		break;
+	case 'clear':
+		if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+			if (!$GLOBALS['xoopsSecurity']->check()) {
+				redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
+			}
+			clearSampleData();
+		} else {
+			xoops_cp_header();
+			xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+			xoops_cp_footer();
+		}
+		break;
 }
 
 // XMF TableLoad for SAMPLE data
@@ -73,43 +73,43 @@ 
  */
 function loadSampleData(): void
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    $utility      = new Utility();
-    $configurator = new Configurator();
-
-    $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
-
-    $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
-    }
-
-    // load module tables
-    foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
-        TableLoad::truncateTable($table);
-        TableLoad::loadTableFromArray($table, $tabledata);
-    }
-
-    // load permissions
-    $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
-    $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
-    loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
-
-    //  ---  COPY test folder files ---------------
-    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
-        //        $file =  \dirname(__DIR__) . '/testdata/images/';
-        foreach (array_keys($configurator->copyTestFolders) as $i) {
-            $src  = $configurator->copyTestFolders[$i][0];
-            $dest = $configurator->copyTestFolders[$i][1];
-            $utility::rcopy($src, $dest);
-        }
-    }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	$utility      = new Utility();
+	$configurator = new Configurator();
+
+	$tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
+
+	$language = 'english/';
+	if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
+		$language = $xoopsConfig['language'] . '/';
+	}
+
+	// load module tables
+	foreach ($tables as $table) {
+		$tabledata = Yaml::readWrapped($language . $table . '.yml');
+		TableLoad::truncateTable($table);
+		TableLoad::loadTableFromArray($table, $tabledata);
+	}
+
+	// load permissions
+	$table     = 'group_permission';
+	$tabledata = Yaml::readWrapped($language . $table . '.yml');
+	$mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
+	loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
+
+	//  ---  COPY test folder files ---------------
+	if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+		//        $file =  \dirname(__DIR__) . '/testdata/images/';
+		foreach (array_keys($configurator->copyTestFolders) as $i) {
+			$src  = $configurator->copyTestFolders[$i][0];
+			$dest = $configurator->copyTestFolders[$i][1];
+			$utility::rcopy($src, $dest);
+		}
+	}
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -117,32 +117,32 @@ 
  */
 function saveSampleData(): void
 {
-    global $xoopsConfig;
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    $tables             = $helper->getModule()->getInfo('tables');
-
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
-    }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
-    Utility::createFolder($exportFolder);
-
-    // save module tables
-    foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
-    }
-
-    // save permissions
-    $criteria = new \CriteriaCompo();
-    $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
-    $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
-    unset($criteria);
-
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+	global $xoopsConfig;
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	$tables             = $helper->getModule()->getInfo('tables');
+
+	$languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
+	if (!file_exists($languageFolder . '/')) {
+		Utility::createFolder($languageFolder . '/');
+	}
+	$exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+	Utility::createFolder($exportFolder);
+
+	// save module tables
+	foreach ($tables as $table) {
+		TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+	}
+
+	// save permissions
+	$criteria = new \CriteriaCompo();
+	$criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
+	$skipColumns[] = 'gperm_id';
+	TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+	unset($criteria);
+
+	\redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -150,18 +150,18 @@ 
  */
 function exportSchema(): void
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    try {
-        // TODO set exportSchema
-        //        $migrate = new Migrate($moduleDirName);
-        //        $migrate->saveCurrentSchema();
-        //
-        //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
-    } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
-    }
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	try {
+		// TODO set exportSchema
+		//        $migrate = new Migrate($moduleDirName);
+		//        $migrate->saveCurrentSchema();
+		//
+		//        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
+	} catch (\Throwable $e) {
+		exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+	}
 }
 
 /**
@@ -178,45 +178,45 @@ 
  */
 function loadTableFromArrayWithReplace($table, $data, $search, $replace): int
 {
-    /** @var \XoopsMySQLDatabase $db */
-    $db = \XoopsDatabaseFactory::getDatabaseConnection();
-
-    $prefixedTable = $db->prefix($table);
-    $count         = 0;
-
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
-
-    $result = $db->queryF($sql);
-
-    foreach ($data as $row) {
-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
-        $valueClause = ' VALUES (';
-        $first       = true;
-        foreach ($row as $column => $value) {
-            if ($first) {
-                $first = false;
-            } else {
-                $insertInto  .= ', ';
-                $valueClause .= ', ';
-            }
-
-            $insertInto .= $column;
-            if ($search === $column) {
-                $valueClause .= $db->quote($replace);
-            } else {
-                $valueClause .= $db->quote($value);
-            }
-        }
-
-        $sql = $insertInto . ') ' . $valueClause . ')';
-
-        $result = $db->queryF($sql);
-        if (false !== $result) {
-            ++$count;
-        }
-    }
-
-    return $count;
+	/** @var \XoopsMySQLDatabase $db */
+	$db = \XoopsDatabaseFactory::getDatabaseConnection();
+
+	$prefixedTable = $db->prefix($table);
+	$count         = 0;
+
+	$sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+
+	$result = $db->queryF($sql);
+
+	foreach ($data as $row) {
+		$insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+		$valueClause = ' VALUES (';
+		$first       = true;
+		foreach ($row as $column => $value) {
+			if ($first) {
+				$first = false;
+			} else {
+				$insertInto  .= ', ';
+				$valueClause .= ', ';
+			}
+
+			$insertInto .= $column;
+			if ($search === $column) {
+				$valueClause .= $db->quote($replace);
+			} else {
+				$valueClause .= $db->quote($value);
+			}
+		}
+
+		$sql = $insertInto . ') ' . $valueClause . ')';
+
+		$result = $db->queryF($sql);
+		if (false !== $result) {
+			++$count;
+		}
+	}
+
+	return $count;
 }
 
 /**
@@ -224,15 +224,15 @@ 
  */
 function clearSampleData(): void
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
-    // Load language files
-    $helper->loadLanguage('common');
-    $tables = $helper->getModule()->getInfo('tables');
-    // truncate module tables
-    foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::truncateTable($table);
-    }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
+	// Load language files
+	$helper->loadLanguage('common');
+	$tables = $helper->getModule()->getInfo('tables');
+	// truncate module tables
+	foreach ($tables as $table) {
+		\Xmf\Database\TableLoad::truncateTable($table);
+	}
+	redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
 }

Spacing +26 added lines, -26 removed lines

@@ -24,8 +24,8 @@ 
 /** @var Helper $helper */
 /** @var Utility $utility */
 /** @var Configurator $configurator */
-require \dirname(__DIR__, 3) . '/include/cp_header.php';
-require \dirname(__DIR__) . '/preloads/autoloader.php';
+require \dirname(__DIR__, 3).'/include/cp_header.php';
+require \dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = Request::getCmd('op', '');
 
@@ -38,14 +38,14 @@ 
 
 switch ($op) {
     case 'load':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+        if (Request::hasVar('ok', 'REQUEST') && 1===Request::getInt('ok', 0)) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_CONFIRM'), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -53,14 +53,14 @@ 
         saveSampleData();
         break;
     case 'clear':
-        if (Request::hasVar('ok', 'REQUEST') && 1 === Request::getInt('ok', 0)) {
+        if (Request::hasVar('ok', 'REQUEST') && 1===Request::getInt('ok', 0)) {
             if (!$GLOBALS['xoopsSecurity']->check()) {
                 redirect_header($helper->url('admin/index.php'), 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             clearSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'clear'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -83,25 +83,25 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
     // load module tables
     foreach ($tables as $table) {
-        $tabledata = Yaml::readWrapped($language . $table . '.yml');
+        $tabledata = Yaml::readWrapped($language.$table.'.yml');
         TableLoad::truncateTable($table);
         TableLoad::loadTableFromArray($table, $tabledata);
     }
 
     // load permissions
     $table     = 'group_permission';
-    $tabledata = Yaml::readWrapped($language . $table . '.yml');
+    $tabledata = Yaml::readWrapped($language.$table.'.yml');
     $mid       = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getVar('mid');
     loadTableFromArrayWithReplace($table, $tabledata, 'gperm_modid', $mid);
 
     //  ---  COPY test folder files ---------------
-    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders)>0) {
         //        $file =  \dirname(__DIR__) . '/testdata/images/';
         foreach (array_keys($configurator->copyTestFolders) as $i) {
             $src  = $configurator->copyTestFolders[$i][0];
@@ -109,7 +109,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'LOAD_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'LOAD_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -123,26 +123,26 @@ 
     $helper             = Helper::getInstance();
     $tables             = $helper->getModule()->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];
+    if (!file_exists($languageFolder.'/')) {
+        Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
     // save module tables
     foreach ($tables as $table) {
-        TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
 
     // save permissions
     $criteria = new \CriteriaCompo();
     $criteria->add(new \Criteria('gperm_modid', $helper->getModule()->getVar('mid')));
     $skipColumns[] = 'gperm_id';
-    TableLoad::saveTableToYamlFile('group_permission', $exportFolder . 'group_permission.yml', $criteria, $skipColumns);
+    TableLoad::saveTableToYamlFile('group_permission', $exportFolder.'group_permission.yml', $criteria, $skipColumns);
     unset($criteria);
 
-    \redirect_header('../admin/index.php', 1, \constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA_SUCCESS'));
+    \redirect_header('../admin/index.php', 1, \constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA_SUCCESS'));
 }
 
 /**
@@ -160,7 +160,7 @@ 
         //
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     } catch (\Throwable $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 }
 
@@ -184,12 +184,12 @@ 
     $prefixedTable = $db->prefix($table);
     $count         = 0;
 
-    $sql = 'DELETE FROM ' . $prefixedTable . ' WHERE `' . $search . '`=' . $db->quote($replace);
+    $sql = 'DELETE FROM '.$prefixedTable.' WHERE `'.$search.'`='.$db->quote($replace);
 
     $result = $db->queryF($sql);
 
     foreach ($data as $row) {
-        $insertInto  = 'INSERT INTO ' . $prefixedTable . ' (';
+        $insertInto  = 'INSERT INTO '.$prefixedTable.' (';
         $valueClause = ' VALUES (';
         $first       = true;
         foreach ($row as $column => $value) {
@@ -201,17 +201,17 @@ 
             }
 
             $insertInto .= $column;
-            if ($search === $column) {
+            if ($search===$column) {
                 $valueClause .= $db->quote($replace);
             } else {
                 $valueClause .= $db->quote($value);
             }
         }
 
-        $sql = $insertInto . ') ' . $valueClause . ')';
+        $sql = $insertInto.') '.$valueClause.')';
 
         $result = $db->queryF($sql);
-        if (false !== $result) {
+        if (false!==$result) {
             ++$count;
         }
     }
@@ -234,5 +234,5 @@ 
     foreach ($tables as $table) {
         \Xmf\Database\TableLoad::truncateTable($table);
     }
-    redirect_header($helper->url('admin/index.php'), 1, constant('CO_' . $moduleDirNameUpper . '_' . 'CLEAR_SAMPLEDATA_OK'));
+    redirect_header($helper->url('admin/index.php'), 1, constant('CO_'.$moduleDirNameUpper.'_'.'CLEAR_SAMPLEDATA_OK'));
 }