XoopsModules25x / songlist

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/functions.php

Indentation +580 added lines, -580 removed lines

@@ -9,611 +9,611 @@
 use XoopsModules\Songlist\Form\SelectVoiceForm;
 
 if (!function_exists('songlist_getToken')) {
-    /**
-     * @return mixed
-     */
-    function songlist_getToken()
-    {
-        $sql    = 'SELECT md5(rand()/rand()*rand()/rand()*rand()*rand()/rand()*rand()) as `salt`';
-        $result = $GLOBALS['xoopsDB']->queryF($sql);
-        [$salt] = $GLOBALS['xoopsDB']->fetchRow($result);
-
-        return $salt;
-    }
+	/**
+	 * @return mixed
+	 */
+	function songlist_getToken()
+	{
+		$sql    = 'SELECT md5(rand()/rand()*rand()/rand()*rand()*rand()/rand()*rand()) as `salt`';
+		$result = $GLOBALS['xoopsDB']->queryF($sql);
+		[$salt] = $GLOBALS['xoopsDB']->fetchRow($result);
+
+		return $salt;
+	}
 }
 
 if (!function_exists('ucword')) {
-    /**
-     * @param $string
-     * @return string
-     */
-    function ucword($string): string
-    {
-        $ret = [];
-        foreach (explode(' ', \mb_strtolower($string)) as $part) {
-            $ret[] = ucfirst($part);
-        }
-
-        return implode(' ', $ret);
-    }
+	/**
+	 * @param $string
+	 * @return string
+	 */
+	function ucword($string): string
+	{
+		$ret = [];
+		foreach (explode(' ', \mb_strtolower($string)) as $part) {
+			$ret[] = ucfirst($part);
+		}
+
+		return implode(' ', $ret);
+	}
 }
 
 if (!function_exists('songlist_getIPData')) {
-    /**
-     * @param bool|string $ip
-     * @return array
-     */
-    function songlist_getIPData($ip = false): array
-    {
-        $ret = [];
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $ret['uid']   = $GLOBALS['xoopsUser']->getVar('uid');
-            $ret['uname'] = $GLOBALS['xoopsUser']->getVar('uname');
-            $ret['email'] = $GLOBALS['xoopsUser']->getVar('email');
-        } else {
-            $ret['uid']   = 0;
-            $ret['uname'] = ($_REQUEST['uname'] ?? '');
-            $ret['email'] = ($_REQUEST['email'] ?? '');
-        }
-        $ret['agent'] = $_SERVER['HTTP_USER_AGENT'];
-        if ($ip) {
-            $ret['is_proxied']   = false;
-            $ret['network-addy'] = @gethostbyaddr($ip);
-            $ret['long']         = @ip2long($ip);
-            if (is_ipv6($ip)) {
-                $ret['ip6'] = true;
-                $ret['ip4'] = false;
-            } else {
-                $ret['ip4'] = true;
-                $ret['ip6'] = false;
-            }
-            $ret['ip'] = $ip;
-        } elseif (Request::hasVar('HTTP_X_FORWARDED_FOR', 'SERVER')) {
-                $ip                  = $_SERVER['HTTP_X_FORWARDED_FOR'];
-                $ret['is_proxied']   = true;
-                $proxy_ip            = $_SERVER['REMOTE_ADDR'];
-                $ret['network-addy'] = @gethostbyaddr($ip);
-                $ret['long']         = @ip2long($ip);
-                if (is_ipv6($ip)) {
-                    $ret['ip6']       = true;
-                    $ret['proxy-ip6'] = true;
-                    $ret['ip4']       = false;
-                    $ret['proxy-ip4'] = false;
-                } else {
-                    $ret['ip4']       = true;
-                    $ret['proxy-ip4'] = true;
-                    $ret['ip6']       = false;
-                    $ret['proxy-ip6'] = false;
-                }
-                $ret['ip']       = $ip;
-                $ret['proxy-ip'] = $proxy_ip;
-            } else {
-                $ret['is_proxied']   = false;
-                $ip                  = $_SERVER['REMOTE_ADDR'];
-                $ret['network-addy'] = @gethostbyaddr($ip);
-                $ret['long']         = @ip2long($ip);
-                if (is_ipv6($ip)) {
-                    $ret['ip6'] = true;
-                    $ret['ip4'] = false;
-                } else {
-                    $ret['ip4'] = true;
-                    $ret['ip6'] = false;
-                }
-                $ret['ip'] = $ip;
-        }
-        $ret['made'] = time();
-
-        return $ret;
-    }
+	/**
+	 * @param bool|string $ip
+	 * @return array
+	 */
+	function songlist_getIPData($ip = false): array
+	{
+		$ret = [];
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$ret['uid']   = $GLOBALS['xoopsUser']->getVar('uid');
+			$ret['uname'] = $GLOBALS['xoopsUser']->getVar('uname');
+			$ret['email'] = $GLOBALS['xoopsUser']->getVar('email');
+		} else {
+			$ret['uid']   = 0;
+			$ret['uname'] = ($_REQUEST['uname'] ?? '');
+			$ret['email'] = ($_REQUEST['email'] ?? '');
+		}
+		$ret['agent'] = $_SERVER['HTTP_USER_AGENT'];
+		if ($ip) {
+			$ret['is_proxied']   = false;
+			$ret['network-addy'] = @gethostbyaddr($ip);
+			$ret['long']         = @ip2long($ip);
+			if (is_ipv6($ip)) {
+				$ret['ip6'] = true;
+				$ret['ip4'] = false;
+			} else {
+				$ret['ip4'] = true;
+				$ret['ip6'] = false;
+			}
+			$ret['ip'] = $ip;
+		} elseif (Request::hasVar('HTTP_X_FORWARDED_FOR', 'SERVER')) {
+				$ip                  = $_SERVER['HTTP_X_FORWARDED_FOR'];
+				$ret['is_proxied']   = true;
+				$proxy_ip            = $_SERVER['REMOTE_ADDR'];
+				$ret['network-addy'] = @gethostbyaddr($ip);
+				$ret['long']         = @ip2long($ip);
+				if (is_ipv6($ip)) {
+					$ret['ip6']       = true;
+					$ret['proxy-ip6'] = true;
+					$ret['ip4']       = false;
+					$ret['proxy-ip4'] = false;
+				} else {
+					$ret['ip4']       = true;
+					$ret['proxy-ip4'] = true;
+					$ret['ip6']       = false;
+					$ret['proxy-ip6'] = false;
+				}
+				$ret['ip']       = $ip;
+				$ret['proxy-ip'] = $proxy_ip;
+			} else {
+				$ret['is_proxied']   = false;
+				$ip                  = $_SERVER['REMOTE_ADDR'];
+				$ret['network-addy'] = @gethostbyaddr($ip);
+				$ret['long']         = @ip2long($ip);
+				if (is_ipv6($ip)) {
+					$ret['ip6'] = true;
+					$ret['ip4'] = false;
+				} else {
+					$ret['ip4'] = true;
+					$ret['ip6'] = false;
+				}
+				$ret['ip'] = $ip;
+		}
+		$ret['made'] = time();
+
+		return $ret;
+	}
 }
 
 if (!function_exists('is_ipv6')) {
-    /**
-     * @param string $ip
-     * @return bool
-     */
-    function is_ipv6($ip = ''): bool
-    {
-        if ('' == $ip) {
-            return false;
-        }
-
-        if (mb_substr_count($ip, ':') > 0) {
-            return true;
-        }
-
-        return false;
-    }
+	/**
+	 * @param string $ip
+	 * @return bool
+	 */
+	function is_ipv6($ip = ''): bool
+	{
+		if ('' == $ip) {
+			return false;
+		}
+
+		if (mb_substr_count($ip, ':') > 0) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 if (!function_exists('songlist_getFilterElement')) {
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return bool|\XoopsModules\Songlist\Form\SelectAlbumForm|\XoopsModules\Songlist\Form\SelectArtistForm|\XoopsModules\Songlist\Form\SelectCategoryForm|\XoopsModules\Songlist\Form\SelectGenreForm|\XoopsModules\Songlist\Form\SelectVoiceForm
-     */
-    function songlist_getFilterElement($filter, $field, $sort = 'created', $op = '', $fct = '')
-    {
-        $components = songlist_getFilterURLComponents($filter, $field, $sort);
-        $ele        = false;
-        require_once __DIR__ . '/songlist.object.php';
-        switch ($field) {
-            case 'gid':
-                if ('genre' !== $op) {
-                    $ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'vcid':
-                if ('voice' !== $op) {
-                    $ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'cid':
-                if ('category' !== $op) {
-                    $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'pid':
-                $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                $ele->setExtra(
-                    'onchange="window.open(\''
-                    . $_SERVER['SCRIPT_NAME']
-                    . '?'
-                    . $components['extra']
-                    . '&filter='
-                    . $components['filter']
-                    . (!empty($components['filter']) ? '|' : '')
-                    . $field
-                    . ',\'+this.options[this.selectedIndex].value'
-                    . (!empty($components['operator']) ? '+\','
-                                                         . $components['operator']
-                                                         . '\'' : '')
-                    . ',\'_self\')"'
-                );
-                break;
-            case 'abid':
-                if ('albums' !== $op) {
-                    $ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'aid':
-                if ('artists' !== $op) {
-                    $ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'sid':
-                if ('songs' !== $op) {
-                    $ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
-                    $ele->setExtra(
-                        'onchange="window.open(\''
-                        . $_SERVER['SCRIPT_NAME']
-                        . '?'
-                        . $components['extra']
-                        . '&filter='
-                        . $components['filter']
-                        . (!empty($components['filter']) ? '|' : '')
-                        . $field
-                        . ',\'+this.options[this.selectedIndex].value'
-                        . (!empty($components['operator']) ? '+\','
-                                                             . $components['operator']
-                                                             . '\'' : '')
-                        . ',\'_self\')"'
-                    );
-                }
-                break;
-            case 'name':
-            case 'title':
-            case 'artists':
-            case 'albums':
-            case 'songs':
-            case 'hits':
-            case 'rank':
-            case 'votes':
-            case 'description':
-            case 'lyrics':
-            case 'songid':
-            case 'tags':
-                $ele = new \XoopsFormElementTray('');
-                $ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
-                $button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
-                $button->setExtra(
-                    'onclick="window.open(\''
-                    . $_SERVER['SCRIPT_NAME']
-                    . '?'
-                    . $components['extra']
-                    . '&filter='
-                    . $components['filter']
-                    . (!empty($components['filter']) ? '|' : '')
-                    . $field
-                    . ',\'+$(\'#filter_'
-                    . $field
-                    . '\').val()'
-                    . (!empty($components['operator']) ? '+\','
-                                                         . $components['operator']
-                                                         . '\'' : '')
-                    . ',\'_self\')"'
-                );
-                $ele->addElement($button);
-                break;
-        }
-
-        return $ele;
-    }
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return bool|\XoopsModules\Songlist\Form\SelectAlbumForm|\XoopsModules\Songlist\Form\SelectArtistForm|\XoopsModules\Songlist\Form\SelectCategoryForm|\XoopsModules\Songlist\Form\SelectGenreForm|\XoopsModules\Songlist\Form\SelectVoiceForm
+	 */
+	function songlist_getFilterElement($filter, $field, $sort = 'created', $op = '', $fct = '')
+	{
+		$components = songlist_getFilterURLComponents($filter, $field, $sort);
+		$ele        = false;
+		require_once __DIR__ . '/songlist.object.php';
+		switch ($field) {
+			case 'gid':
+				if ('genre' !== $op) {
+					$ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'vcid':
+				if ('voice' !== $op) {
+					$ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'cid':
+				if ('category' !== $op) {
+					$ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'pid':
+				$ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+				$ele->setExtra(
+					'onchange="window.open(\''
+					. $_SERVER['SCRIPT_NAME']
+					. '?'
+					. $components['extra']
+					. '&filter='
+					. $components['filter']
+					. (!empty($components['filter']) ? '|' : '')
+					. $field
+					. ',\'+this.options[this.selectedIndex].value'
+					. (!empty($components['operator']) ? '+\','
+														 . $components['operator']
+														 . '\'' : '')
+					. ',\'_self\')"'
+				);
+				break;
+			case 'abid':
+				if ('albums' !== $op) {
+					$ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'aid':
+				if ('artists' !== $op) {
+					$ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'sid':
+				if ('songs' !== $op) {
+					$ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
+					$ele->setExtra(
+						'onchange="window.open(\''
+						. $_SERVER['SCRIPT_NAME']
+						. '?'
+						. $components['extra']
+						. '&filter='
+						. $components['filter']
+						. (!empty($components['filter']) ? '|' : '')
+						. $field
+						. ',\'+this.options[this.selectedIndex].value'
+						. (!empty($components['operator']) ? '+\','
+															 . $components['operator']
+															 . '\'' : '')
+						. ',\'_self\')"'
+					);
+				}
+				break;
+			case 'name':
+			case 'title':
+			case 'artists':
+			case 'albums':
+			case 'songs':
+			case 'hits':
+			case 'rank':
+			case 'votes':
+			case 'description':
+			case 'lyrics':
+			case 'songid':
+			case 'tags':
+				$ele = new \XoopsFormElementTray('');
+				$ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
+				$button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
+				$button->setExtra(
+					'onclick="window.open(\''
+					. $_SERVER['SCRIPT_NAME']
+					. '?'
+					. $components['extra']
+					. '&filter='
+					. $components['filter']
+					. (!empty($components['filter']) ? '|' : '')
+					. $field
+					. ',\'+$(\'#filter_'
+					. $field
+					. '\').val()'
+					. (!empty($components['operator']) ? '+\','
+														 . $components['operator']
+														 . '\'' : '')
+					. ',\'_self\')"'
+				);
+				$ele->addElement($button);
+				break;
+		}
+
+		return $ele;
+	}
 }
 
 if (!function_exists('songlist_getFilterURLComponents')) {
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @return array
-     */
-    function songlist_getFilterURLComponents($filter, $field, $sort = 'created'): array
-    {
-        $parts     = explode('|', $filter);
-        $ret       = [];
-        $value     = '';
-        $ele_value = '';
-        $operator  = '';
-        foreach ($parts as $part) {
-            $var = explode(',', $part);
-            if (count($var) > 1) {
-                if ($var[0] == $field) {
-                    $ele_value = $var[1];
-                    if (isset($var[2])) {
-                        $operator = $var[2];
-                    }
-                } elseif (1 != $var[0]) {
-                    $ret[] = implode(',', $var);
-                }
-            }
-        }
-        $pagenav          = [];
-        $pagenav['op']    = $_REQUEST['op'] ?? 'videos';
-        $pagenav['fct']   = $_REQUEST['fct'] ?? 'list';
-        $pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
-        $pagenav['start'] = 0;
-        $pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-        $pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
-        $retb             = [];
-        foreach ($pagenav as $key => $value) {
-            $retb[] = "$key=$value";
-        }
-
-        return ['value' => $ele_value, 'field' => $field, 'operator' => $operator, 'filter' => implode('|', $ret), 'extra' => implode('&', $retb)];
-    }
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @return array
+	 */
+	function songlist_getFilterURLComponents($filter, $field, $sort = 'created'): array
+	{
+		$parts     = explode('|', $filter);
+		$ret       = [];
+		$value     = '';
+		$ele_value = '';
+		$operator  = '';
+		foreach ($parts as $part) {
+			$var = explode(',', $part);
+			if (count($var) > 1) {
+				if ($var[0] == $field) {
+					$ele_value = $var[1];
+					if (isset($var[2])) {
+						$operator = $var[2];
+					}
+				} elseif (1 != $var[0]) {
+					$ret[] = implode(',', $var);
+				}
+			}
+		}
+		$pagenav          = [];
+		$pagenav['op']    = $_REQUEST['op'] ?? 'videos';
+		$pagenav['fct']   = $_REQUEST['fct'] ?? 'list';
+		$pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
+		$pagenav['start'] = 0;
+		$pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
+		$pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
+		$retb             = [];
+		foreach ($pagenav as $key => $value) {
+			$retb[] = "$key=$value";
+		}
+
+		return ['value' => $ele_value, 'field' => $field, 'operator' => $operator, 'filter' => implode('|', $ret), 'extra' => implode('&', $retb)];
+	}
 }
 
 if (!function_exists('songlist_obj2array')) {
-    /**
-     * @param $objects
-     * @return array
-     */
-    function songlist_obj2array($objects): array
-    {
-        $ret = [];
-        foreach ((array)$objects as $key => $value) {
-            if (is_a($value, 'stdClass')) {
-                $ret[$key] = songlist_obj2array($value);
-            } elseif (is_array($value)) {
-                $ret[$key] = songlist_obj2array($value);
-            } else {
-                $ret[$key] = $value;
-            }
-        }
-
-        return $ret;
-    }
+	/**
+	 * @param $objects
+	 * @return array
+	 */
+	function songlist_obj2array($objects): array
+	{
+		$ret = [];
+		foreach ((array)$objects as $key => $value) {
+			if (is_a($value, 'stdClass')) {
+				$ret[$key] = songlist_obj2array($value);
+			} elseif (is_array($value)) {
+				$ret[$key] = songlist_obj2array($value);
+			} else {
+				$ret[$key] = $value;
+			}
+		}
+
+		return $ret;
+	}
 }
 
 if (!function_exists('songlist_shortenurl')) {
-    /**
-     * @param $url
-     * @return mixed
-     */
-    function songlist_shortenurl($url)
-    {
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        /** @var \XoopsConfigHandler $configHandler */
-        $configHandler                   = xoops_getHandler('config');
-        $GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
-
-        if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
-            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
-            $cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
-            if (!$ch = curl_init($source_url)) {
-                return $url;
-            }
-            curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_USERAGENT, $GLOBALS['songlistModuleConfig']['user_agent']);
-            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['songlistModuleConfig']['curl_connect_timeout']);
-            curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['songlistModuleConfig']['curl_timeout']);
-            $data = curl_exec($ch);
-            curl_close($ch);
-            $result                = songlist_object2array(json_decode($data));
-            $result['status_code'] = 200;
-            if ($result['status_code']) {
-                if (!empty($result['data']['url'])) {
-                    return $result['data']['url'];
-                }
-
-                return $url;
-            }
-
-            return $url;
-        }
-
-        return $url;
-    }
+	/**
+	 * @param $url
+	 * @return mixed
+	 */
+	function songlist_shortenurl($url)
+	{
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		/** @var \XoopsConfigHandler $configHandler */
+		$configHandler                   = xoops_getHandler('config');
+		$GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+
+		if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
+			$source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
+			$cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
+			if (!$ch = curl_init($source_url)) {
+				return $url;
+			}
+			curl_setopt($ch, CURLOPT_COOKIEJAR, $cookies);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($ch, CURLOPT_USERAGENT, $GLOBALS['songlistModuleConfig']['user_agent']);
+			curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $GLOBALS['songlistModuleConfig']['curl_connect_timeout']);
+			curl_setopt($ch, CURLOPT_TIMEOUT, $GLOBALS['songlistModuleConfig']['curl_timeout']);
+			$data = curl_exec($ch);
+			curl_close($ch);
+			$result                = songlist_object2array(json_decode($data));
+			$result['status_code'] = 200;
+			if ($result['status_code']) {
+				if (!empty($result['data']['url'])) {
+					return $result['data']['url'];
+				}
+
+				return $url;
+			}
+
+			return $url;
+		}
+
+		return $url;
+	}
 }
 
 if (!function_exists('songlist_xml2array')) {
-    /**
-     * @param        $contents
-     * @param int    $get_attributes
-     * @param string $priority
-     * @return array|void
-     */
-    function songlist_xml2array($contents, $get_attributes = 1, $priority = 'tag')
-    {
-        if (!$contents) {
-            return [];
-        }
-
-        if (!function_exists('xml_parser_create')) {
-            return [];
-        }
-
-        //Get the XML parser of PHP - PHP must have this module for the parser to work
-        $parser = xml_parser_create('');
-        xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); # https://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
-        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
-        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
-        xml_parse_into_struct($parser, trim($contents), $xml_values);
-        xml_parser_free($parser);
-
-        if (!$xml_values) {
-            return;
-        }//Hmm...
-
-        //Initializations
-        $xml_array   = [];
-        $parents     = [];
-        $opened_tags = [];
-        $arr         = [];
-
-        $current = &$xml_array; //Refference
-
-        //Go through the tags.
-        $repeated_tag_index = []; //Multiple tags with same name will be turned into an array
-        foreach ($xml_values as $data) {
-            unset($attributes, $value); //Remove existing values, or there will be trouble
-
-            //This command will extract these variables into the foreach scope
-            // tag(string), type(string), level(int), attributes(array).
-            extract($data); //We could use the array by itself, but this cooler.
-
-            $result          = [];
-            $attributes_data = [];
-
-            if (isset($value)) {
-                if ('tag' === $priority) {
-                    $result = $value;
-                } else {
-                    $result['value'] = $value;
-                } //Put the value in a assoc array if we are in the 'Attribute' mode
-            }
-
-            //Set the attributes too.
-            if (isset($attributes) and $get_attributes) {
-                foreach ($attributes as $attr => $val) {
-                    if ('tag' === $priority) {
-                        $attributes_data[$attr] = $val;
-                    } else {
-                        $result['attr'][$attr] = $val;
-                    } //Set all the attributes in a array called 'attr'
-                }
-            }
-
-            //See tag status and do the needed.
-            if ('open' === $type) {//The starting of the tag '<tag>'
-                $parent[$level - 1] = &$current;
-                if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
-                    $current[$tag] = $result;
-                    if ($attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
-                    }
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-
-                    $current = &$current[$tag];
-                } else { //There was another element with the same tag name
-                    if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        $repeated_tag_index[$tag . '_' . $level]++;
-                    } else {//This section will make the value an array if multiple tags with the same name appear together
-                        $current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
-                        $repeated_tag_index[$tag . '_' . $level] = 2;
-
-                        if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                            $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                            unset($current[$tag . '_attr']);
-                        }
-                    }
-                    $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
-                    $current         = &$current[$tag][$last_item_index];
-                }
-            } elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
-                //See if the key is already taken.
-                if (isset($current[$tag])) { //If taken, put all things inside a list(array)
-                    if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
-                        // ...push the new element into that array.
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-
-                        if ('tag' === $priority and $get_attributes and $attributes_data) {
-                            $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
-                        }
-                        $repeated_tag_index[$tag . '_' . $level]++;
-                    } else { //If it is not an array...
-                        $current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
-                        $repeated_tag_index[$tag . '_' . $level] = 1;
-                        if ('tag' === $priority and $get_attributes) {
-                            if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                                $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                                unset($current[$tag . '_attr']);
-                            }
-
-                            if ($attributes_data) {
-                                $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
-                            }
-                        }
-                        $repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
-                    }
-                } else { //New Key
-                    $current[$tag]                           = $result;
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-                    if ('tag' === $priority and $attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
-                    }
-                }
-            } elseif ('close' === $type) { //End of tag '</tag>'
-                $current = &$parent[$level - 1];
-            }
-        }
-
-        return $xml_array;
-    }
+	/**
+	 * @param        $contents
+	 * @param int    $get_attributes
+	 * @param string $priority
+	 * @return array|void
+	 */
+	function songlist_xml2array($contents, $get_attributes = 1, $priority = 'tag')
+	{
+		if (!$contents) {
+			return [];
+		}
+
+		if (!function_exists('xml_parser_create')) {
+			return [];
+		}
+
+		//Get the XML parser of PHP - PHP must have this module for the parser to work
+		$parser = xml_parser_create('');
+		xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, 'UTF-8'); # https://minutillo.com/steve/weblog/2004/6/17/php-xml-and-character-encodings-a-tale-of-sadness-rage-and-data-loss
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+		xml_parse_into_struct($parser, trim($contents), $xml_values);
+		xml_parser_free($parser);
+
+		if (!$xml_values) {
+			return;
+		}//Hmm...
+
+		//Initializations
+		$xml_array   = [];
+		$parents     = [];
+		$opened_tags = [];
+		$arr         = [];
+
+		$current = &$xml_array; //Refference
+
+		//Go through the tags.
+		$repeated_tag_index = []; //Multiple tags with same name will be turned into an array
+		foreach ($xml_values as $data) {
+			unset($attributes, $value); //Remove existing values, or there will be trouble
+
+			//This command will extract these variables into the foreach scope
+			// tag(string), type(string), level(int), attributes(array).
+			extract($data); //We could use the array by itself, but this cooler.
+
+			$result          = [];
+			$attributes_data = [];
+
+			if (isset($value)) {
+				if ('tag' === $priority) {
+					$result = $value;
+				} else {
+					$result['value'] = $value;
+				} //Put the value in a assoc array if we are in the 'Attribute' mode
+			}
+
+			//Set the attributes too.
+			if (isset($attributes) and $get_attributes) {
+				foreach ($attributes as $attr => $val) {
+					if ('tag' === $priority) {
+						$attributes_data[$attr] = $val;
+					} else {
+						$result['attr'][$attr] = $val;
+					} //Set all the attributes in a array called 'attr'
+				}
+			}
+
+			//See tag status and do the needed.
+			if ('open' === $type) {//The starting of the tag '<tag>'
+				$parent[$level - 1] = &$current;
+				if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
+					$current[$tag] = $result;
+					if ($attributes_data) {
+						$current[$tag . '_attr'] = $attributes_data;
+					}
+					$repeated_tag_index[$tag . '_' . $level] = 1;
+
+					$current = &$current[$tag];
+				} else { //There was another element with the same tag name
+					if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
+						$current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+						$repeated_tag_index[$tag . '_' . $level]++;
+					} else {//This section will make the value an array if multiple tags with the same name appear together
+						$current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
+						$repeated_tag_index[$tag . '_' . $level] = 2;
+
+						if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
+							$current[$tag]['0_attr'] = $current[$tag . '_attr'];
+							unset($current[$tag . '_attr']);
+						}
+					}
+					$last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
+					$current         = &$current[$tag][$last_item_index];
+				}
+			} elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
+				//See if the key is already taken.
+				if (isset($current[$tag])) { //If taken, put all things inside a list(array)
+					if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
+						// ...push the new element into that array.
+						$current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+
+						if ('tag' === $priority and $get_attributes and $attributes_data) {
+							$current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+						}
+						$repeated_tag_index[$tag . '_' . $level]++;
+					} else { //If it is not an array...
+						$current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
+						$repeated_tag_index[$tag . '_' . $level] = 1;
+						if ('tag' === $priority and $get_attributes) {
+							if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
+								$current[$tag]['0_attr'] = $current[$tag . '_attr'];
+								unset($current[$tag . '_attr']);
+							}
+
+							if ($attributes_data) {
+								$current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+							}
+						}
+						$repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
+					}
+				} else { //New Key
+					$current[$tag]                           = $result;
+					$repeated_tag_index[$tag . '_' . $level] = 1;
+					if ('tag' === $priority and $attributes_data) {
+						$current[$tag . '_attr'] = $attributes_data;
+					}
+				}
+			} elseif ('close' === $type) { //End of tag '</tag>'
+				$current = &$parent[$level - 1];
+			}
+		}
+
+		return $xml_array;
+	}
 }
 
 if (!function_exists('songlist_toXml')) {
-    /**
-     * @param $array
-     * @param $name
-     * @param $standalone
-     * @param $beginning
-     * @param $nested
-     * @return string
-     */
-    function songlist_toXml($array, $name, $standalone, $beginning, $nested): string
-    {
-        $output = '';
-        if ($beginning) {
-            if ($standalone) {
-                header('content-type:text/xml;charset=' . _CHARSET);
-            }
-            $output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
-            $output .= '<' . $name . '>' . "\n";
-            $nested = 0;
-        }
-
-        if (is_array($array)) {
-            foreach ($array as $key => $value) {
-                ++$nested;
-                if (is_array($value)) {
-                    $output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                    ++$nested;
-                    $output .= songlist_toXml($value, $name, false, false, $nested);
-                    $nested--;
-                    $output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                } elseif ('' != $value) {
-                        ++$nested;
-                        $output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                        $nested--;
-                }
-                $nested--;
-            }
-        } elseif ('' != $array) {
-            ++$nested;
-            $output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
-            $nested--;
-        }
-
-        if ($beginning) {
-            $output .= '</' . $name . '>';
-
-            return $output;
-        }
-
-        return $output;
-    }
+	/**
+	 * @param $array
+	 * @param $name
+	 * @param $standalone
+	 * @param $beginning
+	 * @param $nested
+	 * @return string
+	 */
+	function songlist_toXml($array, $name, $standalone, $beginning, $nested): string
+	{
+		$output = '';
+		if ($beginning) {
+			if ($standalone) {
+				header('content-type:text/xml;charset=' . _CHARSET);
+			}
+			$output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
+			$output .= '<' . $name . '>' . "\n";
+			$nested = 0;
+		}
+
+		if (is_array($array)) {
+			foreach ($array as $key => $value) {
+				++$nested;
+				if (is_array($value)) {
+					$output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+					++$nested;
+					$output .= songlist_toXml($value, $name, false, false, $nested);
+					$nested--;
+					$output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+				} elseif ('' != $value) {
+						++$nested;
+						$output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+						$nested--;
+				}
+				$nested--;
+			}
+		} elseif ('' != $array) {
+			++$nested;
+			$output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
+			$nested--;
+		}
+
+		if ($beginning) {
+			$output .= '</' . $name . '>';
+
+			return $output;
+		}
+
+		return $output;
+	}
 }

Spacing +65 added lines, -65 removed lines

@@ -114,11 +114,11 @@ 
      */
     function is_ipv6($ip = ''): bool
     {
-        if ('' == $ip) {
+        if (''==$ip) {
             return false;
         }
 
-        if (mb_substr_count($ip, ':') > 0) {
+        if (mb_substr_count($ip, ':')>0) {
             return true;
         }
 
@@ -139,11 +139,11 @@ 
     {
         $components = songlist_getFilterURLComponents($filter, $field, $sort);
         $ele        = false;
-        require_once __DIR__ . '/songlist.object.php';
+        require_once __DIR__.'/songlist.object.php';
         switch ($field) {
             case 'gid':
-                if ('genre' !== $op) {
-                    $ele = new SelectGenreForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('genre'!==$op) {
+                    $ele = new SelectGenreForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -162,8 +162,8 @@ 
                 }
                 break;
             case 'vcid':
-                if ('voice' !== $op) {
-                    $ele = new SelectVoiceForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('voice'!==$op) {
+                    $ele = new SelectVoiceForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -182,8 +182,8 @@ 
                 }
                 break;
             case 'cid':
-                if ('category' !== $op) {
-                    $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('category'!==$op) {
+                    $ele = new SelectCategoryForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -202,7 +202,7 @@ 
                 }
                 break;
             case 'pid':
-                $ele = new SelectCategoryForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                $ele = new SelectCategoryForm('', 'filter_'.$field.'', $components['value'], 1, false);
                 $ele->setExtra(
                     'onchange="window.open(\''
                     . $_SERVER['SCRIPT_NAME']
@@ -220,8 +220,8 @@ 
                 );
                 break;
             case 'abid':
-                if ('albums' !== $op) {
-                    $ele = new SelectAlbumForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('albums'!==$op) {
+                    $ele = new SelectAlbumForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -240,8 +240,8 @@ 
                 }
                 break;
             case 'aid':
-                if ('artists' !== $op) {
-                    $ele = new SelectArtistForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('artists'!==$op) {
+                    $ele = new SelectArtistForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -260,8 +260,8 @@ 
                 }
                 break;
             case 'sid':
-                if ('songs' !== $op) {
-                    $ele = new SelectSongForm('', 'filter_' . $field . '', $components['value'], 1, false);
+                if ('songs'!==$op) {
+                    $ele = new SelectSongForm('', 'filter_'.$field.'', $components['value'], 1, false);
                     $ele->setExtra(
                         'onchange="window.open(\''
                         . $_SERVER['SCRIPT_NAME']
@@ -292,8 +292,8 @@ 
             case 'songid':
             case 'tags':
                 $ele = new \XoopsFormElementTray('');
-                $ele->addElement(new \XoopsFormText('', 'filter_' . $field . '', 11, 40, $components['value']));
-                $button = new \XoopsFormButton('', 'button_' . $field . '', '[+]');
+                $ele->addElement(new \XoopsFormText('', 'filter_'.$field.'', 11, 40, $components['value']));
+                $button = new \XoopsFormButton('', 'button_'.$field.'', '[+]');
                 $button->setExtra(
                     'onclick="window.open(\''
                     . $_SERVER['SCRIPT_NAME']
@@ -335,13 +335,13 @@ 
         $operator  = '';
         foreach ($parts as $part) {
             $var = explode(',', $part);
-            if (count($var) > 1) {
-                if ($var[0] == $field) {
+            if (count($var)>1) {
+                if ($var[0]==$field) {
                     $ele_value = $var[1];
                     if (isset($var[2])) {
                         $operator = $var[2];
                     }
-                } elseif (1 != $var[0]) {
+                } elseif (1!=$var[0]) {
                     $ret[] = implode(',', $var);
                 }
             }
@@ -352,7 +352,7 @@ 
         $pagenav['limit'] = Request::getInt('limit', 30, 'REQUEST');
         $pagenav['start'] = 0;
         $pagenav['order'] = !empty($_REQUEST['order']) ? $_REQUEST['order'] : 'DESC';
-        $pagenav['sort']  = !empty($_REQUEST['sort']) ? '' . $_REQUEST['sort'] . '' : $sort;
+        $pagenav['sort']  = !empty($_REQUEST['sort']) ? ''.$_REQUEST['sort'].'' : $sort;
         $retb             = [];
         foreach ($pagenav as $key => $value) {
             $retb[] = "$key=$value";
@@ -370,7 +370,7 @@ 
     function songlist_obj2array($objects): array
     {
         $ret = [];
-        foreach ((array)$objects as $key => $value) {
+        foreach ((array) $objects as $key => $value) {
             if (is_a($value, 'stdClass')) {
                 $ret[$key] = songlist_obj2array($value);
             } elseif (is_array($value)) {
@@ -399,8 +399,8 @@ 
         $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
 
         if (!empty($GLOBALS['songlistModuleConfig']['bitly_username']) && !empty($GLOBALS['songlistModuleConfig']['bitly_apikey'])) {
-            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'] . '/shorten?login=' . $GLOBALS['songlistModuleConfig']['bitly_username'] . '&apiKey=' . $GLOBALS['songlistModuleConfig']['bitly_apikey'] . '&format=json&longUrl=' . urlencode($url);
-            $cookies    = XOOPS_ROOT_PATH . '/uploads/songlist_' . md5($GLOBALS['songlistModuleConfig']['bitly_apikey']) . '.cookie';
+            $source_url = $GLOBALS['songlistModuleConfig']['bitly_apiurl'].'/shorten?login='.$GLOBALS['songlistModuleConfig']['bitly_username'].'&apiKey='.$GLOBALS['songlistModuleConfig']['bitly_apikey'].'&format=json&longUrl='.urlencode($url);
+            $cookies    = XOOPS_ROOT_PATH.'/uploads/songlist_'.md5($GLOBALS['songlistModuleConfig']['bitly_apikey']).'.cookie';
             if (!$ch = curl_init($source_url)) {
                 return $url;
             }
@@ -478,7 +478,7 @@ 
             $attributes_data = [];
 
             if (isset($value)) {
-                if ('tag' === $priority) {
+                if ('tag'===$priority) {
                     $result = $value;
                 } else {
                     $result['value'] = $value;
@@ -488,7 +488,7 @@ 
             //Set the attributes too.
             if (isset($attributes) and $get_attributes) {
                 foreach ($attributes as $attr => $val) {
-                    if ('tag' === $priority) {
+                    if ('tag'===$priority) {
                         $attributes_data[$attr] = $val;
                     } else {
                         $result['attr'][$attr] = $val;
@@ -497,67 +497,67 @@ 
             }
 
             //See tag status and do the needed.
-            if ('open' === $type) {//The starting of the tag '<tag>'
-                $parent[$level - 1] = &$current;
+            if ('open'===$type) {//The starting of the tag '<tag>'
+                $parent[$level-1] = &$current;
                 if (!is_array($current) or (!array_key_exists($tag, $current))) { //Insert New tag
                     $current[$tag] = $result;
                     if ($attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
+                        $current[$tag.'_attr'] = $attributes_data;
                     }
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
+                    $repeated_tag_index[$tag.'_'.$level] = 1;
 
                     $current = &$current[$tag];
                 } else { //There was another element with the same tag name
                     if (isset($current[$tag][0])) {//If there is a 0th element it is already an array
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
-                        $repeated_tag_index[$tag . '_' . $level]++;
+                        $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
+                        $repeated_tag_index[$tag.'_'.$level]++;
                     } else {//This section will make the value an array if multiple tags with the same name appear together
                         $current[$tag]                           = [$current[$tag], $result]; //This will combine the existing item and the new item together to make an array
-                        $repeated_tag_index[$tag . '_' . $level] = 2;
+                        $repeated_tag_index[$tag.'_'.$level] = 2;
 
-                        if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                            $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                            unset($current[$tag . '_attr']);
+                        if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+                            $current[$tag]['0_attr'] = $current[$tag.'_attr'];
+                            unset($current[$tag.'_attr']);
                         }
                     }
-                    $last_item_index = $repeated_tag_index[$tag . '_' . $level] - 1;
+                    $last_item_index = $repeated_tag_index[$tag.'_'.$level]-1;
                     $current         = &$current[$tag][$last_item_index];
                 }
-            } elseif ('complete' === $type) { //Tags that ends in 1 line '<tag>'
+            } elseif ('complete'===$type) { //Tags that ends in 1 line '<tag>'
                 //See if the key is already taken.
                 if (isset($current[$tag])) { //If taken, put all things inside a list(array)
                     if (isset($current[$tag][0]) and is_array($current[$tag])) {//If it is already an array...
                         // ...push the new element into that array.
-                        $current[$tag][$repeated_tag_index[$tag . '_' . $level]] = $result;
+                        $current[$tag][$repeated_tag_index[$tag.'_'.$level]] = $result;
 
-                        if ('tag' === $priority and $get_attributes and $attributes_data) {
-                            $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+                        if ('tag'===$priority and $get_attributes and $attributes_data) {
+                            $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
                         }
-                        $repeated_tag_index[$tag . '_' . $level]++;
+                        $repeated_tag_index[$tag.'_'.$level]++;
                     } else { //If it is not an array...
                         $current[$tag]                           = [$current[$tag], $result]; //...Make it an array using using the existing value and the new value
-                        $repeated_tag_index[$tag . '_' . $level] = 1;
-                        if ('tag' === $priority and $get_attributes) {
-                            if (isset($current[$tag . '_attr'])) { //The attribute of the last(0th) tag must be moved as well
-                                $current[$tag]['0_attr'] = $current[$tag . '_attr'];
-                                unset($current[$tag . '_attr']);
+                        $repeated_tag_index[$tag.'_'.$level] = 1;
+                        if ('tag'===$priority and $get_attributes) {
+                            if (isset($current[$tag.'_attr'])) { //The attribute of the last(0th) tag must be moved as well
+                                $current[$tag]['0_attr'] = $current[$tag.'_attr'];
+                                unset($current[$tag.'_attr']);
                             }
 
                             if ($attributes_data) {
-                                $current[$tag][$repeated_tag_index[$tag . '_' . $level] . '_attr'] = $attributes_data;
+                                $current[$tag][$repeated_tag_index[$tag.'_'.$level].'_attr'] = $attributes_data;
                             }
                         }
-                        $repeated_tag_index[$tag . '_' . $level]++; //0 and 1 index is already taken
+                        $repeated_tag_index[$tag.'_'.$level]++; //0 and 1 index is already taken
                     }
                 } else { //New Key
                     $current[$tag]                           = $result;
-                    $repeated_tag_index[$tag . '_' . $level] = 1;
-                    if ('tag' === $priority and $attributes_data) {
-                        $current[$tag . '_attr'] = $attributes_data;
+                    $repeated_tag_index[$tag.'_'.$level] = 1;
+                    if ('tag'===$priority and $attributes_data) {
+                        $current[$tag.'_attr'] = $attributes_data;
                     }
                 }
-            } elseif ('close' === $type) { //End of tag '</tag>'
-                $current = &$parent[$level - 1];
+            } elseif ('close'===$type) { //End of tag '</tag>'
+                $current = &$parent[$level-1];
             }
         }
 
@@ -579,10 +579,10 @@ 
         $output = '';
         if ($beginning) {
             if ($standalone) {
-                header('content-type:text/xml;charset=' . _CHARSET);
+                header('content-type:text/xml;charset='._CHARSET);
             }
-            $output .= '<' . '?' . 'xml version="1.0" encoding="' . _CHARSET . '"' . '?' . '>' . "\n";
-            $output .= '<' . $name . '>' . "\n";
+            $output .= '<'.'?'.'xml version="1.0" encoding="'._CHARSET.'"'.'?'.'>'."\n";
+            $output .= '<'.$name.'>'."\n";
             $nested = 0;
         }
 
@@ -590,26 +590,26 @@ 
             foreach ($array as $key => $value) {
                 ++$nested;
                 if (is_array($value)) {
-                    $output .= str_repeat("\t", (int)$nested) . '<' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+                    $output .= str_repeat("\t", (int) $nested).'<'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
                     ++$nested;
                     $output .= songlist_toXml($value, $name, false, false, $nested);
                     $nested--;
-                    $output .= str_repeat("\t", (int)$nested) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
-                } elseif ('' != $value) {
+                    $output .= str_repeat("\t", (int) $nested).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
+                } elseif (''!=$value) {
                         ++$nested;
-                        $output .= str_repeat("\t", (int)$nested) . '  <' . (is_string($key) ? $key : $name . '_' . $key) . '>' . trim($value) . '</' . (is_string($key) ? $key : $name . '_' . $key) . '>' . "\n";
+                        $output .= str_repeat("\t", (int) $nested).'  <'.(is_string($key) ? $key : $name.'_'.$key).'>'.trim($value).'</'.(is_string($key) ? $key : $name.'_'.$key).'>'."\n";
                         $nested--;
                 }
                 $nested--;
             }
-        } elseif ('' != $array) {
+        } elseif (''!=$array) {
             ++$nested;
-            $output .= str_repeat("\t", (int)$nested) . trim($array) . "\n";
+            $output .= str_repeat("\t", (int) $nested).trim($array)."\n";
             $nested--;
         }
 
         if ($beginning) {
-            $output .= '</' . $name . '>';
+            $output .= '</'.$name.'>';
 
             return $output;
         }

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/JSON.php

Indentation +676 added lines, -676 removed lines

@@ -76,271 +76,271 @@ 
  */
 class ServicesJSON
 {
-    /**
-     * constructs a new JSON instance
-     *
-     * @param int $use object behavior flags; combine with boolean-OR
-     *
-     *                           possible values:
-     *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-     *                                   "{...}" syntax creates associative arrays
-     *                                   instead of objects in decode().
-     *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-     *                                   Values which can't be encoded (e.g. resources)
-     *                                   appear as NULL instead of throwing errors.
-     *                                   By default, a deeply-nested resource will
-     *                                   bubble up with an error, so all return values
-     *                                   from encode() should be checked with isError()
-     */
-    public function __construct($use = 0)
-    {
-        $this->use = $use;
-    }
-
-    /**
-     * convert a string from one UTF-16 char to one UTF-8 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf16 UTF-16 character
-     * @return   string  UTF-8 character
-     */
-    public function utf162utf8($utf16): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
-
-        switch (true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * convert a string from one UTF-8 char to one UTF-16 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf8 UTF-8 character
-     * @return   string  UTF-16 character
-     */
-    public function utf82utf16($utf8): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch (mb_strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format (and sends JSON Header)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encode($var)
-    {
-        header('Document-type: application/json');
-
-        return $this->encodeUnsafe($var);
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encodeUnsafe($var)
-    {
-        // see bug #16908 - regarding numeric locale printing
-        $lc = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-        $ret = $this->_encode($var);
-        setlocale(LC_NUMERIC, $lc);
-
-        return $ret;
-    }
-
-    /**
-     * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function _encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-            case 'NULL':
-                return 'null';
-            case 'integer':
-                return (int)$var;
-            case 'double':
-            case 'float':
-                return (float)$var;
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii      = '';
-                $strlen_var = mb_strlen($var);
-
-                /*
+	/**
+	 * constructs a new JSON instance
+	 *
+	 * @param int $use object behavior flags; combine with boolean-OR
+	 *
+	 *                           possible values:
+	 *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+	 *                                   "{...}" syntax creates associative arrays
+	 *                                   instead of objects in decode().
+	 *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+	 *                                   Values which can't be encoded (e.g. resources)
+	 *                                   appear as NULL instead of throwing errors.
+	 *                                   By default, a deeply-nested resource will
+	 *                                   bubble up with an error, so all return values
+	 *                                   from encode() should be checked with isError()
+	 */
+	public function __construct($use = 0)
+	{
+		$this->use = $use;
+	}
+
+	/**
+	 * convert a string from one UTF-16 char to one UTF-8 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf16 UTF-16 character
+	 * @return   string  UTF-8 character
+	 */
+	public function utf162utf8($utf16): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		}
+
+		$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
+
+		switch (true) {
+			case ((0x7F & $bytes) == $bytes):
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x7F & $bytes);
+			case (0x07FF & $bytes) == $bytes:
+				// return a 2-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
+			case (0xFFFF & $bytes) == $bytes:
+				// return a 3-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * convert a string from one UTF-8 char to one UTF-16 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf8 UTF-8 character
+	 * @return   string  UTF-16 character
+	 */
+	public function utf82utf16($utf8): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		}
+
+		switch (mb_strlen($utf8)) {
+			case 1:
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return $utf8;
+			case 2:
+				// return a UTF-16 character from a 2-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+			case 3:
+				// return a UTF-16 character from a 3-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format (and sends JSON Header)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encode($var)
+	{
+		header('Document-type: application/json');
+
+		return $this->encodeUnsafe($var);
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encodeUnsafe($var)
+	{
+		// see bug #16908 - regarding numeric locale printing
+		$lc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, 'C');
+		$ret = $this->_encode($var);
+		setlocale(LC_NUMERIC, $lc);
+
+		return $ret;
+	}
+
+	/**
+	 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function _encode($var)
+	{
+		switch (gettype($var)) {
+			case 'boolean':
+				return $var ? 'true' : 'false';
+			case 'NULL':
+				return 'null';
+			case 'integer':
+				return (int)$var;
+			case 'double':
+			case 'float':
+				return (float)$var;
+			case 'string':
+				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+				$ascii      = '';
+				$strlen_var = mb_strlen($var);
+
+				/*
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-                    $ord_var_c = ord($var[$c]);
-
-                    switch (true) {
-                        case 0x08 == $ord_var_c:
-                            $ascii .= '\b';
-                            break;
-                        case 0x09 == $ord_var_c:
-                            $ascii .= '\t';
-                            break;
-                        case 0x0A == $ord_var_c:
-                            $ascii .= '\n';
-                            break;
-                        case 0x0C == $ord_var_c:
-                            $ascii .= '\f';
-                            break;
-                        case 0x0D == $ord_var_c:
-                            $ascii .= '\r';
-                            break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
-                            // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
-                            break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var[$c];
-                            break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
-                            // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
-                                ++$c;
-                                $ascii .= '?';
-                                break;
-                            }
-
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
-                            ++$c;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
-                                $c     += 2;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
-                            $c     += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
-                                $c     += 3;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
-                            $c     += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
-                                $c     += 4;
-                                $ascii .= '?';
-                                break;
-                            }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
-                            $c     += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
-                                $c     += 5;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
-                            $c     += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"' . $ascii . '"';
-            case 'array':
-                /*
+				for ($c = 0; $c < $strlen_var; ++$c) {
+					$ord_var_c = ord($var[$c]);
+
+					switch (true) {
+						case 0x08 == $ord_var_c:
+							$ascii .= '\b';
+							break;
+						case 0x09 == $ord_var_c:
+							$ascii .= '\t';
+							break;
+						case 0x0A == $ord_var_c:
+							$ascii .= '\n';
+							break;
+						case 0x0C == $ord_var_c:
+							$ascii .= '\f';
+							break;
+						case 0x0D == $ord_var_c:
+							$ascii .= '\r';
+							break;
+						case 0x22 == $ord_var_c:
+						case 0x2F == $ord_var_c:
+						case 0x5C == $ord_var_c:
+							// double quote, slash, slosh
+							$ascii .= '\\' . $var[$c];
+							break;
+						case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+							// characters U-00000000 - U-0000007F (same as ASCII)
+							$ascii .= $var[$c];
+							break;
+						case (0xC0 == ($ord_var_c & 0xE0)):
+							// characters U-00000080 - U-000007FF, mask 110SONGLIST
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 1 >= $strlen_var) {
+								++$c;
+								$ascii .= '?';
+								break;
+							}
+
+							$char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+							++$c;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xE0 == ($ord_var_c & 0xF0)):
+							if ($c + 2 >= $strlen_var) {
+								$c     += 2;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+							$c     += 2;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF0 == ($ord_var_c & 0xF8)):
+							if ($c + 3 >= $strlen_var) {
+								$c     += 3;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00010000 - U-001FFFFF, mask 11110XXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+							$c     += 3;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF8 == ($ord_var_c & 0xFC)):
+							// characters U-00200000 - U-03FFFFFF, mask 111110XX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 4 >= $strlen_var) {
+								$c     += 4;
+								$ascii .= '?';
+								break;
+							}
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+							$c     += 4;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xFC == ($ord_var_c & 0xFE)):
+							if ($c + 5 >= $strlen_var) {
+								$c     += 5;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+							$c     += 5;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+					}
+				}
+
+				return '"' . $ascii . '"';
+			case 'array':
+				/*
                  * As per JSON spec if any array key is not an integer
                  * we must treat the the whole array as an object. We
                  * also try to catch a sparsely populated associative
@@ -358,422 +358,422 @@ 
                  * bracket notation.
                  */
 
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
-                    $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
-
-                    foreach ($properties as $property) {
-                        if ($this->isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . implode(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map([$this, '_encode'], $var);
-
-                foreach ($elements as $element) {
-                    if ($this->isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . implode(',', $elements) . ']';
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
-
-                foreach ($properties as $property) {
-                    if ($this->isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . implode(',', $properties) . '}';
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
-        }
-    }
-
-    /**
-     * array-walking function for use in generating JSON-formatted name-value pairs
-     *
-     * @param string $name  name of key to use
-     * @param mixed  $value reference to an array element to be encoded
-     *
-     * @return   string  JSON-formatted name-value pair, like '"name":value'
-     */
-    public function name_value($name, $value)
-    {
-        $encoded_value = $this->_encode($value);
-
-        if ($this->isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->_encode((string)$name) . ':' . $encoded_value;
-    }
-
-    /**
-     * reduce a string by removing leading and trailing comments and whitespace
-     *
-     * @param string $str string value to strip of comments and whitespace
-     *
-     * @return   string  string value stripped of comments and whitespace
-     */
-    public function reduce_string($str): string
-    {
-        $str = preg_replace(
-            [
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us',
-            ],
-            '',
-            $str
-        );
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-    /**
-     * decodes a JSON string into appropriate variable
-     *
-     * @param string $str JSON-formatted string
-     *
-     * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
-     *                   corresponding to given JSON input string.
-     *                   See argument 1 to ServicesJSON() above for object-output behavior.
-     *                   Note that decode() always returns strings
-     *                   in ASCII or UTF-8 format!
-     */
-    public function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (mb_strtolower($str)) {
-            case 'true':
-                return true;
-            case 'false':
-                return false;
-            case 'null':
-                return null;
-            default:
-                $m = [];
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
-                }
-
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim       = mb_substr($str, 0, 1);
-                    $chrs        = mb_substr($str, 1, -1);
-                    $utf8        = '';
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-                        $ord_chrs_c      = ord($chrs[$c]);
-
-                        switch (true) {
-                            case '\b' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case '\t' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case '\n' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case '\f' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case '\r' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
-                                    $utf8 .= $chrs[++$c];
-                                }
-                                break;
-                            case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
-                                $utf8  .= $this->utf162utf8($utf16);
-                                $c     += 5;
-                                break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs[$c];
-                                break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
-                                // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                                //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 3);
-                                $c    += 2;
-                                break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 4);
-                                $c    += 3;
-                                break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 5);
-                                $c    += 4;
-                                break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 6);
-                                $c    += 5;
-                                break;
-                        }
-                    }
-
-                    return $utf8;
-                }
-
-                if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ('[' === $str[0]) {
-                        $stk = [SERVICES_JSON_IN_ARR];
-                        $arr = [];
-                    } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = [];
-                        } else {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = new stdClass();
-                    }
-
-                    array_push(
-                        $stk,
-                        [
-                            'what'  => SERVICES_JSON_SLICE,
-                            'where' => 0,
-                            'delim' => false,
-                        ]
-                    );
-
-                    $chrs = mb_substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                            return $arr;
-                        }
-
-                        return $obj;
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-                        $top             = end($stk);
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                                // we are in an array, so just push an element onto the stack
-                                $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = [];
-
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-                            }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
-                            //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
-                            //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
-                            //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
-                            ++$c;
-                            //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            ++$c;
-
-                            for ($i = $top['where']; $i <= $c; ++$i) {
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-                            }
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        }
-                    }
-
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                        return $arr;
-                    }
-
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                        return $obj;
-                    }
-                }
-        }
-    }
-
-    /**
-     * @param      $data
-     * @param null $code
-     * @return bool
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    public function isError($data, $code = null): bool
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        }
-
-        if (is_object($data)
-            && ($data instanceof \services_json_error
-                || $data instanceof \services_json_error)) {
-            return true;
-        }
-
-        return false;
-    }
+				// treat as a JSON object
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+					$properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
+
+					foreach ($properties as $property) {
+						if ($this->isError($property)) {
+							return $property;
+						}
+					}
+
+					return '{' . implode(',', $properties) . '}';
+				}
+
+				// treat it like a regular array
+				$elements = array_map([$this, '_encode'], $var);
+
+				foreach ($elements as $element) {
+					if ($this->isError($element)) {
+						return $element;
+					}
+				}
+
+				return '[' . implode(',', $elements) . ']';
+			case 'object':
+				$vars = get_object_vars($var);
+
+				$properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
+
+				foreach ($properties as $property) {
+					if ($this->isError($property)) {
+						return $property;
+					}
+				}
+
+				return '{' . implode(',', $properties) . '}';
+			default:
+				return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+		}
+	}
+
+	/**
+	 * array-walking function for use in generating JSON-formatted name-value pairs
+	 *
+	 * @param string $name  name of key to use
+	 * @param mixed  $value reference to an array element to be encoded
+	 *
+	 * @return   string  JSON-formatted name-value pair, like '"name":value'
+	 */
+	public function name_value($name, $value)
+	{
+		$encoded_value = $this->_encode($value);
+
+		if ($this->isError($encoded_value)) {
+			return $encoded_value;
+		}
+
+		return $this->_encode((string)$name) . ':' . $encoded_value;
+	}
+
+	/**
+	 * reduce a string by removing leading and trailing comments and whitespace
+	 *
+	 * @param string $str string value to strip of comments and whitespace
+	 *
+	 * @return   string  string value stripped of comments and whitespace
+	 */
+	public function reduce_string($str): string
+	{
+		$str = preg_replace(
+			[
+				// eliminate single line comments in '// ...' form
+				'#^\s*//(.+)$#m',
+
+				// eliminate multi-line comments in '/* ... */' form, at start of string
+				'#^\s*/\*(.+)\*/#Us',
+
+				// eliminate multi-line comments in '/* ... */' form, at end of string
+				'#/\*(.+)\*/\s*$#Us',
+			],
+			'',
+			$str
+		);
+
+		// eliminate extraneous space
+		return trim($str);
+	}
+
+	/**
+	 * decodes a JSON string into appropriate variable
+	 *
+	 * @param string $str JSON-formatted string
+	 *
+	 * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
+	 *                   corresponding to given JSON input string.
+	 *                   See argument 1 to ServicesJSON() above for object-output behavior.
+	 *                   Note that decode() always returns strings
+	 *                   in ASCII or UTF-8 format!
+	 */
+	public function decode($str)
+	{
+		$str = $this->reduce_string($str);
+
+		switch (mb_strtolower($str)) {
+			case 'true':
+				return true;
+			case 'false':
+				return false;
+			case 'null':
+				return null;
+			default:
+				$m = [];
+
+				if (is_numeric($str)) {
+					// Lookie-loo, it's a number
+
+					// This would work on its own, but I'm trying to be
+					// good about returning integers where appropriate:
+					// return (float)$str;
+
+					// Return float or int, as appropriate
+					return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+				}
+
+				if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+					// STRINGS RETURNED IN UTF-8 FORMAT
+					$delim       = mb_substr($str, 0, 1);
+					$chrs        = mb_substr($str, 1, -1);
+					$utf8        = '';
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c < $strlen_chrs; ++$c) {
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+						$ord_chrs_c      = ord($chrs[$c]);
+
+						switch (true) {
+							case '\b' === $substr_chrs_c_2:
+								$utf8 .= chr(0x08);
+								++$c;
+								break;
+							case '\t' === $substr_chrs_c_2:
+								$utf8 .= chr(0x09);
+								++$c;
+								break;
+							case '\n' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0A);
+								++$c;
+								break;
+							case '\f' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0C);
+								++$c;
+								break;
+							case '\r' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0D);
+								++$c;
+								break;
+							case '\\"' === $substr_chrs_c_2:
+							case '\\\'' === $substr_chrs_c_2:
+							case '\\\\' === $substr_chrs_c_2:
+							case '\\/' === $substr_chrs_c_2:
+								if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
+									|| ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+									$utf8 .= $chrs[++$c];
+								}
+								break;
+							case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
+								// single, escaped unicode character
+								$utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+								$utf8  .= $this->utf162utf8($utf16);
+								$c     += 5;
+								break;
+							case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+								$utf8 .= $chrs[$c];
+								break;
+							case 0xC0 == ($ord_chrs_c & 0xE0):
+								// characters U-00000080 - U-000007FF, mask 110SONGLIST
+								//see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 2);
+								++$c;
+								break;
+							case 0xE0 == ($ord_chrs_c & 0xF0):
+								// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 3);
+								$c    += 2;
+								break;
+							case 0xF0 == ($ord_chrs_c & 0xF8):
+								// characters U-00010000 - U-001FFFFF, mask 11110XXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 4);
+								$c    += 3;
+								break;
+							case 0xF8 == ($ord_chrs_c & 0xFC):
+								// characters U-00200000 - U-03FFFFFF, mask 111110XX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 5);
+								$c    += 4;
+								break;
+							case 0xFC == ($ord_chrs_c & 0xFE):
+								// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 6);
+								$c    += 5;
+								break;
+						}
+					}
+
+					return $utf8;
+				}
+
+				if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+					// array, or object notation
+
+					if ('[' === $str[0]) {
+						$stk = [SERVICES_JSON_IN_ARR];
+						$arr = [];
+					} elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = [];
+						} else {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = new stdClass();
+					}
+
+					array_push(
+						$stk,
+						[
+							'what'  => SERVICES_JSON_SLICE,
+							'where' => 0,
+							'delim' => false,
+						]
+					);
+
+					$chrs = mb_substr($str, 1, -1);
+					$chrs = $this->reduce_string($chrs);
+
+					if ('' == $chrs) {
+						if (SERVICES_JSON_IN_ARR == reset($stk)) {
+							return $arr;
+						}
+
+						return $obj;
+					}
+
+					//print("\nparsing {$chrs}\n");
+
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c <= $strlen_chrs; ++$c) {
+						$top             = end($stk);
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+
+						if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+							// found a comma that is not inside a string, array, etc.,
+							// OR we've reached the end of the character list
+							$slice = mb_substr($chrs, $top['where'], $c - $top['where']);
+							array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+							//print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+							if (SERVICES_JSON_IN_ARR == reset($stk)) {
+								// we are in an array, so just push an element onto the stack
+								$arr[] = $this->decode($slice);
+							} elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+								// we are in an object, so figure
+								// out the property name and set an
+								// element in an associative array,
+								// for now
+								$parts = [];
+
+								if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// "name":value pair
+									$key = $this->decode($parts[1]);
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								} elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// name:value pair, where name is unquoted
+									$key = $parts[1];
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								}
+							}
+						} elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+							// found a quote, and we are not inside a string
+							array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
+							//print("Found start of string at {$c}\n");
+						} elseif (($chrs[$c] == $top['delim'])
+								  && (SERVICES_JSON_IN_STR == $top['what'])
+								  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+							// found a quote, we're in a string, and it's not escaped
+							// we know that it's not escaped becase there is _not_ an
+							// odd number of backslashes at the end of the string so far
+							array_pop($stk);
+							//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+						} elseif (('[' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-bracket, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
+							//print("Found start of array at {$c}\n");
+						} elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+							// found a right-bracket, and we're in an array
+							array_pop($stk);
+							//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('{' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-brace, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
+							//print("Found start of object at {$c}\n");
+						} elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+							// found a right-brace, and we're in an object
+							array_pop($stk);
+							//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('/*' === $substr_chrs_c_2)
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a comment start, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
+							++$c;
+							//print("Found start of comment at {$c}\n");
+						} elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+							// found a comment end, and we're in one now
+							array_pop($stk);
+							++$c;
+
+							for ($i = $top['where']; $i <= $c; ++$i) {
+								$chrs = substr_replace($chrs, ' ', $i, 1);
+							}
+							//print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						}
+					}
+
+					if (SERVICES_JSON_IN_ARR == reset($stk)) {
+						return $arr;
+					}
+
+					if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+						return $obj;
+					}
+				}
+		}
+	}
+
+	/**
+	 * @param      $data
+	 * @param null $code
+	 * @return bool
+	 * @todo Ultimately, this should just call PEAR::isError()
+	 */
+	public function isError($data, $code = null): bool
+	{
+		if (class_exists('pear')) {
+			return PEAR::isError($data, $code);
+		}
+
+		if (is_object($data)
+			&& ($data instanceof \services_json_error
+				|| $data instanceof \services_json_error)) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 if (class_exists('PEAR_Error')) {
-    /**
-     * Class ServicesJSON_Error
-     */
-    class ServicesJSON_Error extends PEAR_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-            parent::__construct($message, $code, $mode, $options, $userinfo);
-        }
-    }
+	/**
+	 * Class ServicesJSON_Error
+	 */
+	class ServicesJSON_Error extends PEAR_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+			parent::__construct($message, $code, $mode, $options, $userinfo);
+		}
+	}
 } else {
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class ServicesJSON_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-        }
-    }
+	/**
+	 * @todo Ultimately, this class shall be descended from PEAR_Error
+	 */
+	class ServicesJSON_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+		}
+	}
 }

Spacing +85 added lines, -85 removed lines

@@ -117,18 +117,18 @@ 
         $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch (true) {
-            case ((0x7F & $bytes) == $bytes):
+            case ((0x7F & $bytes)==$bytes):
                 // this case should never be reached, because we are in ASCII range
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                 return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
+            case (0x07FF & $bytes)==$bytes:
                 // return a 2-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
+                return chr(0xC0 | (($bytes >> 6) & 0x1F)).chr(0x80 | ($bytes & 0x3F));
+            case (0xFFFF & $bytes)==$bytes:
                 // return a 3-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+                return chr(0xE0 | (($bytes >> 12) & 0x0F)).chr(0x80 | (($bytes >> 6) & 0x3F)).chr(0x80 | ($bytes & 0x3F));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -160,11 +160,11 @@ 
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+                return chr(0x07 & (ord($utf8[0]) >> 2)).chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))).chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -227,10 +227,10 @@ 
             case 'NULL':
                 return 'null';
             case 'integer':
-                return (int)$var;
+                return (int) $var;
             case 'double':
             case 'float':
-                return (float)$var;
+                return (float) $var;
             case 'string':
                 // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
                 $ascii      = '';
@@ -240,97 +240,97 @@ 
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
+                for ($c = 0; $c<$strlen_var; ++$c) {
                     $ord_var_c = ord($var[$c]);
 
                     switch (true) {
-                        case 0x08 == $ord_var_c:
+                        case 0x08==$ord_var_c:
                             $ascii .= '\b';
                             break;
-                        case 0x09 == $ord_var_c:
+                        case 0x09==$ord_var_c:
                             $ascii .= '\t';
                             break;
-                        case 0x0A == $ord_var_c:
+                        case 0x0A==$ord_var_c:
                             $ascii .= '\n';
                             break;
-                        case 0x0C == $ord_var_c:
+                        case 0x0C==$ord_var_c:
                             $ascii .= '\f';
                             break;
-                        case 0x0D == $ord_var_c:
+                        case 0x0D==$ord_var_c:
                             $ascii .= '\r';
                             break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
+                        case 0x22==$ord_var_c:
+                        case 0x2F==$ord_var_c:
+                        case 0x5C==$ord_var_c:
                             // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
+                            $ascii .= '\\'.$var[$c];
                             break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                        case (($ord_var_c>=0x20) && ($ord_var_c<=0x7F)):
                             // characters U-00000000 - U-0000007F (same as ASCII)
                             $ascii .= $var[$c];
                             break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
+                        case (0xC0==($ord_var_c & 0xE0)):
                             // characters U-00000080 - U-000007FF, mask 110SONGLIST
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
+                            if ($c+1>=$strlen_var) {
                                 ++$c;
                                 $ascii .= '?';
                                 break;
                             }
 
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+                            $char = pack('C*', $ord_var_c, ord($var[$c+1]));
                             ++$c;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
+                        case (0xE0==($ord_var_c & 0xF0)):
+                            if ($c+2>=$strlen_var) {
                                 $c     += 2;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+                            $char  = pack('C*', $ord_var_c, @ord($var[$c+1]), @ord($var[$c+2]));
                             $c     += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
+                        case (0xF0==($ord_var_c & 0xF8)):
+                            if ($c+3>=$strlen_var) {
                                 $c     += 3;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]));
                             $c     += 3;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
+                        case (0xF8==($ord_var_c & 0xFC)):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
+                            if ($c+4>=$strlen_var) {
                                 $c     += 4;
                                 $ascii .= '?';
                                 break;
                             }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]));
                             $c     += 4;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
+                        case (0xFC==($ord_var_c & 0xFE)):
+                            if ($c+5>=$strlen_var) {
                                 $c     += 5;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]), ord($var[$c+5]));
                             $c     += 5;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -338,7 +338,7 @@ 
                     }
                 }
 
-                return '"' . $ascii . '"';
+                return '"'.$ascii.'"';
             case 'array':
                 /*
                  * As per JSON spec if any array key is not an integer
@@ -359,7 +359,7 @@ 
                  */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var)!==range(0, count($var)-1))) {
                     $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
 
                     foreach ($properties as $property) {
@@ -368,7 +368,7 @@ 
                         }
                     }
 
-                    return '{' . implode(',', $properties) . '}';
+                    return '{'.implode(',', $properties).'}';
                 }
 
                 // treat it like a regular array
@@ -380,7 +380,7 @@ 
                     }
                 }
 
-                return '[' . implode(',', $elements) . ']';
+                return '['.implode(',', $elements).']';
             case 'object':
                 $vars = get_object_vars($var);
 
@@ -392,9 +392,9 @@ 
                     }
                 }
 
-                return '{' . implode(',', $properties) . '}';
+                return '{'.implode(',', $properties).'}';
             default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var).' can not be encoded as JSON string');
         }
     }
 
@@ -414,7 +414,7 @@ 
             return $encoded_value;
         }
 
-        return $this->_encode((string)$name) . ':' . $encoded_value;
+        return $this->_encode((string) $name).':'.$encoded_value;
     }
 
     /**
@@ -478,84 +478,84 @@ 
                     // return (float)$str;
 
                     // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+                    return ((float) $str==(int) $str) ? (int) $str : (float) $str;
                 }
 
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1]==$m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
                     $delim       = mb_substr($str, 0, 1);
                     $chrs        = mb_substr($str, 1, -1);
                     $utf8        = '';
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<$strlen_chrs; ++$c) {
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
                         $ord_chrs_c      = ord($chrs[$c]);
 
                         switch (true) {
-                            case '\b' === $substr_chrs_c_2:
+                            case '\b'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x08);
                                 ++$c;
                                 break;
-                            case '\t' === $substr_chrs_c_2:
+                            case '\t'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x09);
                                 ++$c;
                                 break;
-                            case '\n' === $substr_chrs_c_2:
+                            case '\n'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0A);
                                 ++$c;
                                 break;
-                            case '\f' === $substr_chrs_c_2:
+                            case '\f'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0C);
                                 ++$c;
                                 break;
-                            case '\r' === $substr_chrs_c_2:
+                            case '\r'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0D);
                                 ++$c;
                                 break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+                            case '\\"'===$substr_chrs_c_2:
+                            case '\\\''===$substr_chrs_c_2:
+                            case '\\\\'===$substr_chrs_c_2:
+                            case '\\/'===$substr_chrs_c_2:
+                                if (('"'===$delim && '\\\''!==$substr_chrs_c_2)
+                                    || ("'"===$delim && '\\"'!==$substr_chrs_c_2)) {
                                     $utf8 .= $chrs[++$c];
                                 }
                                 break;
                             case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
                                 // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+                                $utf16 = chr(hexdec(mb_substr($chrs, $c+2, 2))).chr(hexdec(mb_substr($chrs, $c+4, 2)));
                                 $utf8  .= $this->utf162utf8($utf16);
                                 $c     += 5;
                                 break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                            case ($ord_chrs_c>=0x20) && ($ord_chrs_c<=0x7F):
                                 $utf8 .= $chrs[$c];
                                 break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
+                            case 0xC0==($ord_chrs_c & 0xE0):
                                 // characters U-00000080 - U-000007FF, mask 110SONGLIST
                                 //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 2);
                                 ++$c;
                                 break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
+                            case 0xE0==($ord_chrs_c & 0xF0):
                                 // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 3);
                                 $c    += 2;
                                 break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
+                            case 0xF0==($ord_chrs_c & 0xF8):
                                 // characters U-00010000 - U-001FFFFF, mask 11110XXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 4);
                                 $c    += 3;
                                 break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
+                            case 0xF8==($ord_chrs_c & 0xFC):
                                 // characters U-00200000 - U-03FFFFFF, mask 111110XX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 5);
                                 $c    += 4;
                                 break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
+                            case 0xFC==($ord_chrs_c & 0xFE):
                                 // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 6);
@@ -570,7 +570,7 @@ 
                 if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
                     // array, or object notation
 
-                    if ('[' === $str[0]) {
+                    if ('['===$str[0]) {
                         $stk = [SERVICES_JSON_IN_ARR];
                         $arr = [];
                     } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
@@ -593,8 +593,8 @@ 
                     $chrs = mb_substr($str, 1, -1);
                     $chrs = $this->reduce_string($chrs);
 
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (''==$chrs) {
+                        if (SERVICES_JSON_IN_ARR==reset($stk)) {
                             return $arr;
                         }
 
@@ -605,21 +605,21 @@ 
 
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<=$strlen_chrs; ++$c) {
                         $top             = end($stk);
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
 
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+                        if (($c==$strlen_chrs) || ((','===$chrs[$c]) && (SERVICES_JSON_SLICE==$top['what']))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+                            $slice = mb_substr($chrs, $top['where'], $c-$top['where']);
+                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c+1, 'delim' => false]);
                             //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                            if (SERVICES_JSON_IN_ARR==reset($stk)) {
                                 // we are in an array, so just push an element onto the stack
                                 $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                            } elseif (SERVICES_JSON_IN_OBJ==reset($stk)) {
                                 // we are in an object, so figure
                                 // out the property name and set an
                                 // element in an associative array,
@@ -648,59 +648,59 @@ 
                                     }
                                 }
                             }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+                        } elseif ((('"'===$chrs[$c]) || ("'"===$chrs[$c])) && (SERVICES_JSON_IN_STR!=$top['what'])) {
                             // found a quote, and we are not inside a string
                             array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
                             //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+                        } elseif (($chrs[$c]==$top['delim'])
+                                  && (SERVICES_JSON_IN_STR==$top['what'])
+                                  && (1!=(mb_strlen(mb_substr($chrs, 0, $c))-mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\')))%2)) {
                             // found a quote, we're in a string, and it's not escaped
                             // we know that it's not escaped becase there is _not_ an
                             // odd number of backslashes at the end of the string so far
                             array_pop($stk);
                             //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
+                        } elseif (('['===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-bracket, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
                             //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+                        } elseif ((']'===$chrs[$c]) && (SERVICES_JSON_IN_ARR==$top['what'])) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
                             //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
+                        } elseif (('{'===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-brace, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
                             //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+                        } elseif (('}'===$chrs[$c]) && (SERVICES_JSON_IN_OBJ==$top['what'])) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
                             //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
+                        } elseif (('/*'===$substr_chrs_c_2)
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a comment start, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
                             ++$c;
                             //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+                        } elseif (('*/'===$substr_chrs_c_2) && (SERVICES_JSON_IN_CMT==$top['what'])) {
                             // found a comment end, and we're in one now
                             array_pop($stk);
                             ++$c;
 
-                            for ($i = $top['where']; $i <= $c; ++$i) {
+                            for ($i = $top['where']; $i<=$c; ++$i) {
                                 $chrs = substr_replace($chrs, ' ', $i, 1);
                             }
                             //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
                         }
                     }
 
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (SERVICES_JSON_IN_ARR==reset($stk)) {
                         return $arr;
                     }
 
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                    if (SERVICES_JSON_IN_OBJ==reset($stk)) {
                         return $obj;
                     }
                 }

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