XoopsModules25x / songlist

class/Artists.php

Indentation +146 added lines, -146 removed lines

@@ -12,150 +12,150 @@
  */
 class Artists extends \XoopsObject
 {
-    public $aid;
-    public $cids;
-    public $sids;
-    public $name;
-    public $albums;
-    public $songs;
-    public $hits;
-    public $rank;
-    public $votes;
-    public $created;
-    public $updated;
-
-    /**
-     * Artists constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('aid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $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::getFormArtists($this, $as_array);
-    }
-
-    /**
-     * @param bool $extra
-     * @return array
-     */
-    public function toArray($extra = false): 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));
-            }
-        }
-
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
-        $ret['url']  = $this->getURL(true);
-
-        \xoops_loadLanguage('enum', 'songlist');
-        if (!empty($ret['singer'])) {
-            $ret['singer'] = \constant($ret['singer']);
-        }
-
-        if (!$extra) {
-            return $ret;
-        }
-
-        if (0 != \count($this->getVar('cids'))) {
-            $categoriesHandler = Helper::getInstance()->getHandler('Category');
-            foreach ($this->getVar('cids') as $aid) {
-                $category = $categoriesHandler->get($aid);
-                if (\is_object($category)) {
-                    $ret['categories_array'][$aid] = $category->toArray(false);
-                }
-            }
-        }
-
-        if (\is_array($this->getVar('aids')) && 0 != \count($this->getVar('aids'))) {
-            $artistsHandler = Helper::getInstance()->getHandler('Artists');
-            foreach ($this->getVar('aids') as $aid) {
-                $artist = $artistsHandler->get($aid);
-                if (\is_object($artist)) {
-                    $ret['artists_array'][$aid] = $artist->toArray(false);
-                }
-            }
-        }
-
-        if (0 != \count($this->getVar('sids'))) {
-            $songsHandler = Helper::getInstance()->getHandler('Songs');
-            $criteria     = new \Criteria('aids', '%"' . $this->getVar('aid') . '"%', 'LIKE');
-            $criteria->setSort('songid');
-            $criteria->setOrder('ASC');
-            foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
-                if (\is_object($song)) {
-                    $ret['songs_array'][$sid] = $song->toArray(false);
-                }
-            }
-        }
-
-        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 != $id) {
-                $artistHandler = Helper::getInstance()->getHandler('Artists');
-                $artist        = $artistHandler->get($id);
-                if (\is_object($artist) && !$artist->isNew()) {
-                    return XOOPS_URL
-                           . '/'
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
-                           . '/artists/'
-                           . \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'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-            }
-
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/artists.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
-    }
+	public $aid;
+	public $cids;
+	public $sids;
+	public $name;
+	public $albums;
+	public $songs;
+	public $hits;
+	public $rank;
+	public $votes;
+	public $created;
+	public $updated;
+
+	/**
+	 * Artists constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('aid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$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::getFormArtists($this, $as_array);
+	}
+
+	/**
+	 * @param bool $extra
+	 * @return array
+	 */
+	public function toArray($extra = false): 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));
+			}
+		}
+
+		$ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+		$ret['url']  = $this->getURL(true);
+
+		\xoops_loadLanguage('enum', 'songlist');
+		if (!empty($ret['singer'])) {
+			$ret['singer'] = \constant($ret['singer']);
+		}
+
+		if (!$extra) {
+			return $ret;
+		}
+
+		if (0 != \count($this->getVar('cids'))) {
+			$categoriesHandler = Helper::getInstance()->getHandler('Category');
+			foreach ($this->getVar('cids') as $aid) {
+				$category = $categoriesHandler->get($aid);
+				if (\is_object($category)) {
+					$ret['categories_array'][$aid] = $category->toArray(false);
+				}
+			}
+		}
+
+		if (\is_array($this->getVar('aids')) && 0 != \count($this->getVar('aids'))) {
+			$artistsHandler = Helper::getInstance()->getHandler('Artists');
+			foreach ($this->getVar('aids') as $aid) {
+				$artist = $artistsHandler->get($aid);
+				if (\is_object($artist)) {
+					$ret['artists_array'][$aid] = $artist->toArray(false);
+				}
+			}
+		}
+
+		if (0 != \count($this->getVar('sids'))) {
+			$songsHandler = Helper::getInstance()->getHandler('Songs');
+			$criteria     = new \Criteria('aids', '%"' . $this->getVar('aid') . '"%', 'LIKE');
+			$criteria->setSort('songid');
+			$criteria->setOrder('ASC');
+			foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
+				if (\is_object($song)) {
+					$ret['songs_array'][$sid] = $song->toArray(false);
+				}
+			}
+		}
+
+		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 != $id) {
+				$artistHandler = Helper::getInstance()->getHandler('Artists');
+				$artist        = $artistHandler->get($id);
+				if (\is_object($artist) && !$artist->isNew()) {
+					return XOOPS_URL
+						   . '/'
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
+						   . '/artists/'
+						   . \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'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/artists.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+	}
 }

class/Genre.php

Indentation +84 added lines, -84 removed lines

@@ -12,94 +12,94 @@
  */
 class Genre extends \XoopsObject
 {
-    public $gid;
-    public $name;
-    public $artists;
-    public $albums;
-    public $songs;
-    public $hits;
-    public $rank;
-    public $votes;
-    public $created;
-    public $updated;
+	public $gid;
+	public $name;
+	public $artists;
+	public $albums;
+	public $songs;
+	public $hits;
+	public $rank;
+	public $votes;
+	public $created;
+	public $updated;
 
-    /**
-     * Genre constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('gid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
+	/**
+	 * Genre constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('gid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$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::getFormGenre($this, $as_array);
-    }
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormGenre($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));
-            }
-        }
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+	/**
+	 * @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));
+			}
+		}
+		$ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
 
-        return $ret;
-    }
+		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
-                   . '/'
-                   . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('name')))
-                   . '/'
-                   . $op
-                   . '-'
-                   . $fct
-                   . '-'
-                   . $this->getVar('gid')
-                   . '-'
-                   . \urlencode($value)
-                   . '-'
-                   . $gid
-                   . '-'
-                   . $cid
-                   . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
+	/**
+	 * @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
+				   . '/'
+				   . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('name')))
+				   . '/'
+				   . $op
+				   . '-'
+				   . $fct
+				   . '-'
+				   . $this->getVar('gid')
+				   . '-'
+				   . \urlencode($value)
+				   . '-'
+				   . $gid
+				   . '-'
+				   . $cid
+				   . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $this->getVar('gid') . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid;
-    }
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $this->getVar('gid') . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&cid=' . $cid;
+	}
 }

class/Requests.php

Indentation +60 added lines, -60 removed lines

@@ -15,68 +15,68 @@
  */
 class Requests extends XoopsObject
 {
-    public $rid;
-    public $aid;
-    public $artist;
-    public $album;
-    public $title;
-    public $lyrics;
-    public $uid;
-    public $name;
-    public $email;
-    public $songid;
-    public $sid;
-    public $created;
-    public $updated;
+	public $rid;
+	public $aid;
+	public $artist;
+	public $album;
+	public $title;
+	public $lyrics;
+	public $uid;
+	public $name;
+	public $email;
+	public $songid;
+	public $sid;
+	public $created;
+	public $updated;
 
-    /**
-     * Requests constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('rid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('artist', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('album', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('lyrics', \XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('email', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('songid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
-        $this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
+	/**
+	 * Requests constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('rid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('artist', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('album', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('lyrics', \XOBJ_DTYPE_OTHER, null, false);
+		$this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('email', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('songid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
+		$this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
+		$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::getFormRequests($this, $as_array);
-    }
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormRequests($this, $as_array);
+	}
 
-    /**
-     * @return array
-     */
-    public function toArray(): array
-    {
-        $ret            = parent::toArray();
-        $form           = $this->getForm(true);
-        $form['songid'] = new XoopsFormText('', $this->getVar('rid') . '[songid]', 11, 32);
-        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 array
+	 */
+	public function toArray(): array
+	{
+		$ret            = parent::toArray();
+		$form           = $this->getForm(true);
+		$form['songid'] = new XoopsFormText('', $this->getVar('rid') . '[songid]', 11, 32);
+		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;
-    }
+		return $ret;
+	}
 }

class/Category.php

Indentation +98 added lines, -98 removed lines

@@ -9,110 +9,110 @@
  */
 class Category extends \XoopsObject
 {
-    public $cid;
-    public $pid;
-    public $weight;
-    public $name;
-    public $description;
-    public $image;
-    public $path;
-    public $artists;
-    public $albums;
-    public $songs;
-    public $hits;
-    public $rank;
-    public $votes;
-    public $created;
-    public $updated;
+	public $cid;
+	public $pid;
+	public $weight;
+	public $name;
+	public $description;
+	public $image;
+	public $path;
+	public $artists;
+	public $albums;
+	public $songs;
+	public $hits;
+	public $rank;
+	public $votes;
+	public $created;
+	public $updated;
 
-    /**
-     * Category constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('pid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('weight', \XOBJ_DTYPE_INT, 1, false);
-        $this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('description', \XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
-    }
+	/**
+	 * Category constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('pid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('weight', \XOBJ_DTYPE_INT, 1, false);
+		$this->initVar('name', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('description', \XOBJ_DTYPE_OTHER, null, false);
+		$this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('albums', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$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::getFormCategory($this, $as_array);
-    }
+	/**
+	 * @param bool $as_array
+	 * @return array|string
+	 */
+	public function getForm($as_array = false)
+	{
+		return FormController::getFormCategory($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));
-            }
-        }
-        $ret['picture']  = $this->getImage('image', false);
-        $ret['rank']     = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
-        $ret['url']      = $this->getURL();
-        $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-        if ($categoryHandler->getCount(new \Criteria('pid', $this->getVar('cid')))) {
-            foreach ($categoryHandler->getObjects(new \Criteria('pid', $this->getVar('cid')), true) as $cid => $cat) {
-                $ret['subcategories'][$cid] = $cat->toArray();
-            }
-        }
+	/**
+	 * @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));
+			}
+		}
+		$ret['picture']  = $this->getImage('image', false);
+		$ret['rank']     = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+		$ret['url']      = $this->getURL();
+		$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+		if ($categoryHandler->getCount(new \Criteria('pid', $this->getVar('cid')))) {
+			foreach ($categoryHandler->getObjects(new \Criteria('pid', $this->getVar('cid')), true) as $cid => $cat) {
+				$ret['subcategories'][$cid] = $cat->toArray();
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * @param string $field
-     * @param bool   $local
-     * @return bool|string
-     */
-    public function getImage($field = 'image', $local = false)
-    {
-        if ('' == $this->getVar($field)) {
-            return false;
-        }
-        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
-            return false;
-        }
-        if (!$local) {
-            return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
-        }
+	/**
+	 * @param string $field
+	 * @param bool   $local
+	 * @return bool|string
+	 */
+	public function getImage($field = 'image', $local = false)
+	{
+		if ('' == $this->getVar($field)) {
+			return false;
+		}
+		if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
+			return false;
+		}
+		if (!$local) {
+			return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
+		}
 
-        return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
-    }
+		return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
+	}
 
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=category&fct=set&id=' . $this->getVar('cid') . '&value=' . \urlencode($file ?? '') . '&gid=' . $gid . '&cid=' . $cid;
-    }
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=category&fct=set&id=' . $this->getVar('cid') . '&value=' . \urlencode($file ?? '') . '&gid=' . $gid . '&cid=' . $cid;
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -68,13 +68,13 @@ 
             $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));
             }
         }
         $ret['picture']  = $this->getImage('image', false);
-        $ret['rank']     = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+        $ret['rank']     = \number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2).\_MI_SONGLIST_OFTEN;
         $ret['url']      = $this->getURL();
         $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
         if ($categoryHandler->getCount(new \Criteria('pid', $this->getVar('cid')))) {
@@ -93,17 +93,17 @@ 
      */
     public function getImage($field = 'image', $local = false)
     {
-        if ('' == $this->getVar($field)) {
+        if (''==$this->getVar($field)) {
             return false;
         }
-        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
+        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path').$this->getVar($field)))) {
             return false;
         }
         if (!$local) {
-            return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
+            return XOOPS_URL.'/'.\str_replace(DS, '/', $this->getVar('path')).$this->getVar($field);
         }
 
-        return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
+        return XOOPS_ROOT_PATH.DS.$this->getVar('path').$this->getVar($field);
     }
 
     /**
@@ -113,6 +113,6 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
 
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=category&fct=set&id=' . $this->getVar('cid') . '&value=' . \urlencode($file ?? '') . '&gid=' . $gid . '&cid=' . $cid;
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op=category&fct=set&id='.$this->getVar('cid').'&value='.\urlencode($file ?? '').'&gid='.$gid.'&cid='.$cid;
     }
 }

class/Songs.php

Indentation +182 added lines, -182 removed lines

@@ -16,186 +16,186 @@
  */
 class Songs extends XoopsObject
 {
-    public $sid;
-    public $cid;
-    public $gids;
-    public $vcid;
-    public $aids;
-    public $abid;
-    public $songid;
-    public $traxid;
-    public $title;
-    public $lyrics;
-    public $hits;
-    public $rank;
-    public $votes;
-    public $tags;
-    public $mp3;
-    public $created;
-    public $updated;
-
-    /**
-     * Songs constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('gids', \XOBJ_DTYPE_ARRAY, 0, false);
-        $this->initVar('vcid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
-        $this->initVar('traxid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
-        $this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('lyrics', \XOBJ_DTYPE_OTHER, null, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('tags', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('mp3', \XOBJ_DTYPE_OTHER, null, false, 500);
-        $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::getFormSongs($this, $as_array);
-    }
-
-    /**
-     * @param bool $extra
-     * @return array
-     */
-    public function toArray($extra = true): array
-    {
-        $ret = parent::toArray();
-
-        $GLOBALS['myts'] = MyTextSanitizer::getInstance();
-
-        $ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true);
-
-        $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));
-            }
-        }
-
-        $ret['url'] = $this->getURL();
-
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
-
-        if (!empty($ret['mp3'])) {
-            $ret['mp3'] = '<embed flashvars="playerID=1&amp;bg=0xf8f8f8&amp;leftbg=0x3786b3&amp;lefticon=0x78bee3&amp;rightbg=0x3786b3&amp;rightbghover=0x78bee3&amp;righticon=0x78bee3&amp;righticonhover=0x3786b3&amp;text=0x666666&amp;slider=0x3786b3&amp;track=0xcccccc&amp;border=0x666666&amp;loader=0x78bee3&amp;loop=no&amp;soundFile='
-                          . $ret['mp3']
-                          . "\" quality='high' menu='false' wmode='transparent' pluginspage='https://www.macromedia.com/go/getflashplayer' src='"
-                          . XOOPS_URL
-                          . "/images/form/player.swf'  width=290 height=24 type='application/x-shockwave-flash'></embed>";
-        }
-
-        $helper = Helper::getInstance();
-        if (1 == $helper->getConfig('tags')
-            && \class_exists(\XoopsModules\Tag\Tagbar::class)
-            && \xoops_isActiveModule('tag')) {
-            $tagbarObj     = new \XoopsModules\Tag\Tagbar();
-            $ret['tagbar'] = $tagbarObj->getTagbar($this->getVar('sid'), $this->getVar('cid'));
-        }
-
-        $extrasHandler     = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
-        $fieldHandler      = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Field');
-        $visibilityHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Visibility');
-
-        $extras = $extrasHandler->get($this->getVar('sid'));
-        if ($extras) {
-            if (\is_object($GLOBALS['xoopsUser'])) {
-                $fields_id = $visibilityHandler->getVisibleFields([], $GLOBALS['xoopsUser']->getGroups());
-            } elseif (!\is_object($GLOBALS['xoopsUser'])) {
-                $fields_id = $visibilityHandler->getVisibleFields([], []);
-            }
-
-            if (\count($fields_id) > 0) {
-                $criteria = new Criteria('field_id', '(' . \implode(',', $fields_id) . ')', 'IN');
-                $criteria->setSort('field_weight');
-                $fields = $fieldHandler->getObjects($criteria, true);
-                foreach ($fields as $id => $field) {
-                    if (\in_array($this->getVar('cid'), $field->getVar('cids'), true)) {
-                        $ret['fields'][$id]['title'] = $field->getVar('field_title');
-                        if (\is_object($GLOBALS['xoopsUser'])) {
-                            $ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras));
-                        } elseif (!\is_object($GLOBALS['xoopsUser'])) {
-                            $ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name')));
-                        }
-                    }
-                }
-            }
-        }
-
-        if (!$extra) {
-            return $ret;
-        }
-
-        if (0 != $this->getVar('cid')) {
-            $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-            $category        = $categoryHandler->get($this->getVar('cid'));
-            $ret['category'] = $category->toArray(false);
-        }
-
-        if (0 != \count($this->getVar('gids'))) {
-            $i            = 0;
-            $genreHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
-            $ret['genre'] = '';
-            $genres       = $genreHandler->getObjects(new Criteria('gid', '(' . \implode(',', $this->getVar('gids')) . ')', 'IN'), true);
-            foreach ($genres as $gid => $genre) {
-                $ret['genre_array'][$gid] = $genre->toArray(false);
-                ++$i;
-                $ret['genre'] .= $genre->getVar('name') . ($i < \count($genres) ? ', ' : '');
-            }
-        }
-        if (0 != $this->getVar('vcid')) {
-            $voiceHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
-            $voice        = $voiceHandler->get($this->getVar('vcid'));
-            $ret['voice'] = $voice->toArray(false);
-        }
-
-        if (0 != \count($this->getVar('aids'))) {
-            $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-            foreach ($this->getVar('aids') as $aid) {
-                $artist                     = $artistsHandler->get($aid);
-                $ret['artists_array'][$aid] = $artist->toArray(false);
-            }
-        }
-
-        if (0 != $this->getVar('abid')) {
-            $albumsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-            $albums        = $albumsHandler->get($this->getVar('abid'));
-            if (null !== $albums) {
-                $ret['albums'] = $albums->toArray(false);
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $vcid, $gid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/index/' . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('title'))) . '/item-item-' . $this->getVar('sid') . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/index.php?op=item&fct=item&id=' . $this->getVar('sid') . '&value=' . \urlencode($value ?? '') . '&vcid=' . $vcid . '&gid=' . $gid . '&cid=' . $cid;
-    }
+	public $sid;
+	public $cid;
+	public $gids;
+	public $vcid;
+	public $aids;
+	public $abid;
+	public $songid;
+	public $traxid;
+	public $title;
+	public $lyrics;
+	public $hits;
+	public $rank;
+	public $votes;
+	public $tags;
+	public $mp3;
+	public $created;
+	public $updated;
+
+	/**
+	 * Songs constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('gids', \XOBJ_DTYPE_ARRAY, 0, false);
+		$this->initVar('vcid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
+		$this->initVar('traxid', \XOBJ_DTYPE_TXTBOX, null, false, 32);
+		$this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('lyrics', \XOBJ_DTYPE_OTHER, null, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('tags', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('mp3', \XOBJ_DTYPE_OTHER, null, false, 500);
+		$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::getFormSongs($this, $as_array);
+	}
+
+	/**
+	 * @param bool $extra
+	 * @return array
+	 */
+	public function toArray($extra = true): array
+	{
+		$ret = parent::toArray();
+
+		$GLOBALS['myts'] = MyTextSanitizer::getInstance();
+
+		$ret['lyrics'] = $GLOBALS['myts']->displayTarea($this->getVar('lyrics'), true, true, true, true, true);
+
+		$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));
+			}
+		}
+
+		$ret['url'] = $this->getURL();
+
+		$ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+
+		if (!empty($ret['mp3'])) {
+			$ret['mp3'] = '<embed flashvars="playerID=1&amp;bg=0xf8f8f8&amp;leftbg=0x3786b3&amp;lefticon=0x78bee3&amp;rightbg=0x3786b3&amp;rightbghover=0x78bee3&amp;righticon=0x78bee3&amp;righticonhover=0x3786b3&amp;text=0x666666&amp;slider=0x3786b3&amp;track=0xcccccc&amp;border=0x666666&amp;loader=0x78bee3&amp;loop=no&amp;soundFile='
+						  . $ret['mp3']
+						  . "\" quality='high' menu='false' wmode='transparent' pluginspage='https://www.macromedia.com/go/getflashplayer' src='"
+						  . XOOPS_URL
+						  . "/images/form/player.swf'  width=290 height=24 type='application/x-shockwave-flash'></embed>";
+		}
+
+		$helper = Helper::getInstance();
+		if (1 == $helper->getConfig('tags')
+			&& \class_exists(\XoopsModules\Tag\Tagbar::class)
+			&& \xoops_isActiveModule('tag')) {
+			$tagbarObj     = new \XoopsModules\Tag\Tagbar();
+			$ret['tagbar'] = $tagbarObj->getTagbar($this->getVar('sid'), $this->getVar('cid'));
+		}
+
+		$extrasHandler     = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
+		$fieldHandler      = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Field');
+		$visibilityHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Visibility');
+
+		$extras = $extrasHandler->get($this->getVar('sid'));
+		if ($extras) {
+			if (\is_object($GLOBALS['xoopsUser'])) {
+				$fields_id = $visibilityHandler->getVisibleFields([], $GLOBALS['xoopsUser']->getGroups());
+			} elseif (!\is_object($GLOBALS['xoopsUser'])) {
+				$fields_id = $visibilityHandler->getVisibleFields([], []);
+			}
+
+			if (\count($fields_id) > 0) {
+				$criteria = new Criteria('field_id', '(' . \implode(',', $fields_id) . ')', 'IN');
+				$criteria->setSort('field_weight');
+				$fields = $fieldHandler->getObjects($criteria, true);
+				foreach ($fields as $id => $field) {
+					if (\in_array($this->getVar('cid'), $field->getVar('cids'), true)) {
+						$ret['fields'][$id]['title'] = $field->getVar('field_title');
+						if (\is_object($GLOBALS['xoopsUser'])) {
+							$ret['fields'][$id]['value'] = htmlspecialchars_decode($field->getOutputValue($GLOBALS['xoopsUser'], $extras));
+						} elseif (!\is_object($GLOBALS['xoopsUser'])) {
+							$ret['fields'][$id]['value'] = htmlspecialchars_decode($extras->getVar($field->getVar('field_name')));
+						}
+					}
+				}
+			}
+		}
+
+		if (!$extra) {
+			return $ret;
+		}
+
+		if (0 != $this->getVar('cid')) {
+			$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+			$category        = $categoryHandler->get($this->getVar('cid'));
+			$ret['category'] = $category->toArray(false);
+		}
+
+		if (0 != \count($this->getVar('gids'))) {
+			$i            = 0;
+			$genreHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
+			$ret['genre'] = '';
+			$genres       = $genreHandler->getObjects(new Criteria('gid', '(' . \implode(',', $this->getVar('gids')) . ')', 'IN'), true);
+			foreach ($genres as $gid => $genre) {
+				$ret['genre_array'][$gid] = $genre->toArray(false);
+				++$i;
+				$ret['genre'] .= $genre->getVar('name') . ($i < \count($genres) ? ', ' : '');
+			}
+		}
+		if (0 != $this->getVar('vcid')) {
+			$voiceHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
+			$voice        = $voiceHandler->get($this->getVar('vcid'));
+			$ret['voice'] = $voice->toArray(false);
+		}
+
+		if (0 != \count($this->getVar('aids'))) {
+			$artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+			foreach ($this->getVar('aids') as $aid) {
+				$artist                     = $artistsHandler->get($aid);
+				$ret['artists_array'][$aid] = $artist->toArray(false);
+			}
+		}
+
+		if (0 != $this->getVar('abid')) {
+			$albumsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+			$albums        = $albumsHandler->get($this->getVar('abid'));
+			if (null !== $albums) {
+				$ret['albums'] = $albums->toArray(false);
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $vcid, $gid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/index/' . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('title'))) . '/item-item-' . $this->getVar('sid') . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/index.php?op=item&fct=item&id=' . $this->getVar('sid') . '&value=' . \urlencode($value ?? '') . '&vcid=' . $vcid . '&gid=' . $gid . '&cid=' . $cid;
+	}
 }

Spacing +16 added lines, -16 removed lines

@@ -6,7 +6,7 @@ 
 use MyTextSanitizer;
 use XoopsObject;
 
-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;
@@ -85,7 +85,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));
             }
@@ -93,7 +93,7 @@ 
 
         $ret['url'] = $this->getURL();
 
-        $ret['rank'] = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+        $ret['rank'] = \number_format(($this->getVar('rank')>0 && $this->getVar('votes')>0 ? $this->getVar('rank')/$this->getVar('votes') : 0), 2).\_MI_SONGLIST_OFTEN;
 
         if (!empty($ret['mp3'])) {
             $ret['mp3'] = '<embed flashvars="playerID=1&amp;bg=0xf8f8f8&amp;leftbg=0x3786b3&amp;lefticon=0x78bee3&amp;rightbg=0x3786b3&amp;rightbghover=0x78bee3&amp;righticon=0x78bee3&amp;righticonhover=0x3786b3&amp;text=0x666666&amp;slider=0x3786b3&amp;track=0xcccccc&amp;border=0x666666&amp;loader=0x78bee3&amp;loop=no&amp;soundFile='
@@ -104,7 +104,7 @@ 
         }
 
         $helper = Helper::getInstance();
-        if (1 == $helper->getConfig('tags')
+        if (1==$helper->getConfig('tags')
             && \class_exists(\XoopsModules\Tag\Tagbar::class)
             && \xoops_isActiveModule('tag')) {
             $tagbarObj     = new \XoopsModules\Tag\Tagbar();
@@ -123,8 +123,8 @@ 
                 $fields_id = $visibilityHandler->getVisibleFields([], []);
             }
 
-            if (\count($fields_id) > 0) {
-                $criteria = new Criteria('field_id', '(' . \implode(',', $fields_id) . ')', 'IN');
+            if (\count($fields_id)>0) {
+                $criteria = new Criteria('field_id', '('.\implode(',', $fields_id).')', 'IN');
                 $criteria->setSort('field_weight');
                 $fields = $fieldHandler->getObjects($criteria, true);
                 foreach ($fields as $id => $field) {
@@ -144,30 +144,30 @@ 
             return $ret;
         }
 
-        if (0 != $this->getVar('cid')) {
+        if (0!=$this->getVar('cid')) {
             $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
             $category        = $categoryHandler->get($this->getVar('cid'));
             $ret['category'] = $category->toArray(false);
         }
 
-        if (0 != \count($this->getVar('gids'))) {
+        if (0!=\count($this->getVar('gids'))) {
             $i            = 0;
             $genreHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
             $ret['genre'] = '';
-            $genres       = $genreHandler->getObjects(new Criteria('gid', '(' . \implode(',', $this->getVar('gids')) . ')', 'IN'), true);
+            $genres       = $genreHandler->getObjects(new Criteria('gid', '('.\implode(',', $this->getVar('gids')).')', 'IN'), true);
             foreach ($genres as $gid => $genre) {
                 $ret['genre_array'][$gid] = $genre->toArray(false);
                 ++$i;
-                $ret['genre'] .= $genre->getVar('name') . ($i < \count($genres) ? ', ' : '');
+                $ret['genre'] .= $genre->getVar('name').($i<\count($genres) ? ', ' : '');
             }
         }
-        if (0 != $this->getVar('vcid')) {
+        if (0!=$this->getVar('vcid')) {
             $voiceHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
             $voice        = $voiceHandler->get($this->getVar('vcid'));
             $ret['voice'] = $voice->toArray(false);
         }
 
-        if (0 != \count($this->getVar('aids'))) {
+        if (0!=\count($this->getVar('aids'))) {
             $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
             foreach ($this->getVar('aids') as $aid) {
                 $artist                     = $artistsHandler->get($aid);
@@ -175,10 +175,10 @@ 
             }
         }
 
-        if (0 != $this->getVar('abid')) {
+        if (0!=$this->getVar('abid')) {
             $albumsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
             $albums        = $albumsHandler->get($this->getVar('abid'));
-            if (null !== $albums) {
+            if (null!==$albums) {
                 $ret['albums'] = $albums->toArray(false);
             }
         }
@@ -193,9 +193,9 @@ 
     {
         global $file, $op, $fct, $id, $value, $vcid, $gid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/index/' . \urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('title'))) . '/item-item-' . $this->getVar('sid') . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/index/'.\urlencode(\str_replace([' ', \chr(9)], '-', $this->getVar('title'))).'/item-item-'.$this->getVar('sid').$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/index.php?op=item&fct=item&id=' . $this->getVar('sid') . '&value=' . \urlencode($value ?? '') . '&vcid=' . $vcid . '&gid=' . $gid . '&cid=' . $cid;
+        return XOOPS_URL.'/modules/songlist/index.php?op=item&fct=item&id='.$this->getVar('sid').'&value='.\urlencode($value ?? '').'&vcid='.$vcid.'&gid='.$gid.'&cid='.$cid;
     }
 }

class/Albums.php

Indentation +165 added lines, -165 removed lines

@@ -12,169 +12,169 @@
  */
 class Albums extends \XoopsObject
 {
-    public $abid;
-    public $cid;
-    public $aids;
-    public $sids;
-    public $title;
-    public $image;
-    public $path;
-    public $artists;
-    public $songs;
-    public $hits;
-    public $rank;
-    public $votes;
-    public $created;
-    public $updated;
-
-    /**
-     * Albums constructor.
-     * @param null $fid
-     */
-    public function __construct($fid = null)
-    {
-        $this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
-        $this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
-        $this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 255);
-        $this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
-        $this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
-        $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::getFormAlbums($this, $as_array);
-    }
-
-    /**
-     * @param bool $extra
-     * @return array
-     */
-    public function toArray($extra = true): 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));
-            }
-        }
-        $ret['picture'] = $this->getImage('image', false);
-        $ret['rank']    = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
-        $ret['url']     = $this->getURL(true);
-
-        if (!$extra) {
-            return $ret;
-        }
-
-        if (0 != $this->getVar('cid')) {
-            $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-            $category        = $categoryHandler->get($this->getVar('cid'));
-            if (\is_object($category)) {
-                $ret['category'] = $category->toArray(false);
-            }
-        }
-
-        if (0 != \count($this->getVar('aids'))) {
-            $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-            foreach ($this->getVar('aids') as $aid) {
-                $artist = $artistsHandler->get($aid);
-                if (\is_object($artist)) {
-                    $ret['artists_array'][$aid] = $artist->toArray(false);
-                }
-            }
-        }
-
-        if (0 != \count($this->getVar('sids'))) {
-            $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-            $criteria     = new \Criteria('sid', '(' . \implode(',', $this->getVar('sids')) . ')', 'IN');
-            $criteria->setSort('traxid');
-            $criteria->setOrder('ASC');
-            foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
-                if (\is_object($song)) {
-                    $ret['songs_array'][$sid] = $song->toArray(false);
-                }
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param string $field
-     * @param bool   $local
-     * @return bool|string
-     */
-    public function getImage($field = 'image', $local = false)
-    {
-        if ('' == $this->getVar($field)) {
-            return false;
-        }
-        if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
-            return false;
-        }
-        if (!$local) {
-            return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
-        }
-
-        return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
-    }
-
-    /**
-     * @return string
-     */
-    public function getURL(): string
-    {
-        global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $id) {
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-                $artist        = $artistHandler->get($id);
-                if (\is_object($artist) && !$artist->isNew()) {
-                    return XOOPS_URL
-                           . '/'
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
-                           . '/albums/'
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('title')))
-                           . '/'
-                           . $start
-                           . '-'
-                           . $id
-                           . '-'
-                           . $op
-                           . '-'
-                           . $fct
-                           . '-'
-                           . $gid
-                           . '-'
-                           . $cid
-                           . '/'
-                           . \urlencode($value)
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
-                }
-
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-            }
-
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
-        }
-
-        return XOOPS_URL . '/modules/songlist/albums.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
-    }
+	public $abid;
+	public $cid;
+	public $aids;
+	public $sids;
+	public $title;
+	public $image;
+	public $path;
+	public $artists;
+	public $songs;
+	public $hits;
+	public $rank;
+	public $votes;
+	public $created;
+	public $updated;
+
+	/**
+	 * Albums constructor.
+	 * @param null $fid
+	 */
+	public function __construct($fid = null)
+	{
+		$this->initVar('abid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('cid', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('aids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('sids', \XOBJ_DTYPE_ARRAY, [], false);
+		$this->initVar('title', \XOBJ_DTYPE_TXTBOX, null, false, 128);
+		$this->initVar('image', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('path', \XOBJ_DTYPE_TXTBOX, null, false, 255);
+		$this->initVar('artists', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('songs', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('hits', \XOBJ_DTYPE_INT, 0, false);
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
+		$this->initVar('votes', \XOBJ_DTYPE_INT, 0, false);
+		$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::getFormAlbums($this, $as_array);
+	}
+
+	/**
+	 * @param bool $extra
+	 * @return array
+	 */
+	public function toArray($extra = true): 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));
+			}
+		}
+		$ret['picture'] = $this->getImage('image', false);
+		$ret['rank']    = \number_format(($this->getVar('rank') > 0 && $this->getVar('votes') > 0 ? $this->getVar('rank') / $this->getVar('votes') : 0), 2) . \_MI_SONGLIST_OFTEN;
+		$ret['url']     = $this->getURL(true);
+
+		if (!$extra) {
+			return $ret;
+		}
+
+		if (0 != $this->getVar('cid')) {
+			$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+			$category        = $categoryHandler->get($this->getVar('cid'));
+			if (\is_object($category)) {
+				$ret['category'] = $category->toArray(false);
+			}
+		}
+
+		if (0 != \count($this->getVar('aids'))) {
+			$artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+			foreach ($this->getVar('aids') as $aid) {
+				$artist = $artistsHandler->get($aid);
+				if (\is_object($artist)) {
+					$ret['artists_array'][$aid] = $artist->toArray(false);
+				}
+			}
+		}
+
+		if (0 != \count($this->getVar('sids'))) {
+			$songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
+			$criteria     = new \Criteria('sid', '(' . \implode(',', $this->getVar('sids')) . ')', 'IN');
+			$criteria->setSort('traxid');
+			$criteria->setOrder('ASC');
+			foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
+				if (\is_object($song)) {
+					$ret['songs_array'][$sid] = $song->toArray(false);
+				}
+			}
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param string $field
+	 * @param bool   $local
+	 * @return bool|string
+	 */
+	public function getImage($field = 'image', $local = false)
+	{
+		if ('' == $this->getVar($field)) {
+			return false;
+		}
+		if (!\file_exists($GLOBALS['xoops']->path($this->getVar('path') . $this->getVar($field)))) {
+			return false;
+		}
+		if (!$local) {
+			return XOOPS_URL . '/' . \str_replace(DS, '/', $this->getVar('path')) . $this->getVar($field);
+		}
+
+		return XOOPS_ROOT_PATH . DS . $this->getVar('path') . $this->getVar($field);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getURL(): string
+	{
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
+			if (0 != $id) {
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+				$artist        = $artistHandler->get($id);
+				if (\is_object($artist) && !$artist->isNew()) {
+					return XOOPS_URL
+						   . '/'
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
+						   . '/albums/'
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('title')))
+						   . '/'
+						   . $start
+						   . '-'
+						   . $id
+						   . '-'
+						   . $op
+						   . '-'
+						   . $fct
+						   . '-'
+						   . $gid
+						   . '-'
+						   . $cid
+						   . '/'
+						   . \urlencode($value)
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
+				}
+
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+			}
+
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/albums/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+		}
+
+		return XOOPS_URL . '/modules/songlist/albums.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+	}
 }