XoopsModules25x / songlist

class/RequestsHandler.php

Indentation +195 added lines, -195 removed lines

@@ -11,199 +11,199 @@
  */
 class RequestsHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * RequestsHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_requests', Requests::class, 'rid', 'name');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['rid', 'artist', 'album', 'title', 'lyrics', 'uid', 'name', 'email', 'songid', 'sid', 'created', 'updated'];
-    }
-
-    /**
-     * @param $filter
-     * @return \CriteriaCompo
-     */
-    public function getFilterCriteria($filter): \CriteriaCompo
-    {
-        $parts    = \explode('|', $filter);
-        $criteria = new \CriteriaCompo();
-        foreach ($parts as $part) {
-            $var = \explode(',', $part);
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
-                $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
-                }
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
-                $criteria->add(new \Criteria($var[0], $var[1]));
-            }
-        }
-
-        return $criteria;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return string
-     */
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
-    {
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
-        if (\is_object($ele)) {
-            return $ele->render();
-        }
-
-        return ' ';
-    }
-
-    /**
-     * @param bool $force
-     * @return mixed
-     */
-    public function insert(\XoopsObject $obj, $force = true)
-    {
-        if ($obj->isNew()) {
-            $obj->setVar('created', \time());
-            $new      = true;
-            $sendmail = true;
-        } else {
-            $obj->setVar('updated', \time());
-            $new = false;
-            if (true === $obj->vars['songid']['changed']) {
-                $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-                $criteria     = new \Criteria('songid', $obj->getVar('songid'));
-                $songs        = $songsHandler->getObjects($criteria, false);
-                if (\is_object($songs[0])) {
-                    foreach ($songs[0]->getVar('aids') as $aid) {
-                        $ad[] = $aid;
-                    }
-                    $obj->setVar('sid', $songs[0]->getVar('sid'));
-                    $obj->setVar('aid', $ad[0]);
-                    $sendmail = true;
-                }
-            }
-        }
-        $rid = parent::insert($obj, $force);
-        if ($rid) {
-            if ($sendmail) {
-                if ($new) {
-                    \xoops_loadLanguage('email', 'songlist');
-                    $xoopsMailer = \xoops_getMailer();
-                    $xoopsMailer->setHTML(true);
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
-                    $xoopsMailer->setTemplate('songlist_request_created.tpl');
-                    $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
-
-                    foreach (\explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email) {
-                        $xoopsMailer->setToEmails($email);
-                    }
-
-                    $xoopsMailer->setToEmails($obj->getVar('email'));
-
-                    $xoopsMailer->assign('SITEURL', XOOPS_URL);
-                    $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
-                    $xoopsMailer->assign('RID', $rid);
-                    $xoopsMailer->assign('TITLE', $obj->getVar('title'));
-                    $xoopsMailer->assign('ALBUM', $obj->getVar('album'));
-                    $xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
-
-                    $debug = true;
-
-                    if (!$xoopsMailer->send($debug)) {
-                        \xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
-                    }
-                } else {
-                    \xoops_loadLanguage('email', 'songlist');
-                    $songsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-                    $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-                    $albumsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-                    $genreHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
-
-                    $song = $songsHandler->get($obj->getVar('sid'));
-                    if (\is_object($song)) {
-                        $sng = $genre->getVar('title');
-                    }
-                    $album = $albumHandler->get($song->getVar('abid'));
-                    if (\is_object($album)) {
-                        $alb     = $genre->getVar('title');
-                        $alb_img = $genre->getImage();
-                    }
-                    $genre = $genreHandler->get($song->getVar('abid'));
-                    if (\is_object($genre)) {
-                        $gen = $genre->getVar('name');
-                    }
-                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
-                    $art     = '';
-                    foreach ($artists as $id => $artist) {
-                        $art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
-                    }
-                    $xoopsMailer = \getMailer();
-                    $xoopsMailer->setHTML(true);
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
-                    $xoopsMailer->setTemplate('songlist_request_updated.tpl');
-                    $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
-
-                    $xoopsMailer->setToEmails($obj->getVar('email'));
-
-                    $xoopsMailer->assign('SITEURL', XOOPS_URL);
-                    $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
-                    $xoopsMailer->assign('RID', $rid);
-                    $xoopsMailer->assign('TITLE', $obj->getVar('title'));
-                    $xoopsMailer->assign('ALBUM', $obj->getVar('album'));
-                    $xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
-                    $xoopsMailer->assign('SONGID', $song->getVar('songid'));
-                    $xoopsMailer->assign('SONGURL', $song->getURL());
-                    $xoopsMailer->assign('FOUNDTITLE', $sng);
-                    $xoopsMailer->assign('FOUNDALBUM', $alb);
-                    $xoopsMailer->assign('FOUNDARTIST', $art);
-                    $xoopsMailer->assign('FOUNDGENRE', $gen);
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
-
-                    if (!$xoopsMailer->send()) {
-                        \xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
-                    }
-                }
-            }
-        }
-
-        return $rid;
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
-    }
+	/**
+	 * RequestsHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_requests', Requests::class, 'rid', 'name');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['rid', 'artist', 'album', 'title', 'lyrics', 'uid', 'name', 'email', 'songid', 'sid', 'created', 'updated'];
+	}
+
+	/**
+	 * @param $filter
+	 * @return \CriteriaCompo
+	 */
+	public function getFilterCriteria($filter): \CriteriaCompo
+	{
+		$parts    = \explode('|', $filter);
+		$criteria = new \CriteriaCompo();
+		foreach ($parts as $part) {
+			$var = \explode(',', $part);
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
+				$object = $this->create();
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+				}
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
+				$criteria->add(new \Criteria($var[0], $var[1]));
+			}
+		}
+
+		return $criteria;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return string
+	 */
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
+	{
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
+		if (\is_object($ele)) {
+			return $ele->render();
+		}
+
+		return '&nbsp;';
+	}
+
+	/**
+	 * @param bool $force
+	 * @return mixed
+	 */
+	public function insert(\XoopsObject $obj, $force = true)
+	{
+		if ($obj->isNew()) {
+			$obj->setVar('created', \time());
+			$new      = true;
+			$sendmail = true;
+		} else {
+			$obj->setVar('updated', \time());
+			$new = false;
+			if (true === $obj->vars['songid']['changed']) {
+				$songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
+				$criteria     = new \Criteria('songid', $obj->getVar('songid'));
+				$songs        = $songsHandler->getObjects($criteria, false);
+				if (\is_object($songs[0])) {
+					foreach ($songs[0]->getVar('aids') as $aid) {
+						$ad[] = $aid;
+					}
+					$obj->setVar('sid', $songs[0]->getVar('sid'));
+					$obj->setVar('aid', $ad[0]);
+					$sendmail = true;
+				}
+			}
+		}
+		$rid = parent::insert($obj, $force);
+		if ($rid) {
+			if ($sendmail) {
+				if ($new) {
+					\xoops_loadLanguage('email', 'songlist');
+					$xoopsMailer = \xoops_getMailer();
+					$xoopsMailer->setHTML(true);
+					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
+					$xoopsMailer->setTemplate('songlist_request_created.tpl');
+					$xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
+
+					foreach (\explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email) {
+						$xoopsMailer->setToEmails($email);
+					}
+
+					$xoopsMailer->setToEmails($obj->getVar('email'));
+
+					$xoopsMailer->assign('SITEURL', XOOPS_URL);
+					$xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+					$xoopsMailer->assign('RID', $rid);
+					$xoopsMailer->assign('TITLE', $obj->getVar('title'));
+					$xoopsMailer->assign('ALBUM', $obj->getVar('album'));
+					$xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
+
+					$debug = true;
+
+					if (!$xoopsMailer->send($debug)) {
+						\xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
+					}
+				} else {
+					\xoops_loadLanguage('email', 'songlist');
+					$songsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
+					$artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+					$albumsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+					$genreHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
+
+					$song = $songsHandler->get($obj->getVar('sid'));
+					if (\is_object($song)) {
+						$sng = $genre->getVar('title');
+					}
+					$album = $albumHandler->get($song->getVar('abid'));
+					if (\is_object($album)) {
+						$alb     = $genre->getVar('title');
+						$alb_img = $genre->getImage();
+					}
+					$genre = $genreHandler->get($song->getVar('abid'));
+					if (\is_object($genre)) {
+						$gen = $genre->getVar('name');
+					}
+					$artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
+					$art     = '';
+					foreach ($artists as $id => $artist) {
+						$art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
+					}
+					$xoopsMailer = \getMailer();
+					$xoopsMailer->setHTML(true);
+					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
+					$xoopsMailer->setTemplate('songlist_request_updated.tpl');
+					$xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
+
+					$xoopsMailer->setToEmails($obj->getVar('email'));
+
+					$xoopsMailer->assign('SITEURL', XOOPS_URL);
+					$xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
+					$xoopsMailer->assign('RID', $rid);
+					$xoopsMailer->assign('TITLE', $obj->getVar('title'));
+					$xoopsMailer->assign('ALBUM', $obj->getVar('album'));
+					$xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
+					$xoopsMailer->assign('SONGID', $song->getVar('songid'));
+					$xoopsMailer->assign('SONGURL', $song->getURL());
+					$xoopsMailer->assign('FOUNDTITLE', $sng);
+					$xoopsMailer->assign('FOUNDALBUM', $alb);
+					$xoopsMailer->assign('FOUNDARTIST', $art);
+					$xoopsMailer->assign('FOUNDGENRE', $gen);
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
+
+					if (!$xoopsMailer->send()) {
+						\xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
+					}
+				}
+			}
+		}
+
+		return $rid;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -40,15 +40,15 @@ 
             $var = \explode(',', $part);
             if (!empty($var[1]) && !\is_numeric($var[0])) {
                 $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
                 }
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -89,7 +89,7 @@ 
         } else {
             $obj->setVar('updated', \time());
             $new = false;
-            if (true === $obj->vars['songid']['changed']) {
+            if (true===$obj->vars['songid']['changed']) {
                 $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
                 $criteria     = new \Criteria('songid', $obj->getVar('songid'));
                 $songs        = $songsHandler->getObjects($criteria, false);
@@ -110,7 +110,7 @@ 
                     \xoops_loadLanguage('email', 'songlist');
                     $xoopsMailer = \xoops_getMailer();
                     $xoopsMailer->setHTML(true);
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
+                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
                     $xoopsMailer->setTemplate('songlist_request_created.tpl');
                     $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
 
@@ -154,14 +154,14 @@ 
                     if (\is_object($genre)) {
                         $gen = $genre->getVar('name');
                     }
-                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
+                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '('.\implode(',', $song->getVar('aid')).')', 'IN'), false);
                     $art     = '';
                     foreach ($artists as $id => $artist) {
-                        $art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
+                        $art .= $artist->getVar('name').($id<\count($artists)-1 ? ', ' : '');
                     }
                     $xoopsMailer = \getMailer();
                     $xoopsMailer->setHTML(true);
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
+                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
                     $xoopsMailer->setTemplate('songlist_request_updated.tpl');
                     $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
 
@@ -201,9 +201,9 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct;
     }
 }

class/SongsHandler.php

Indentation +375 added lines, -375 removed lines

@@ -11,303 +11,303 @@ 
  */
 class SongsHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * SongsHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        $moduleHandler                   = \xoops_getHandler('module');
-        $configHandler                   = \xoops_getHandler('config');
-        $GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
-
-        parent::__construct($db, 'songlist_songs', Songs::class, 'sid', 'title');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
-    }
-
-    /**
-     * @param $filter
-     * @return \CriteriaCompo
-     */
-    public function getFilterCriteria($filter): \CriteriaCompo
-    {
-        $parts    = \explode('|', $filter);
-        $criteria = new \CriteriaCompo();
-        foreach ($parts as $part) {
-            $var = \explode(',', $part);
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
-                $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
-                }
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
-                $criteria->add(new \Criteria($var[0], $var[1]));
-            }
-        }
-
-        return $criteria;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return string
-     */
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
-    {
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
-        if (\is_object($ele)) {
-            return $ele->render();
-        }
-
-        return ' ';
-    }
-
-    /**
-     * @param bool $force
-     * @param null $object
-     * @return bool|mixed
-     */
-    public function insert(\XoopsObject $obj, $force = true, $object = null)
-    {
-        if ($obj->isNew()) {
-            $new = true;
-            $old = $this->create();
-            $obj->setVar('created', \time());
-        } else {
-            $new = false;
-            $old = $this->get($obj->getVar('sid'));
-            $obj->setVar('updated', \time());
-        }
-
-        $albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-        $artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-        $genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
-        $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
-        $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-
-        if (true === ($obj->vars['gid']['changed']??false)) {
-            if ($new || (0 != $obj->vars['gid']['value'])) {
-                $genre = $genreHandler->get($obj->vars['gid']['value']);
-                if (\is_object($genre)) {
-                    $genre->setVar('songs', $genre->getVar('songs') + 1);
-                    $genreHandler->insert($genre, true, $obj);
-                }
-            }
-            if (!$old->isNew() && $old->getVar('gid') > 0) {
-                $genre = $genreHandler->get($old->vars['gid']['value']);
-                if (\is_object($genre)) {
-                    $genre->setVar('songs', $genre->getVar('songs') - 1);
-                    $genreHandler->insert($genre, true, null);
-                }
-            }
-        }
-
-        if (true === $obj->vars['vcid']['changed']) {
-            if ($new || (0 != $obj->vars['vcid']['value'])) {
-                $voice = $voiceHandler->get($obj->vars['vcid']['value']);
-                if (\is_object($voice)) {
-                    $voice->setVar('songs', $voice->getVar('songs') + 1);
-                    $voiceHandler->insert($voice, true, $obj);
-                }
-            }
-            if (!$old->isNew() && $old->getVar('vcid') > 0) {
-                $voice = $voiceHandler->get($old->vars['vcid']['value']);
-                if (\is_object($voice)) {
-                    $voice->setVar('songs', $voice->getVar('songs') - 1);
-                    $voiceHandler->insert($voice, true, null);
-                }
-            }
-        }
-
-        if (true === $obj->vars['cid']['changed']) {
-            if (true === $new || (0 != $obj->vars['cid']['value'])) {
-                $category = $categoryHandler->get($obj->vars['cid']['value']);
-                if (\is_object($category)) {
-                    $category->setVar('songs', $category->getVar('songs') + 1);
-                    $categoryHandler->insert($category, true, $obj);
-                    foreach ($obj->getVar('aids') as $aid) {
-                        $artists                   = $artistsHandler->get($aid);
-                        $cids                      = $artists->getVar('cids');
-                        $cids[$obj->getVar('cid')] = $obj->getVar('cid');
-                        if (\is_object($artists)) {
-                            $artists->setVar('cids', $cids);
-                            $artistsHandler->insert($artists, true, null);
-                        }
-                    }
-                }
-            }
-            if (!$old->isNew() && $old->getVar('cid') > 0) {
-                $category = $categoryHandler->get($old->vars['cid']['value']);
-                if (\is_object($category)) {
-                    $category->setVar('songs', $category->getVar('songs') - 1);
-                    $categoryHandler->insert($category, true, null);
-                    foreach ($obj->getVar('aids') as $aid) {
-                        $artists = $artistsHandler->get($aid);
-                        $cids    = [];
-                        foreach ($artists->getVar('cids') as $cid) {
-                            if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
-                                $cids[$cid] = $cid;
-                            }
-                        }
-                        if (\is_object($artists)) {
-                            $artists->setVar('cids', $cids);
-                            $artistsHandler->insert($artists, true, null);
-                        }
-                    }
-                }
-            }
-        }
-
-        if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
-            if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
-                foreach ($obj->vars['aids']['value'] as $aid) {
-                    if (!\in_array($aid, $old->vars['aids']['value'], true)) {
-                        $artists = $artistsHandler->get($aid);
-                        if (\is_object($artists)) {
-                            $artists->setVar('songs', $artists->getVar('songs') + 1);
-                            $artistsHandler->insert($artists, true, $obj);
-                            if (true === $new || (0 != $obj->vars['vcid']['value'])) {
-                                $voice = $voiceHandler->get($obj->vars['vcid']['value']);
-                                if (\is_object($voice)) {
-                                    $voice->setVar('artists', $voice->getVar('artists') + 1);
-                                    $voiceHandler->insert($voice, true, $obj);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
-                foreach ($old->getVar('aids') as $aid) {
-                    if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
-                        $artists = $artistsHandler->get($aid);
-                        if (\is_object($artists)) {
-                            $artists->setVar('songs', $artists->getVar('songs') - 1);
-                            $artistsHandler->insert($artists, true, null);
-                            if (!$old->isNew() && $old->getVar('vcid') > 0) {
-                                $voice = $voiceHandler->get($old->vars['vcid']['value']);
-                                if (\is_object($voice)) {
-                                    $voice->setVar('artists', $voice->getVar('artists') - 1);
-                                    $voiceHandler->insert($voice, true, null);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        if (true === $obj->vars['abid']['changed']) {
-            if (true === $new || (0 != $obj->vars['abid']['value'])) {
-                $album = $albumsHandler->get($obj->vars['abid']['value']);
-                if (\is_object($album)) {
-                    $album->setVar('songs', $album->getVar('songs') + 1);
-                    $albumsHandler->insert($album, true, $obj);
-                    if (true === $new || (0 != $obj->vars['vcid']['value'])) {
-                        $voice = $voiceHandler->get($obj->vars['vcid']['value']);
-                        if (\is_object($voice)) {
-                            $voice->setVar('albums', $voice->getVar('albums') + 1);
-                            $voiceHandler->insert($voice, true, $obj);
-                        }
-                    }
-                }
-            }
-            if (!$old->isNew() && $old->getVar('abid') > 0) {
-                $album = $albumsHandler->get($obj->vars['abid']['value']);
-                if (\is_object($album)) {
-                    $album->setVar('songs', $album->getVar('songs') - 1);
-                    $albumsHandler->insert($album, true, null);
-                    if (!$old->isNew() && $old->getVar('vcid') > 0) {
-                        $voice = $voiceHandler->get($old->vars['vcid']['value']);
-                        if (\is_object($voice)) {
-                            $voice->setVar('albums', $voice->getVar('albums') - 1);
-                            $voiceHandler->insert($voice, true, null);
-                        }
-                    }
-                }
-            }
-        }
-
-        if ('' == $obj->getVar('title')) {
-            return false;
-        }
-
-        $sid = parent::insert($obj, $force);
-        if ($obj->vars['abid']['value'] > 0) {
-            $album      = $albumsHandler->get($obj->vars['abid']['value']);
-            $arry       = $album->getVar('sids');
-            $arry[$sid] = $sid;
-            if (\is_object($album)) {
-                $album->setVar('sids', $arry);
-                $albumsHandler->insert($album);
-            }
-        }
-        if (\count($obj->getVar('aids')) > 0) {
-            foreach ($obj->getVar('aids') as $aid) {
-                $artist     = $artistsHandler->get($aid);
-                $arry       = $artist->getVar('sids');
-                $arry[$sid] = $sid;
-                if (\is_object($artists)) {
-                    $artist->setVar('sids', $arry);
-                    $artistsHandler->insert($artist);
-                }
-            }
-        }
-
-        return $sid;
-    }
-
-    public $_objects = ['object' => [], 'array' => []];
-
-    /**
-     * @param null $id
-     * @param null $fields
-     * @return \XoopsObject
-     */
-    public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
-    {
-        $fields = $fields ?: '*';
-        if (!isset($this->_objects['object'][$id])) {
-            $this->_objects['object'][$id] = parent::get($id, $fields);
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
-                $GLOBALS['xoopsDB']->queryF($sql);
-            }
-        }
-
-        return $this->_objects['object'][$id];
-    }
-
-    /**
-     * @param \CriteriaElement|\CriteriaCompo $criteria
-     * @param bool $id_as_key
-     * @param bool $as_object
-     * @return array
-     */
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
-    {
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
-
-        /*if (!isset($GLOBALS['songlistAdmin'])) {
+	/**
+	 * SongsHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		$moduleHandler                   = \xoops_getHandler('module');
+		$configHandler                   = \xoops_getHandler('config');
+		$GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
+
+		parent::__construct($db, 'songlist_songs', Songs::class, 'sid', 'title');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
+	}
+
+	/**
+	 * @param $filter
+	 * @return \CriteriaCompo
+	 */
+	public function getFilterCriteria($filter): \CriteriaCompo
+	{
+		$parts    = \explode('|', $filter);
+		$criteria = new \CriteriaCompo();
+		foreach ($parts as $part) {
+			$var = \explode(',', $part);
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
+				$object = $this->create();
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+				}
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
+				$criteria->add(new \Criteria($var[0], $var[1]));
+			}
+		}
+
+		return $criteria;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return string
+	 */
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
+	{
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
+		if (\is_object($ele)) {
+			return $ele->render();
+		}
+
+		return ' ';
+	}
+
+	/**
+	 * @param bool $force
+	 * @param null $object
+	 * @return bool|mixed
+	 */
+	public function insert(\XoopsObject $obj, $force = true, $object = null)
+	{
+		if ($obj->isNew()) {
+			$new = true;
+			$old = $this->create();
+			$obj->setVar('created', \time());
+		} else {
+			$new = false;
+			$old = $this->get($obj->getVar('sid'));
+			$obj->setVar('updated', \time());
+		}
+
+		$albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+		$artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+		$genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
+		$voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
+		$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+
+		if (true === ($obj->vars['gid']['changed']??false)) {
+			if ($new || (0 != $obj->vars['gid']['value'])) {
+				$genre = $genreHandler->get($obj->vars['gid']['value']);
+				if (\is_object($genre)) {
+					$genre->setVar('songs', $genre->getVar('songs') + 1);
+					$genreHandler->insert($genre, true, $obj);
+				}
+			}
+			if (!$old->isNew() && $old->getVar('gid') > 0) {
+				$genre = $genreHandler->get($old->vars['gid']['value']);
+				if (\is_object($genre)) {
+					$genre->setVar('songs', $genre->getVar('songs') - 1);
+					$genreHandler->insert($genre, true, null);
+				}
+			}
+		}
+
+		if (true === $obj->vars['vcid']['changed']) {
+			if ($new || (0 != $obj->vars['vcid']['value'])) {
+				$voice = $voiceHandler->get($obj->vars['vcid']['value']);
+				if (\is_object($voice)) {
+					$voice->setVar('songs', $voice->getVar('songs') + 1);
+					$voiceHandler->insert($voice, true, $obj);
+				}
+			}
+			if (!$old->isNew() && $old->getVar('vcid') > 0) {
+				$voice = $voiceHandler->get($old->vars['vcid']['value']);
+				if (\is_object($voice)) {
+					$voice->setVar('songs', $voice->getVar('songs') - 1);
+					$voiceHandler->insert($voice, true, null);
+				}
+			}
+		}
+
+		if (true === $obj->vars['cid']['changed']) {
+			if (true === $new || (0 != $obj->vars['cid']['value'])) {
+				$category = $categoryHandler->get($obj->vars['cid']['value']);
+				if (\is_object($category)) {
+					$category->setVar('songs', $category->getVar('songs') + 1);
+					$categoryHandler->insert($category, true, $obj);
+					foreach ($obj->getVar('aids') as $aid) {
+						$artists                   = $artistsHandler->get($aid);
+						$cids                      = $artists->getVar('cids');
+						$cids[$obj->getVar('cid')] = $obj->getVar('cid');
+						if (\is_object($artists)) {
+							$artists->setVar('cids', $cids);
+							$artistsHandler->insert($artists, true, null);
+						}
+					}
+				}
+			}
+			if (!$old->isNew() && $old->getVar('cid') > 0) {
+				$category = $categoryHandler->get($old->vars['cid']['value']);
+				if (\is_object($category)) {
+					$category->setVar('songs', $category->getVar('songs') - 1);
+					$categoryHandler->insert($category, true, null);
+					foreach ($obj->getVar('aids') as $aid) {
+						$artists = $artistsHandler->get($aid);
+						$cids    = [];
+						foreach ($artists->getVar('cids') as $cid) {
+							if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
+								$cids[$cid] = $cid;
+							}
+						}
+						if (\is_object($artists)) {
+							$artists->setVar('cids', $cids);
+							$artistsHandler->insert($artists, true, null);
+						}
+					}
+				}
+			}
+		}
+
+		if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
+			if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
+				foreach ($obj->vars['aids']['value'] as $aid) {
+					if (!\in_array($aid, $old->vars['aids']['value'], true)) {
+						$artists = $artistsHandler->get($aid);
+						if (\is_object($artists)) {
+							$artists->setVar('songs', $artists->getVar('songs') + 1);
+							$artistsHandler->insert($artists, true, $obj);
+							if (true === $new || (0 != $obj->vars['vcid']['value'])) {
+								$voice = $voiceHandler->get($obj->vars['vcid']['value']);
+								if (\is_object($voice)) {
+									$voice->setVar('artists', $voice->getVar('artists') + 1);
+									$voiceHandler->insert($voice, true, $obj);
+								}
+							}
+						}
+					}
+				}
+			}
+			if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
+				foreach ($old->getVar('aids') as $aid) {
+					if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
+						$artists = $artistsHandler->get($aid);
+						if (\is_object($artists)) {
+							$artists->setVar('songs', $artists->getVar('songs') - 1);
+							$artistsHandler->insert($artists, true, null);
+							if (!$old->isNew() && $old->getVar('vcid') > 0) {
+								$voice = $voiceHandler->get($old->vars['vcid']['value']);
+								if (\is_object($voice)) {
+									$voice->setVar('artists', $voice->getVar('artists') - 1);
+									$voiceHandler->insert($voice, true, null);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (true === $obj->vars['abid']['changed']) {
+			if (true === $new || (0 != $obj->vars['abid']['value'])) {
+				$album = $albumsHandler->get($obj->vars['abid']['value']);
+				if (\is_object($album)) {
+					$album->setVar('songs', $album->getVar('songs') + 1);
+					$albumsHandler->insert($album, true, $obj);
+					if (true === $new || (0 != $obj->vars['vcid']['value'])) {
+						$voice = $voiceHandler->get($obj->vars['vcid']['value']);
+						if (\is_object($voice)) {
+							$voice->setVar('albums', $voice->getVar('albums') + 1);
+							$voiceHandler->insert($voice, true, $obj);
+						}
+					}
+				}
+			}
+			if (!$old->isNew() && $old->getVar('abid') > 0) {
+				$album = $albumsHandler->get($obj->vars['abid']['value']);
+				if (\is_object($album)) {
+					$album->setVar('songs', $album->getVar('songs') - 1);
+					$albumsHandler->insert($album, true, null);
+					if (!$old->isNew() && $old->getVar('vcid') > 0) {
+						$voice = $voiceHandler->get($old->vars['vcid']['value']);
+						if (\is_object($voice)) {
+							$voice->setVar('albums', $voice->getVar('albums') - 1);
+							$voiceHandler->insert($voice, true, null);
+						}
+					}
+				}
+			}
+		}
+
+		if ('' == $obj->getVar('title')) {
+			return false;
+		}
+
+		$sid = parent::insert($obj, $force);
+		if ($obj->vars['abid']['value'] > 0) {
+			$album      = $albumsHandler->get($obj->vars['abid']['value']);
+			$arry       = $album->getVar('sids');
+			$arry[$sid] = $sid;
+			if (\is_object($album)) {
+				$album->setVar('sids', $arry);
+				$albumsHandler->insert($album);
+			}
+		}
+		if (\count($obj->getVar('aids')) > 0) {
+			foreach ($obj->getVar('aids') as $aid) {
+				$artist     = $artistsHandler->get($aid);
+				$arry       = $artist->getVar('sids');
+				$arry[$sid] = $sid;
+				if (\is_object($artists)) {
+					$artist->setVar('sids', $arry);
+					$artistsHandler->insert($artist);
+				}
+			}
+		}
+
+		return $sid;
+	}
+
+	public $_objects = ['object' => [], 'array' => []];
+
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return \XoopsObject
+	 */
+	public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
+	{
+		$fields = $fields ?: '*';
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+
+		return $this->_objects['object'][$id];
+	}
+
+	/**
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
+	 * @param bool $id_as_key
+	 * @param bool $as_object
+	 * @return array
+	 */
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
+	{
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
             foreach($ret as $data) {
                 $id = [];
                 if ($as_object==true) {
@@ -328,82 +328,82 @@ 
             $GLOBALS['xoopsDB']->queryF($sql);
         }*/
 
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $cid) {
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-                $artist        = $artistHandler->get($cid);
-                if (\is_object($artist) && !$artist->isNew()) {
-                    return XOOPS_URL
-                           . '/'
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
-                           . '/'
-                           . $file
-                           . '/'
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
-                           . '/'
-                           . $start
-                           . '-'
-                           . $id
-                           . '-'
-                           . $op
-                           . '-'
-                           . $fct
-                           . '-'
-                           . $gid
-                           . '-'
-                           . $cid
-                           . '/'
-                           . \urlencode($value)
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
-                }
-
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-            }
-
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSearchURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
-    }
-
-    /**
-     * @param int $limit
-     * @return array
-     */
-    public function getTop($limit = 1): array
-    {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
-        $ret     = [];
-        $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
-            $ret[$i] = $this->create();
-            $ret[$i]->assignVars($row);
-            ++$i;
-        }
-
-        return $ret;
-    }
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if (0 != $cid) {
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+				$artist        = $artistHandler->get($cid);
+				if (\is_object($artist) && !$artist->isNew()) {
+					return XOOPS_URL
+						   . '/'
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
+						   . '/'
+						   . $file
+						   . '/'
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
+						   . '/'
+						   . $start
+						   . '-'
+						   . $id
+						   . '-'
+						   . $op
+						   . '-'
+						   . $fct
+						   . '-'
+						   . $gid
+						   . '-'
+						   . $cid
+						   . '/'
+						   . \urlencode($value)
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSearchURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
+	}
+
+	/**
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getTop($limit = 1): array
+	{
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret     = [];
+		$i       = 0;
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			++$i;
+		}
+
+		return $ret;
+	}
 }

Spacing +55 added lines, -55 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -45,15 +45,15 @@ 
             $var = \explode(',', $part);
             if (!empty($var[1]) && !\is_numeric($var[0])) {
                 $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
                 }
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -104,45 +104,45 @@ 
         $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
         $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
 
-        if (true === ($obj->vars['gid']['changed']??false)) {
-            if ($new || (0 != $obj->vars['gid']['value'])) {
+        if (true===($obj->vars['gid']['changed'] ?? false)) {
+            if ($new || (0!=$obj->vars['gid']['value'])) {
                 $genre = $genreHandler->get($obj->vars['gid']['value']);
                 if (\is_object($genre)) {
-                    $genre->setVar('songs', $genre->getVar('songs') + 1);
+                    $genre->setVar('songs', $genre->getVar('songs')+1);
                     $genreHandler->insert($genre, true, $obj);
                 }
             }
-            if (!$old->isNew() && $old->getVar('gid') > 0) {
+            if (!$old->isNew() && $old->getVar('gid')>0) {
                 $genre = $genreHandler->get($old->vars['gid']['value']);
                 if (\is_object($genre)) {
-                    $genre->setVar('songs', $genre->getVar('songs') - 1);
+                    $genre->setVar('songs', $genre->getVar('songs')-1);
                     $genreHandler->insert($genre, true, null);
                 }
             }
         }
 
-        if (true === $obj->vars['vcid']['changed']) {
-            if ($new || (0 != $obj->vars['vcid']['value'])) {
+        if (true===$obj->vars['vcid']['changed']) {
+            if ($new || (0!=$obj->vars['vcid']['value'])) {
                 $voice = $voiceHandler->get($obj->vars['vcid']['value']);
                 if (\is_object($voice)) {
-                    $voice->setVar('songs', $voice->getVar('songs') + 1);
+                    $voice->setVar('songs', $voice->getVar('songs')+1);
                     $voiceHandler->insert($voice, true, $obj);
                 }
             }
-            if (!$old->isNew() && $old->getVar('vcid') > 0) {
+            if (!$old->isNew() && $old->getVar('vcid')>0) {
                 $voice = $voiceHandler->get($old->vars['vcid']['value']);
                 if (\is_object($voice)) {
-                    $voice->setVar('songs', $voice->getVar('songs') - 1);
+                    $voice->setVar('songs', $voice->getVar('songs')-1);
                     $voiceHandler->insert($voice, true, null);
                 }
             }
         }
 
-        if (true === $obj->vars['cid']['changed']) {
-            if (true === $new || (0 != $obj->vars['cid']['value'])) {
+        if (true===$obj->vars['cid']['changed']) {
+            if (true===$new || (0!=$obj->vars['cid']['value'])) {
                 $category = $categoryHandler->get($obj->vars['cid']['value']);
                 if (\is_object($category)) {
-                    $category->setVar('songs', $category->getVar('songs') + 1);
+                    $category->setVar('songs', $category->getVar('songs')+1);
                     $categoryHandler->insert($category, true, $obj);
                     foreach ($obj->getVar('aids') as $aid) {
                         $artists                   = $artistsHandler->get($aid);
@@ -155,16 +155,16 @@ 
                     }
                 }
             }
-            if (!$old->isNew() && $old->getVar('cid') > 0) {
+            if (!$old->isNew() && $old->getVar('cid')>0) {
                 $category = $categoryHandler->get($old->vars['cid']['value']);
                 if (\is_object($category)) {
-                    $category->setVar('songs', $category->getVar('songs') - 1);
+                    $category->setVar('songs', $category->getVar('songs')-1);
                     $categoryHandler->insert($category, true, null);
                     foreach ($obj->getVar('aids') as $aid) {
                         $artists = $artistsHandler->get($aid);
                         $cids    = [];
                         foreach ($artists->getVar('cids') as $cid) {
-                            if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
+                            if ($cid!=$old->getVar('cid') || $cid==$obj->getVar('cid')) {
                                 $cids[$cid] = $cid;
                             }
                         }
@@ -177,18 +177,18 @@ 
             }
         }
 
-        if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
-            if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
+        if (true===$obj->vars['aids']['changed'] && 0!=\count($obj->vars['aids']['value'])) {
+            if (true===$new || 0!=\count($obj->vars['aids']['value'])) {
                 foreach ($obj->vars['aids']['value'] as $aid) {
                     if (!\in_array($aid, $old->vars['aids']['value'], true)) {
                         $artists = $artistsHandler->get($aid);
                         if (\is_object($artists)) {
-                            $artists->setVar('songs', $artists->getVar('songs') + 1);
+                            $artists->setVar('songs', $artists->getVar('songs')+1);
                             $artistsHandler->insert($artists, true, $obj);
-                            if (true === $new || (0 != $obj->vars['vcid']['value'])) {
+                            if (true===$new || (0!=$obj->vars['vcid']['value'])) {
                                 $voice = $voiceHandler->get($obj->vars['vcid']['value']);
                                 if (\is_object($voice)) {
-                                    $voice->setVar('artists', $voice->getVar('artists') + 1);
+                                    $voice->setVar('artists', $voice->getVar('artists')+1);
                                     $voiceHandler->insert($voice, true, $obj);
                                 }
                             }
@@ -196,17 +196,17 @@ 
                     }
                 }
             }
-            if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
+            if (!$old->isNew() && 0==\count($old->getVar('aids'))) {
                 foreach ($old->getVar('aids') as $aid) {
                     if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
                         $artists = $artistsHandler->get($aid);
                         if (\is_object($artists)) {
-                            $artists->setVar('songs', $artists->getVar('songs') - 1);
+                            $artists->setVar('songs', $artists->getVar('songs')-1);
                             $artistsHandler->insert($artists, true, null);
-                            if (!$old->isNew() && $old->getVar('vcid') > 0) {
+                            if (!$old->isNew() && $old->getVar('vcid')>0) {
                                 $voice = $voiceHandler->get($old->vars['vcid']['value']);
                                 if (\is_object($voice)) {
-                                    $voice->setVar('artists', $voice->getVar('artists') - 1);
+                                    $voice->setVar('artists', $voice->getVar('artists')-1);
                                     $voiceHandler->insert($voice, true, null);
                                 }
                             }
@@ -216,30 +216,30 @@ 
             }
         }
 
-        if (true === $obj->vars['abid']['changed']) {
-            if (true === $new || (0 != $obj->vars['abid']['value'])) {
+        if (true===$obj->vars['abid']['changed']) {
+            if (true===$new || (0!=$obj->vars['abid']['value'])) {
                 $album = $albumsHandler->get($obj->vars['abid']['value']);
                 if (\is_object($album)) {
-                    $album->setVar('songs', $album->getVar('songs') + 1);
+                    $album->setVar('songs', $album->getVar('songs')+1);
                     $albumsHandler->insert($album, true, $obj);
-                    if (true === $new || (0 != $obj->vars['vcid']['value'])) {
+                    if (true===$new || (0!=$obj->vars['vcid']['value'])) {
                         $voice = $voiceHandler->get($obj->vars['vcid']['value']);
                         if (\is_object($voice)) {
-                            $voice->setVar('albums', $voice->getVar('albums') + 1);
+                            $voice->setVar('albums', $voice->getVar('albums')+1);
                             $voiceHandler->insert($voice, true, $obj);
                         }
                     }
                 }
             }
-            if (!$old->isNew() && $old->getVar('abid') > 0) {
+            if (!$old->isNew() && $old->getVar('abid')>0) {
                 $album = $albumsHandler->get($obj->vars['abid']['value']);
                 if (\is_object($album)) {
-                    $album->setVar('songs', $album->getVar('songs') - 1);
+                    $album->setVar('songs', $album->getVar('songs')-1);
                     $albumsHandler->insert($album, true, null);
-                    if (!$old->isNew() && $old->getVar('vcid') > 0) {
+                    if (!$old->isNew() && $old->getVar('vcid')>0) {
                         $voice = $voiceHandler->get($old->vars['vcid']['value']);
                         if (\is_object($voice)) {
-                            $voice->setVar('albums', $voice->getVar('albums') - 1);
+                            $voice->setVar('albums', $voice->getVar('albums')-1);
                             $voiceHandler->insert($voice, true, null);
                         }
                     }
@@ -247,12 +247,12 @@ 
             }
         }
 
-        if ('' == $obj->getVar('title')) {
+        if (''==$obj->getVar('title')) {
             return false;
         }
 
         $sid = parent::insert($obj, $force);
-        if ($obj->vars['abid']['value'] > 0) {
+        if ($obj->vars['abid']['value']>0) {
             $album      = $albumsHandler->get($obj->vars['abid']['value']);
             $arry       = $album->getVar('sids');
             $arry[$sid] = $sid;
@@ -261,7 +261,7 @@ 
                 $albumsHandler->insert($album);
             }
         }
-        if (\count($obj->getVar('aids')) > 0) {
+        if (\count($obj->getVar('aids'))>0) {
             foreach ($obj->getVar('aids') as $aid) {
                 $artist     = $artistsHandler->get($aid);
                 $arry       = $artist->getVar('sids');
@@ -289,7 +289,7 @@ 
         if (!isset($this->_objects['object'][$id])) {
             $this->_objects['object'][$id] = parent::get($id, $fields);
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
                 $GLOBALS['xoopsDB']->queryF($sql);
             }
         }
@@ -338,7 +338,7 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $cid) {
+            if (0!=$cid) {
                 $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
                 $artist        = $artistHandler->get($cid);
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -366,13 +366,13 @@ 
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
                 }
 
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
             }
 
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
     }
 
     /**
@@ -382,10 +382,10 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.($_GET['cid'] ?? $cid).'-'.$vcid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.\urlencode($value ?? '').'&cid='.$cid.'&gid='.$gid.'&vcid='.$vcid.'&start='.$start;
     }
 
     /**
@@ -394,11 +394,11 @@ 
      */
     public function getTop($limit = 1): array
     {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
         $results = $GLOBALS['xoopsDB']->queryF($sql);
         $ret     = [];
         $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
             $ret[$i] = $this->create();
             $ret[$i]->assignVars($row);
             ++$i;

class/Votes.php

Indentation +38 added lines, -38 removed lines

@@ -13,42 +13,42 @@
  */
 class Votes extends \XoopsObject
 {
-    /**
-     * Votes constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('vid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('ip', \XOBJ_DTYPE_TXTBOX, null, false, 64);
-        $this->initVar('netaddy', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-    }
-
-    /**
-     * @param bool $as_array
-     * @return array|string
-     */
-    public function getForm($as_array = false)
-    {
-        return FormController::votes_get_form($this, $as_array);
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $ret  = parent::toArray();
-        $form = $this->getForm(true);
-        foreach ($form as $key => $element) {
-            $ret['form'][$key] = $element->render();
-        }
-
-        $ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
-
-        return $ret;
-    }
+	/**
+	 * Votes constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('vid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('ip', \XOBJ_DTYPE_TXTBOX, null, false, 64);
+		$this->initVar('netaddy', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+	}
+
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::votes_get_form($this, $as_array);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		$ret  = parent::toArray();
+		$form = $this->getForm(true);
+		foreach ($form as $key => $element) {
+			$ret['form'][$key] = $element->render();
+		}
+
+		$ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
+
+		return $ret;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -47,7 +47,7 @@ 
             $ret['form'][$key] = $element->render();
         }
 
-        $ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
+        $ret['rank'] = \number_format($this->getVar('rank'), 2).\_MI_SONGLIST_OFTEN;
 
         return $ret;
     }

class/Utf8map.php

Indentation +41 added lines, -41 removed lines

@@ -15,45 +15,45 @@
  */
 class Utf8map extends XoopsObject
 {
-    /**
-     * Utf8map constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('utfid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('from', \XOBJ_DTYPE_TXTBOX, null, false, 2);
-        $this->initVar('to', \XOBJ_DTYPE_TXTBOX, null, false, 2);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
-
-    /**
-     * @param bool $as_array
-     * @return array|string
-     */
-    public function getForm($as_array = false)
-    {
-        return FormController::getFormUtf8map($this, $as_array);
-    }
-
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $ret  = parent::toArray();
-        $form = $this->getForm(true);
-        foreach ($form as $key => $element) {
-            $ret['form'][$key] = $element->render();
-        }
-        foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
-                $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
-                $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
-            }
-        }
-
-        return $ret;
-    }
+	/**
+	 * Utf8map constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('utfid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('from', \XOBJ_DTYPE_TXTBOX, null, false, 2);
+		$this->initVar('to', \XOBJ_DTYPE_TXTBOX, null, false, 2);
+		$this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
+	}
+
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormUtf8map($this, $as_array);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function toArray(): array
+	{
+		$ret  = parent::toArray();
+		$form = $this->getForm(true);
+		foreach ($form as $key => $element) {
+			$ret['form'][$key] = $element->render();
+		}
+		foreach (['created', 'updated'] as $key) {
+			if ($this->getVar($key) > 0) {
+				$ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
+				$ret[$key]         = \date(_DATESTRING, $this->getVar($key));
+			}
+		}
+
+		return $ret;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
 
 \defined('XOOPS_ROOT_PATH') || exit('Restricted access');
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -48,7 +48,7 @@ 
             $ret['form'][$key] = $element->render();
         }
         foreach (['created', 'updated'] as $key) {
-            if ($this->getVar($key) > 0) {
+            if ($this->getVar($key)>0) {
                 $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
                 $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
             }

class/VoiceHandler.php

Indentation +162 added lines, -162 removed lines

@@ -11,121 +11,121 @@ 
  */
 class VoiceHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * VoiceHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_voice', Voice::class, 'vcid', 'name');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['vcid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
-    }
-
-    /**
-     * @param $filter
-     * @return \CriteriaCompo
-     */
-    public function getFilterCriteria($filter): \CriteriaCompo
-    {
-        $parts    = \explode('|', $filter);
-        $criteria = new \CriteriaCompo();
-        foreach ($parts as $part) {
-            $var = \explode(',', $part);
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
-                $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
-                }
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
-                $criteria->add(new \Criteria($var[0], $var[1]));
-            }
-        }
-
-        return $criteria;
-    }
-
-    /**
-     * @param        $filter
-     * @param        $field
-     * @param string $sort
-     * @param string $op
-     * @param string $fct
-     * @return string
-     */
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
-    {
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
-        if (\is_object($ele)) {
-            return $ele->render();
-        }
-
-        return ' ';
-    }
-
-    /**
-     * @param bool $force
-     * @return bool|mixed
-     */
-    public function insert(\XoopsObject $obj, $force = true)
-    {
-        if ($obj->isNew()) {
-            $obj->setVar('created', \time());
-        } else {
-            $obj->setVar('updated', \time());
-        }
-        if ('' == $obj->getVar('name')) {
-            return false;
-        }
-
-        return parent::insert($obj, $force);
-    }
-
-    public $_objects = ['object' => [], 'array' => []];
-
-    /**
-     * @param null $id
-     * @param null $fields
-     * @return \XoopsObject
-     */
-    public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
-    {
-        $fields = $fields ?: '*';
-        if (!isset($this->_objects['object'][$id])) {
-            $this->_objects['object'][$id] = parent::get($id, $fields);
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
-                $GLOBALS['xoopsDB']->queryF($sql);
-            }
-        }
-
-        return $this->_objects['object'][$id];
-    }
-
-    /**
-     * @param \CriteriaElement|\CriteriaCompo $criteria
-     * @param bool $id_as_key
-     * @param bool $as_object
-     * @return array
-     */
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
-    {
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
-
-        /*if (!isset($GLOBALS['songlistAdmin'])) {
+	/**
+	 * VoiceHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_voice', Voice::class, 'vcid', 'name');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['vcid', 'name', 'artists', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
+	}
+
+	/**
+	 * @param $filter
+	 * @return \CriteriaCompo
+	 */
+	public function getFilterCriteria($filter): \CriteriaCompo
+	{
+		$parts    = \explode('|', $filter);
+		$criteria = new \CriteriaCompo();
+		foreach ($parts as $part) {
+			$var = \explode(',', $part);
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
+				$object = $this->create();
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+				}
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
+				$criteria->add(new \Criteria($var[0], $var[1]));
+			}
+		}
+
+		return $criteria;
+	}
+
+	/**
+	 * @param        $filter
+	 * @param        $field
+	 * @param string $sort
+	 * @param string $op
+	 * @param string $fct
+	 * @return string
+	 */
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
+	{
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
+		if (\is_object($ele)) {
+			return $ele->render();
+		}
+
+		return ' ';
+	}
+
+	/**
+	 * @param bool $force
+	 * @return bool|mixed
+	 */
+	public function insert(\XoopsObject $obj, $force = true)
+	{
+		if ($obj->isNew()) {
+			$obj->setVar('created', \time());
+		} else {
+			$obj->setVar('updated', \time());
+		}
+		if ('' == $obj->getVar('name')) {
+			return false;
+		}
+
+		return parent::insert($obj, $force);
+	}
+
+	public $_objects = ['object' => [], 'array' => []];
+
+	/**
+	 * @param null $id
+	 * @param null $fields
+	 * @return \XoopsObject
+	 */
+	public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
+	{
+		$fields = $fields ?: '*';
+		if (!isset($this->_objects['object'][$id])) {
+			$this->_objects['object'][$id] = parent::get($id, $fields);
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+
+		return $this->_objects['object'][$id];
+	}
+
+	/**
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
+	 * @param bool $id_as_key
+	 * @param bool $as_object
+	 * @return array
+	 */
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
+	{
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
+
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
             $id = [];
             foreach($ret as $data) {
                 if ($as_object==true) {
@@ -146,51 +146,51 @@ 
             $GLOBALS['xoopsDB']->queryF($sql);
         }*/
 
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
-    }
-
-    /**
-     * @param int $limit
-     * @return array
-     */
-    public function getTop($limit = 1): array
-    {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
-        $ret     = [];
-        $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
-            $ret[$i] = $this->create();
-            $ret[$i]->assignVars($row);
-            ++$i;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param \XoopsObject $object
-     * @param bool         $force
-     * @return bool
-     */
-    public function delete(\XoopsObject $object, $force = true): bool
-    {
-        parent::delete($object, $force);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
-
-        return $GLOBALS['xoopsDB']->queryF($sql);
-    }
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
+	}
+
+	/**
+	 * @param int $limit
+	 * @return array
+	 */
+	public function getTop($limit = 1): array
+	{
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
+		$ret     = [];
+		$i       = 0;
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+			$ret[$i] = $this->create();
+			$ret[$i]->assignVars($row);
+			++$i;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param \XoopsObject $object
+	 * @param bool         $force
+	 * @return bool
+	 */
+	public function delete(\XoopsObject $object, $force = true): bool
+	{
+		parent::delete($object, $force);
+		$sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
+
+		return $GLOBALS['xoopsDB']->queryF($sql);
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace XoopsModules\Songlist;
 
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
+require_once \dirname(__DIR__).'/include/songlist.object.php';
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
 use  XoopsModules\Songlist\Form\FormController;
 
@@ -40,15 +40,15 @@ 
             $var = \explode(',', $part);
             if (!empty($var[1]) && !\is_numeric($var[0])) {
                 $object = $this->create();
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
                 }
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -87,7 +87,7 @@ 
         } else {
             $obj->setVar('updated', \time());
         }
-        if ('' == $obj->getVar('name')) {
+        if (''==$obj->getVar('name')) {
             return false;
         }
 
@@ -107,7 +107,7 @@ 
         if (!isset($this->_objects['object'][$id])) {
             $this->_objects['object'][$id] = parent::get($id, $fields);
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
                 $GLOBALS['xoopsDB']->queryF($sql);
             }
         }
@@ -156,10 +156,10 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $id . '-' . \urlencode($value) . '-' . $gid . '-' . $cid . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$id.'-'.\urlencode($value).'-'.$gid.'-'.$cid.$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&cid='.$cid.'&start='.$start;
     }
 
     /**
@@ -168,11 +168,11 @@ 
      */
     public function getTop($limit = 1): array
     {
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
         $results = $GLOBALS['xoopsDB']->queryF($sql);
         $ret     = [];
         $i       = 0;
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
             $ret[$i] = $this->create();
             $ret[$i]->assignVars($row);
             ++$i;
@@ -189,7 +189,7 @@ 
     public function delete(\XoopsObject $object, $force = true): bool
     {
         parent::delete($object, $force);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `vcid` = 0 WHERE `vcid` = ' . $object->getVar('vcid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `vcid` = 0 WHERE `vcid` = '.$object->getVar('vcid');
 
         return $GLOBALS['xoopsDB']->queryF($sql);
     }

class/Form/SelectGenreForm.php

Indentation +207 added lines, -207 removed lines

@@ -53,230 +53,230 @@
  */
 class SelectGenreForm extends XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     */
-    public $_options = [];
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     */
-    public $_multiple = false;
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     */
-    public $_size;
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     */
-    public $_value = [];
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	public $_options = [];
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 */
+	public $_multiple = false;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 */
+	public $_size;
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 */
+	public $_value = [];
 
-    /**
-     * Constructor
-     *
-     * @param string $caption  Caption
-     * @param string $name     "name" attribute
-     * @param mixed  $value    Pre-selected value (or array of them).
-     * @param int    $size     Number or rows. "1" makes a drop-down-list
-     * @param bool   $multiple Allow multiple selections?
-     */
-    public function __construct($caption, $name, $value = null, $size = 1, $multiple = false)
-    {
-        global $_form_object_options;
-        \xoops_loadLanguage('modinfo', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption  Caption
+	 * @param string $name     "name" attribute
+	 * @param mixed  $value    Pre-selected value (or array of them).
+	 * @param int    $size     Number or rows. "1" makes a drop-down-list
+	 * @param bool   $multiple Allow multiple selections?
+	 */
+	public function __construct($caption, $name, $value = null, $size = 1, $multiple = false)
+	{
+		global $_form_object_options;
+		\xoops_loadLanguage('modinfo', 'songlist');
 
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        $this->addOption('0', \_MI_SONGLIST_ALL);
-        if (!isset($_form_object_options['genre'])) {
-            $genreHandler = Helper::getInstance()->getHandler('Genre');
-            $criteria     = new Criteria('');
-            $criteria->setSort('name');
-            $criteria->setOrder('ASC');
-            foreach ($genreHandler->getObjects($criteria, true) as $id => $obj) {
-                $_form_object_options['genre'][$id] = $obj->getVar('name');
-            }
-        }
-        //        if (Request::hasVar('genre', 'form_object_options')) {
-        if (isset($_form_object_options['genre'])) {
-            foreach ($_form_object_options['genre'] as $id => $value) {
-                $this->addOption($id, $value);
-            }
-        }
-    }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size     = (int)$size;
+		if (isset($value)) {
+			$this->setValue($value);
+		}
+		$this->addOption('0', \_MI_SONGLIST_ALL);
+		if (!isset($_form_object_options['genre'])) {
+			$genreHandler = Helper::getInstance()->getHandler('Genre');
+			$criteria     = new Criteria('');
+			$criteria->setSort('name');
+			$criteria->setOrder('ASC');
+			foreach ($genreHandler->getObjects($criteria, true) as $id => $obj) {
+				$_form_object_options['genre'][$id] = $obj->getVar('name');
+			}
+		}
+		//        if (Request::hasVar('genre', 'form_object_options')) {
+		if (isset($_form_object_options['genre'])) {
+			foreach ($_form_object_options['genre'] as $id => $value) {
+				$this->addOption($id, $value);
+			}
+		}
+	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    public function isMultiple(): bool
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	public function isMultiple(): bool
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    public function getSize(): int
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	public function getSize(): int
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    public function getValue($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_value;
-        }
-        $value = [];
-        foreach ($this->_value as $val) {
-            $value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
-        }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	public function getValue($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_value;
+		}
+		$value = [];
+		foreach ($this->_value as $val) {
+			$value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param mixed $value
-     */
-    public function setValue($value): void
-    {
-        if (\is_array($value)) {
-            foreach ($value as $v) {
-                $this->_value[] = (int)$v;
-            }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param mixed $value
+	 */
+	public function setValue($value): void
+	{
+		if (\is_array($value)) {
+			foreach ($value as $v) {
+				$this->_value[] = (int)$v;
+			}
 
 //            $this->_value[] = array_values($value);
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name  "name" attribute
-     */
-    public function addOption($value, $name = ''): void
-    {
-        if ('' != $name) {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name  "name" attribute
+	 */
+	public function addOption($value, $name = ''): void
+	{
+		if ('' != $name) {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    public function addOptionArray($options): void
-    {
-        if (\is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	public function addOptionArray($options): void
+	{
+		if (\is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    public function getOptions($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_options;
-        }
-        $value = [];
-        foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
-        }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	public function getOptions($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_options;
+		}
+		$value = [];
+		foreach ($this->_options as $val => $name) {
+			$value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render(): string
-    {
-        $ele_name    = $this->getName();
-        $ele_title   = $this->getTitle();
-        $ele_value   = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
-        if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
-        } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
-        }
-        foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
-                $ret .= ' selected';
-            }
-            $ret .= '>' . $name . '</option>';
-        }
-        $ret .= '</select>';
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render(): string
+	{
+		$ele_name    = $this->getName();
+		$ele_title   = $this->getTitle();
+		$ele_value   = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+		if ($this->isMultiple()) {
+			$ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+		} else {
+			$ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+		}
+		foreach ($ele_options as $value => $name) {
+			$ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
+			if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+				$ret .= ' selected';
+			}
+			$ret .= '>' . $name . '</option>';
+		}
+		$ret .= '</select>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    public function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (!empty($this->customValidationCode)) {
-            return \implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	public function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (!empty($this->customValidationCode)) {
+			return \implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		}
 
-        if ($this->isRequired()) {
-            $eltname    = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
+		if ($this->isRequired()) {
+			$eltname    = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
 
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
-                   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
-                   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
+				   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
+				   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
 
-        return '';
-    }
+		return '';
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -95,7 +95,7 @@ 
         $this->setCaption($caption);
         $this->setName($name);
         $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
+        $this->_size     = (int) $size;
         if (isset($value)) {
             $this->setValue($value);
         }
@@ -165,7 +165,7 @@ 
     {
         if (\is_array($value)) {
             foreach ($value as $v) {
-                $this->_value[] = (int)$v;
+                $this->_value[] = (int) $v;
             }
 
 //            $this->_value[] = array_values($value);
@@ -182,7 +182,7 @@ 
      */
     public function addOption($value, $name = ''): void
     {
-        if ('' != $name) {
+        if (''!=$name) {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -218,7 +218,7 @@ 
         }
         $value = [];
         foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode>1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
         }
 
         return $value;
@@ -235,18 +235,18 @@ 
         $ele_title   = $this->getTitle();
         $ele_value   = $this->getValue();
         $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+        $ret         = '<select size="'.$this->getSize().'"'.$this->getExtra();
         if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
         foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+            $ret .= '<option value="'.\htmlspecialchars((string) $value, \ENT_QUOTES).'"';
+            if (\count($ele_value)>0 && \in_array($value, $ele_value, true)) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $name . '</option>';
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
 

class/Form/FormController.php

Indentation +1296 added lines, -1296 removed lines

@@ -16,1301 +16,1301 @@
 
 class FormController
 {
-    /**
-     * Get {@link XoopsThemeForm} for adding/editing fields
-     *
-     * @param object $field  {@link ProfileField} object to get edit form for
-     * @param mixed  $action URL to submit to - or false for $_SERVER['SCRIPT_NAME']
-     *
-     * @return object
-     */
-    public static function getFieldForm($field, $action = false)
-    {
-        if (false === $action) {
-            $action = $_SERVER['SCRIPT_NAME'];
-        }
-
-        $helper = Helper::getInstance();
-        $helper->loadLanguage('forms');
-
-        $title = $field->isNew() ? sprintf(_FRM_SONGLIST_FIELDS_ADD, _FRM_SONGLIST_FIELDS_FIELD) : sprintf(_FRM_SONGLIST_FIELDS_EDIT, _FRM_SONGLIST_FIELDS_FIELD);
-
-        xoops_load('XoopsFormLoader');
-
-        $form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
-
-        $form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_TITLE, 'field_title', 35, 255, $field->getVar('field_title', 'e')));
-        $form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DESCRIPTION, 'field_description', $field->getVar('field_description', 'e')));
-
-        if ($field->isNew()) {
-            $fieldcid = [1 => 0];
-        } else {
-            $fieldcid = $field->getVar('cids');
-        }
-        $categoryHandler = Helper::getInstance()
-                                 ->getHandler('Category');
-        $cat_select      = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_CATEGORY, 'cids', $fieldcid, 7, true);
-        $cat_select->addOption(0, _FRM_SONGLIST_FIELDS_DEFAULT);
-        foreach ($categoryHandler->getObjects(null, true) as $cid => $category) {
-            $cat_select->addOption($cid, $category->getVar('name'));
-        }
-        $form->addElement($cat_select);
-        $form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
-        if ($field->getVar('field_config') || $field->isNew()) {
-            if ($field->isNew()) {
-                $form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_NAME, 'field_name', 35, 255, $field->getVar('field_name', 'e')));
-            } else {
-                $form->addElement(new \XoopsFormLabel(_FRM_SONGLIST_FIELDS_NAME, $field->getVar('field_name')));
-                $form->addElement(new \XoopsFormHidden('id', $field->getVar('field_id')));
-            }
-
-            //autotext and theme left out of this one as fields of that type should never be changed (valid assumption, I think)
-            $fieldtypes = [
-                'checkbox'     => _FRM_SONGLIST_FIELDS_CHECKBOX,
-                'date'         => _FRM_SONGLIST_FIELDS_DATE,
-                'datetime'     => _FRM_SONGLIST_FIELDS_DATETIME,
-                'longdate'     => _FRM_SONGLIST_FIELDS_LONGDATE,
-                'group'        => _FRM_SONGLIST_FIELDS_GROUP,
-                'group_multi'  => _FRM_SONGLIST_FIELDS_GROUPMULTI,
-                'language'     => _FRM_SONGLIST_FIELDS_LANGUAGE,
-                'radio'        => _FRM_SONGLIST_FIELDS_RADIO,
-                'select'       => _FRM_SONGLIST_FIELDS_SELECT,
-                'select_multi' => _FRM_SONGLIST_FIELDS_SELECTMULTI,
-                'textarea'     => _FRM_SONGLIST_FIELDS_TEXTAREA,
-                'dhtml'        => _FRM_SONGLIST_FIELDS_DHTMLTEXTAREA,
-                'textbox'      => _FRM_SONGLIST_FIELDS_TEXTBOX,
-                'timezone'     => _FRM_SONGLIST_FIELDS_TIMEZONE,
-                'yesno'        => _FRM_SONGLIST_FIELDS_YESNO,
-            ];
-
-            $element_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_TYPE, 'field_type', $field->getVar('field_type', 'e'));
-            $element_select->addOptionArray($fieldtypes);
-
-            $form->addElement($element_select);
-
-            switch ($field->getVar('field_type')) {
-                case 'textbox':
-                    $valuetypes = [
-                        XOBJ_DTYPE_ARRAY   => _FRM_SONGLIST_FIELDS_ARRAY,
-                        XOBJ_DTYPE_EMAIL   => _FRM_SONGLIST_FIELDS_EMAIL,
-                        XOBJ_DTYPE_INT     => _FRM_SONGLIST_FIELDS_INT,
-                        XOBJ_DTYPE_FLOAT   => _FRM_SONGLIST_FIELDS_FLOAT,
-                        XOBJ_DTYPE_DECIMAL => _FRM_SONGLIST_FIELDS_DECIMAL,
-                        XOBJ_DTYPE_TXTAREA => _FRM_SONGLIST_FIELDS_TXTAREA,
-                        XOBJ_DTYPE_TXTBOX  => _FRM_SONGLIST_FIELDS_TXTBOX,
-                        XOBJ_DTYPE_URL     => _FRM_SONGLIST_FIELDS_URL,
-                        XOBJ_DTYPE_OTHER   => _FRM_SONGLIST_FIELDS_OTHER,
-                    ];
-
-                    $type_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
-                    $type_select->addOptionArray($valuetypes);
-                    $form->addElement($type_select);
-                    break;
-                case 'select':
-                case 'radio':
-                    $valuetypes = [
-                        XOBJ_DTYPE_ARRAY   => _FRM_SONGLIST_FIELDS_ARRAY,
-                        XOBJ_DTYPE_EMAIL   => _FRM_SONGLIST_FIELDS_EMAIL,
-                        XOBJ_DTYPE_INT     => _FRM_SONGLIST_FIELDS_INT,
-                        XOBJ_DTYPE_FLOAT   => _FRM_SONGLIST_FIELDS_FLOAT,
-                        XOBJ_DTYPE_DECIMAL => _FRM_SONGLIST_FIELDS_DECIMAL,
-                        XOBJ_DTYPE_TXTAREA => _FRM_SONGLIST_FIELDS_TXTAREA,
-                        XOBJ_DTYPE_TXTBOX  => _FRM_SONGLIST_FIELDS_TXTBOX,
-                        XOBJ_DTYPE_URL     => _FRM_SONGLIST_FIELDS_URL,
-                        XOBJ_DTYPE_OTHER   => _FRM_SONGLIST_FIELDS_OTHER,
-                    ];
-
-                    $type_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
-                    $type_select->addOptionArray($valuetypes);
-                    $form->addElement($type_select);
-                    break;
-            }
-
-            //$form->addElement(new \XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e') ));
-
-            if ('select' === $field->getVar('field_type') || 'select_multi' === $field->getVar('field_type') || 'radio' === $field->getVar('field_type') || 'checkbox' === $field->getVar('field_type')) {
-                $options = $field->getVar('field_options');
-                if (count($options) > 0) {
-                    $remove_options          = new \XoopsFormCheckBox(_FRM_SONGLIST_FIELDS_REMOVEOPTIONS, 'removeOptions');
-                    $remove_options->columns = 3;
-                    asort($options);
-                    foreach (array_keys($options) as $key) {
-                        $options[$key] .= "[{$key}]";
-                    }
-                    $remove_options->addOptionArray($options);
-                    $form->addElement($remove_options);
-                }
-
-                $option_text = "<table  cellspacing='1'><tr><td width='20%'>" . _FRM_SONGLIST_FIELDS_KEY . '</td><td>' . _FRM_SONGLIST_FIELDS_VALUE . '</td></tr>';
-                for ($i = 0; $i < 3; ++$i) {
-                    $option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15'></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35'></td></tr>";
-                    $option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
-                }
-                $option_text .= '</table>';
-                $form->addElement(new \XoopsFormLabel(_FRM_SONGLIST_FIELDS_ADDOPTION, $option_text));
-            }
-        }
-
-        if ($field->getVar('field_edit')) {
-            switch ($field->getVar('field_type')) {
-                case 'textbox':
-                case 'textarea':
-                case 'dhtml':
-                    $form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_MAXLENGTH, 'field_maxlength', 35, 35, $field->getVar('field_maxlength', 'e')));
-                    $form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-                case 'checkbox':
-                case 'select_multi':
-                    $def_value = null !== $field->getVar('field_default', 'e') ? unserialize(($field->getVar('field_default', 'n')) ?? '') : null;
-                    $element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value, 8, true);
-                    $options   = $field->getVar('field_options');
-                    asort($options);
-                    // If options do not include an empty element, then add a blank option to prevent any default selection
-                    if (!array_key_exists('', $options)) {
-                        $element->addOption('', _NONE);
-                    }
-                    $element->addOptionArray($options);
-                    $form->addElement($element);
-                    break;
-                case 'select':
-                case 'radio':
-                    $def_value = null !== $field->getVar('field_default', 'e') ? $field->getVar('field_default') : null;
-                    $element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value);
-                    $options   = $field->getVar('field_options');
-                    asort($options);
-                    // If options do not include an empty element, then add a blank option to prevent any default selection
-                    if (!array_key_exists('', $options)) {
-                        $element->addOption('', _NONE);
-                    }
-                    $element->addOptionArray($options);
-                    $form->addElement($element);
-                    break;
-                case 'date':
-                    $form->addElement(new \XoopsFormTextDateSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, $field->getVar('field_default', 'e')));
-                    break;
-                case 'longdate':
-                    $form->addElement(new \XoopsFormTextDateSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, strtotime($field->getVar('field_default', 'e'))));
-                    break;
-                case 'datetime':
-                    $form->addElement(new \XoopsFormDateTime(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, $field->getVar('field_default', 'e')));
-                    break;
-                case 'yesno':
-                    $form->addElement(new \XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-                case 'timezone':
-                    $form->addElement(new \XoopsFormSelectTimezone(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-                case 'language':
-                    $form->addElement(new \XoopsFormSelectLang(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-                case 'group':
-                    $form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', true, $field->getVar('field_default', 'e')));
-                    break;
-                case 'group_multi':
-                    $form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', true, $field->getVar('field_default', 'e'), 5, true));
-                    break;
-                case 'theme':
-                    $form->addElement(new \XoopsFormSelectTheme(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-                case 'autotext':
-                    $form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
-                    break;
-            }
-        }
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        $searchable_types = [
-            'textbox',
-            'select',
-            'radio',
-            'yesno',
-            'date',
-            'datetime',
-            'timezone',
-            'language',
-        ];
-        if (in_array($field->getVar('field_type'), $searchable_types, true)) {
-            $search_groups = $grouppermHandler->getGroupIds('songlist_search', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
-            $form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true));
-        }
-        if ($field->getVar('field_edit') || $field->isNew()) {
-            if ($field->isNew()) {
-                $editable_groups = [];
-            } else {
-                //Load groups
-                $editable_groups = $grouppermHandler->getGroupIds('songlist_edit', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
-            }
-            $form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_EDITABLE, 'songlist_edit', false, $editable_groups, 5, true));
+	/**
+	 * Get {@link XoopsThemeForm} for adding/editing fields
+	 *
+	 * @param object $field  {@link ProfileField} object to get edit form for
+	 * @param mixed  $action URL to submit to - or false for $_SERVER['SCRIPT_NAME']
+	 *
+	 * @return object
+	 */
+	public static function getFieldForm($field, $action = false)
+	{
+		if (false === $action) {
+			$action = $_SERVER['SCRIPT_NAME'];
+		}
+
+		$helper = Helper::getInstance();
+		$helper->loadLanguage('forms');
+
+		$title = $field->isNew() ? sprintf(_FRM_SONGLIST_FIELDS_ADD, _FRM_SONGLIST_FIELDS_FIELD) : sprintf(_FRM_SONGLIST_FIELDS_EDIT, _FRM_SONGLIST_FIELDS_FIELD);
+
+		xoops_load('XoopsFormLoader');
+
+		$form = new \XoopsThemeForm($title, 'form', $action, 'post', true);
+
+		$form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_TITLE, 'field_title', 35, 255, $field->getVar('field_title', 'e')));
+		$form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DESCRIPTION, 'field_description', $field->getVar('field_description', 'e')));
+
+		if ($field->isNew()) {
+			$fieldcid = [1 => 0];
+		} else {
+			$fieldcid = $field->getVar('cids');
+		}
+		$categoryHandler = Helper::getInstance()
+								 ->getHandler('Category');
+		$cat_select      = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_CATEGORY, 'cids', $fieldcid, 7, true);
+		$cat_select->addOption(0, _FRM_SONGLIST_FIELDS_DEFAULT);
+		foreach ($categoryHandler->getObjects(null, true) as $cid => $category) {
+			$cat_select->addOption($cid, $category->getVar('name'));
+		}
+		$form->addElement($cat_select);
+		$form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_WEIGHT, 'field_weight', 10, 10, $field->getVar('field_weight', 'e')));
+		if ($field->getVar('field_config') || $field->isNew()) {
+			if ($field->isNew()) {
+				$form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_NAME, 'field_name', 35, 255, $field->getVar('field_name', 'e')));
+			} else {
+				$form->addElement(new \XoopsFormLabel(_FRM_SONGLIST_FIELDS_NAME, $field->getVar('field_name')));
+				$form->addElement(new \XoopsFormHidden('id', $field->getVar('field_id')));
+			}
+
+			//autotext and theme left out of this one as fields of that type should never be changed (valid assumption, I think)
+			$fieldtypes = [
+				'checkbox'     => _FRM_SONGLIST_FIELDS_CHECKBOX,
+				'date'         => _FRM_SONGLIST_FIELDS_DATE,
+				'datetime'     => _FRM_SONGLIST_FIELDS_DATETIME,
+				'longdate'     => _FRM_SONGLIST_FIELDS_LONGDATE,
+				'group'        => _FRM_SONGLIST_FIELDS_GROUP,
+				'group_multi'  => _FRM_SONGLIST_FIELDS_GROUPMULTI,
+				'language'     => _FRM_SONGLIST_FIELDS_LANGUAGE,
+				'radio'        => _FRM_SONGLIST_FIELDS_RADIO,
+				'select'       => _FRM_SONGLIST_FIELDS_SELECT,
+				'select_multi' => _FRM_SONGLIST_FIELDS_SELECTMULTI,
+				'textarea'     => _FRM_SONGLIST_FIELDS_TEXTAREA,
+				'dhtml'        => _FRM_SONGLIST_FIELDS_DHTMLTEXTAREA,
+				'textbox'      => _FRM_SONGLIST_FIELDS_TEXTBOX,
+				'timezone'     => _FRM_SONGLIST_FIELDS_TIMEZONE,
+				'yesno'        => _FRM_SONGLIST_FIELDS_YESNO,
+			];
+
+			$element_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_TYPE, 'field_type', $field->getVar('field_type', 'e'));
+			$element_select->addOptionArray($fieldtypes);
+
+			$form->addElement($element_select);
+
+			switch ($field->getVar('field_type')) {
+				case 'textbox':
+					$valuetypes = [
+						XOBJ_DTYPE_ARRAY   => _FRM_SONGLIST_FIELDS_ARRAY,
+						XOBJ_DTYPE_EMAIL   => _FRM_SONGLIST_FIELDS_EMAIL,
+						XOBJ_DTYPE_INT     => _FRM_SONGLIST_FIELDS_INT,
+						XOBJ_DTYPE_FLOAT   => _FRM_SONGLIST_FIELDS_FLOAT,
+						XOBJ_DTYPE_DECIMAL => _FRM_SONGLIST_FIELDS_DECIMAL,
+						XOBJ_DTYPE_TXTAREA => _FRM_SONGLIST_FIELDS_TXTAREA,
+						XOBJ_DTYPE_TXTBOX  => _FRM_SONGLIST_FIELDS_TXTBOX,
+						XOBJ_DTYPE_URL     => _FRM_SONGLIST_FIELDS_URL,
+						XOBJ_DTYPE_OTHER   => _FRM_SONGLIST_FIELDS_OTHER,
+					];
+
+					$type_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
+					$type_select->addOptionArray($valuetypes);
+					$form->addElement($type_select);
+					break;
+				case 'select':
+				case 'radio':
+					$valuetypes = [
+						XOBJ_DTYPE_ARRAY   => _FRM_SONGLIST_FIELDS_ARRAY,
+						XOBJ_DTYPE_EMAIL   => _FRM_SONGLIST_FIELDS_EMAIL,
+						XOBJ_DTYPE_INT     => _FRM_SONGLIST_FIELDS_INT,
+						XOBJ_DTYPE_FLOAT   => _FRM_SONGLIST_FIELDS_FLOAT,
+						XOBJ_DTYPE_DECIMAL => _FRM_SONGLIST_FIELDS_DECIMAL,
+						XOBJ_DTYPE_TXTAREA => _FRM_SONGLIST_FIELDS_TXTAREA,
+						XOBJ_DTYPE_TXTBOX  => _FRM_SONGLIST_FIELDS_TXTBOX,
+						XOBJ_DTYPE_URL     => _FRM_SONGLIST_FIELDS_URL,
+						XOBJ_DTYPE_OTHER   => _FRM_SONGLIST_FIELDS_OTHER,
+					];
+
+					$type_select = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_VALUETYPE, 'field_valuetype', $field->getVar('field_valuetype', 'e'));
+					$type_select->addOptionArray($valuetypes);
+					$form->addElement($type_select);
+					break;
+			}
+
+			//$form->addElement(new \XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e') ));
+
+			if ('select' === $field->getVar('field_type') || 'select_multi' === $field->getVar('field_type') || 'radio' === $field->getVar('field_type') || 'checkbox' === $field->getVar('field_type')) {
+				$options = $field->getVar('field_options');
+				if (count($options) > 0) {
+					$remove_options          = new \XoopsFormCheckBox(_FRM_SONGLIST_FIELDS_REMOVEOPTIONS, 'removeOptions');
+					$remove_options->columns = 3;
+					asort($options);
+					foreach (array_keys($options) as $key) {
+						$options[$key] .= "[{$key}]";
+					}
+					$remove_options->addOptionArray($options);
+					$form->addElement($remove_options);
+				}
+
+				$option_text = "<table  cellspacing='1'><tr><td width='20%'>" . _FRM_SONGLIST_FIELDS_KEY . '</td><td>' . _FRM_SONGLIST_FIELDS_VALUE . '</td></tr>';
+				for ($i = 0; $i < 3; ++$i) {
+					$option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15'></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35'></td></tr>";
+					$option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
+				}
+				$option_text .= '</table>';
+				$form->addElement(new \XoopsFormLabel(_FRM_SONGLIST_FIELDS_ADDOPTION, $option_text));
+			}
+		}
+
+		if ($field->getVar('field_edit')) {
+			switch ($field->getVar('field_type')) {
+				case 'textbox':
+				case 'textarea':
+				case 'dhtml':
+					$form->addElement(new \XoopsFormText(_FRM_SONGLIST_FIELDS_MAXLENGTH, 'field_maxlength', 35, 35, $field->getVar('field_maxlength', 'e')));
+					$form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+				case 'checkbox':
+				case 'select_multi':
+					$def_value = null !== $field->getVar('field_default', 'e') ? unserialize(($field->getVar('field_default', 'n')) ?? '') : null;
+					$element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value, 8, true);
+					$options   = $field->getVar('field_options');
+					asort($options);
+					// If options do not include an empty element, then add a blank option to prevent any default selection
+					if (!array_key_exists('', $options)) {
+						$element->addOption('', _NONE);
+					}
+					$element->addOptionArray($options);
+					$form->addElement($element);
+					break;
+				case 'select':
+				case 'radio':
+					$def_value = null !== $field->getVar('field_default', 'e') ? $field->getVar('field_default') : null;
+					$element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value);
+					$options   = $field->getVar('field_options');
+					asort($options);
+					// If options do not include an empty element, then add a blank option to prevent any default selection
+					if (!array_key_exists('', $options)) {
+						$element->addOption('', _NONE);
+					}
+					$element->addOptionArray($options);
+					$form->addElement($element);
+					break;
+				case 'date':
+					$form->addElement(new \XoopsFormTextDateSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, $field->getVar('field_default', 'e')));
+					break;
+				case 'longdate':
+					$form->addElement(new \XoopsFormTextDateSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, strtotime($field->getVar('field_default', 'e'))));
+					break;
+				case 'datetime':
+					$form->addElement(new \XoopsFormDateTime(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', 15, $field->getVar('field_default', 'e')));
+					break;
+				case 'yesno':
+					$form->addElement(new \XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+				case 'timezone':
+					$form->addElement(new \XoopsFormSelectTimezone(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+				case 'language':
+					$form->addElement(new \XoopsFormSelectLang(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+				case 'group':
+					$form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', true, $field->getVar('field_default', 'e')));
+					break;
+				case 'group_multi':
+					$form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', true, $field->getVar('field_default', 'e'), 5, true));
+					break;
+				case 'theme':
+					$form->addElement(new \XoopsFormSelectTheme(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+				case 'autotext':
+					$form->addElement(new \XoopsFormTextArea(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $field->getVar('field_default', 'e')));
+					break;
+			}
+		}
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		$searchable_types = [
+			'textbox',
+			'select',
+			'radio',
+			'yesno',
+			'date',
+			'datetime',
+			'timezone',
+			'language',
+		];
+		if (in_array($field->getVar('field_type'), $searchable_types, true)) {
+			$search_groups = $grouppermHandler->getGroupIds('songlist_search', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
+			$form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_SEARCH, 'songlist_search', true, $search_groups, 5, true));
+		}
+		if ($field->getVar('field_edit') || $field->isNew()) {
+			if ($field->isNew()) {
+				$editable_groups = [];
+			} else {
+				//Load groups
+				$editable_groups = $grouppermHandler->getGroupIds('songlist_edit', $field->getVar('field_id'), $GLOBALS['songlistModule']->getVar('mid'));
+			}
+			$form->addElement(new \XoopsFormSelectGroup(_FRM_SONGLIST_FIELDS_PROF_EDITABLE, 'songlist_edit', false, $editable_groups, 5, true));
 //            $form->addElement($steps_select);
-        }
-        $form->addElement(new \XoopsFormHidden('op', 'save'));
-        $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
-        return $form;
-    }
-
-    /**
-     * Get {@link XoopsThemeForm} for editing a user
-     *
-     * @param bool $action
-     * @return object
-     * @internal param object $user <a href='psi_element://XoopsUser'>XoopsUser</a> to edit to edit
-     */
-    public static function getUserSearchForm($action = false)
-    {
-        xoops_loadLanguage('forms', 'songlist');
-
-        if (!$action) {
-            $action = $_SERVER['SCRIPT_NAME'];
-        }
-        if (empty($GLOBALS['xoopsConfigUser'])) {
-            /** @var \XoopsConfigHandler $configHandler */
-            $configHandler              = xoops_getHandler('config');
-            $GLOBALS['xoopsConfigUser'] = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
-        }
-
-        $helper = Helper::getInstance();
-
-        $title = _FRM_SONGLIST_FIELDS_SEARCH;
-
-        $form = new \XoopsThemeForm($title, 'search', $action, 'post', true);
-
-        $songlistHandler = Helper::getInstance()
-                                 ->getHandler('Profile', 'objects');
-        // Get fields
-        $fields = $songlistHandler->loadFields();
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        /** @var \XoopsConfigHandler $configHandler */
-        $configHandler = xoops_getHandler('config');
-        $groups        = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $xoModule      = $moduleHandler->getByDirname('objects');
-        $modid         = $xoModule->getVar('mid');
-
-        // Get ids of fields that can be edited
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-
-        $editable_fields = $grouppermHandler->getItemIds('songlist_search', $groups, $modid);
-
-        $catHandler = Helper::getInstance()
-                            ->getHandler('Category');
-
-        $selcat = new \XoopsFormSelect('Form', 'cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : 0, 1, false, false, false, true);
-        $selcat->setExtra(' onChange="window.location=\'' . XOOPS_URL . '/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
-
-        $form->addElement($selcat, true);
-
-        $categories = [];
-
-        $criteria       = new \CriteriaCompo(new \Criteria('cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : '0'), 'OR');
-        $all_categories = $catHandler->getObjects($criteria, true, false);
-        $count_fields   = count($fields);
-
-        foreach (array_keys($fields) as $i) {
-            if (in_array($fields[$i]->getVar('field_id'), $editable_fields, true)) {
-                // Set default value for user fields if available
-                $fieldinfo['element']  = $fields[$i]->getSearchElement();
-                $fieldinfo['required'] = false;
-
-                foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
-                    if (array_key_exists($cid, $all_categories)) {
-                        $key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
-                        $elements[$key][] = $fieldinfo;
-                        $weights[$key][]  = $fields[$i]->getVar('field_weight');
-                        $categories[$key] = $all_categories[$cid];
-                    } elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
-                        $key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
-                        $elements[$key][] = $fieldinfo;
-                        $weights[$key][]  = $fields[$i]->getVar('field_weight');
-                        $categories[$key] = $all_categories[$cid];
-                    }
-                }
-            }
-        }
-
-        ksort($elements);
-        foreach (array_keys($elements) as $k) {
-            array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
-            $title = isset($categories[$k]) ? $categories[$k]['cat_title'] : _FRM_SONGLIST_FORM_DEFAULT;
-            $desc  = isset($categories[$k]) ? $categories[$k]['cat_description'] : '';
-            $form->addElement(new \XoopsFormLabel("<h3>{$title}</h3>", $desc), false);
-            foreach (array_keys($elements[$k]) as $i) {
-                $form->addElement($elements[$k][$i]['element'], $elements[$k][$i]['required']);
-            }
-        }
-
-        $form->addElement(new \XoopsFormHidden('fct', 'objects'));
-        $form->addElement(new \XoopsFormHidden('op', 'search'));
-        $form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
-
-        return $form;
-    }
-
-    /**
-     * @param bool $as_array
-     * @return string
-     */
-    public static function  getFormImport($as_array = false): string
-    {
-        xoops_loadLanguage('forms', 'songlist');
-
-        $sform = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_IMPORT, 'import', $_SERVER['SCRIPT_NAME'], 'post', true);
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $ele['op']      = new \XoopsFormHidden('op', 'import');
-        $ele['fct']     = new \XoopsFormHidden('fct', 'upload');
-        $ele['xmlfile'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML : ''), 'xmlfile', 1024 * 1024 * 1024 * 32);
-        $ele['xmlfile']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC : ''));
-        $ele['file'] = new \XoopsFormSelect((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML : ''), 'file');
-        $ele['file']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC : ''));
-        $ele['file']->addOption('', '*********');
-        xoops_load('XoopsLists');
-        foreach (\XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $file) {
-            if ('xml' === mb_substr($file, mb_strlen($file) - 3, 3)) {
-                $ele['file']->addOption($file, $file);
-            }
-        }
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = [];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $file
-     * @param bool $as_array
-     * @return string
-     */
-    public static function  getFormImportb($file, $as_array = false): string
-    {
-        xoops_loadLanguage('forms', 'songlist');
-
-        $sform = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ELEMENTS, 'elements', $_SERVER['SCRIPT_NAME'], 'post', true);
-
-        $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $file));
-        $mb       = floor($filesize / 1024 / 1024);
-        if ($mb > 32) {
-            set_ini('memory_limit', ($mb + 128) . 'M');
-        }
-        set_time_limit(3600);
-
-        $i = 0;
-        foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])) as $data) {
-            ++$i;
-            if ($i < 20) {
-                $line .= htmlspecialchars($data, ENT_QUOTES | ENT_HTML5) . ($i < 19 ? "\n" : '');
-            }
-        }
-
-        $ele['op']      = new \XoopsFormHidden('op', 'import');
-        $ele['fct']     = new \XoopsFormHidden('fct', 'import');
-        $ele['example'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE : ''), '<pre>' . $line . '</pre>');
-        $ele['example']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC : ''));
-        $ele['collection'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION : ''), 'collection', 32, 128, 'collection');
-        $ele['collection']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION_DESC : ''));
-        $ele['record'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_RECORD : ''), 'record', 32, 128, 'record');
-        $ele['record']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_RECORD_DESC : ''));
-        $ele['genre'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_GENRES : ''), 'genre', 32, 128, 'genre');
-        $ele['genre']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_GENRES_DESC : ''));
-        $ele['voice'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_VOICE : ''), 'voice', 32, 128, 'voice');
-        $ele['voice']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_VOICE_DESC : ''));
-        $ele['category'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_CATEGORY : ''), 'category', 32, 128, 'category');
-        $ele['category']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC : ''));
-        $ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ARTIST : ''), 'artist', 32, 128, 'artist');
-        $ele['artist']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC : ''));
-        $ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ALBUM : ''), 'album', 32, 128, 'album');
-        $ele['album']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC : ''));
-        $ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_SONGID : ''), 'songid', 32, 128, 'songid');
-        $ele['songid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC : ''));
-        $ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TRAXID : ''), 'traxid', 32, 128, 'trackno');
-        $ele['traxid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TRAXID_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TITLE : ''), 'title', 32, 128, 'title');
-        $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC : ''));
-        $ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_LYRICS : ''), 'lyrics', 32, 128, 'lyric');
-        $ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC : ''));
-        $ele['tags'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TAGS : ''), 'tags', 32, 128, 'tags');
-        $ele['tags']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC : ''));
-        $ele['mp3'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_MP3 : ''), 'mp3', 32, 128, 'mp3');
-        $ele['mp3']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_MP3_DESC : ''));
-        $extrasHandler = Helper::getInstance()
-                               ->getHandler('Extras');
-        $fields        = $extrasHandler->getFields(null);
-        foreach ($fields as $field) {
-            $ele[$field->getVar('field_name')] = new \XoopsFormText((!$as_array ? $field->getVar('field_title') : ''), $field->getVar('field_name'), 32, 128, $field->getVar('field_name'));
-            $ele[$field->getVar('field_name')]->setDescription((!$as_array ? $field->getVar('field_description') : ''));
-        }
-        $ele['limiting'] = new \XoopsFormRadioYN((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_LIMITING : ''), 'limiting');
-        $ele['limiting']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_LIMITING_DESC : ''));
-        $ele['records'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_RECORDS : ''), 'records', 10, 10, '250');
-        $ele['records']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_RECORDS_DESC : ''));
-        $ele['wait'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_WAIT : ''), 'wait', 10, 10, '40');
-        $ele['wait']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_WAIT_DESC : ''));
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = [];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormGenre($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Genre');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_GENRE, 'genre', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_GENRE, 'genre', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('gid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'genre');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
-        $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME_DESC : ''));
-        $ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ALBUMS : ''), $object->getVar('albums'));
-        $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ARTISTS : ''), $object->getVar('artists'));
-        $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_SONGS : ''), $object->getVar('songs'));
-        $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormVoice($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Voice');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_VOICE, 'voice', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_VOICE, 'voice', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('vcid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'voice');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
-        $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME_DESC : ''));
-        $ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ALBUMS : ''), $object->getVar('albums'));
-        $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ARTISTS : ''), $object->getVar('artists'));
-        $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_SONGS : ''), $object->getVar('songs'));
-        $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormAlbums($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Albums');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ALBUMS, 'albums', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_ALBUMS, 'albums', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('abid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'albums');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY : ''), $id . '[cid]', $object->getVar('cid'), 1, false, false, false);
-        $ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
-        $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC : ''));
-        $ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-        $ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC : ''));
-        if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
-            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
-            $ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC : ''));
-        }
-        $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_ARTISTS : ''), $object->getVar('artists'));
-        $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_SONGS : ''), $object->getVar('songs'));
-        $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name', 'id', 'source'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param Songlist\Artists $object
-     * @param bool             $as_array
-     * @return array|string
-     */
-    public static function  getFormArtists($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Artists');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ARTISTS, 'artists', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_ARTISTS, 'artists', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $id = $object->getVar('aid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'artists');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['cids'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY : ''), $id . '[cids]', $object->getVar('cids'), 7, true, false, false);
-        $ele['cids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC : ''));
-        //$ele['singer'] = new \XoopsModules\Songlist\Form\SelectSingerForm(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
-        //$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
-        $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME_DESC : ''));
-        $ele['albums'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_ALBUMS : ''), $object->getVar('albums'));
-        $ele['songs']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_SONGS : ''), $object->getVar('songs'));
-        $ele['hits']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_HITS : ''), $object->getVar('hits'));
-        $ele['rank']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name', 'mimetype', 'support'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormCategory($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Category');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_CATEGORY, 'category', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_CATEGORY, 'category', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('cid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'category');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['pid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT : ''), $id . '[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
-        $ele['pid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC : ''));
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
-        $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME_DESC : ''));
-        $description_configs           = [];
-        $description_configs['name']   = $id . '[description]';
-        $description_configs['value']  = $object->getVar('description');
-        $description_configs['rows']   = 35;
-        $description_configs['cols']   = 60;
-        $description_configs['width']  = '100%';
-        $description_configs['height'] = '400px';
-        $ele['description']            = new \XoopsFormEditor(_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-        $ele['description']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC : ''));
-        $ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
-        $ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER_DESC : ''));
-        if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
-            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
-            $ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER_DESC : ''));
-        }
-        $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_ARTISTS : ''), $object->getVar('artists'));
-        $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_SONGS : ''), $object->getVar('songs'));
-        $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name', 'id', 'source'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormUtf8map($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Utf8map');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_UTF8MAP, 'utf8map', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_UTF8MAP, 'utf8map', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('utfid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'utf8map');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['from'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM : ''), $id . '[from]', (!$as_array ? 6 : 4), 2, $object->getVar('from'));
-        $ele['from']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM_DESC : ''));
-        $ele['to'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO : ''), $id . '[to]', (!$as_array ? 6 : 4), 2, $object->getVar('to'));
-        $ele['to']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO_DESC : ''));
-
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['from', 'to'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormRequests($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Requests');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_REQUESTS, 'requests', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_REQUESTS, 'requests', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('rid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'requests');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST : ''), $id . '[artist]', (!$as_array ? 55 : 21), 128, $object->getVar('artist'));
-        $ele['artist']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST_DESC : ''));
-        $ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM : ''), $id . '[album]', (!$as_array ? 55 : 21), 128, $object->getVar('album'));
-        $ele['album']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
-        $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE_DESC : ''));
-        $ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS : ''), $id . '[lyrics]', (!$as_array ? 55 : 21), 128, $object->getVar('lyrics'));
-        $ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS_DESC : ''));
-
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $ele['uid']  = new \XoopsFormHidden('uid', $GLOBALS['xoopsUser']->getVar('uid'));
-            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('name') : $object->getVar('name')));
-            $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
-            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('email') : $object->getVar('email')));
-            $ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
-        } else {
-            $ele['uid']  = new \XoopsFormHidden('uid', 0);
-            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('name')));
-            $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
-            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('email')));
-            $ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
-        }
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = ['name', 'email'];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormSongs($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Songs');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_SONGS, 'songs', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_SONGS, 'songs', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('sid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'songs');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY : ''), $id . '[cid]', ($_REQUEST['cid'] ?? $object->getVar('cid')), 1, false);
-        $ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC : ''));
-        if ($GLOBALS['songlistModuleConfig']['genre']) {
-            $ele['gids'] = new SelectGenreForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE : ''), $id . '[gids]', ($_REQUEST['gids'] ?? $object->getVar('gids')), 8, true);
-            $ele['gids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE_DESC : ''));
-        }
-        if ($GLOBALS['songlistModuleConfig']['voice']) {
-            $ele['vcid'] = new SelectVoiceForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE : ''), $id . '[vcid]', ($_REQUEST['vcid'] ?? $object->getVar('vcid')), 1, false);
-            $ele['vcid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE_DESC : ''));
-        }
-        if ($GLOBALS['songlistModuleConfig']['album']) {
-            $ele['abid'] = new SelectAlbumForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM : ''), $id . '[abid]', $object->getVar('abid'), 1, false);
-            $ele['abid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM_DESC : ''));
-        }
-        $ele['aids'] = new SelectArtistForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS : ''), $id . '[aids]', $object->getVar('aids'), 7, true);
-        $ele['aids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS_DESC : ''));
-        $ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID : ''), $id . '[songid]', (!$as_array ? 25 : 15), 32, $object->getVar('songid'));
-        $ele['songid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID_DESC : ''));
-        $ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID : ''), $id . '[traxid]', (!$as_array ? 25 : 15), 32, $object->getVar('traxid'));
-        $ele['traxid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
-        $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE_DESC : ''));
-        $description_configs           = [];
-        $description_configs['name']   = $id . '[lyrics]';
-        $description_configs['value']  = $object->getVar('lyrics');
-        $description_configs['rows']   = 35;
-        $description_configs['cols']   = 60;
-        $description_configs['width']  = '100%';
-        $description_configs['height'] = '400px';
-        $ele['lyrics']                 = new \XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
-        $ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_LYRICS_DESC : ''));
-        $ele['mp3'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3 : ''), 'mp3' . $id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
-        $ele['mp3']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3_DESC : ''));
-        $categoryHandler = Helper::getInstance()
-                                 ->getHandler('Category');
-        $criteria        = new \CriteriaCompo(new \Criteria('cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : $object->getVar('cid')));
-        $all_categories  = $categoryHandler->getObjects($criteria, true, false);
-
-        // Dynamic fields
-        $extrasHandler = Helper::getInstance()
-                               ->getHandler('Extras');
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-        /** @var \XoopsModuleHandler $moduleHandler */
-        $moduleHandler = xoops_getHandler('module');
-        $xoModule      = $moduleHandler->getByDirname('songlist');
-        $modid         = $xoModule->getVar('mid');
-
-        if (is_object($GLOBALS['xoopsUser'])) {
-            $groups = $GLOBALS['xoopsUser']->getGroups();
-        } else {
-            $groups = [XOOPS_GROUP_ANONYMOUS => XOOPS_GROUP_ANONYMOUS];
-        }
-
-        $count_fields = 0;
-        $fields       = $extrasHandler->loadFields();
-
-        $required = [];
-        $elements = [];
-        $weights  = [];
-        if ($object->getVar('sid') > 0) {
-            $extra = $extrasHandler->get($object->getVar('sid'));
-        } else {
-            $extra = $extrasHandler->create();
-        }
-        $allnames = [];
-        if (is_array($fields)) {
-            foreach (array_keys($fields) as $i) {
-                if ((0 != $object->getVar('sid') && $grouppermHandler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid))
-                    || (0 == $object->getVar('sid') && $grouppermHandler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
-                    $fieldinfo['element']  = $fields[$i]->getEditElement($object, $extra);
-                    $fieldinfo['required'] = $fields[$i]->getVar('field_required');
-                    foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
-                        if (!in_array($fields[$i]->getVar('field_name'), $allnames, true)) {
-                            $allnames[] = $fields[$i]->getVar('field_name');
-                            if (array_key_exists($cid, $all_categories)
-                                || $cid == (!empty($_REQUEST['cid'])
-                                    ? Request::getInt('cid', 0, 'REQUEST')
-                                    : $object->getVar('cid'))) {
-                                $key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0)
-                                                    * $count_fields + $object->getVar('cid');
-                                $elements[$key][] = $fieldinfo;
-                                $weights[$key][]  = $fields[$i]->getVar('field_weight');
-                            } elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
-                                $key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0) * $count_fields + $object->getVar('cid');
-                                $elements[$key][] = $fieldinfo;
-                                $weights[$key][]  = $fields[$i]->getVar('field_weight');
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        if (is_array($elements)) {
-            ksort($elements);
-            foreach (array_keys($elements) as $k) {
-                array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
-                foreach (array_keys($elements[$k]) as $i) {
-                    $ele[$k] = $elements[$k][$i]['element'];
-                    if (true === $elements[$k][$i]['required']) {
-                        $required[$k] = $elements[$k][$i]['element']->getName();
-                    }
-                }
-            }
-        }
-
-        if (class_exists(\XoopsModules\Tag\FormTag::class)) {
-            $ele['tags'] = new \XoopsModules\Tag\FormTag('tags', 60, 255, $object->getVar('sid'), $object->getVar('cid'));
-        } else {
-            $ele['tags'] = new \XoopsFormHidden('tags', $object->getVar('tags'));
-        }
-
-        $ele['hits'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_HITS : ''), $object->getVar('hits'));
-        $ele['rank'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
-            $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
-        }
-        if ($object->getVar('updated') > 0) {
-            $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
-        }
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
-
-    /**
-     * @param      $object
-     * @param bool $as_array
-     * @return array|string
-     */
-    public static function  getFormVotes($object, $as_array = false)
-    {
-        if (!is_object($object)) {
-            $handler = Helper::getInstance()
-                             ->getHandler('Votes');
-            $object  = $handler->create();
-        }
-
-        xoops_loadLanguage('forms', 'songlist');
-        $ele = [];
-
-        if ($object->isNew()) {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_CART, 'votes', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'new');
-        } else {
-            $sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_CART, 'votes', $_SERVER['SCRIPT_NAME'], 'post', true);
-            $ele['mode'] = new \XoopsFormHidden('mode', 'edit');
-        }
-
-        $sform->setExtra("enctype='multipart/form-data'");
-
-        $id = $object->getVar('cid');
-        if (empty($id)) {
-            $id = '0';
-        }
-
-        $ele['op']  = new \XoopsFormHidden('op', 'votes');
-        $ele['fct'] = new \XoopsFormHidden('fct', 'save');
-        if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id', $id);
-        } else {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
-        }
-        $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
-        $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
-        $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
-
-        $songsHandler = Helper::getInstance()
-                              ->getHandler('Songs');
-        $userHandler  = xoops_getHandler('user');
-        $song         = $songsHandler->get($object->getVar('sid'));
-        $user         = $userHandler->get($object->getVar('uid'));
-        if (is_object($song)) {
-            $ele['sid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_SONG : ''), $song->getVar('title'));
-        } else {
-            $ele['sid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_SONG : ''), $object->getVar('sid'));
-        }
-        if (is_object($user)) {
-            $ele['uid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_USER : ''), $user->getVar('uname'));
-        } else {
-            $ele['uid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_USER : ''), _GUESTS);
-        }
-        $ele['ip']      = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_IP : ''), $object->getVar('ip'));
-        $ele['netaddy'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_NETADDY : ''), $object->getVar('netaddy'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_RANK : ''), $object->getVar('rank') . ' of 10');
-
-        if ($as_array) {
-            return $ele;
-        }
-
-        $ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
-
-        $required = [];
-
-        foreach ($ele as $id => $obj) {
-            if (in_array($id, $required, true)) {
-                $sform->addElement($obj, true);
-            } else {
-                $sform->addElement($obj, false);
-            }
-        }
-
-        return $sform->render();
-    }
+		}
+		$form->addElement(new \XoopsFormHidden('op', 'save'));
+		$form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+		return $form;
+	}
+
+	/**
+	 * Get {@link XoopsThemeForm} for editing a user
+	 *
+	 * @param bool $action
+	 * @return object
+	 * @internal param object $user <a href='psi_element://XoopsUser'>XoopsUser</a> to edit to edit
+	 */
+	public static function getUserSearchForm($action = false)
+	{
+		xoops_loadLanguage('forms', 'songlist');
+
+		if (!$action) {
+			$action = $_SERVER['SCRIPT_NAME'];
+		}
+		if (empty($GLOBALS['xoopsConfigUser'])) {
+			/** @var \XoopsConfigHandler $configHandler */
+			$configHandler              = xoops_getHandler('config');
+			$GLOBALS['xoopsConfigUser'] = $configHandler->getConfigsByCat(XOOPS_CONF_USER);
+		}
+
+		$helper = Helper::getInstance();
+
+		$title = _FRM_SONGLIST_FIELDS_SEARCH;
+
+		$form = new \XoopsThemeForm($title, 'search', $action, 'post', true);
+
+		$songlistHandler = Helper::getInstance()
+								 ->getHandler('Profile', 'objects');
+		// Get fields
+		$fields = $songlistHandler->loadFields();
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		/** @var \XoopsConfigHandler $configHandler */
+		$configHandler = xoops_getHandler('config');
+		$groups        = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : [XOOPS_GROUP_ANONYMOUS];
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$xoModule      = $moduleHandler->getByDirname('objects');
+		$modid         = $xoModule->getVar('mid');
+
+		// Get ids of fields that can be edited
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+
+		$editable_fields = $grouppermHandler->getItemIds('songlist_search', $groups, $modid);
+
+		$catHandler = Helper::getInstance()
+							->getHandler('Category');
+
+		$selcat = new \XoopsFormSelect('Form', 'cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : 0, 1, false, false, false, true);
+		$selcat->setExtra(' onChange="window.location=\'' . XOOPS_URL . '/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
+
+		$form->addElement($selcat, true);
+
+		$categories = [];
+
+		$criteria       = new \CriteriaCompo(new \Criteria('cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : '0'), 'OR');
+		$all_categories = $catHandler->getObjects($criteria, true, false);
+		$count_fields   = count($fields);
+
+		foreach (array_keys($fields) as $i) {
+			if (in_array($fields[$i]->getVar('field_id'), $editable_fields, true)) {
+				// Set default value for user fields if available
+				$fieldinfo['element']  = $fields[$i]->getSearchElement();
+				$fieldinfo['required'] = false;
+
+				foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
+					if (array_key_exists($cid, $all_categories)) {
+						$key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$elements[$key][] = $fieldinfo;
+						$weights[$key][]  = $fields[$i]->getVar('field_weight');
+						$categories[$key] = $all_categories[$cid];
+					} elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
+						$key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+						$elements[$key][] = $fieldinfo;
+						$weights[$key][]  = $fields[$i]->getVar('field_weight');
+						$categories[$key] = $all_categories[$cid];
+					}
+				}
+			}
+		}
+
+		ksort($elements);
+		foreach (array_keys($elements) as $k) {
+			array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
+			$title = isset($categories[$k]) ? $categories[$k]['cat_title'] : _FRM_SONGLIST_FORM_DEFAULT;
+			$desc  = isset($categories[$k]) ? $categories[$k]['cat_description'] : '';
+			$form->addElement(new \XoopsFormLabel("<h3>{$title}</h3>", $desc), false);
+			foreach (array_keys($elements[$k]) as $i) {
+				$form->addElement($elements[$k][$i]['element'], $elements[$k][$i]['required']);
+			}
+		}
+
+		$form->addElement(new \XoopsFormHidden('fct', 'objects'));
+		$form->addElement(new \XoopsFormHidden('op', 'search'));
+		$form->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
+		return $form;
+	}
+
+	/**
+	 * @param bool $as_array
+	 * @return string
+	 */
+	public static function  getFormImport($as_array = false): string
+	{
+		xoops_loadLanguage('forms', 'songlist');
+
+		$sform = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_IMPORT, 'import', $_SERVER['SCRIPT_NAME'], 'post', true);
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$ele['op']      = new \XoopsFormHidden('op', 'import');
+		$ele['fct']     = new \XoopsFormHidden('fct', 'upload');
+		$ele['xmlfile'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML : ''), 'xmlfile', 1024 * 1024 * 1024 * 32);
+		$ele['xmlfile']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC : ''));
+		$ele['file'] = new \XoopsFormSelect((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML : ''), 'file');
+		$ele['file']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC : ''));
+		$ele['file']->addOption('', '*********');
+		xoops_load('XoopsLists');
+		foreach (\XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $file) {
+			if ('xml' === mb_substr($file, mb_strlen($file) - 3, 3)) {
+				$ele['file']->addOption($file, $file);
+			}
+		}
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = [];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $file
+	 * @param bool $as_array
+	 * @return string
+	 */
+	public static function  getFormImportb($file, $as_array = false): string
+	{
+		xoops_loadLanguage('forms', 'songlist');
+
+		$sform = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ELEMENTS, 'elements', $_SERVER['SCRIPT_NAME'], 'post', true);
+
+		$filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $file));
+		$mb       = floor($filesize / 1024 / 1024);
+		if ($mb > 32) {
+			set_ini('memory_limit', ($mb + 128) . 'M');
+		}
+		set_time_limit(3600);
+
+		$i = 0;
+		foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])) as $data) {
+			++$i;
+			if ($i < 20) {
+				$line .= htmlspecialchars($data, ENT_QUOTES | ENT_HTML5) . ($i < 19 ? "\n" : '');
+			}
+		}
+
+		$ele['op']      = new \XoopsFormHidden('op', 'import');
+		$ele['fct']     = new \XoopsFormHidden('fct', 'import');
+		$ele['example'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE : ''), '<pre>' . $line . '</pre>');
+		$ele['example']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC : ''));
+		$ele['collection'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION : ''), 'collection', 32, 128, 'collection');
+		$ele['collection']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION_DESC : ''));
+		$ele['record'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_RECORD : ''), 'record', 32, 128, 'record');
+		$ele['record']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_RECORD_DESC : ''));
+		$ele['genre'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_GENRES : ''), 'genre', 32, 128, 'genre');
+		$ele['genre']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_GENRES_DESC : ''));
+		$ele['voice'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_VOICE : ''), 'voice', 32, 128, 'voice');
+		$ele['voice']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_VOICE_DESC : ''));
+		$ele['category'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_CATEGORY : ''), 'category', 32, 128, 'category');
+		$ele['category']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_CATEGORY_DESC : ''));
+		$ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ARTIST : ''), 'artist', 32, 128, 'artist');
+		$ele['artist']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ARTIST_DESC : ''));
+		$ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ALBUM : ''), 'album', 32, 128, 'album');
+		$ele['album']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_ALBUM_DESC : ''));
+		$ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_SONGID : ''), 'songid', 32, 128, 'songid');
+		$ele['songid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_SONGID_DESC : ''));
+		$ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TRAXID : ''), 'traxid', 32, 128, 'trackno');
+		$ele['traxid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TRAXID_DESC : ''));
+		$ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TITLE : ''), 'title', 32, 128, 'title');
+		$ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TITLE_DESC : ''));
+		$ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_LYRICS : ''), 'lyrics', 32, 128, 'lyric');
+		$ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_LYRICS_DESC : ''));
+		$ele['tags'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TAGS : ''), 'tags', 32, 128, 'tags');
+		$ele['tags']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_TAGS_DESC : ''));
+		$ele['mp3'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_MP3 : ''), 'mp3', 32, 128, 'mp3');
+		$ele['mp3']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_MP3_DESC : ''));
+		$extrasHandler = Helper::getInstance()
+							   ->getHandler('Extras');
+		$fields        = $extrasHandler->getFields(null);
+		foreach ($fields as $field) {
+			$ele[$field->getVar('field_name')] = new \XoopsFormText((!$as_array ? $field->getVar('field_title') : ''), $field->getVar('field_name'), 32, 128, $field->getVar('field_name'));
+			$ele[$field->getVar('field_name')]->setDescription((!$as_array ? $field->getVar('field_description') : ''));
+		}
+		$ele['limiting'] = new \XoopsFormRadioYN((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_LIMITING : ''), 'limiting');
+		$ele['limiting']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_LIMITING_DESC : ''));
+		$ele['records'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_RECORDS : ''), 'records', 10, 10, '250');
+		$ele['records']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_RECORDS_DESC : ''));
+		$ele['wait'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_WAIT : ''), 'wait', 10, 10, '40');
+		$ele['wait']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_WAIT_DESC : ''));
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = [];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormGenre($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Genre');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_GENRE, 'genre', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_GENRE, 'genre', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('gid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'genre');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME_DESC : ''));
+		$ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ALBUMS : ''), $object->getVar('albums'));
+		$ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ARTISTS : ''), $object->getVar('artists'));
+		$ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_SONGS : ''), $object->getVar('songs'));
+		$ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_HITS : ''), $object->getVar('hits'));
+		$ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormVoice($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Voice');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_VOICE, 'voice', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_VOICE, 'voice', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('vcid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'voice');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME_DESC : ''));
+		$ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ALBUMS : ''), $object->getVar('albums'));
+		$ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ARTISTS : ''), $object->getVar('artists'));
+		$ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_SONGS : ''), $object->getVar('songs'));
+		$ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_HITS : ''), $object->getVar('hits'));
+		$ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormAlbums($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Albums');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ALBUMS, 'albums', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_ALBUMS, 'albums', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('abid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'albums');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY : ''), $id . '[cid]', $object->getVar('cid'), 1, false, false, false);
+		$ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC : ''));
+		$ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC : ''));
+		$ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC : ''));
+		if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
+			$ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
+			$ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC : ''));
+		}
+		$ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_ARTISTS : ''), $object->getVar('artists'));
+		$ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_SONGS : ''), $object->getVar('songs'));
+		$ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_HITS : ''), $object->getVar('hits'));
+		$ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name', 'id', 'source'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param Songlist\Artists $object
+	 * @param bool             $as_array
+	 * @return array|string
+	 */
+	public static function  getFormArtists($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Artists');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ARTISTS, 'artists', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_ARTISTS, 'artists', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$id = $object->getVar('aid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'artists');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['cids'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY : ''), $id . '[cids]', $object->getVar('cids'), 7, true, false, false);
+		$ele['cids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC : ''));
+		//$ele['singer'] = new \XoopsModules\Songlist\Form\SelectSingerForm(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
+		//$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
+		$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME_DESC : ''));
+		$ele['albums'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_ALBUMS : ''), $object->getVar('albums'));
+		$ele['songs']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_SONGS : ''), $object->getVar('songs'));
+		$ele['hits']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_HITS : ''), $object->getVar('hits'));
+		$ele['rank']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name', 'mimetype', 'support'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormCategory($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Category');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_CATEGORY, 'category', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_CATEGORY, 'category', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('cid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'category');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['pid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT : ''), $id . '[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
+		$ele['pid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC : ''));
+		$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+		$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME_DESC : ''));
+		$description_configs           = [];
+		$description_configs['name']   = $id . '[description]';
+		$description_configs['value']  = $object->getVar('description');
+		$description_configs['rows']   = 35;
+		$description_configs['cols']   = 60;
+		$description_configs['width']  = '100%';
+		$description_configs['height'] = '400px';
+		$ele['description']            = new \XoopsFormEditor(_FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
+		$ele['description']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC : ''));
+		$ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
+		$ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER_DESC : ''));
+		if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
+			$ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
+			$ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER_DESC : ''));
+		}
+		$ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_ARTISTS : ''), $object->getVar('artists'));
+		$ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_SONGS : ''), $object->getVar('songs'));
+		$ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_HITS : ''), $object->getVar('hits'));
+		$ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name', 'id', 'source'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormUtf8map($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Utf8map');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_UTF8MAP, 'utf8map', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_UTF8MAP, 'utf8map', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('utfid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'utf8map');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['from'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM : ''), $id . '[from]', (!$as_array ? 6 : 4), 2, $object->getVar('from'));
+		$ele['from']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM_DESC : ''));
+		$ele['to'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO : ''), $id . '[to]', (!$as_array ? 6 : 4), 2, $object->getVar('to'));
+		$ele['to']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO_DESC : ''));
+
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['from', 'to'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormRequests($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Requests');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_REQUESTS, 'requests', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_REQUESTS, 'requests', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('rid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'requests');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST : ''), $id . '[artist]', (!$as_array ? 55 : 21), 128, $object->getVar('artist'));
+		$ele['artist']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST_DESC : ''));
+		$ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM : ''), $id . '[album]', (!$as_array ? 55 : 21), 128, $object->getVar('album'));
+		$ele['album']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM_DESC : ''));
+		$ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE_DESC : ''));
+		$ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS : ''), $id . '[lyrics]', (!$as_array ? 55 : 21), 128, $object->getVar('lyrics'));
+		$ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS_DESC : ''));
+
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$ele['uid']  = new \XoopsFormHidden('uid', $GLOBALS['xoopsUser']->getVar('uid'));
+			$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('name') : $object->getVar('name')));
+			$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
+			$ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('email') : $object->getVar('email')));
+			$ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
+		} else {
+			$ele['uid']  = new \XoopsFormHidden('uid', 0);
+			$ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('name')));
+			$ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
+			$ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('email')));
+			$ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
+		}
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = ['name', 'email'];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormSongs($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Songs');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_SONGS, 'songs', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_SONGS, 'songs', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('sid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'songs');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY : ''), $id . '[cid]', ($_REQUEST['cid'] ?? $object->getVar('cid')), 1, false);
+		$ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC : ''));
+		if ($GLOBALS['songlistModuleConfig']['genre']) {
+			$ele['gids'] = new SelectGenreForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE : ''), $id . '[gids]', ($_REQUEST['gids'] ?? $object->getVar('gids')), 8, true);
+			$ele['gids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE_DESC : ''));
+		}
+		if ($GLOBALS['songlistModuleConfig']['voice']) {
+			$ele['vcid'] = new SelectVoiceForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE : ''), $id . '[vcid]', ($_REQUEST['vcid'] ?? $object->getVar('vcid')), 1, false);
+			$ele['vcid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE_DESC : ''));
+		}
+		if ($GLOBALS['songlistModuleConfig']['album']) {
+			$ele['abid'] = new SelectAlbumForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM : ''), $id . '[abid]', $object->getVar('abid'), 1, false);
+			$ele['abid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM_DESC : ''));
+		}
+		$ele['aids'] = new SelectArtistForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS : ''), $id . '[aids]', $object->getVar('aids'), 7, true);
+		$ele['aids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS_DESC : ''));
+		$ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID : ''), $id . '[songid]', (!$as_array ? 25 : 15), 32, $object->getVar('songid'));
+		$ele['songid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID_DESC : ''));
+		$ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID : ''), $id . '[traxid]', (!$as_array ? 25 : 15), 32, $object->getVar('traxid'));
+		$ele['traxid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID_DESC : ''));
+		$ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+		$ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE_DESC : ''));
+		$description_configs           = [];
+		$description_configs['name']   = $id . '[lyrics]';
+		$description_configs['value']  = $object->getVar('lyrics');
+		$description_configs['rows']   = 35;
+		$description_configs['cols']   = 60;
+		$description_configs['width']  = '100%';
+		$description_configs['height'] = '400px';
+		$ele['lyrics']                 = new \XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
+		$ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_LYRICS_DESC : ''));
+		$ele['mp3'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3 : ''), 'mp3' . $id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
+		$ele['mp3']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3_DESC : ''));
+		$categoryHandler = Helper::getInstance()
+								 ->getHandler('Category');
+		$criteria        = new \CriteriaCompo(new \Criteria('cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : $object->getVar('cid')));
+		$all_categories  = $categoryHandler->getObjects($criteria, true, false);
+
+		// Dynamic fields
+		$extrasHandler = Helper::getInstance()
+							   ->getHandler('Extras');
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+		/** @var \XoopsModuleHandler $moduleHandler */
+		$moduleHandler = xoops_getHandler('module');
+		$xoModule      = $moduleHandler->getByDirname('songlist');
+		$modid         = $xoModule->getVar('mid');
+
+		if (is_object($GLOBALS['xoopsUser'])) {
+			$groups = $GLOBALS['xoopsUser']->getGroups();
+		} else {
+			$groups = [XOOPS_GROUP_ANONYMOUS => XOOPS_GROUP_ANONYMOUS];
+		}
+
+		$count_fields = 0;
+		$fields       = $extrasHandler->loadFields();
+
+		$required = [];
+		$elements = [];
+		$weights  = [];
+		if ($object->getVar('sid') > 0) {
+			$extra = $extrasHandler->get($object->getVar('sid'));
+		} else {
+			$extra = $extrasHandler->create();
+		}
+		$allnames = [];
+		if (is_array($fields)) {
+			foreach (array_keys($fields) as $i) {
+				if ((0 != $object->getVar('sid') && $grouppermHandler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid))
+					|| (0 == $object->getVar('sid') && $grouppermHandler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
+					$fieldinfo['element']  = $fields[$i]->getEditElement($object, $extra);
+					$fieldinfo['required'] = $fields[$i]->getVar('field_required');
+					foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
+						if (!in_array($fields[$i]->getVar('field_name'), $allnames, true)) {
+							$allnames[] = $fields[$i]->getVar('field_name');
+							if (array_key_exists($cid, $all_categories)
+								|| $cid == (!empty($_REQUEST['cid'])
+									? Request::getInt('cid', 0, 'REQUEST')
+									: $object->getVar('cid'))) {
+								$key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0)
+													* $count_fields + $object->getVar('cid');
+								$elements[$key][] = $fieldinfo;
+								$weights[$key][]  = $fields[$i]->getVar('field_weight');
+							} elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
+								$key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0) * $count_fields + $object->getVar('cid');
+								$elements[$key][] = $fieldinfo;
+								$weights[$key][]  = $fields[$i]->getVar('field_weight');
+							}
+						}
+					}
+				}
+			}
+		}
+		if (is_array($elements)) {
+			ksort($elements);
+			foreach (array_keys($elements) as $k) {
+				array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
+				foreach (array_keys($elements[$k]) as $i) {
+					$ele[$k] = $elements[$k][$i]['element'];
+					if (true === $elements[$k][$i]['required']) {
+						$required[$k] = $elements[$k][$i]['element']->getName();
+					}
+				}
+			}
+		}
+
+		if (class_exists(\XoopsModules\Tag\FormTag::class)) {
+			$ele['tags'] = new \XoopsModules\Tag\FormTag('tags', 60, 255, $object->getVar('sid'), $object->getVar('cid'));
+		} else {
+			$ele['tags'] = new \XoopsFormHidden('tags', $object->getVar('tags'));
+		}
+
+		$ele['hits'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_HITS : ''), $object->getVar('hits'));
+		$ele['rank'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
+		if ($object->getVar('created') > 0) {
+			$ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
+		}
+		if ($object->getVar('updated') > 0) {
+			$ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
+		}
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
+
+	/**
+	 * @param      $object
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public static function  getFormVotes($object, $as_array = false)
+	{
+		if (!is_object($object)) {
+			$handler = Helper::getInstance()
+							 ->getHandler('Votes');
+			$object  = $handler->create();
+		}
+
+		xoops_loadLanguage('forms', 'songlist');
+		$ele = [];
+
+		if ($object->isNew()) {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_CART, 'votes', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'new');
+		} else {
+			$sform       = new \XoopsThemeForm(_FRM_SONGLIST_FORM_EDIT_CART, 'votes', $_SERVER['SCRIPT_NAME'], 'post', true);
+			$ele['mode'] = new \XoopsFormHidden('mode', 'edit');
+		}
+
+		$sform->setExtra("enctype='multipart/form-data'");
+
+		$id = $object->getVar('cid');
+		if (empty($id)) {
+			$id = '0';
+		}
+
+		$ele['op']  = new \XoopsFormHidden('op', 'votes');
+		$ele['fct'] = new \XoopsFormHidden('fct', 'save');
+		if ($as_array) {
+			$ele['id'] = new \XoopsFormHidden('id', $id);
+		} else {
+			$ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+		}
+		$ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
+		$ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
+		$ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
+		$ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+		$ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
+
+		$songsHandler = Helper::getInstance()
+							  ->getHandler('Songs');
+		$userHandler  = xoops_getHandler('user');
+		$song         = $songsHandler->get($object->getVar('sid'));
+		$user         = $userHandler->get($object->getVar('uid'));
+		if (is_object($song)) {
+			$ele['sid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_SONG : ''), $song->getVar('title'));
+		} else {
+			$ele['sid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_SONG : ''), $object->getVar('sid'));
+		}
+		if (is_object($user)) {
+			$ele['uid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_USER : ''), $user->getVar('uname'));
+		} else {
+			$ele['uid'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_USER : ''), _GUESTS);
+		}
+		$ele['ip']      = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_IP : ''), $object->getVar('ip'));
+		$ele['netaddy'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_NETADDY : ''), $object->getVar('netaddy'));
+		$ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_RANK : ''), $object->getVar('rank') . ' of 10');
+
+		if ($as_array) {
+			return $ele;
+		}
+
+		$ele['submit'] = new \XoopsFormButton('', 'submit', _SUBMIT, 'submit');
+
+		$required = [];
+
+		foreach ($ele as $id => $obj) {
+			if (in_array($id, $required, true)) {
+				$sform->addElement($obj, true);
+			} else {
+				$sform->addElement($obj, false);
+			}
+		}
+
+		return $sform->render();
+	}
 }

Spacing +110 added lines, -110 removed lines

@@ -26,7 +26,7 @@ 
      */
     public static function getFieldForm($field, $action = false)
     {
-        if (false === $action) {
+        if (false===$action) {
             $action = $_SERVER['SCRIPT_NAME'];
         }
 
@@ -128,9 +128,9 @@ 
 
             //$form->addElement(new \XoopsFormRadioYN(_FRM_SONGLIST_FIELDS_NOTNULL, 'field_notnull', $field->getVar('field_notnull', 'e') ));
 
-            if ('select' === $field->getVar('field_type') || 'select_multi' === $field->getVar('field_type') || 'radio' === $field->getVar('field_type') || 'checkbox' === $field->getVar('field_type')) {
+            if ('select'===$field->getVar('field_type') || 'select_multi'===$field->getVar('field_type') || 'radio'===$field->getVar('field_type') || 'checkbox'===$field->getVar('field_type')) {
                 $options = $field->getVar('field_options');
-                if (count($options) > 0) {
+                if (count($options)>0) {
                     $remove_options          = new \XoopsFormCheckBox(_FRM_SONGLIST_FIELDS_REMOVEOPTIONS, 'removeOptions');
                     $remove_options->columns = 3;
                     asort($options);
@@ -141,8 +141,8 @@ 
                     $form->addElement($remove_options);
                 }
 
-                $option_text = "<table  cellspacing='1'><tr><td width='20%'>" . _FRM_SONGLIST_FIELDS_KEY . '</td><td>' . _FRM_SONGLIST_FIELDS_VALUE . '</td></tr>';
-                for ($i = 0; $i < 3; ++$i) {
+                $option_text = "<table  cellspacing='1'><tr><td width='20%'>"._FRM_SONGLIST_FIELDS_KEY.'</td><td>'._FRM_SONGLIST_FIELDS_VALUE.'</td></tr>';
+                for ($i = 0; $i<3; ++$i) {
                     $option_text .= "<tr><td><input type='text' name='addOption[{$i}][key]' id='addOption[{$i}][key]' size='15'></td><td><input type='text' name='addOption[{$i}][value]' id='addOption[{$i}][value]' size='35'></td></tr>";
                     $option_text .= "<tr height='3px'><td colspan='2'> </td></tr>";
                 }
@@ -161,7 +161,7 @@ 
                     break;
                 case 'checkbox':
                 case 'select_multi':
-                    $def_value = null !== $field->getVar('field_default', 'e') ? unserialize(($field->getVar('field_default', 'n')) ?? '') : null;
+                    $def_value = null!==$field->getVar('field_default', 'e') ? unserialize(($field->getVar('field_default', 'n')) ?? '') : null;
                     $element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value, 8, true);
                     $options   = $field->getVar('field_options');
                     asort($options);
@@ -174,7 +174,7 @@ 
                     break;
                 case 'select':
                 case 'radio':
-                    $def_value = null !== $field->getVar('field_default', 'e') ? $field->getVar('field_default') : null;
+                    $def_value = null!==$field->getVar('field_default', 'e') ? $field->getVar('field_default') : null;
                     $element   = new \XoopsFormSelect(_FRM_SONGLIST_FIELDS_DEFAULT, 'field_default', $def_value);
                     $options   = $field->getVar('field_options');
                     asort($options);
@@ -301,7 +301,7 @@ 
                             ->getHandler('Category');
 
         $selcat = new \XoopsFormSelect('Form', 'cid', !empty($_REQUEST['cid']) ? Request::getInt('cid', 0, 'REQUEST') : 0, 1, false, false, false, true);
-        $selcat->setExtra(' onChange="window.location=\'' . XOOPS_URL . '/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
+        $selcat->setExtra(' onChange="window.location=\''.XOOPS_URL.'/modules/objects/search.php?op=search&fct=form&cid=\'+document.search.cid.options[document.search.cid.selectedIndex].value"');
 
         $form->addElement($selcat, true);
 
@@ -319,12 +319,12 @@ 
 
                 foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
                     if (array_key_exists($cid, $all_categories)) {
-                        $key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+                        $key              = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
                         $elements[$key][] = $fieldinfo;
                         $weights[$key][]  = $fields[$i]->getVar('field_weight');
                         $categories[$key] = $all_categories[$cid];
                     } elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
-                        $key              = $all_categories[$cid]['cat_weight'] * $count_fields + $cid;
+                        $key              = $all_categories[$cid]['cat_weight']*$count_fields+$cid;
                         $elements[$key][] = $fieldinfo;
                         $weights[$key][]  = $fields[$i]->getVar('field_weight');
                         $categories[$key] = $all_categories[$cid];
@@ -364,14 +364,14 @@ 
 
         $ele['op']      = new \XoopsFormHidden('op', 'import');
         $ele['fct']     = new \XoopsFormHidden('fct', 'upload');
-        $ele['xmlfile'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML : ''), 'xmlfile', 1024 * 1024 * 1024 * 32);
+        $ele['xmlfile'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML : ''), 'xmlfile', 1024*1024*1024*32);
         $ele['xmlfile']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_UPLOAD_XML_DESC : ''));
         $ele['file'] = new \XoopsFormSelect((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML : ''), 'file');
         $ele['file']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_IMPORT_EXISTING_XML_DESC : ''));
         $ele['file']->addOption('', '*********');
         xoops_load('XoopsLists');
         foreach (\XoopsLists::getFileListAsArray($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'])) as $file) {
-            if ('xml' === mb_substr($file, mb_strlen($file) - 3, 3)) {
+            if ('xml'===mb_substr($file, mb_strlen($file)-3, 3)) {
                 $ele['file']->addOption($file, $file);
             }
         }
@@ -401,24 +401,24 @@ 
 
         $sform = new \XoopsThemeForm(_FRM_SONGLIST_FORM_ISNEW_ELEMENTS, 'elements', $_SERVER['SCRIPT_NAME'], 'post', true);
 
-        $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $file));
-        $mb       = floor($filesize / 1024 / 1024);
-        if ($mb > 32) {
-            set_ini('memory_limit', ($mb + 128) . 'M');
+        $filesize = filesize($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$file));
+        $mb       = floor($filesize/1024/1024);
+        if ($mb>32) {
+            set_ini('memory_limit', ($mb+128).'M');
         }
         set_time_limit(3600);
 
         $i = 0;
-        foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'] . $_SESSION['xmlfile'])) as $data) {
+        foreach (file($GLOBALS['xoops']->path($GLOBALS['songlistModuleConfig']['upload_areas'].$_SESSION['xmlfile'])) as $data) {
             ++$i;
-            if ($i < 20) {
-                $line .= htmlspecialchars($data, ENT_QUOTES | ENT_HTML5) . ($i < 19 ? "\n" : '');
+            if ($i<20) {
+                $line .= htmlspecialchars($data, ENT_QUOTES | ENT_HTML5).($i<19 ? "\n" : '');
             }
         }
 
         $ele['op']      = new \XoopsFormHidden('op', 'import');
         $ele['fct']     = new \XoopsFormHidden('fct', 'import');
-        $ele['example'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE : ''), '<pre>' . $line . '</pre>');
+        $ele['example'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE : ''), '<pre>'.$line.'</pre>');
         $ele['example']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_EXAMPLE_DESC : ''));
         $ele['collection'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION : ''), 'collection', 32, 128, 'collection');
         $ele['collection']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ELEMENT_COLLECTION_DESC : ''));
@@ -509,27 +509,27 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'genre');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
         $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_GENRE_NAME_DESC : ''));
         $ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ALBUMS : ''), $object->getVar('albums'));
         $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_ARTISTS : ''), $object->getVar('artists'));
         $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_SONGS : ''), $object->getVar('songs'));
         $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_GENRE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -586,27 +586,27 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'voice');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
         $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_VOICE_NAME_DESC : ''));
         $ele['albums']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ALBUMS : ''), $object->getVar('albums'));
         $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_ARTISTS : ''), $object->getVar('artists'));
         $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_SONGS : ''), $object->getVar('songs'));
         $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOICE_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -663,34 +663,34 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'albums');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY : ''), $id . '[cid]', $object->getVar('cid'), 1, false, false, false);
+        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY : ''), $id.'[cid]', $object->getVar('cid'), 1, false, false, false);
         $ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CATEGORY_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE : ''), $id.'[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
         $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_TITLE_DESC : ''));
         $ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
         $ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPLOAD_POSTER_DESC : ''));
-        if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
-            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
+        if (''!=$object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER : ''), '<img src="'.$object->getImage('image').'" width="340px">');
             $ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_POSTER_DESC : ''));
         }
         $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_ARTISTS : ''), $object->getVar('artists'));
         $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_SONGS : ''), $object->getVar('songs'));
         $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ALBUMS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -745,30 +745,30 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'artists');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['cids'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY : ''), $id . '[cids]', $object->getVar('cids'), 7, true, false, false);
+        $ele['cids'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY : ''), $id.'[cids]', $object->getVar('cids'), 7, true, false, false);
         $ele['cids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CATEGORY_DESC : ''));
         //$ele['singer'] = new \XoopsModules\Songlist\Form\SelectSingerForm(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER:''), $id.'[singer]', $object->getVar('singer'), 1, false, false, false);
         //$ele['singer']->setDescription(($as_array==false?_FRM_SONGLIST_FORM_ARTISTS_SINGER_DESC:''));
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
         $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_NAME_DESC : ''));
         $ele['albums'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_ALBUMS : ''), $object->getVar('albums'));
         $ele['songs']  = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_SONGS : ''), $object->getVar('songs'));
         $ele['hits']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_HITS : ''), $object->getVar('hits'));
-        $ele['rank']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_ARTISTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -825,22 +825,22 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'category');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['pid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT : ''), $id . '[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
+        $ele['pid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT : ''), $id.'[pid]', $object->getVar('pid'), 1, false, $object->getVar('cid'));
         $ele['pid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_PARENT_DESC : ''));
-        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
+        $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, $object->getVar('name'));
         $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_NAME_DESC : ''));
         $description_configs           = [];
-        $description_configs['name']   = $id . '[description]';
+        $description_configs['name']   = $id.'[description]';
         $description_configs['value']  = $object->getVar('description');
         $description_configs['rows']   = 35;
         $description_configs['cols']   = 60;
@@ -850,18 +850,18 @@ 
         $ele['description']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_DESCRIPTION_DESC : ''));
         $ele['image'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER : ''), 'image', $GLOBALS['songlistModuleConfig']['filesize_upload']);
         $ele['image']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPLOAD_POSTER_DESC : ''));
-        if ('' != $object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path') . $object->getVar('image')))) {
-            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER : ''), '<img src="' . $object->getImage('image') . '" width="340px">');
+        if (''!=$object->getVar('image') && file_exists($GLOBALS['xoops']->path($object->getVar('path').$object->getVar('image')))) {
+            $ele['image_preview'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER : ''), '<img src="'.$object->getImage('image').'" width="340px">');
             $ele['image_preview']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_POSTER_DESC : ''));
         }
         $ele['artists'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_ARTISTS : ''), $object->getVar('artists'));
         $ele['songs']   = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_SONGS : ''), $object->getVar('songs'));
         $ele['hits']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_HITS : ''), $object->getVar('hits'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_CATEGORY_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -918,25 +918,25 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'utf8map');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['from'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM : ''), $id . '[from]', (!$as_array ? 6 : 4), 2, $object->getVar('from'));
+        $ele['from'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM : ''), $id.'[from]', (!$as_array ? 6 : 4), 2, $object->getVar('from'));
         $ele['from']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_FROM_DESC : ''));
-        $ele['to'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO : ''), $id . '[to]', (!$as_array ? 6 : 4), 2, $object->getVar('to'));
+        $ele['to'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO : ''), $id.'[to]', (!$as_array ? 6 : 4), 2, $object->getVar('to'));
         $ele['to']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_TO_DESC : ''));
 
-        if ($object->getVar('created') > 0) {
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_UTF8MAP_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -995,40 +995,40 @@ 
         if ($as_array) {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         } else {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST : ''), $id . '[artist]', (!$as_array ? 55 : 21), 128, $object->getVar('artist'));
+        $ele['artist'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST : ''), $id.'[artist]', (!$as_array ? 55 : 21), 128, $object->getVar('artist'));
         $ele['artist']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ARTIST_DESC : ''));
-        $ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM : ''), $id . '[album]', (!$as_array ? 55 : 21), 128, $object->getVar('album'));
+        $ele['album'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM : ''), $id.'[album]', (!$as_array ? 55 : 21), 128, $object->getVar('album'));
         $ele['album']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_ALBUM_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE : ''), $id.'[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
         $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_TITLE_DESC : ''));
-        $ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS : ''), $id . '[lyrics]', (!$as_array ? 55 : 21), 128, $object->getVar('lyrics'));
+        $ele['lyrics'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS : ''), $id.'[lyrics]', (!$as_array ? 55 : 21), 128, $object->getVar('lyrics'));
         $ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_LYRICS_DESC : ''));
 
         if (is_object($GLOBALS['xoopsUser'])) {
             $ele['uid']  = new \XoopsFormHidden('uid', $GLOBALS['xoopsUser']->getVar('uid'));
-            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('name') : $object->getVar('name')));
+            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('name') : $object->getVar('name')));
             $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
-            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('email') : $object->getVar('email')));
+            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id.'[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? $GLOBALS['xoopsUser']->getVar('email') : $object->getVar('email')));
             $ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
         } else {
             $ele['uid']  = new \XoopsFormHidden('uid', 0);
-            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id . '[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('name')));
+            $ele['name'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME : ''), $id.'[name]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('name')));
             $ele['name']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_NAME_DESC : ''));
-            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id . '[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('email')));
+            $ele['email'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL : ''), $id.'[email]', (!$as_array ? 55 : 21), 128, ($object->isNew() ? '' : $object->getVar('email')));
             $ele['email']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_EMAIL_DESC : ''));
         }
-        if ($object->getVar('created') > 0) {
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_REQUESTS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
 
@@ -1085,40 +1085,40 @@ 
         $ele['op']  = new \XoopsFormHidden('op', 'songs');
         $ele['fct'] = new \XoopsFormHidden('fct', 'save');
         if ($as_array) {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         } else {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
-        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY : ''), $id . '[cid]', ($_REQUEST['cid'] ?? $object->getVar('cid')), 1, false);
+        $ele['cid'] = new SelectCategoryForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY : ''), $id.'[cid]', ($_REQUEST['cid'] ?? $object->getVar('cid')), 1, false);
         $ele['cid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CATEGORY_DESC : ''));
         if ($GLOBALS['songlistModuleConfig']['genre']) {
-            $ele['gids'] = new SelectGenreForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE : ''), $id . '[gids]', ($_REQUEST['gids'] ?? $object->getVar('gids')), 8, true);
+            $ele['gids'] = new SelectGenreForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE : ''), $id.'[gids]', ($_REQUEST['gids'] ?? $object->getVar('gids')), 8, true);
             $ele['gids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_GENRE_DESC : ''));
         }
         if ($GLOBALS['songlistModuleConfig']['voice']) {
-            $ele['vcid'] = new SelectVoiceForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE : ''), $id . '[vcid]', ($_REQUEST['vcid'] ?? $object->getVar('vcid')), 1, false);
+            $ele['vcid'] = new SelectVoiceForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE : ''), $id.'[vcid]', ($_REQUEST['vcid'] ?? $object->getVar('vcid')), 1, false);
             $ele['vcid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_VOICE_DESC : ''));
         }
         if ($GLOBALS['songlistModuleConfig']['album']) {
-            $ele['abid'] = new SelectAlbumForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM : ''), $id . '[abid]', $object->getVar('abid'), 1, false);
+            $ele['abid'] = new SelectAlbumForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM : ''), $id.'[abid]', $object->getVar('abid'), 1, false);
             $ele['abid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ALBUM_DESC : ''));
         }
-        $ele['aids'] = new SelectArtistForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS : ''), $id . '[aids]', $object->getVar('aids'), 7, true);
+        $ele['aids'] = new SelectArtistForm((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS : ''), $id.'[aids]', $object->getVar('aids'), 7, true);
         $ele['aids']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_ARTISTS_DESC : ''));
-        $ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID : ''), $id . '[songid]', (!$as_array ? 25 : 15), 32, $object->getVar('songid'));
+        $ele['songid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID : ''), $id.'[songid]', (!$as_array ? 25 : 15), 32, $object->getVar('songid'));
         $ele['songid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_SONGID_DESC : ''));
-        $ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID : ''), $id . '[traxid]', (!$as_array ? 25 : 15), 32, $object->getVar('traxid'));
+        $ele['traxid'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID : ''), $id.'[traxid]', (!$as_array ? 25 : 15), 32, $object->getVar('traxid'));
         $ele['traxid']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TRAXID_DESC : ''));
-        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE : ''), $id . '[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
+        $ele['title'] = new \XoopsFormText((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE : ''), $id.'[title]', (!$as_array ? 55 : 21), 128, $object->getVar('title'));
         $ele['title']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_TITLE_DESC : ''));
         $description_configs           = [];
-        $description_configs['name']   = $id . '[lyrics]';
+        $description_configs['name']   = $id.'[lyrics]';
         $description_configs['value']  = $object->getVar('lyrics');
         $description_configs['rows']   = 35;
         $description_configs['cols']   = 60;
@@ -1126,7 +1126,7 @@ 
         $description_configs['height'] = '400px';
         $ele['lyrics']                 = new \XoopsFormEditor(_FRM_SONGLIST_FORM_SONGS_LYRICS, $GLOBALS['songlistModuleConfig']['editor'], $description_configs);
         $ele['lyrics']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_LYRICS_DESC : ''));
-        $ele['mp3'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3 : ''), 'mp3' . $id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
+        $ele['mp3'] = new \XoopsFormFile((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3 : ''), 'mp3'.$id, $GLOBALS['songlistModuleConfig']['mp3_filesize']);
         $ele['mp3']->setDescription((!$as_array ? _FRM_SONGLIST_FORM_SONGS_MP3_DESC : ''));
         $categoryHandler = Helper::getInstance()
                                  ->getHandler('Category');
@@ -1155,7 +1155,7 @@ 
         $required = [];
         $elements = [];
         $weights  = [];
-        if ($object->getVar('sid') > 0) {
+        if ($object->getVar('sid')>0) {
             $extra = $extrasHandler->get($object->getVar('sid'));
         } else {
             $extra = $extrasHandler->create();
@@ -1163,23 +1163,23 @@ 
         $allnames = [];
         if (is_array($fields)) {
             foreach (array_keys($fields) as $i) {
-                if ((0 != $object->getVar('sid') && $grouppermHandler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid))
-                    || (0 == $object->getVar('sid') && $grouppermHandler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
+                if ((0!=$object->getVar('sid') && $grouppermHandler->checkRight('songlist_edit', $fields[$i]->getVar('field_id'), $groups, $modid))
+                    || (0==$object->getVar('sid') && $grouppermHandler->checkRight('songlist_post', $fields[$i]->getVar('field_id'), $groups, $modid))) {
                     $fieldinfo['element']  = $fields[$i]->getEditElement($object, $extra);
                     $fieldinfo['required'] = $fields[$i]->getVar('field_required');
                     foreach ($fields[$i]->getVar('cids') as $catidid => $cid) {
                         if (!in_array($fields[$i]->getVar('field_name'), $allnames, true)) {
                             $allnames[] = $fields[$i]->getVar('field_name');
                             if (array_key_exists($cid, $all_categories)
-                                || $cid == (!empty($_REQUEST['cid'])
+                                || $cid==(!empty($_REQUEST['cid'])
                                     ? Request::getInt('cid', 0, 'REQUEST')
                                     : $object->getVar('cid'))) {
                                 $key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0)
-                                                    * $count_fields + $object->getVar('cid');
+                                                    * $count_fields+$object->getVar('cid');
                                 $elements[$key][] = $fieldinfo;
                                 $weights[$key][]  = $fields[$i]->getVar('field_weight');
                             } elseif (in_array(0, $fields[$i]->getVar('cids'), true)) {
-                                $key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0) * $count_fields + $object->getVar('cid');
+                                $key              = (isset($all_categories[$cid]) ? $all_categories[$cid]['weight'] : 0)*$count_fields+$object->getVar('cid');
                                 $elements[$key][] = $fieldinfo;
                                 $weights[$key][]  = $fields[$i]->getVar('field_weight');
                             }
@@ -1194,7 +1194,7 @@ 
                 array_multisort($weights[$k], SORT_ASC, array_keys($elements[$k]), SORT_ASC, $elements[$k]);
                 foreach (array_keys($elements[$k]) as $i) {
                     $ele[$k] = $elements[$k][$i]['element'];
-                    if (true === $elements[$k][$i]['required']) {
+                    if (true===$elements[$k][$i]['required']) {
                         $required[$k] = $elements[$k][$i]['element']->getName();
                     }
                 }
@@ -1208,11 +1208,11 @@ 
         }
 
         $ele['hits'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_HITS : ''), $object->getVar('hits'));
-        $ele['rank'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_RANK : ''), number_format(($object->getVar('rank') > 0 && $object->getVar('votes') > 0 ? $object->getVar('rank') / $object->getVar('votes') : 0), 2) . ' of 10');
-        if ($object->getVar('created') > 0) {
+        $ele['rank'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_RANK : ''), number_format(($object->getVar('rank')>0 && $object->getVar('votes')>0 ? $object->getVar('rank')/$object->getVar('votes') : 0), 2).' of 10');
+        if ($object->getVar('created')>0) {
             $ele['created'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_CREATED : ''), date(_DATESTRING, $object->getVar('created')));
         }
-        if ($object->getVar('updated') > 0) {
+        if ($object->getVar('updated')>0) {
             $ele['updated'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_SONGS_UPDATED : ''), date(_DATESTRING, $object->getVar('updated')));
         }
         if ($as_array) {
@@ -1268,12 +1268,12 @@ 
         if ($as_array) {
             $ele['id'] = new \XoopsFormHidden('id', $id);
         } else {
-            $ele['id'] = new \XoopsFormHidden('id[' . $id . ']', $id);
+            $ele['id'] = new \XoopsFormHidden('id['.$id.']', $id);
         }
         $ele['sort']   = new \XoopsFormHidden('sort', $_REQUEST['sort'] ?? 'created');
         $ele['order']  = new \XoopsFormHidden('order', $_REQUEST['order'] ?? 'DESC');
-        $ele['start']  = new \XoopsFormHidden('start', (string)Request::getInt('start', 0, 'REQUEST'));
-        $ele['limit']  = new \XoopsFormHidden('limit', (string)Request::getInt('limit', 0, 'REQUEST'));
+        $ele['start']  = new \XoopsFormHidden('start', (string) Request::getInt('start', 0, 'REQUEST'));
+        $ele['limit']  = new \XoopsFormHidden('limit', (string) Request::getInt('limit', 0, 'REQUEST'));
         $ele['filter'] = new \XoopsFormHidden('filter', $_REQUEST['filter'] ?? '1,1');
 
         $songsHandler = Helper::getInstance()
@@ -1293,7 +1293,7 @@ 
         }
         $ele['ip']      = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_IP : ''), $object->getVar('ip'));
         $ele['netaddy'] = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_NETADDY : ''), $object->getVar('netaddy'));
-        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_RANK : ''), $object->getVar('rank') . ' of 10');
+        $ele['rank']    = new \XoopsFormLabel((!$as_array ? _FRM_SONGLIST_FORM_VOTES_RANK : ''), $object->getVar('rank').' of 10');
 
         if ($as_array) {
             return $ele;

class/Form/SelectAlbumForm.php

Indentation +208 added lines, -208 removed lines

@@ -53,230 +53,230 @@
  */
 class SelectAlbumForm extends XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     */
-    public $_options = [];
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     */
-    public $_multiple = false;
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     */
-    public $_size;
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     */
-    public $_value = [];
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	public $_options = [];
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 */
+	public $_multiple = false;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 */
+	public $_size;
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 */
+	public $_value = [];
 
-    /**
-     * Constructor
-     *
-     * @param string $caption  Caption
-     * @param string $name     "name" attribute
-     * @param mixed  $value    Pre-selected value (or array of them).
-     * @param int    $size     Number or rows. "1" makes a drop-down-list
-     * @param bool   $multiple Allow multiple selections?
-     * @param int    $ownid
-     */
-    public function __construct($caption, $name, $value = null, $size = 1, $multiple = false, $ownid = 0)
-    {
-        global $_form_object_options;
-        \xoops_loadLanguage('modinfo', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption  Caption
+	 * @param string $name     "name" attribute
+	 * @param mixed  $value    Pre-selected value (or array of them).
+	 * @param int    $size     Number or rows. "1" makes a drop-down-list
+	 * @param bool   $multiple Allow multiple selections?
+	 * @param int    $ownid
+	 */
+	public function __construct($caption, $name, $value = null, $size = 1, $multiple = false, $ownid = 0)
+	{
+		global $_form_object_options;
+		\xoops_loadLanguage('modinfo', 'songlist');
 
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        $this->addOption('0', \_MI_SONGLIST_NONE);
-        if (!isset($_form_object_options['albums'])) {
-            $albumsHandler = Helper::getInstance()->getHandler('Albums');
-            $criteria      = new Criteria('');
-            $criteria->setSort('title');
-            $criteria->setOrder('ASC');
-            foreach ($albumsHandler->getObjects($criteria, true) as $id => $obj) {
-                $_form_object_options['albums'][$id] = $obj->getVar('title');
-            }
-        }
-        //        if (Request::hasVar('albums', 'form_object_options')) {
-        if (isset($_form_object_options['albums'])) {
-            foreach ($_form_object_options['albums'] as $id => $value) {
-                $this->addOption($id, $value);
-            }
-        }
-    }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size     = (int)$size;
+		if (isset($value)) {
+			$this->setValue($value);
+		}
+		$this->addOption('0', \_MI_SONGLIST_NONE);
+		if (!isset($_form_object_options['albums'])) {
+			$albumsHandler = Helper::getInstance()->getHandler('Albums');
+			$criteria      = new Criteria('');
+			$criteria->setSort('title');
+			$criteria->setOrder('ASC');
+			foreach ($albumsHandler->getObjects($criteria, true) as $id => $obj) {
+				$_form_object_options['albums'][$id] = $obj->getVar('title');
+			}
+		}
+		//        if (Request::hasVar('albums', 'form_object_options')) {
+		if (isset($_form_object_options['albums'])) {
+			foreach ($_form_object_options['albums'] as $id => $value) {
+				$this->addOption($id, $value);
+			}
+		}
+	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    public function isMultiple(): bool
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	public function isMultiple(): bool
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    public function getSize(): int
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	public function getSize(): int
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    public function getValue($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_value;
-        }
-        $value = [];
-        foreach ($this->_value as $val) {
-            $value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
-        }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	public function getValue($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_value;
+		}
+		$value = [];
+		foreach ($this->_value as $val) {
+			$value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param mixed $value
-     */
-    public function setValue($value): void
-    {
-        if (\is_array($value)) {
-            foreach ($value as $v) {
-                $this->_value[] = (int)$v;
-            }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param mixed $value
+	 */
+	public function setValue($value): void
+	{
+		if (\is_array($value)) {
+			foreach ($value as $v) {
+				$this->_value[] = (int)$v;
+			}
 //            $this->_value[] = array_values($value);
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name  "name" attribute
-     */
-    public function addOption($value, $name = ''): void
-    {
-        if ('' != $name) {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name  "name" attribute
+	 */
+	public function addOption($value, $name = ''): void
+	{
+		if ('' != $name) {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    public function addOptionArray($options): void
-    {
-        if (\is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	public function addOptionArray($options): void
+	{
+		if (\is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    public function getOptions($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_options;
-        }
-        $value = [];
-        foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
-        }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	public function getOptions($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_options;
+		}
+		$value = [];
+		foreach ($this->_options as $val => $name) {
+			$value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render(): string
-    {
-        $ele_name    = $this->getName();
-        $ele_title   = $this->getTitle();
-        $ele_value   = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
-        if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
-        } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
-        }
-        foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
-                $ret .= ' selected';
-            }
-            $ret .= '>' . $name . '</option>';
-        }
-        $ret .= '</select>';
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render(): string
+	{
+		$ele_name    = $this->getName();
+		$ele_title   = $this->getTitle();
+		$ele_value   = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+		if ($this->isMultiple()) {
+			$ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+		} else {
+			$ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+		}
+		foreach ($ele_options as $value => $name) {
+			$ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
+			if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+				$ret .= ' selected';
+			}
+			$ret .= '>' . $name . '</option>';
+		}
+		$ret .= '</select>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    public function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (!empty($this->customValidationCode)) {
-            return \implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	public function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (!empty($this->customValidationCode)) {
+			return \implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		}
 
-        if ($this->isRequired()) {
-            $eltname    = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
+		if ($this->isRequired()) {
+			$eltname    = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
 
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
-                   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
-                   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
+				   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
+				   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
 
-        return '';
-    }
+		return '';
+	}
 }

Spacing +10 added lines, -10 removed lines

@@ -96,7 +96,7 @@ 
         $this->setCaption($caption);
         $this->setName($name);
         $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
+        $this->_size     = (int) $size;
         if (isset($value)) {
             $this->setValue($value);
         }
@@ -166,7 +166,7 @@ 
     {
         if (\is_array($value)) {
             foreach ($value as $v) {
-                $this->_value[] = (int)$v;
+                $this->_value[] = (int) $v;
             }
 //            $this->_value[] = array_values($value);
         } elseif (isset($value)) {
@@ -182,7 +182,7 @@ 
      */
     public function addOption($value, $name = ''): void
     {
-        if ('' != $name) {
+        if (''!=$name) {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -218,7 +218,7 @@ 
         }
         $value = [];
         foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode>1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
         }
 
         return $value;
@@ -235,18 +235,18 @@ 
         $ele_title   = $this->getTitle();
         $ele_value   = $this->getValue();
         $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+        $ret         = '<select size="'.$this->getSize().'"'.$this->getExtra();
         if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
         foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+            $ret .= '<option value="'.\htmlspecialchars((string) $value, \ENT_QUOTES).'"';
+            if (\count($ele_value)>0 && \in_array($value, $ele_value, true)) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $name . '</option>';
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
 

class/Form/SelectSongForm.php

Indentation +218 added lines, -218 removed lines

@@ -50,240 +50,240 @@
  */
 class SelectSongForm extends \XoopsFormElement
 {
-    /**
-     * Options
-     *
-     * @var array
-     */
-    public $_options = [];
-    /**
-     * Allow multiple selections?
-     *
-     * @var bool
-     */
-    public $_multiple = false;
-    /**
-     * Number of rows. "1" makes a dropdown list.
-     *
-     * @var int
-     */
-    public $_size;
-    /**
-     * Pre-selcted values
-     *
-     * @var array
-     */
-    public $_value = [];
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	public $_options = [];
+	/**
+	 * Allow multiple selections?
+	 *
+	 * @var bool
+	 */
+	public $_multiple = false;
+	/**
+	 * Number of rows. "1" makes a dropdown list.
+	 *
+	 * @var int
+	 */
+	public $_size;
+	/**
+	 * Pre-selcted values
+	 *
+	 * @var array
+	 */
+	public $_value = [];
 
-    /**
-     * Constructor
-     *
-     * @param string $caption  Caption
-     * @param string $name     "name" attribute
-     * @param mixed  $value    Pre-selected value (or array of them).
-     * @param int    $size     Number or rows. "1" makes a drop-down-list
-     * @param bool   $multiple Allow multiple selections?
-     * @param int    $id
-     * @param string $field
-     */
-    public function __construct($caption, $name, $value = null, $size = 1, $multiple = false, $id = -1, $field = 'cid')
-    {
-        global $_form_object_options;
-        \xoops_loadLanguage('modinfo', 'songlist');
+	/**
+	 * Constructor
+	 *
+	 * @param string $caption  Caption
+	 * @param string $name     "name" attribute
+	 * @param mixed  $value    Pre-selected value (or array of them).
+	 * @param int    $size     Number or rows. "1" makes a drop-down-list
+	 * @param bool   $multiple Allow multiple selections?
+	 * @param int    $id
+	 * @param string $field
+	 */
+	public function __construct($caption, $name, $value = null, $size = 1, $multiple = false, $id = -1, $field = 'cid')
+	{
+		global $_form_object_options;
+		\xoops_loadLanguage('modinfo', 'songlist');
 
-        $this->setCaption($caption);
-        $this->setName($name);
-        $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
-        if (isset($value)) {
-            $this->setValue($value);
-        }
-        $this->addOption('0', \_MI_SONGLIST_NONE);
-        if (-1 == $id) {
-            if (!isset($_form_object_options['songs'][$field][$id])) {
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
-                $criteria     = new \Criteria('');
-                $criteria->setSort('title');
-                $criteria->setOrder('ASC');
-                foreach ($songsHandler->getObjects($criteria, true) as $id => $obj) {
-                    $_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
-                }
-            }
-        } elseif (!isset($_form_object_options['songs'][$field][$id])) {
-                $songsHandler = Helper::getInstance()->getHandler('Songs');
-                $criteria     = new \Criteria('`' . $field . '`', $id);
-                $criteria->setSort('title');
-                $criteria->setOrder('ASC');
-                foreach ($songsHandler->getObjects($criteria) as $id => $obj) {
-                    $_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
-                }
-        }
-        if (isset($_form_object_options['songs'][$field][$id])) {
-            foreach ($_form_object_options['songs'][$field][$id] as $id => $value) {
-                $this->addOption($id, $value);
-            }
-        }
-    }
+		$this->setCaption($caption);
+		$this->setName($name);
+		$this->_multiple = $multiple;
+		$this->_size     = (int)$size;
+		if (isset($value)) {
+			$this->setValue($value);
+		}
+		$this->addOption('0', \_MI_SONGLIST_NONE);
+		if (-1 == $id) {
+			if (!isset($_form_object_options['songs'][$field][$id])) {
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
+				$criteria     = new \Criteria('');
+				$criteria->setSort('title');
+				$criteria->setOrder('ASC');
+				foreach ($songsHandler->getObjects($criteria, true) as $id => $obj) {
+					$_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
+				}
+			}
+		} elseif (!isset($_form_object_options['songs'][$field][$id])) {
+				$songsHandler = Helper::getInstance()->getHandler('Songs');
+				$criteria     = new \Criteria('`' . $field . '`', $id);
+				$criteria->setSort('title');
+				$criteria->setOrder('ASC');
+				foreach ($songsHandler->getObjects($criteria) as $id => $obj) {
+					$_form_object_options['songs'][$field][$id][$id] = $obj->getVar('title');
+				}
+		}
+		if (isset($_form_object_options['songs'][$field][$id])) {
+			foreach ($_form_object_options['songs'][$field][$id] as $id => $value) {
+				$this->addOption($id, $value);
+			}
+		}
+	}
 
-    /**
-     * Are multiple selections allowed?
-     *
-     * @return bool
-     */
-    public function isMultiple(): bool
-    {
-        return $this->_multiple;
-    }
+	/**
+	 * Are multiple selections allowed?
+	 *
+	 * @return bool
+	 */
+	public function isMultiple(): bool
+	{
+		return $this->_multiple;
+	}
 
-    /**
-     * Get the size
-     *
-     * @return int
-     */
-    public function getSize(): int
-    {
-        return $this->_size;
-    }
+	/**
+	 * Get the size
+	 *
+	 * @return int
+	 */
+	public function getSize(): int
+	{
+		return $this->_size;
+	}
 
-    /**
-     * Get an array of pre-selected values
-     *
-     * @param bool $encode To sanitizer the text?
-     * @return array
-     */
-    public function getValue($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_value;
-        }
-        $value = [];
-        foreach ($this->_value as $val) {
-            $value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
-        }
+	/**
+	 * Get an array of pre-selected values
+	 *
+	 * @param bool $encode To sanitizer the text?
+	 * @return array
+	 */
+	public function getValue($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_value;
+		}
+		$value = [];
+		foreach ($this->_value as $val) {
+			$value[] = $val ? \htmlspecialchars($val, \ENT_QUOTES) : $val;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Set pre-selected values
-     *
-     * @param mixed $value
-     */
-    public function setValue($value): void
-    {
-        if (\is_array($value)) {
-            foreach ($value as $v) {
-                $this->_value[] = (int)$v;
-            }
+	/**
+	 * Set pre-selected values
+	 *
+	 * @param mixed $value
+	 */
+	public function setValue($value): void
+	{
+		if (\is_array($value)) {
+			foreach ($value as $v) {
+				$this->_value[] = (int)$v;
+			}
 //            $this->_value[] = array_values($value);
-        } elseif (isset($value)) {
-            $this->_value[] = $value;
-        }
-    }
+		} elseif (isset($value)) {
+			$this->_value[] = $value;
+		}
+	}
 
-    /**
-     * Add an option
-     *
-     * @param string $value "value" attribute
-     * @param string $name  "name" attribute
-     */
-    public function addOption($value, $name = ''): void
-    {
-        if ('' != $name) {
-            $this->_options[$value] = $name;
-        } else {
-            $this->_options[$value] = $value;
-        }
-    }
+	/**
+	 * Add an option
+	 *
+	 * @param string $value "value" attribute
+	 * @param string $name  "name" attribute
+	 */
+	public function addOption($value, $name = ''): void
+	{
+		if ('' != $name) {
+			$this->_options[$value] = $name;
+		} else {
+			$this->_options[$value] = $value;
+		}
+	}
 
-    /**
-     * Add multiple options
-     *
-     * @param array $options Associative array of value->name pairs
-     */
-    public function addOptionArray($options): void
-    {
-        if (\is_array($options)) {
-            foreach ($options as $k => $v) {
-                $this->addOption($k, $v);
-            }
-        }
-    }
+	/**
+	 * Add multiple options
+	 *
+	 * @param array $options Associative array of value->name pairs
+	 */
+	public function addOptionArray($options): void
+	{
+		if (\is_array($options)) {
+			foreach ($options as $k => $v) {
+				$this->addOption($k, $v);
+			}
+		}
+	}
 
-    /**
-     * Get an array with all the options
-     *
-     * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
-     *
-     * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
-     * @return array Associative array of value->name pairs
-     */
-    public function getOptions($encode = false): array
-    {
-        if (!$encode) {
-            return $this->_options;
-        }
-        $value = [];
-        foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
-        }
+	/**
+	 * Get an array with all the options
+	 *
+	 * Note: both name and value should be sanitized. However for backward compatibility, only value is sanitized for now.
+	 *
+	 * @param bool|int $encode To sanitizer the text? potential values: 0 - skip; 1 - only for value; 2 - for both value and name
+	 * @return array Associative array of value->name pairs
+	 */
+	public function getOptions($encode = false): array
+	{
+		if (!$encode) {
+			return $this->_options;
+		}
+		$value = [];
+		foreach ($this->_options as $val => $name) {
+			$value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+		}
 
-        return $value;
-    }
+		return $value;
+	}
 
-    /**
-     * Prepare HTML for output
-     *
-     * @return string HTML
-     */
-    public function render(): string
-    {
-        $ele_name    = $this->getName();
-        $ele_title   = $this->getTitle();
-        $ele_value   = $this->getValue();
-        $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
-        if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
-        } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
-        }
-        foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
-                $ret .= ' selected';
-            }
-            $ret .= '>' . $name . '</option>';
-        }
-        $ret .= '</select>';
+	/**
+	 * Prepare HTML for output
+	 *
+	 * @return string HTML
+	 */
+	public function render(): string
+	{
+		$ele_name    = $this->getName();
+		$ele_title   = $this->getTitle();
+		$ele_value   = $this->getValue();
+		$ele_options = $this->getOptions();
+		$ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+		if ($this->isMultiple()) {
+			$ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+		} else {
+			$ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+		}
+		foreach ($ele_options as $value => $name) {
+			$ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
+			if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+				$ret .= ' selected';
+			}
+			$ret .= '>' . $name . '</option>';
+		}
+		$ret .= '</select>';
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Render custom javascript validation code
-     *
-     * @seealso XoopsForm::renderValidationJS
-     */
-    public function renderValidationJS()
-    {
-        // render custom validation code if any
-        if (!empty($this->customValidationCode)) {
-            return \implode("\n", $this->customValidationCode);
-            // generate validation code if required
-        }
+	/**
+	 * Render custom javascript validation code
+	 *
+	 * @seealso XoopsForm::renderValidationJS
+	 */
+	public function renderValidationJS()
+	{
+		// render custom validation code if any
+		if (!empty($this->customValidationCode)) {
+			return \implode("\n", $this->customValidationCode);
+			// generate validation code if required
+		}
 
-        if ($this->isRequired()) {
-            $eltname    = $this->getName();
-            $eltcaption = $this->getCaption();
-            $eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
-            $eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
+		if ($this->isRequired()) {
+			$eltname    = $this->getName();
+			$eltcaption = $this->getCaption();
+			$eltmsg     = empty($eltcaption) ? \sprintf(_FORM_ENTER, $eltname) : \sprintf(_FORM_ENTER, $eltcaption);
+			$eltmsg     = \str_replace('"', '\"', \stripslashes($eltmsg));
 
-            return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
-                   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
-                   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
-        }
+			return "\nvar hasSelected = false; var selectBox = myform.{$eltname};"
+				   . 'for (i = 0; i < selectBox.options.length; i++ ) { if (selectBox.options[i].selected === true) { hasSelected = true; break; } }'
+				   . "if (!hasSelected) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
+		}
 
-        return '';
-    }
+		return '';
+	}
 }

Spacing +12 added lines, -12 removed lines

@@ -94,12 +94,12 @@ 
         $this->setCaption($caption);
         $this->setName($name);
         $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
+        $this->_size     = (int) $size;
         if (isset($value)) {
             $this->setValue($value);
         }
         $this->addOption('0', \_MI_SONGLIST_NONE);
-        if (-1 == $id) {
+        if (-1==$id) {
             if (!isset($_form_object_options['songs'][$field][$id])) {
                 $songsHandler = Helper::getInstance()->getHandler('Songs');
                 $criteria     = new \Criteria('');
@@ -111,7 +111,7 @@ 
             }
         } elseif (!isset($_form_object_options['songs'][$field][$id])) {
                 $songsHandler = Helper::getInstance()->getHandler('Songs');
-                $criteria     = new \Criteria('`' . $field . '`', $id);
+                $criteria     = new \Criteria('`'.$field.'`', $id);
                 $criteria->setSort('title');
                 $criteria->setOrder('ASC');
                 foreach ($songsHandler->getObjects($criteria) as $id => $obj) {
@@ -173,7 +173,7 @@ 
     {
         if (\is_array($value)) {
             foreach ($value as $v) {
-                $this->_value[] = (int)$v;
+                $this->_value[] = (int) $v;
             }
 //            $this->_value[] = array_values($value);
         } elseif (isset($value)) {
@@ -189,7 +189,7 @@ 
      */
     public function addOption($value, $name = ''): void
     {
-        if ('' != $name) {
+        if (''!=$name) {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -225,7 +225,7 @@ 
         }
         $value = [];
         foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode>1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
         }
 
         return $value;
@@ -242,18 +242,18 @@ 
         $ele_title   = $this->getTitle();
         $ele_value   = $this->getValue();
         $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+        $ret         = '<select size="'.$this->getSize().'"'.$this->getExtra();
         if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
         foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+            $ret .= '<option value="'.\htmlspecialchars((string) $value, \ENT_QUOTES).'"';
+            if (\count($ele_value)>0 && \in_array($value, $ele_value, true)) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $name . '</option>';
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';