XoopsModules25x / songlist

class/Utf8mapHandler.php

Indentation +85 added lines, -85 removed lines

@@ -17,98 +17,98 @@
  */
 class Utf8mapHandler extends XoopsPersistableObjectHandler
 {
-    /**
-     * Utf8mapHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_utf8map', Utf8map::class, 'utfid', 'from');
-    }
+	/**
+	 * Utf8mapHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_utf8map', Utf8map::class, 'utfid', 'from');
+	}
 
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['utfid', 'from', 'to', 'created', 'updated'];
-    }
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['utfid', 'from', 'to', '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]));
-            }
-        }
+	/**
+	 * @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;
-    }
+		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();
-        }
+	/**
+	 * @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 ' ';
-    }
+		return ' ';
+	}
 
-    /**
-     * @param bool $force
-     * @return mixed
-     */
-    public function insert(XoopsObject $obj, $force = true)
-    {
-        if ($obj->isNew()) {
-            $obj->setVar('created', \time());
-        } else {
-            $obj->setVar('updated', \time());
-        }
+	/**
+	 * @param bool $force
+	 * @return mixed
+	 */
+	public function insert(XoopsObject $obj, $force = true)
+	{
+		if ($obj->isNew()) {
+			$obj->setVar('created', \time());
+		} else {
+			$obj->setVar('updated', \time());
+		}
 
-        return parent::insert($obj, $force);
-    }
+		return parent::insert($obj, $force);
+	}
 
-    /**
-     * @param string $phrase
-     * @param null   $criteria
-     * @return string|string[]
-     */
-    public function convert($phrase = '', $criteria = null)
-    {
-        foreach ($this->getObjects($criteria, true) as $utfid => $utf8) {
-            $phrase = \str_replace(mb_strtolower($utf8->getVar('from')), \mb_strtolower($utf8->getVar('to')), $phrase);
-            $phrase = \str_replace(mb_strtoupper($utf8->getVar('from')), \mb_strtoupper($utf8->getVar('to')), $phrase);
-        }
+	/**
+	 * @param string $phrase
+	 * @param null   $criteria
+	 * @return string|string[]
+	 */
+	public function convert($phrase = '', $criteria = null)
+	{
+		foreach ($this->getObjects($criteria, true) as $utfid => $utf8) {
+			$phrase = \str_replace(mb_strtolower($utf8->getVar('from')), \mb_strtolower($utf8->getVar('to')), $phrase);
+			$phrase = \str_replace(mb_strtoupper($utf8->getVar('from')), \mb_strtoupper($utf8->getVar('to')), $phrase);
+		}
 
-        return $phrase;
-    }
+		return $phrase;
+	}
 }

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 use XoopsObject;
 use XoopsPersistableObjectHandler;
 
-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;
 
@@ -46,15 +46,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]));

class/Genre.php

Indentation +74 added lines, -74 removed lines

@@ -11,83 +11,83 @@
  */
 class Genre extends \XoopsObject
 {
-    /**
-     * 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;
+	}
 }

Spacing +4 added lines, -4 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;
 
@@ -49,12 +49,12 @@ 
             $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['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;
 
         return $ret;
     }
@@ -88,6 +88,6 @@ 
                    . $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/ExtrasHandler.php

Indentation +209 added lines, -209 removed lines

@@ -11,213 +11,213 @@
  */
 class ExtrasHandler extends XoopsPersistableObjectHandler
 {
-    /**
-     * holds reference to {@link ObjectsFieldHandler} object
-     */
-    public $_fHandler;
-    /**
-     * Array of {@link XoopsObjectsField} objects
-     * @var array
-     */
-    public $_fields = [];
-
-    /**
-     * ExtrasHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_extra', Extras::class, 'sid');
-        $this->_fHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Field');
-    }
-
-    /**
-     * create a new {@link Extras}
-     *
-     * @param bool $isNew Flag the new objects as "new"?
-     *
-     * @return object {@link Extras}
-     */
-    public function &create($isNew = true): object
-    {
-        $obj          = new $this->className($this->loadFields());
-        $obj->handler = $this;
-        $obj->setNew();
-
-        return $obj;
-    }
-
-    /**
-     * Get a {@link Extras}
-     *
-     * @param null $id
-     * @param null $fields
-     * @return object <a href='psi_element://Extras'>Extras</a>
-     */
-    public function get($id = null, $fields = null): object //get($uid, $createOnFailure = true)
-    {
-        if (null === $fields) {
-            $fields = true;
-        }
-        $obj = parent::get($id);
-        if (!\is_object($obj) && $fields) {
-            $obj = $this->create();
-        }
-
-        return $obj;
-    }
-
-    /**
-     * Create new {@link ObjectsField} object
-     *
-     * @param bool $isNew
-     *
-     * @return object
-     */
-    public function &createField($isNew = true): object
-    {
-        $return = $this->_fHandler->create($isNew);
-
-        return $return;
-    }
-
-    /**
-     * Load field information
-     *
-     * @return array|false
-     */
-    public function loadFields()
-    {
-        if (0 == \count($this->_fields)) {
-            $this->_fields = $this->_fHandler->loadFields();
-        }
-
-        return (0 == $this->_fields || empty($this->_fields) ? false : $this->_fields);
-    }
-
-    /**
-     * @return array
-     */
-    public function getPostVars(): array
-    {
-        return ['sid', 'cid', 'gid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
-    }
-
-    /**
-     * @param      $criteria
-     * @param bool $id_as_key
-     * @param bool $as_object
-     * @return array
-     */
-    public function getFields($criteria, $id_as_key = true, $as_object = true): array
-    {
-        return $this->_fHandler->getObjects($criteria, $id_as_key, $as_object);
-    }
-
-    /**
-     * Insert a field in the database
-     *
-     * @param XoopsObject $field
-     * @param bool   $force
-     * @return mixed|void
-     */
-    public function insertField($field, $force = false)
-    {
-        return $this->_fHandler->insert($field, $force);
-    }
-
-    /**
-     * Delete a field from the database
-     *
-     * @param XoopsObject $field
-     * @param bool   $force
-     * @return bool
-     */
-    public function deleteField($field, $force = false)
-    {
-        return $this->_fHandler->delete($field, $force);
-    }
-
-    /**
-     * Save a new field in the database
-     *
-     * @param array $vars array of variables, taken from $module->loadInfo('Extras')['field']
-     * @param int   $weight
-     * @return string
-     * @internal param int $categoryid ID of the category to add it to
-     * @internal param int $type valuetype of the field
-     * @internal param int $moduleid ID of the module, this field belongs to
-     */
-    public function saveField($vars, $weight = 0): string
-    {
-        $field = $this->createField();
-        $field->setVar('field_name', $vars['name']);
-        $field->setVar('field_valuetype', $vars['valuetype']);
-        $field->setVar('field_type', $vars['type']);
-        $field->setVar('field_weight', $weight);
-        if (isset($vars['title'])) {
-            $field->setVar('field_title', $vars['title']);
-        }
-        if (isset($vars['description'])) {
-            $field->setVar('field_description', $vars['description']);
-        }
-        if (isset($vars['required'])) {
-            $field->setVar('field_required', $vars['required']); //0 = no, 1 = yes
-        }
-        if (isset($vars['maxlength'])) {
-            $field->setVar('field_maxlength', $vars['maxlength']);
-        }
-        if (isset($vars['default'])) {
-            $field->setVar('field_default', $vars['default']);
-        }
-        if (isset($vars['notnull'])) {
-            $field->setVar('field_notnull', $vars['notnull']);
-        }
-        if (isset($vars['show'])) {
-            $field->setVar('field_show', $vars['show']);
-        }
-        if (isset($vars['edit'])) {
-            $field->setVar('field_edit', $vars['edit']);
-        }
-        if (isset($vars['config'])) {
-            $field->setVar('field_config', $vars['config']);
-        }
-        if (isset($vars['options'])) {
-            $field->setVar('field_options', $vars['options']);
-        } else {
-            $field->setVar('field_options', []);
-        }
-        if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
-        } else {
-            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. ' . \implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
-        }
-        unset($field);
-
-        return $msg;
-    }
-
-    /**
-     * insert a new object in the database
-     *
-     * @param \XoopsObject $obj         reference to the object
-     * @param bool         $force       whether to force the query execution despite security settings
-     * @param bool         $checkObject check if the object is dirty and clean the attributes
-     *
-     * @return bool FALSE if failed, TRUE if already present and unchanged or successful
-     */
-    public function insert(XoopsObject $obj, $force = false, $checkObject = true): bool
-    {
-        $uservars = $this->getPostVars();
-        foreach ($uservars as $var) {
-            if ('sid' != $var) {
-                unset($obj->vars[$var]);
-            }
-        }
-        if (0 == \count($obj->vars)) {
-            return true;
-        }
-
-        return (bool)parent::insert($obj, $force, $checkObject);
-    }
+	/**
+	 * holds reference to {@link ObjectsFieldHandler} object
+	 */
+	public $_fHandler;
+	/**
+	 * Array of {@link XoopsObjectsField} objects
+	 * @var array
+	 */
+	public $_fields = [];
+
+	/**
+	 * ExtrasHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_extra', Extras::class, 'sid');
+		$this->_fHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Field');
+	}
+
+	/**
+	 * create a new {@link Extras}
+	 *
+	 * @param bool $isNew Flag the new objects as "new"?
+	 *
+	 * @return object {@link Extras}
+	 */
+	public function &create($isNew = true): object
+	{
+		$obj          = new $this->className($this->loadFields());
+		$obj->handler = $this;
+		$obj->setNew();
+
+		return $obj;
+	}
+
+	/**
+	 * Get a {@link Extras}
+	 *
+	 * @param null $id
+	 * @param null $fields
+	 * @return object <a href='psi_element://Extras'>Extras</a>
+	 */
+	public function get($id = null, $fields = null): object //get($uid, $createOnFailure = true)
+	{
+		if (null === $fields) {
+			$fields = true;
+		}
+		$obj = parent::get($id);
+		if (!\is_object($obj) && $fields) {
+			$obj = $this->create();
+		}
+
+		return $obj;
+	}
+
+	/**
+	 * Create new {@link ObjectsField} object
+	 *
+	 * @param bool $isNew
+	 *
+	 * @return object
+	 */
+	public function &createField($isNew = true): object
+	{
+		$return = $this->_fHandler->create($isNew);
+
+		return $return;
+	}
+
+	/**
+	 * Load field information
+	 *
+	 * @return array|false
+	 */
+	public function loadFields()
+	{
+		if (0 == \count($this->_fields)) {
+			$this->_fields = $this->_fHandler->loadFields();
+		}
+
+		return (0 == $this->_fields || empty($this->_fields) ? false : $this->_fields);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getPostVars(): array
+	{
+		return ['sid', 'cid', 'gid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
+	}
+
+	/**
+	 * @param      $criteria
+	 * @param bool $id_as_key
+	 * @param bool $as_object
+	 * @return array
+	 */
+	public function getFields($criteria, $id_as_key = true, $as_object = true): array
+	{
+		return $this->_fHandler->getObjects($criteria, $id_as_key, $as_object);
+	}
+
+	/**
+	 * Insert a field in the database
+	 *
+	 * @param XoopsObject $field
+	 * @param bool   $force
+	 * @return mixed|void
+	 */
+	public function insertField($field, $force = false)
+	{
+		return $this->_fHandler->insert($field, $force);
+	}
+
+	/**
+	 * Delete a field from the database
+	 *
+	 * @param XoopsObject $field
+	 * @param bool   $force
+	 * @return bool
+	 */
+	public function deleteField($field, $force = false)
+	{
+		return $this->_fHandler->delete($field, $force);
+	}
+
+	/**
+	 * Save a new field in the database
+	 *
+	 * @param array $vars array of variables, taken from $module->loadInfo('Extras')['field']
+	 * @param int   $weight
+	 * @return string
+	 * @internal param int $categoryid ID of the category to add it to
+	 * @internal param int $type valuetype of the field
+	 * @internal param int $moduleid ID of the module, this field belongs to
+	 */
+	public function saveField($vars, $weight = 0): string
+	{
+		$field = $this->createField();
+		$field->setVar('field_name', $vars['name']);
+		$field->setVar('field_valuetype', $vars['valuetype']);
+		$field->setVar('field_type', $vars['type']);
+		$field->setVar('field_weight', $weight);
+		if (isset($vars['title'])) {
+			$field->setVar('field_title', $vars['title']);
+		}
+		if (isset($vars['description'])) {
+			$field->setVar('field_description', $vars['description']);
+		}
+		if (isset($vars['required'])) {
+			$field->setVar('field_required', $vars['required']); //0 = no, 1 = yes
+		}
+		if (isset($vars['maxlength'])) {
+			$field->setVar('field_maxlength', $vars['maxlength']);
+		}
+		if (isset($vars['default'])) {
+			$field->setVar('field_default', $vars['default']);
+		}
+		if (isset($vars['notnull'])) {
+			$field->setVar('field_notnull', $vars['notnull']);
+		}
+		if (isset($vars['show'])) {
+			$field->setVar('field_show', $vars['show']);
+		}
+		if (isset($vars['edit'])) {
+			$field->setVar('field_edit', $vars['edit']);
+		}
+		if (isset($vars['config'])) {
+			$field->setVar('field_config', $vars['config']);
+		}
+		if (isset($vars['options'])) {
+			$field->setVar('field_options', $vars['options']);
+		} else {
+			$field->setVar('field_options', []);
+		}
+		if ($this->insertField($field)) {
+			$msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
+		} else {
+			$msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. ' . \implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
+		}
+		unset($field);
+
+		return $msg;
+	}
+
+	/**
+	 * insert a new object in the database
+	 *
+	 * @param \XoopsObject $obj         reference to the object
+	 * @param bool         $force       whether to force the query execution despite security settings
+	 * @param bool         $checkObject check if the object is dirty and clean the attributes
+	 *
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
+	 */
+	public function insert(XoopsObject $obj, $force = false, $checkObject = true): bool
+	{
+		$uservars = $this->getPostVars();
+		foreach ($uservars as $var) {
+			if ('sid' != $var) {
+				unset($obj->vars[$var]);
+			}
+		}
+		if (0 == \count($obj->vars)) {
+			return true;
+		}
+
+		return (bool)parent::insert($obj, $force, $checkObject);
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
      */
     public function get($id = null, $fields = null): object //get($uid, $createOnFailure = true)
     {
-        if (null === $fields) {
+        if (null===$fields) {
             $fields = true;
         }
         $obj = parent::get($id);
@@ -88,11 +88,11 @@ 
      */
     public function loadFields()
     {
-        if (0 == \count($this->_fields)) {
+        if (0==\count($this->_fields)) {
             $this->_fields = $this->_fHandler->loadFields();
         }
 
-        return (0 == $this->_fields || empty($this->_fields) ? false : $this->_fields);
+        return (0==$this->_fields || empty($this->_fields) ? false : $this->_fields);
     }
 
     /**
@@ -188,9 +188,9 @@ 
             $field->setVar('field_options', []);
         }
         if ($this->insertField($field)) {
-            $msg = '&nbsp;&nbsp;Field <b>' . $vars['name'] . '</b> added to the database';
+            $msg = '&nbsp;&nbsp;Field <b>'.$vars['name'].'</b> added to the database';
         } else {
-            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>' . $vars['name'] . '</b> into the database. ' . \implode(' ', $field->getErrors()) . $this->db->error() . '</span>';
+            $msg = '&nbsp;&nbsp;<span style="color:#ff0000;">ERROR: Could not insert field <b>'.$vars['name'].'</b> into the database. '.\implode(' ', $field->getErrors()).$this->db->error().'</span>';
         }
         unset($field);
 
@@ -210,14 +210,14 @@ 
     {
         $uservars = $this->getPostVars();
         foreach ($uservars as $var) {
-            if ('sid' != $var) {
+            if ('sid'!=$var) {
                 unset($obj->vars[$var]);
             }
         }
-        if (0 == \count($obj->vars)) {
+        if (0==\count($obj->vars)) {
             return true;
         }
 
-        return (bool)parent::insert($obj, $force, $checkObject);
+        return (bool) parent::insert($obj, $force, $checkObject);
     }
 }

class/CategoryHandler.php

Indentation +180 added lines, -180 removed lines

@@ -7,165 +7,165 @@ 
  */
 class CategoryHandler extends \XoopsPersistableObjectHandler
 {
-    /**
-     * CategoryHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_category', Category::class, 'cid', 'name');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['cid', 'pid', 'weight', 'name', 'image', 'path', '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 int $pid
-     * @return mixed
-     */
-    public function GetCatAndSubCat($pid = 0)
-    {
-        $categories  = $this->getObjects(new \Criteria('pid', $pid), true);
-        $langs_array = $this->TreeIDs([], $categories, -1);
-
-        return $langs_array;
-    }
-
-    /**
-     * @param $langs_array
-     * @param $categories
-     * @param $level
-     * @return mixed
-     */
-    private function TreeIDs($langs_array, $categories, $level)
-    {
-        foreach ($categories as $catid => $category) {
-            $langs_array[$catid] = $catid;
-            $categoriesb         = $this->getObjects(new \Criteria('pid', $catid), true);
-            if ($categoriesb) {
-                $langs_array = $this->TreeIDs($langs_array, $categoriesb, $level);
-            }
-        }
-
-        return $langs_array;
-    }
-
-    /**
-     * @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'])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $id;
-                $GLOBALS['xoopsDB']->queryF($sql);
-            }
-        }
-
-        return $this->_objects['object'][$id];
-    }
-
-    /**
-     * @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 `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
-
-        return $GLOBALS['xoopsDB']->queryF($sql);
-    }
-
-    /**
-     * @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'])) {
+	/**
+	 * CategoryHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_category', Category::class, 'cid', 'name');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['cid', 'pid', 'weight', 'name', 'image', 'path', '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 int $pid
+	 * @return mixed
+	 */
+	public function GetCatAndSubCat($pid = 0)
+	{
+		$categories  = $this->getObjects(new \Criteria('pid', $pid), true);
+		$langs_array = $this->TreeIDs([], $categories, -1);
+
+		return $langs_array;
+	}
+
+	/**
+	 * @param $langs_array
+	 * @param $categories
+	 * @param $level
+	 * @return mixed
+	 */
+	private function TreeIDs($langs_array, $categories, $level)
+	{
+		foreach ($categories as $catid => $category) {
+			$langs_array[$catid] = $catid;
+			$categoriesb         = $this->getObjects(new \Criteria('pid', $catid), true);
+			if ($categoriesb) {
+				$langs_array = $this->TreeIDs($langs_array, $categoriesb, $level);
+			}
+		}
+
+		return $langs_array;
+	}
+
+	/**
+	 * @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'])) {
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $id;
+				$GLOBALS['xoopsDB']->queryF($sql);
+			}
+		}
+
+		return $this->_objects['object'][$id];
+	}
+
+	/**
+	 * @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 `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
+
+		return $GLOBALS['xoopsDB']->queryF($sql);
+	}
+
+	/**
+	 * @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) {
@@ -186,25 +186,25 @@ 
             $GLOBALS['xoopsDB']->queryF($sql);
         }*/
 
-        return $ret;
-    }
-
-    /**
-     * @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;
+	}
+
+	/**
+	 * @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 +13 added lines, -13 removed lines

@@ -36,15 +36,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]));
@@ -114,7 +114,7 @@ 
         } else {
             $obj->setVar('updated', \time());
         }
-        if ('' == $obj->getVar('name')) {
+        if (''==$obj->getVar('name')) {
             return false;
         }
 
@@ -134,7 +134,7 @@ 
         if (!isset($this->_objects['object'][$id])) {
             $this->_objects['object'][$id] = parent::get($id, $fields);
             if (!isset($GLOBALS['songlistAdmin'])) {
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $id;
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$id;
                 $GLOBALS['xoopsDB']->queryF($sql);
             }
         }
@@ -150,7 +150,7 @@ 
     public function delete(\XoopsObject $object, $force = true): bool
     {
         parent::delete($object, $force);
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('songlist_songs') . ' SET `cid` = 0 WHERE `cid` = ' . $object->getVar('cid');
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('songlist_songs').' SET `cid` = 0 WHERE `cid` = '.$object->getVar('cid');
 
         return $GLOBALS['xoopsDB']->queryF($sql);
     }
@@ -195,11 +195,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/Requests.php

Indentation +47 added lines, -47 removed lines

@@ -14,54 +14,54 @@
  */
 class Requests extends XoopsObject
 {
-    /**
-     * 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;
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -5,7 +5,7 @@ 
 use XoopsFormText;
 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;
 
@@ -51,12 +51,12 @@ 
     {
         $ret            = parent::toArray();
         $form           = $this->getForm(true);
-        $form['songid'] = new XoopsFormText('', $this->getVar('rid') . '[songid]', 11, 32);
+        $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) {
+            if ($this->getVar($key)>0) {
                 $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
                 $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
             }

class/Category.php

Indentation +83 added lines, -83 removed lines

@@ -9,94 +9,94 @@
  */
 class Category extends \XoopsObject
 {
-    /**
-     * 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

@@ -52,13 +52,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')))) {
@@ -77,17 +77,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);
     }
 
     /**
@@ -97,6 +97,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 +165 added lines, -165 removed lines

@@ -15,169 +15,169 @@
  */
 class Songs extends XoopsObject
 {
-    /**
-     * 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;
-    }
+	/**
+	 * 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;
 
@@ -66,7 +66,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));
             }
@@ -74,7 +74,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='
@@ -85,7 +85,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();
@@ -104,8 +104,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) {
@@ -125,30 +125,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);
@@ -156,10 +156,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);
             }
 
@@ -175,9 +175,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/VisibilityHandler.php

Indentation +73 added lines, -73 removed lines

@@ -27,81 +27,81 @@
  */
 class VisibilityHandler extends XoopsPersistableObjectHandler
 {
-    /**
-     * VisibilityHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_visibility', Visibility::class, 'field_id');
-    }
+	/**
+	 * VisibilityHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_visibility', Visibility::class, 'field_id');
+	}
 
-    /**
-     * get all objects matching a condition
-     *
-     * @param \CriteriaElement|null $criteria {@link \CriteriaElement} to match
-     * @param null                  $fields
-     * @param bool                  $asObject
-     * @param bool                  $id_as_key
-     * @return array of objects/array <a href='psi_element://XoopsObject'>XoopsObject</a>
-     * @internal param array $fields variables to fetch
-     * @internal param bool $asObject flag indicating as object, otherwise as array
-     * @internal param bool $id_as_key use the ID as key for the array
-     */
-    public function &getAll(CriteriaElement $criteria = null, $fields = null, $asObject = true, $id_as_key = true): array //getAll($criteria = null)
-    {
-        $limit            = null;
-        $GLOBALS['start'] = null;
-        $sql              = "SELECT * FROM `{$this->table}`";
-        if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql     .= ' ' . $criteria->renderWhere();
-            $groupby = $criteria->getGroupby();
-            if ($groupby) {
-                $sql .= ' ' . $groupby;
-            }
-            $sort = $criteria->getSort();
-            if ($sort) {
-                $sql      .= " ORDER BY {$sort} " . $criteria->getOrder();
-                $orderSet = true;
-            }
-            $limit            = $criteria->getLimit();
-            $GLOBALS['start'] = $criteria->getStart();
-        }
-        if (empty($orderSet)) {
-            $sql .= " ORDER BY `{$this->keyName}` DESC";
-        }
-        $result = $this->db->query($sql, $limit, $GLOBALS['start']);
-        $ret    = [];
-        while (false !== ($row = $this->db->fetchArray($result))) {
-            $ret[$row['field_id']][] = $row;
-        }
+	/**
+	 * get all objects matching a condition
+	 *
+	 * @param \CriteriaElement|null $criteria {@link \CriteriaElement} to match
+	 * @param null                  $fields
+	 * @param bool                  $asObject
+	 * @param bool                  $id_as_key
+	 * @return array of objects/array <a href='psi_element://XoopsObject'>XoopsObject</a>
+	 * @internal param array $fields variables to fetch
+	 * @internal param bool $asObject flag indicating as object, otherwise as array
+	 * @internal param bool $id_as_key use the ID as key for the array
+	 */
+	public function &getAll(CriteriaElement $criteria = null, $fields = null, $asObject = true, $id_as_key = true): array //getAll($criteria = null)
+	{
+		$limit            = null;
+		$GLOBALS['start'] = null;
+		$sql              = "SELECT * FROM `{$this->table}`";
+		if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
+			$sql     .= ' ' . $criteria->renderWhere();
+			$groupby = $criteria->getGroupby();
+			if ($groupby) {
+				$sql .= ' ' . $groupby;
+			}
+			$sort = $criteria->getSort();
+			if ($sort) {
+				$sql      .= " ORDER BY {$sort} " . $criteria->getOrder();
+				$orderSet = true;
+			}
+			$limit            = $criteria->getLimit();
+			$GLOBALS['start'] = $criteria->getStart();
+		}
+		if (empty($orderSet)) {
+			$sql .= " ORDER BY `{$this->keyName}` DESC";
+		}
+		$result = $this->db->query($sql, $limit, $GLOBALS['start']);
+		$ret    = [];
+		while (false !== ($row = $this->db->fetchArray($result))) {
+			$ret[$row['field_id']][] = $row;
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Get fields visible to the $user_groups on a $profile_groups profile
-     *
-     * @param array $profile_groups groups of the user to be accessed
-     * @param array $user_groups    groups of the visitor, default as $GLOBALS['xoopsUser']
-     *
-     * @return array
-     */
-    public function getVisibleFields($profile_groups, $user_groups = []): array
-    {
-        $profile_groups[] = '0';
-        $user_groups[]    = '0';
-        $profile_groups[] = $user_groups[] = 0;
-        $sql              = "SELECT field_id FROM {$this->table} WHERE profile_group IN (" . \implode(',', $profile_groups) . ')';
-        $sql              .= ' AND user_group IN (' . \implode(',', $user_groups) . ')';
-        $field_ids        = [];
-        $result           = $this->db->query($sql);
-        if ($result) {
-            while ([$field_id] = $this->db->fetchRow($result)) {
-                $field_ids[] = $field_id;
-            }
-        }
+	/**
+	 * Get fields visible to the $user_groups on a $profile_groups profile
+	 *
+	 * @param array $profile_groups groups of the user to be accessed
+	 * @param array $user_groups    groups of the visitor, default as $GLOBALS['xoopsUser']
+	 *
+	 * @return array
+	 */
+	public function getVisibleFields($profile_groups, $user_groups = []): array
+	{
+		$profile_groups[] = '0';
+		$user_groups[]    = '0';
+		$profile_groups[] = $user_groups[] = 0;
+		$sql              = "SELECT field_id FROM {$this->table} WHERE profile_group IN (" . \implode(',', $profile_groups) . ')';
+		$sql              .= ' AND user_group IN (' . \implode(',', $user_groups) . ')';
+		$field_ids        = [];
+		$result           = $this->db->query($sql);
+		if ($result) {
+			while ([$field_id] = $this->db->fetchRow($result)) {
+				$field_ids[] = $field_id;
+			}
+		}
 
-        return $field_ids;
-    }
+		return $field_ids;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -54,14 +54,14 @@ 
         $GLOBALS['start'] = null;
         $sql              = "SELECT * FROM `{$this->table}`";
         if (($criteria instanceof \CriteriaCompo) || ($criteria instanceof \Criteria)) {
-            $sql     .= ' ' . $criteria->renderWhere();
+            $sql     .= ' '.$criteria->renderWhere();
             $groupby = $criteria->getGroupby();
             if ($groupby) {
-                $sql .= ' ' . $groupby;
+                $sql .= ' '.$groupby;
             }
             $sort = $criteria->getSort();
             if ($sort) {
-                $sql      .= " ORDER BY {$sort} " . $criteria->getOrder();
+                $sql .= " ORDER BY {$sort} ".$criteria->getOrder();
                 $orderSet = true;
             }
             $limit            = $criteria->getLimit();
@@ -72,7 +72,7 @@ 
         }
         $result = $this->db->query($sql, $limit, $GLOBALS['start']);
         $ret    = [];
-        while (false !== ($row = $this->db->fetchArray($result))) {
+        while (false!==($row = $this->db->fetchArray($result))) {
             $ret[$row['field_id']][] = $row;
         }
 
@@ -92,8 +92,8 @@ 
         $profile_groups[] = '0';
         $user_groups[]    = '0';
         $profile_groups[] = $user_groups[] = 0;
-        $sql              = "SELECT field_id FROM {$this->table} WHERE profile_group IN (" . \implode(',', $profile_groups) . ')';
-        $sql              .= ' AND user_group IN (' . \implode(',', $user_groups) . ')';
+        $sql              = "SELECT field_id FROM {$this->table} WHERE profile_group IN (".\implode(',', $profile_groups).')';
+        $sql .= ' AND user_group IN ('.\implode(',', $user_groups).')';
         $field_ids        = [];
         $result           = $this->db->query($sql);
         if ($result) {

class/VotesHandler.php

Indentation +136 added lines, -136 removed lines

@@ -17,140 +17,140 @@
  */
 class VotesHandler extends XoopsPersistableObjectHandler
 {
-    /**
-     * VotesHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(XoopsDatabase $db)
-    {
-        parent::__construct($db, 'songlist_votes', Votes::class, 'vid', 'ip');
-    }
-
-    /**
-     * @return array
-     */
-    public function filterFields(): array
-    {
-        return ['vid', 'sid', 'uid', 'ip', 'netaddy', 'rank'];
-    }
-
-    /**
-     * @param string $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 string $filter
-     * @param string $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());
-        } else {
-            $obj->setVar('updated', \time());
-        }
-
-        return parent::insert($obj, $force);
-    }
-
-    /**
-     * @param int $sid
-     * @param string$value
-     * @return bool
-     */
-    public function addVote($sid, $value): bool
-    {
-        $criteria = new CriteriaCompo(new Criteria('sid', $sid));
-
-        $ip = Utility::getIPData(false);
-        if ($ip['uid'] > 0) {
-            $criteria->add(new Criteria('uid', $ip['uid']));
-        } else {
-            $criteria->add(new Criteria('ip', $ip['ip']));
-            $criteria->add(new Criteria('netaddy', $ip['network-addy']));
-        }
-
-        if (0 == $this->getCount($criteria) && $sid > 0 && $value > 0) {
-            $vote = $this->create();
-            $vote->setVar('sid', $sid);
-            $vote->setVar('uid', $ip['uid']);
-            $vote->setVar('ip', $ip['ip']);
-            $vote->setVar('netaddy', $ip['network-addy']);
-            $vote->setVar('rank', $value);
-            if ($this->insert($vote)) {
-                $songsHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
-                $albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
-                $artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
-                $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
-                $genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
-                $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
-
-                $song  = $songsHandler->get($sid);
-                $sql   = [];
-                $sql[] = 'UPDATE `' . $songsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $songsHandler->keyName . '` = ' . $sid;
-                $sql[] = 'UPDATE `' . $categoryHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $categoryHandler->keyName . '` = ' . $song->getVar($categoryHandler->keyName);
-                $sql[] = 'UPDATE `' . $genreHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $genreHandler->keyName . '` = ' . $song->getVar($genreHandler->keyName);
-                $sql[] = 'UPDATE `' . $voiceHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $voiceHandler->keyName . '` = ' . $song->getVar($voiceHandler->keyName);
-                $sql[] = 'UPDATE `' . $albumsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $albumsHandler->keyName . '` = ' . $song->getVar($albumsHandler->keyName);
-                foreach ($song->getVar('aids') as $aid) {
-                    $sql[] = 'UPDATE `' . $artistsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $artistsHandler->keyName . '` = ' . $aid;
-                }
-                foreach ($sql as $question) {
-                    $GLOBALS['xoopsDB']->queryF($question);
-                }
-                \redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_FINISHED);
-                exit(0);
-            }
-            \redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_ALREADY);
-            exit(0);
-        }
-        \redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_SOMETHINGWRONG);
-        exit(0);
-
-        return false;
-    }
+	/**
+	 * VotesHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(XoopsDatabase $db)
+	{
+		parent::__construct($db, 'songlist_votes', Votes::class, 'vid', 'ip');
+	}
+
+	/**
+	 * @return array
+	 */
+	public function filterFields(): array
+	{
+		return ['vid', 'sid', 'uid', 'ip', 'netaddy', 'rank'];
+	}
+
+	/**
+	 * @param string $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 string $filter
+	 * @param string $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());
+		} else {
+			$obj->setVar('updated', \time());
+		}
+
+		return parent::insert($obj, $force);
+	}
+
+	/**
+	 * @param int $sid
+	 * @param string$value
+	 * @return bool
+	 */
+	public function addVote($sid, $value): bool
+	{
+		$criteria = new CriteriaCompo(new Criteria('sid', $sid));
+
+		$ip = Utility::getIPData(false);
+		if ($ip['uid'] > 0) {
+			$criteria->add(new Criteria('uid', $ip['uid']));
+		} else {
+			$criteria->add(new Criteria('ip', $ip['ip']));
+			$criteria->add(new Criteria('netaddy', $ip['network-addy']));
+		}
+
+		if (0 == $this->getCount($criteria) && $sid > 0 && $value > 0) {
+			$vote = $this->create();
+			$vote->setVar('sid', $sid);
+			$vote->setVar('uid', $ip['uid']);
+			$vote->setVar('ip', $ip['ip']);
+			$vote->setVar('netaddy', $ip['network-addy']);
+			$vote->setVar('rank', $value);
+			if ($this->insert($vote)) {
+				$songsHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
+				$albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
+				$artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
+				$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
+				$genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
+				$voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
+
+				$song  = $songsHandler->get($sid);
+				$sql   = [];
+				$sql[] = 'UPDATE `' . $songsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $songsHandler->keyName . '` = ' . $sid;
+				$sql[] = 'UPDATE `' . $categoryHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $categoryHandler->keyName . '` = ' . $song->getVar($categoryHandler->keyName);
+				$sql[] = 'UPDATE `' . $genreHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $genreHandler->keyName . '` = ' . $song->getVar($genreHandler->keyName);
+				$sql[] = 'UPDATE `' . $voiceHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $voiceHandler->keyName . '` = ' . $song->getVar($voiceHandler->keyName);
+				$sql[] = 'UPDATE `' . $albumsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $albumsHandler->keyName . '` = ' . $song->getVar($albumsHandler->keyName);
+				foreach ($song->getVar('aids') as $aid) {
+					$sql[] = 'UPDATE `' . $artistsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $artistsHandler->keyName . '` = ' . $aid;
+				}
+				foreach ($sql as $question) {
+					$GLOBALS['xoopsDB']->queryF($question);
+				}
+				\redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_FINISHED);
+				exit(0);
+			}
+			\redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_ALREADY);
+			exit(0);
+		}
+		\redirect_header($_POST['uri'], 10, \_MD_SONGLIST_MSG_VOTED_SOMETHINGWRONG);
+		exit(0);
+
+		return false;
+	}
 }

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 use XoopsObject;
 use XoopsPersistableObjectHandler;
 
-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;
 
@@ -46,15 +46,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]));
@@ -107,14 +107,14 @@ 
         $criteria = new CriteriaCompo(new Criteria('sid', $sid));
 
         $ip = Utility::getIPData(false);
-        if ($ip['uid'] > 0) {
+        if ($ip['uid']>0) {
             $criteria->add(new Criteria('uid', $ip['uid']));
         } else {
             $criteria->add(new Criteria('ip', $ip['ip']));
             $criteria->add(new Criteria('netaddy', $ip['network-addy']));
         }
 
-        if (0 == $this->getCount($criteria) && $sid > 0 && $value > 0) {
+        if (0==$this->getCount($criteria) && $sid>0 && $value>0) {
             $vote = $this->create();
             $vote->setVar('sid', $sid);
             $vote->setVar('uid', $ip['uid']);
@@ -131,13 +131,13 @@ 
 
                 $song  = $songsHandler->get($sid);
                 $sql   = [];
-                $sql[] = 'UPDATE `' . $songsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $songsHandler->keyName . '` = ' . $sid;
-                $sql[] = 'UPDATE `' . $categoryHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $categoryHandler->keyName . '` = ' . $song->getVar($categoryHandler->keyName);
-                $sql[] = 'UPDATE `' . $genreHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $genreHandler->keyName . '` = ' . $song->getVar($genreHandler->keyName);
-                $sql[] = 'UPDATE `' . $voiceHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $voiceHandler->keyName . '` = ' . $song->getVar($voiceHandler->keyName);
-                $sql[] = 'UPDATE `' . $albumsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $albumsHandler->keyName . '` = ' . $song->getVar($albumsHandler->keyName);
+                $sql[] = 'UPDATE `'.$songsHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$songsHandler->keyName.'` = '.$sid;
+                $sql[] = 'UPDATE `'.$categoryHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$categoryHandler->keyName.'` = '.$song->getVar($categoryHandler->keyName);
+                $sql[] = 'UPDATE `'.$genreHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$genreHandler->keyName.'` = '.$song->getVar($genreHandler->keyName);
+                $sql[] = 'UPDATE `'.$voiceHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$voiceHandler->keyName.'` = '.$song->getVar($voiceHandler->keyName);
+                $sql[] = 'UPDATE `'.$albumsHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$albumsHandler->keyName.'` = '.$song->getVar($albumsHandler->keyName);
                 foreach ($song->getVar('aids') as $aid) {
-                    $sql[] = 'UPDATE `' . $artistsHandler->table . '` SET `rank` = `rank` + ' . $value . ', `votes` = `votes` + 1 WHERE `' . $artistsHandler->keyName . '` = ' . $aid;
+                    $sql[] = 'UPDATE `'.$artistsHandler->table.'` SET `rank` = `rank` + '.$value.', `votes` = `votes` + 1 WHERE `'.$artistsHandler->keyName.'` = '.$aid;
                 }
                 foreach ($sql as $question) {
                     $GLOBALS['xoopsDB']->queryF($question);