XoopsModules25x / songlist

admin/votes.php

Indentation +189 added lines, -189 removed lines

@@ -22,102 +22,102 @@ 
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 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'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($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'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($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) {
@@ -130,99 +130,99 @@ 
 //                    }
 
 //                    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);
-
-                break;
-            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);
-                break;
-            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;
-        }
-        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);
+
+				break;
+			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);
+				break;
+			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;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +22 added lines, -22 removed lines

@@ -7,7 +7,7 @@ 
 use XoopsModules\Songlist\VotesHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -18,8 +18,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 switch ($op) {
     default:
@@ -35,14 +35,14 @@ 
 
                 $criteria        = $votesHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $votesHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 
                 foreach ($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='
@@ -52,16 +52,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']);
@@ -73,7 +73,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);
@@ -114,7 +114,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'])) {
@@ -140,7 +140,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) {
                     }
 
@@ -149,11 +149,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']);
@@ -163,19 +163,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);
 
@@ -187,14 +187,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);
                 break;
             case 'delete':
@@ -204,13 +204,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/field_permissions.php

Indentation +58 added lines, -58 removed lines

@@ -38,28 +38,28 @@ 
 
 $perm_desc = '';
 switch ($op) {
-    case 'visibility':
-        //header("Location: visibility.php");
-        redirect_header('field_visibility.php', 0, _AM_SONGLIST_PROF_VISIBLE);
-        break;
-    case 'edit':
-        $title_of_form = _AM_SONGLIST_PROF_EDITABLE;
-        $perm_name     = 'songlist_edit';
-        $restriction   = 'field_edit';
-        $anonymous     = false;
-        break;
-    case 'post':
-        $title_of_form = _AM_SONGLIST_PROF_POST;
-        $perm_name     = 'songlist_post';
-        $restriction   = '';
-        $anonymous     = true;
-        break;
-    case 'search':
-        $title_of_form = _AM_SONGLIST_PROF_SEARCH;
-        $perm_name     = 'songlist_search';
-        $restriction   = '';
-        $anonymous     = true;
-        break;
+	case 'visibility':
+		//header("Location: visibility.php");
+		redirect_header('field_visibility.php', 0, _AM_SONGLIST_PROF_VISIBLE);
+		break;
+	case 'edit':
+		$title_of_form = _AM_SONGLIST_PROF_EDITABLE;
+		$perm_name     = 'songlist_edit';
+		$restriction   = 'field_edit';
+		$anonymous     = false;
+		break;
+	case 'post':
+		$title_of_form = _AM_SONGLIST_PROF_POST;
+		$perm_name     = 'songlist_post';
+		$restriction   = '';
+		$anonymous     = true;
+		break;
+	case 'search':
+		$title_of_form = _AM_SONGLIST_PROF_SEARCH;
+		$perm_name     = 'songlist_search';
+		$restriction   = '';
+		$anonymous     = true;
+		break;
 }
 
 $module_id = $GLOBALS['songlistModule']->getVar('mid');
@@ -67,43 +67,43 @@ 
 $form = new \XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
 
 if ('access' === $op) {
-    /** @var \XoopsMemberHandler $memberHandler */
-    $memberHandler = xoops_getHandler('member');
-    $glist         = $memberHandler->getGroupList();
-    foreach (array_keys($glist) as $i) {
-        if (XOOPS_GROUP_ANONYMOUS != $i) {
-            $form->addItem($i, $glist[$i]);
-        }
-    }
+	/** @var \XoopsMemberHandler $memberHandler */
+	$memberHandler = xoops_getHandler('member');
+	$glist         = $memberHandler->getGroupList();
+	foreach (array_keys($glist) as $i) {
+		if (XOOPS_GROUP_ANONYMOUS != $i) {
+			$form->addItem($i, $glist[$i]);
+		}
+	}
 } else {
-    $extrasHandler = Helper::getInstance()->getHandler('Extras');
-    $tempFields    = $extrasHandler->loadFields();
-    if ($tempFields && is_array($tempFields)) {
-        $fields = array_merge([], $tempFields);
-        if ('search' !== $op) {
-            foreach (array_keys($fields) as $i) {
-                if ('' == $restriction || $fields[$i]->getVar($restriction)) {
-                    $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
-                }
-            }
-        } else {
-            $searchable_types = [
-                'textbox',
-                'select',
-                'radio',
-                'yesno',
-                'date',
-                'datetime',
-                'timezone',
-                'language',
-            ];
-            foreach (array_keys($fields) as $i) {
-                if (in_array($fields[$i]->getVar('field_type'), $searchable_types, true)) {
-                    $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
-                }
-            }
-        }
-    }
+	$extrasHandler = Helper::getInstance()->getHandler('Extras');
+	$tempFields    = $extrasHandler->loadFields();
+	if ($tempFields && is_array($tempFields)) {
+		$fields = array_merge([], $tempFields);
+		if ('search' !== $op) {
+			foreach (array_keys($fields) as $i) {
+				if ('' == $restriction || $fields[$i]->getVar($restriction)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
+				}
+			}
+		} else {
+			$searchable_types = [
+				'textbox',
+				'select',
+				'radio',
+				'yesno',
+				'date',
+				'datetime',
+				'timezone',
+				'language',
+			];
+			foreach (array_keys($fields) as $i) {
+				if (in_array($fields[$i]->getVar('field_type'), $searchable_types, true)) {
+					$form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
+				}
+			}
+		}
+	}
 }
 $form->display();
 

Spacing +5 added lines, -5 removed lines

@@ -17,7 +17,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Songlist\Helper;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 xoops_cp_header();
 
 $adminObject = Admin::getInstance();
@@ -66,12 +66,12 @@ 
 require_once $GLOBALS['xoops']->path('/class/xoopsform/grouppermform.php');
 $form = new \XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/field_permissions.php', $anonymous);
 
-if ('access' === $op) {
+if ('access'===$op) {
     /** @var \XoopsMemberHandler $memberHandler */
     $memberHandler = xoops_getHandler('member');
     $glist         = $memberHandler->getGroupList();
     foreach (array_keys($glist) as $i) {
-        if (XOOPS_GROUP_ANONYMOUS != $i) {
+        if (XOOPS_GROUP_ANONYMOUS!=$i) {
             $form->addItem($i, $glist[$i]);
         }
     }
@@ -80,9 +80,9 @@ 
     $tempFields    = $extrasHandler->loadFields();
     if ($tempFields && is_array($tempFields)) {
         $fields = array_merge([], $tempFields);
-        if ('search' !== $op) {
+        if ('search'!==$op) {
             foreach (array_keys($fields) as $i) {
-                if ('' == $restriction || $fields[$i]->getVar($restriction)) {
+                if (''==$restriction || $fields[$i]->getVar($restriction)) {
                     $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25));
                 }
             }

admin/clone.php

Indentation +43 added lines, -43 removed lines

@@ -20,9 +20,9 @@ 
 
 use Xmf\Request;
 use XoopsModules\Songlist\{
-    Common\Cloner,
-    Helper,
-    Utility
+	Common\Cloner,
+	Helper,
+	Utility
 };
 
 require_once __DIR__ . '/admin_header.php';
@@ -32,53 +32,53 @@ 
 $helper = Helper::getInstance();
 
 if ('submit' === Request::getString('op', '', 'POST')) {
-    if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-    }
+	if (!$GLOBALS['xoopsSecurity']->check()) {
+		redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+	}
 
-    //    $clone = $_POST['clone'];
-    $clone = Request::getString('clone', '', 'POST');
+	//    $clone = $_POST['clone'];
+	$clone = Request::getString('clone', '', 'POST');
 
-    //check if name is valid
-    if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
-    }
+	//check if name is valid
+	if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
+		redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
+	}
 
-    // Check wether the cloned module exists or not
-    if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
-    }
+	// Check wether the cloned module exists or not
+	if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
+		redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
+	}
 
-    $patterns = [
-        \mb_strtolower($helper->dirname())          => \mb_strtolower($clone),
-        \mb_strtoupper($helper->dirname())          => \mb_strtoupper($clone),
-        ucfirst(mb_strtolower($helper->dirname())) => ucfirst(mb_strtolower($clone)),
-    ];
+	$patterns = [
+		\mb_strtolower($helper->dirname())          => \mb_strtolower($clone),
+		\mb_strtoupper($helper->dirname())          => \mb_strtoupper($clone),
+		ucfirst(mb_strtolower($helper->dirname())) => ucfirst(mb_strtolower($clone)),
+	];
 
-    $patKeys   = array_keys($patterns);
-    $patValues = array_values($patterns);
-    Cloner::cloneFileFolder($helper->path());
-    $logocreated = Cloner::createLogo(mb_strtolower($clone));
+	$patKeys   = array_keys($patterns);
+	$patValues = array_values($patterns);
+	Cloner::cloneFileFolder($helper->path());
+	$logocreated = Cloner::createLogo(mb_strtolower($clone));
 
-    $msg = '';
-    if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
-        $msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
-        if (!$logocreated) {
-            $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
-        }
-    } else {
-        $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
-    }
-    echo $msg;
+	$msg = '';
+	if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
+		$msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
+		if (!$logocreated) {
+			$msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
+		}
+	} else {
+		$msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
+	}
+	echo $msg;
 } else {
-    require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
-    $clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
-    $clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
-    $form->addElement($clone, true);
-    $form->addElement(new \XoopsFormHidden('op', 'submit'));
-    $form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
-    $form->display();
+	require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
+	$form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
+	$clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
+	$clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
+	$form->addElement($clone, true);
+	$form->addElement(new \XoopsFormHidden('op', 'submit'));
+	$form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
+	$form->display();
 }
 
 require_once __DIR__ . '/admin_footer.php';

Spacing +13 added lines, -13 removed lines

@@ -25,13 +25,13 @@ 
     Utility
 };
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
 $helper = Helper::getInstance();
 
-if ('submit' === Request::getString('op', '', 'POST')) {
+if ('submit'===Request::getString('op', '', 'POST')) {
     if (!$GLOBALS['xoopsSecurity']->check()) {
         redirect_header('clone.php', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
@@ -41,12 +41,12 @@ 
 
     //check if name is valid
     if (empty($clone) || preg_match('/[^a-zA-Z0-9\_\-]/', $clone)) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_INVALIDNAME'), $clone));
+        redirect_header('clone.php', 3, sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_INVALIDNAME'), $clone));
     }
 
     // Check wether the cloned module exists or not
-    if ($clone && is_dir($GLOBALS['xoops']->path('modules/' . $clone))) {
-        redirect_header('clone.php', 3, sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_EXISTS'), $clone));
+    if ($clone && is_dir($GLOBALS['xoops']->path('modules/'.$clone))) {
+        redirect_header('clone.php', 3, sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_EXISTS'), $clone));
     }
 
     $patterns = [
@@ -61,24 +61,24 @@ 
     $logocreated = Cloner::createLogo(mb_strtolower($clone));
 
     $msg = '';
-    if (is_dir($GLOBALS['xoops']->path('modules/' . \mb_strtolower($clone)))) {
-        $msg .= sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_CONGRAT'), "<a href='" . XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin'>" . ucfirst(mb_strtolower($clone)) . '</a>') . "<br>\n";
+    if (is_dir($GLOBALS['xoops']->path('modules/'.\mb_strtolower($clone)))) {
+        $msg .= sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_CONGRAT'), "<a href='".XOOPS_URL."/modules/system/admin.php?fct=modulesadmin'>".ucfirst(mb_strtolower($clone)).'</a>')."<br>\n";
         if (!$logocreated) {
-            $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_IMAGEFAIL');
+            $msg .= constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_IMAGEFAIL');
         }
     } else {
-        $msg .= constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_FAIL');
+        $msg .= constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_FAIL');
     }
     echo $msg;
 } else {
     require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
-    $form  = new \XoopsThemeForm(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_TITLE'), (string)$helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
-    $clone = new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME'), 'clone', 20, 20, '');
-    $clone->setDescription(constant('CO_' . $moduleDirNameUpper . '_' . 'CLONE_NAME_DSC'));
+    $form  = new \XoopsThemeForm(sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_TITLE'), (string) $helper->getModule()->getVar('name', 'E')), 'clone', 'clone.php', 'post', true);
+    $clone = new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME'), 'clone', 20, 20, '');
+    $clone->setDescription(constant('CO_'.$moduleDirNameUpper.'_'.'CLONE_NAME_DSC'));
     $form->addElement($clone, true);
     $form->addElement(new \XoopsFormHidden('op', 'submit'));
     $form->addElement(new \XoopsFormButton('', '', _SUBMIT, 'submit'));
     $form->display();
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/requests.php

Indentation +150 added lines, -150 removed lines

@@ -21,156 +21,156 @@
 $filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
 
 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'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
-                $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
-
-                foreach ($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);
-
-                break;
-            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);
-                break;
-            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;
-        }
-        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'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+
+				$pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+				$GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
+
+				foreach ($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);
+
+				break;
+			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);
+				break;
+			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;
+		}
+		break;
 }
 
 xoops_cp_footer();

Spacing +18 added lines, -18 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\RequestsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 
 xoops_loadLanguage('admin', 'songlist');
 
@@ -17,8 +17,8 @@ 
 $limit  = Request::getInt('limit', 30, 'REQUEST');
 $start  = Request::getInt('start', 0, 'REQUEST');
 $order  = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-$sort   = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
-$filter = !empty($_REQUEST['filter']) ? '' . $_REQUEST['filter'] . '' : '1,1';
+$sort   = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
+$filter = !empty($_REQUEST['filter']) ? ''.$_REQUEST['filter'].'' : '1,1';
 
 switch ($op) {
     default:
@@ -34,14 +34,14 @@ 
 
                 $criteria        = $requestsHandler->getFilterCriteria($GLOBALS['filter']);
                 $ttl             = $requestsHandler->getCount($criteria);
-                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : 'created';
+                $GLOBALS['sort'] = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : 'created';
 
-                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit=' . $GLOBALS['limit'] . '&sort=' . $GLOBALS['sort'] . '&order=' . $GLOBALS['order'] . '&op=' . $GLOBALS['op'] . '&fct=' . $GLOBALS['fct'] . '&filter=' . $GLOBALS['filter']);
+                $pagenav = new \XoopsPageNav($ttl, $GLOBALS['limit'], $GLOBALS['start'], 'start', 'limit='.$GLOBALS['limit'].'&sort='.$GLOBALS['sort'].'&order='.$GLOBALS['order'].'&op='.$GLOBALS['op'].'&fct='.$GLOBALS['fct'].'&filter='.$GLOBALS['filter']);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav());
 
                 foreach ($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='
@@ -51,16 +51,16 @@ 
                         . '&sort='
                         . $key
                         . '&order='
-                        . (($key == $GLOBALS['sort']) ? ('DESC' === $GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
+                        . (($key==$GLOBALS['sort']) ? ('DESC'===$GLOBALS['order'] ? 'ASC' : 'DESC') : $GLOBALS['order'])
                         . '&op='
                         . $GLOBALS['op']
                         . '&filter='
                         . $GLOBALS['filter']
                         . '">'
-                        . (defined('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_' . \mb_strtoupper(str_replace('-', '_', $key)))
+                        . (defined('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) ? constant('_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key))) : '_AM_SONGLIST_TH_'.\mb_strtoupper(str_replace('-', '_', $key)))
                         . '</a>'
                     );
-                    $GLOBALS['xoopsTpl']->assign('filter_' . \mb_strtolower(str_replace('-', '_', $key)) . '_th', $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']);
@@ -72,7 +72,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);
@@ -113,17 +113,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);
 
@@ -135,14 +135,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);
                 break;
             case 'delete':
@@ -152,13 +152,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'));

list.tag.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/tag/list.tag.php';
+require_once __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/tag/list.tag.php';

include/oninstall.php

Indentation +50 added lines, -50 removed lines

@@ -29,19 +29,19 @@ 
  */
 function xoops_module_pre_install_songlist(\XoopsModule $module): bool
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
-    $utility      = new Utility();
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+	$utility      = new Utility();
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    if ($xoopsSuccess && $phpSuccess) {
-        $moduleTables = &$module->getInfo('tables');
-        foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
-        }
-    }
+	if ($xoopsSuccess && $phpSuccess) {
+		$moduleTables = &$module->getInfo('tables');
+		foreach ($moduleTables as $table) {
+			$GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+		}
+	}
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -52,48 +52,48 @@ 
  */
 function xoops_module_install_songlist(\XoopsModule $module): bool
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+	require \dirname(__DIR__, 3) . '/mainfile.php';
 
-    $moduleDirName = \basename(\dirname(__DIR__));
-    $helper        = Helper::getInstance();
-    $utility       = new Utility();
-    $configurator  = new Songlist\Common\Configurator();
-    // Load language files
-    $helper->loadLanguage('admin');
-    $helper->loadLanguage('modinfo');
+	$moduleDirName = \basename(\dirname(__DIR__));
+	$helper        = Helper::getInstance();
+	$utility       = new Utility();
+	$configurator  = new Songlist\Common\Configurator();
+	// Load language files
+	$helper->loadLanguage('admin');
+	$helper->loadLanguage('modinfo');
 
-    // default Permission Settings ----------------------
-    global $xoopsModule;
-    $moduleId = $xoopsModule->getVar('mid');
-    // $moduleId2        = \XoopsModules\Songlist\Helper::getInstance()->getModule()->mid();
-    /** @var \XoopsGroupPermHandler $grouppermHandler */
-    $grouppermHandler = xoops_getHandler('groupperm');
-    // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+	// default Permission Settings ----------------------
+	global $xoopsModule;
+	$moduleId = $xoopsModule->getVar('mid');
+	// $moduleId2        = \XoopsModules\Songlist\Helper::getInstance()->getModule()->mid();
+	/** @var \XoopsGroupPermHandler $grouppermHandler */
+	$grouppermHandler = xoops_getHandler('groupperm');
+	// access rights ------------------------------------------
+	$grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
+	$grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
-    //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
-        //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-        foreach (array_keys($configurator->uploadFolders) as $i) {
-            $utility::createFolder($configurator->uploadFolders[$i]);
-        }
-    }
+	//  ---  CREATE FOLDERS ---------------
+	if (count($configurator->uploadFolders) > 0) {
+		//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+		foreach (array_keys($configurator->uploadFolders) as $i) {
+			$utility::createFolder($configurator->uploadFolders[$i]);
+		}
+	}
 
-    //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
-        foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-            $utility::copyFile($file, $dest);
-        }
-    }
-    //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
-    $GLOBALS['xoopsDB']->queryF($sql);
+	//  ---  COPY blank.png FILES ---------------
+	if (count($configurator->copyBlankFiles) > 0) {
+		$file = \dirname(__DIR__) . '/assets/images/blank.png';
+		foreach (array_keys($configurator->copyBlankFiles) as $i) {
+			$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+			$utility::copyFile($file, $dest);
+		}
+	}
+	//delete .html entries from the tpl table
+	$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
+	$GLOBALS['xoopsDB']->queryF($sql);
 
-    return true;
+	return true;
 }

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
  */
 function xoops_module_pre_install_songlist(\XoopsModule $module): bool
 {
-    require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+    require_once \dirname(__DIR__).'/preloads/autoloader.php';
     $utility      = new Utility();
     $xoopsSuccess = $utility::checkVerXoops($module);
     $phpSuccess   = $utility::checkVerPhp($module);
@@ -37,7 +37,7 @@ 
     if ($xoopsSuccess && $phpSuccess) {
         $moduleTables = &$module->getInfo('tables');
         foreach ($moduleTables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
 
@@ -52,7 +52,7 @@ 
  */
 function xoops_module_install_songlist(\XoopsModule $module): bool
 {
-    require \dirname(__DIR__, 3) . '/mainfile.php';
+    require \dirname(__DIR__, 3).'/mainfile.php';
 
     $moduleDirName = \basename(\dirname(__DIR__));
     $helper        = Helper::getInstance();
@@ -69,14 +69,14 @@ 
     /** @var \XoopsGroupPermHandler $grouppermHandler */
     $grouppermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $grouppermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $grouppermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $grouppermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
-    if (count($configurator->uploadFolders) > 0) {
+    if (count($configurator->uploadFolders)>0) {
         //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
         foreach (array_keys($configurator->uploadFolders) as $i) {
             $utility::createFolder($configurator->uploadFolders[$i]);
@@ -84,15 +84,15 @@ 
     }
 
     //  ---  COPY blank.png FILES ---------------
-    if (count($configurator->copyBlankFiles) > 0) {
-        $file = \dirname(__DIR__) . '/assets/images/blank.png';
+    if (count($configurator->copyBlankFiles)>0) {
+        $file = \dirname(__DIR__).'/assets/images/blank.png';
         foreach (array_keys($configurator->copyBlankFiles) as $i) {
-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';
             $utility::copyFile($file, $dest);
         }
     }
     //delete .html entries from the tpl table
-    $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $xoopsModule->getVar('dirname', 'n') . "' AND `tpl_file` LIKE '%.tpl%'";
+    $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$xoopsModule->getVar('dirname', 'n')."' AND `tpl_file` LIKE '%.tpl%'";
     $GLOBALS['xoopsDB']->queryF($sql);
 
     return true;

include/songlist.object.php

Indentation +4 added lines, -4 removed lines

@@ -5,12 +5,12 @@
 /** @var \XoopsConfigHandler $configHandler */
 $configHandler = xoops_getHandler('config');
 if (!isset($GLOBALS['songlistModule'])) {
-    $GLOBALS['songlistModule'] = $moduleHandler->getByDirname('songlist');
+	$GLOBALS['songlistModule'] = $moduleHandler->getByDirname('songlist');
 }
 if (is_object($GLOBALS['songlistModule'])) {
-    if (!isset($GLOBALS['songlistModuleConfig'])) {
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
-    }
+	if (!isset($GLOBALS['songlistModuleConfig'])) {
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+	}
 }
 
 require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');

include/update.php

Indentation +35 added lines, -35 removed lines

@@ -6,17 +6,17 @@ 
  */
 function xoops_module_update_songlist(&$module): bool
 {
-    $sql = [];
+	$sql = [];
 
-    $sql[] = 'CREATE TABLE `'
-             . $GLOBALS['xoopsDB']->prefix('songlist_voice')
-             . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
+	$sql[] = 'CREATE TABLE `'
+			 . $GLOBALS['xoopsDB']->prefix('songlist_voice')
+			 . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
+	$sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
 
-    return xoops_module_update_vs_executesql($sql);
+	return xoops_module_update_vs_executesql($sql);
 }
 
 /**
@@ -25,31 +25,31 @@ 
  */
 function xoops_module_update_vs_executesql($sql): bool
 {
-    if (is_string($sql)) {
-        if ($GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($sql, 'SQL Executed Successfully!!!');
-        }
-    } elseif (is_array($sql)) {
-        foreach ($sql as $id => $question) {
-            if (is_array($question)) {
-                foreach ($question as $kquestion => $questionb) {
-                    if ($GLOBALS['xoopsDB']->queryF($kquestion)) {
-                        xoops_error($kquestion, 'SQL Executed Successfully!!!');
-                        xoops_module_update_vs_executesql($questionb);
-                    }
-                }
-            } elseif ($GLOBALS['xoopsDB']->queryF($id)) {
-                    xoops_error($id, 'SQL Executed Successfully!!!');
-                    if ($GLOBALS['xoopsDB']->queryF($question)) {
-                        xoops_error($question, 'SQL Executed Successfully!!!');
-                    }
-                } elseif ($GLOBALS['xoopsDB']->queryF($question)) {
-                    xoops_error($question, 'SQL Executed Successfully!!!');
-            }
-        }
-    } else {
-        return false;
-    }
+	if (is_string($sql)) {
+		if ($GLOBALS['xoopsDB']->queryF($sql)) {
+			xoops_error($sql, 'SQL Executed Successfully!!!');
+		}
+	} elseif (is_array($sql)) {
+		foreach ($sql as $id => $question) {
+			if (is_array($question)) {
+				foreach ($question as $kquestion => $questionb) {
+					if ($GLOBALS['xoopsDB']->queryF($kquestion)) {
+						xoops_error($kquestion, 'SQL Executed Successfully!!!');
+						xoops_module_update_vs_executesql($questionb);
+					}
+				}
+			} elseif ($GLOBALS['xoopsDB']->queryF($id)) {
+					xoops_error($id, 'SQL Executed Successfully!!!');
+					if ($GLOBALS['xoopsDB']->queryF($question)) {
+						xoops_error($question, 'SQL Executed Successfully!!!');
+					}
+				} elseif ($GLOBALS['xoopsDB']->queryF($question)) {
+					xoops_error($question, 'SQL Executed Successfully!!!');
+			}
+		}
+	} else {
+		return false;
+	}
 
-    return true;
+	return true;
 }

Spacing +4 added lines, -4 removed lines

@@ -11,10 +11,10 @@
     $sql[] = 'CREATE TABLE `'
              . $GLOBALS['xoopsDB']->prefix('songlist_voice')
              . "` (  `vcid` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT,  `name` VARCHAR(128) DEFAULT NULL,  `artists` INT(12) UNSIGNED DEFAULT '0',  `albums` INT(12) UNSIGNED DEFAULT '0',  `songs` INT(12) UNSIGNED DEFAULT '0',  `rank` DECIMAL(10,3) UNSIGNED DEFAULT '0.000',  `votes` INT(10) UNSIGNED DEFAULT '0',  `created` INT(12) UNSIGNED DEFAULT '0',  `updated` INT(12) UNSIGNED DEFAULT '0',  PRIMARY KEY (`vcid`),  KEY `SORT` (`name`(32),`rank`,`votes`,`created`)) ENGINE=InnoDB DEFAULT CHARSET=utf8";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . "` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
-    $sql[] = 'ALTER TABLE `' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . '` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `vcid` INT(12) UNSIGNED DEFAULT '0'";
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs').'` CHANGE COLUMN `lyrics` `lyrics` LONGTEXT';
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs')."` ADD COLUMN `mp3` VARCHAR(500) DEFAULT ''";
+    $sql[] = 'ALTER TABLE `'.$GLOBALS['xoopsDB']->prefix('songlist_songs').'` CHANGE COLUMN `traxid` `traxid` INT(4) UNSIGNED ZEROFILL DEFAULT NULL';
 
     return xoops_module_update_vs_executesql($sql);
 }

include/onuninstall.php

Indentation +22 added lines, -22 removed lines

@@ -20,8 +20,8 @@ 
  */
 function xoops_module_pre_uninstall_songlist(\XoopsModule $module): bool
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,26 +32,26 @@ 
  */
 function xoops_module_uninstall_songlist(\XoopsModule $module): bool
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    // Rename uploads folder to BAK and add date to name
-    $uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
-    $dirInfo = new \SplFileInfo($uploadDirectory);
-    if ($dirInfo->isDir()) {
-        // The directory exists so rename it
-        $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
-            $success = false;
-        }
-    }
-    unset($dirInfo);
-    /*
+	// Rename uploads folder to BAK and add date to name
+	$uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
+	$dirInfo = new \SplFileInfo($uploadDirectory);
+	if ($dirInfo->isDir()) {
+		// The directory exists so rename it
+		$date = date('Y-m-d');
+		if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+			$success = false;
+		}
+	}
+	unset($dirInfo);
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -65,6 +65,6 @@ 
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     if ($dirInfo->isDir()) {
         // The directory exists so rename it
         $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+        if (!rename($uploadDirectory, $uploadDirectory."_bak_$date")) {
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
             $success = false;
         }
     }