XoopsModules25x / songlist

class/Form/SelectArtistForm.php

Indentation +208 added lines, -208 removed lines

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

Spacing +10 added lines, -10 removed lines

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

class/Form/SelectCategoryForm.php

Indentation +260 added lines, -260 removed lines

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

Spacing +14 added lines, -14 removed lines

@@ -90,7 +90,7 @@ 
         $this->setCaption($caption);
         $this->setName($name);
         $this->_multiple = $multiple;
-        $this->_size     = (int)$size;
+        $this->_size     = (int) $size;
         if (isset($value)) {
             $this->setValue($value);
         }
@@ -111,9 +111,9 @@ 
     public function populateList($vars, $ownid = 0): void
     {
         foreach ($vars as $previd => $cats) {
-            if ($previd != $ownid || 0 == $ownid) {
+            if ($previd!=$ownid || 0==$ownid) {
                 foreach ($cats as $catid => $title) {
-                    if ($catid != $ownid || 0 == $ownid) {
+                    if ($catid!=$ownid || 0==$ownid) {
                         $this->addOption($catid, $title['item']);
                         if (isset($title['sub'])) {
                             $this->populateList($title['sub'], $ownid);
@@ -153,8 +153,8 @@ 
         ++$level;
         $categoryHandler = Helper::getInstance()->getHandler('Category');
         foreach ($categories as $catid => $category) {
-            if ($catid != $ownid) {
-                $langs_array[$previd][$catid]['item'] = \str_repeat('--', $level) . $category->getVar('name');
+            if ($catid!=$ownid) {
+                $langs_array[$previd][$catid]['item'] = \str_repeat('--', $level).$category->getVar('name');
                 $criteria                             = new \Criteria('pid', $catid);
                 $criteria->setSort('name');
                 $criteria->setOrder('ASC');
@@ -217,7 +217,7 @@ 
     {
         if (\is_array($value)) {
             foreach ($value as $v) {
-                $this->_value[] = (int)$v;
+                $this->_value[] = (int) $v;
             }
 //            $this->_value[] = array_values($value);
         } elseif (isset($value)) {
@@ -233,7 +233,7 @@ 
      */
     public function addOption($value, $name = ''): void
     {
-        if ('' != $name) {
+        if (''!=$name) {
             $this->_options[$value] = $name;
         } else {
             $this->_options[$value] = $value;
@@ -269,7 +269,7 @@ 
         }
         $value = [];
         foreach ($this->_options as $val => $name) {
-            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode > 1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
+            $value[$encode ? \htmlspecialchars($val, \ENT_QUOTES) : $val] = ($encode>1) ? \htmlspecialchars($name, \ENT_QUOTES) : $name;
         }
 
         return $value;
@@ -286,18 +286,18 @@ 
         $ele_title   = $this->getTitle();
         $ele_value   = $this->getValue();
         $ele_options = $this->getOptions();
-        $ret         = '<select size="' . $this->getSize() . '"' . $this->getExtra();
+        $ret         = '<select size="'.$this->getSize().'"'.$this->getExtra();
         if ($this->isMultiple()) {
-            $ret .= ' name="' . $ele_name . '[]" id="' . $ele_name . '" title="' . $ele_title . '" multiple="multiple">';
+            $ret .= ' name="'.$ele_name.'[]" id="'.$ele_name.'" title="'.$ele_title.'" multiple="multiple">';
         } else {
-            $ret .= ' name="' . $ele_name . '" id="' . $ele_name . '" title="' . $ele_title . '">';
+            $ret .= ' name="'.$ele_name.'" id="'.$ele_name.'" title="'.$ele_title.'">';
         }
         foreach ($ele_options as $value => $name) {
-            $ret .= '<option value="' . \htmlspecialchars((string)$value, \ENT_QUOTES) . '"';
-            if (\count($ele_value) > 0 && \in_array($value, $ele_value, true)) {
+            $ret .= '<option value="'.\htmlspecialchars((string) $value, \ENT_QUOTES).'"';
+            if (\count($ele_value)>0 && \in_array($value, $ele_value, true)) {
                 $ret .= ' selected';
             }
-            $ret .= '>' . $name . '</option>';
+            $ret .= '>'.$name.'</option>';
         }
         $ret .= '</select>';
 

class/Form/SelectVoiceForm.php

Indentation +207 added lines, -207 removed lines

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

Spacing +10 added lines, -10 removed lines

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

class/Extras.php

Indentation +22 added lines, -22 removed lines

@@ -7,28 +7,28 @@
  */
 class Extras extends \XoopsObject
 {
-    public $handler;
+	public $handler;
 
-    /**
-     * Extras constructor.
-     * @param $fields
-     */
-    public function __construct($fields)
-    {
-        $this->initVar('sid', \XOBJ_DTYPE_INT, null, true);
-        $this->init($fields);
-    }
+	/**
+	 * Extras constructor.
+	 * @param $fields
+	 */
+	public function __construct($fields)
+	{
+		$this->initVar('sid', \XOBJ_DTYPE_INT, null, true);
+		$this->init($fields);
+	}
 
-    /**
-     * Initiate variables
-     * @param array $fields field information array of {@link \XoopsObjectsField} objects
-     */
-    public function init($fields): void
-    {
-        if ($fields && \is_array($fields)) {
-            foreach (\array_keys($fields) as $key) {
-                $this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
-            }
-        }
-    }
+	/**
+	 * Initiate variables
+	 * @param array $fields field information array of {@link \XoopsObjectsField} objects
+	 */
+	public function init($fields): void
+	{
+		if ($fields && \is_array($fields)) {
+			foreach (\array_keys($fields) as $key) {
+				$this->initVar($key, $fields[$key]->getVar('field_valuetype'), $fields[$key]->getVar('field_default', 'n'), $fields[$key]->getVar('field_required'), $fields[$key]->getVar('field_maxlength'));
+			}
+		}
+	}
 }

class/Artists.php

Indentation +134 added lines, -134 removed lines

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

Spacing +11 added lines, -11 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;
 
@@ -51,13 +51,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['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(true);
 
         \xoops_loadLanguage('enum', 'songlist');
@@ -69,7 +69,7 @@ 
             return $ret;
         }
 
-        if (0 != \count($this->getVar('cids'))) {
+        if (0!=\count($this->getVar('cids'))) {
             $categoriesHandler = Helper::getInstance()->getHandler('Category');
             foreach ($this->getVar('cids') as $aid) {
                 $category = $categoriesHandler->get($aid);
@@ -79,7 +79,7 @@ 
             }
         }
 
-        if (\is_array($this->getVar('aids')) && 0 != \count($this->getVar('aids'))) {
+        if (\is_array($this->getVar('aids')) && 0!=\count($this->getVar('aids'))) {
             $artistsHandler = Helper::getInstance()->getHandler('Artists');
             foreach ($this->getVar('aids') as $aid) {
                 $artist = $artistsHandler->get($aid);
@@ -89,9 +89,9 @@ 
             }
         }
 
-        if (0 != \count($this->getVar('sids'))) {
+        if (0!=\count($this->getVar('sids'))) {
             $songsHandler = Helper::getInstance()->getHandler('Songs');
-            $criteria     = new \Criteria('aids', '%"' . $this->getVar('aid') . '"%', 'LIKE');
+            $criteria     = new \Criteria('aids', '%"'.$this->getVar('aid').'"%', 'LIKE');
             $criteria->setSort('songid');
             $criteria->setOrder('ASC');
             foreach ($songsHandler->getObjects($criteria, true) as $sid => $song) {
@@ -111,7 +111,7 @@ 
     {
         global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
-            if (0 != $id) {
+            if (0!=$id) {
                 $artistHandler = Helper::getInstance()->getHandler('Artists');
                 $artist        = $artistHandler->get($id);
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -137,12 +137,12 @@ 
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
                 }
 
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
             }
 
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/artists/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/artists/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'-'.$vcid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
         }
 
-        return XOOPS_URL . '/modules/songlist/artists.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
+        return XOOPS_URL.'/modules/songlist/artists.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
     }
 }

class/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;