Passed
Push — master ( 84c1d9...4b5f27 )
by Michael
15:53 queued 12:17
created
class/AlbumsHandler.php 2 patches
Indentation   +225 added lines, -225 removed lines patch added patch discarded remove patch
@@ -17,188 +17,188 @@  discard block
 block discarded – undo
17 17
  */
18 18
 class AlbumsHandler extends XoopsPersistableObjectHandler
19 19
 {
20
-    /**
21
-     * AlbumsHandler constructor.
22
-     * @param \XoopsDatabase $db
23
-     */
24
-    public function __construct(XoopsDatabase $db)
25
-    {
26
-        parent::__construct($db, 'songlist_albums', Albums::class, 'abid', 'title');
27
-    }
20
+	/**
21
+	 * AlbumsHandler constructor.
22
+	 * @param \XoopsDatabase $db
23
+	 */
24
+	public function __construct(XoopsDatabase $db)
25
+	{
26
+		parent::__construct($db, 'songlist_albums', Albums::class, 'abid', 'title');
27
+	}
28 28
 
29
-    /**
30
-     * @return array
31
-     */
32
-    public function filterFields(): array
33
-    {
34
-        return ['abid', 'cid', 'aids', 'sids', 'title', 'image', 'path', 'artists', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
35
-    }
29
+	/**
30
+	 * @return array
31
+	 */
32
+	public function filterFields(): array
33
+	{
34
+		return ['abid', 'cid', 'aids', 'sids', 'title', 'image', 'path', 'artists', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
35
+	}
36 36
 
37
-    /**
38
-     * @param $filter
39
-     * @return \CriteriaCompo
40
-     */
41
-    public function getFilterCriteria($filter): CriteriaCompo
42
-    {
43
-        $parts    = \explode('|', $filter);
44
-        $criteria = new CriteriaCompo();
45
-        foreach ($parts as $part) {
46
-            $var = \explode(',', $part);
47
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
48
-                $object = $this->create();
49
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
50
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
51
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
52
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
53
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
55
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
56
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
57
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
58
-                }
59
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
60
-                $criteria->add(new Criteria($var[0], $var[1]));
61
-            }
62
-        }
37
+	/**
38
+	 * @param $filter
39
+	 * @return \CriteriaCompo
40
+	 */
41
+	public function getFilterCriteria($filter): CriteriaCompo
42
+	{
43
+		$parts    = \explode('|', $filter);
44
+		$criteria = new CriteriaCompo();
45
+		foreach ($parts as $part) {
46
+			$var = \explode(',', $part);
47
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
48
+				$object = $this->create();
49
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
50
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
51
+					$criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
52
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
53
+					$criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
55
+					$criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
56
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
57
+					$criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
58
+				}
59
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
60
+				$criteria->add(new Criteria($var[0], $var[1]));
61
+			}
62
+		}
63 63
 
64
-        return $criteria;
65
-    }
64
+		return $criteria;
65
+	}
66 66
 
67
-    /**
68
-     * @param        $filter
69
-     * @param        $field
70
-     * @param string $sort
71
-     * @param string $op
72
-     * @param string $fct
73
-     * @return string
74
-     */
75
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
76
-    {
77
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
78
-        if (\is_object($ele)) {
79
-            return $ele->render();
80
-        }
67
+	/**
68
+	 * @param        $filter
69
+	 * @param        $field
70
+	 * @param string $sort
71
+	 * @param string $op
72
+	 * @param string $fct
73
+	 * @return string
74
+	 */
75
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
76
+	{
77
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
78
+		if (\is_object($ele)) {
79
+			return $ele->render();
80
+		}
81 81
 
82
-        return ' ';
83
-    }
82
+		return ' ';
83
+	}
84 84
 
85
-    /**
86
-     * @param bool $force
87
-     * @param null $object
88
-     * @return bool|mixed
89
-     */
90
-    public function insert(XoopsObject $obj, $force = true, $object = null)
91
-    {
92
-        if ($obj->isNew()) {
93
-            $new = true;
94
-            $old = $this->create();
95
-            $obj->setVar('created', \time());
96
-        } else {
97
-            $new = false;
98
-            $old = $this->get($obj->getVar('abid'));
99
-            $obj->setVar('updated', \time());
100
-        }
85
+	/**
86
+	 * @param bool $force
87
+	 * @param null $object
88
+	 * @return bool|mixed
89
+	 */
90
+	public function insert(XoopsObject $obj, $force = true, $object = null)
91
+	{
92
+		if ($obj->isNew()) {
93
+			$new = true;
94
+			$old = $this->create();
95
+			$obj->setVar('created', \time());
96
+		} else {
97
+			$new = false;
98
+			$old = $this->get($obj->getVar('abid'));
99
+			$obj->setVar('updated', \time());
100
+		}
101 101
 
102
-        $artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
103
-        $genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
104
-        $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
105
-        $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
102
+		$artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
103
+		$genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
104
+		$voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
105
+		$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
106 106
 
107
-        if ($object instanceof Songs) {
108
-            if (true === $obj->vars['cid']['changed']) {
109
-                if ($obj->vars['cid']['value'] != $old->vars['cid']['value']) {
110
-                    $category = $categoryHandler->get($obj->vars['cid']['value']);
111
-                    if (\is_object($category)) {
112
-                        $category->setVar('albums', $category->getVar('albums') + 1);
113
-                        $categoryHandler->insert($category, true, $obj);
114
-                        if (!$old->isNew() && $old->vars['cid']['value'] > 0) {
115
-                            $category = $categoryHandler->get($old->vars['cid']['value']);
116
-                            if (\is_object($category)) {
117
-                                $category->setVar('albums', $category->getVar('albums') - 1);
118
-                                $categoryHandler->insert($category, true, $obj);
119
-                            }
120
-                        }
121
-                    }
122
-                }
123
-            }
107
+		if ($object instanceof Songs) {
108
+			if (true === $obj->vars['cid']['changed']) {
109
+				if ($obj->vars['cid']['value'] != $old->vars['cid']['value']) {
110
+					$category = $categoryHandler->get($obj->vars['cid']['value']);
111
+					if (\is_object($category)) {
112
+						$category->setVar('albums', $category->getVar('albums') + 1);
113
+						$categoryHandler->insert($category, true, $obj);
114
+						if (!$old->isNew() && $old->vars['cid']['value'] > 0) {
115
+							$category = $categoryHandler->get($old->vars['cid']['value']);
116
+							if (\is_object($category)) {
117
+								$category->setVar('albums', $category->getVar('albums') - 1);
118
+								$categoryHandler->insert($category, true, $obj);
119
+							}
120
+						}
121
+					}
122
+				}
123
+			}
124 124
 
125
-            if (is_array($obj->vars['aids']['value']) && 0 != \count($obj->vars['aids']['value']) && true === $obj->vars['aids']['changed']) {
126
-                foreach ($obj->vars['aids']['value'] as $aid) {
127
-                    if (!\is_array($aid, $old->getVar('aids')) && 0 != $aid) {
128
-                        $artists = $artistsHandler->get($aid);
129
-                        if (\is_object($artists)) {
130
-                            $artists->setVar('albums', $artists->getVar('albums') + 1);
131
-                            $artistsHandler->insert($artists, true, $obj);
132
-                        }
133
-                    }
134
-                }
135
-                if (!$old->isNew()) {
136
-                    foreach ($old->getVar('aids') as $aid) {
137
-                        if (!\is_array($aid, $obj->vars['aids']['value']) && 0 != $aid) {
138
-                            $artists = $artistsHandler->get($aid);
139
-                            if (\is_object($artists)) {
140
-                                $artists->setVar('albums', $artists->getVar('albums') - 1);
141
-                                $artistsHandler->insert($artists, true, $obj);
142
-                            }
143
-                        }
144
-                    }
145
-                }
146
-            }
125
+			if (is_array($obj->vars['aids']['value']) && 0 != \count($obj->vars['aids']['value']) && true === $obj->vars['aids']['changed']) {
126
+				foreach ($obj->vars['aids']['value'] as $aid) {
127
+					if (!\is_array($aid, $old->getVar('aids')) && 0 != $aid) {
128
+						$artists = $artistsHandler->get($aid);
129
+						if (\is_object($artists)) {
130
+							$artists->setVar('albums', $artists->getVar('albums') + 1);
131
+							$artistsHandler->insert($artists, true, $obj);
132
+						}
133
+					}
134
+				}
135
+				if (!$old->isNew()) {
136
+					foreach ($old->getVar('aids') as $aid) {
137
+						if (!\is_array($aid, $obj->vars['aids']['value']) && 0 != $aid) {
138
+							$artists = $artistsHandler->get($aid);
139
+							if (\is_object($artists)) {
140
+								$artists->setVar('albums', $artists->getVar('albums') - 1);
141
+								$artistsHandler->insert($artists, true, $obj);
142
+							}
143
+						}
144
+					}
145
+				}
146
+			}
147 147
 
148
-            if (0 != $object->vars['gid']['value']??'' && true === $object->vars['gid']['changed']??'') {
149
-                $genre = $genreHandler->get($object->vars['gid']['value']);
150
-                if (\is_object($genre)) {
151
-                    $genre->setVar('albums', $genre->getVar('albums') + 1);
152
-                    $genreHandler->insert($genre, true, $obj);
153
-                }
154
-            }
155
-            if (0 != $object->vars['vid']['value']??'' && true === $object->vars['vid']['changed']??'') {
156
-                $voice = $voiceHandler->get($object->vars['vid']['value']);
157
-                if (\is_object($voice)) {
158
-                    $voice->setVar('albums', $voice->getVar('albums') + 1);
159
-                    $voiceHandler->insert($voice, true, $obj);
160
-                }
161
-            }
162
-        }
163
-        if ('' == $obj->getVar('title')) {
164
-            return false;
165
-        }
148
+			if (0 != $object->vars['gid']['value']??'' && true === $object->vars['gid']['changed']??'') {
149
+				$genre = $genreHandler->get($object->vars['gid']['value']);
150
+				if (\is_object($genre)) {
151
+					$genre->setVar('albums', $genre->getVar('albums') + 1);
152
+					$genreHandler->insert($genre, true, $obj);
153
+				}
154
+			}
155
+			if (0 != $object->vars['vid']['value']??'' && true === $object->vars['vid']['changed']??'') {
156
+				$voice = $voiceHandler->get($object->vars['vid']['value']);
157
+				if (\is_object($voice)) {
158
+					$voice->setVar('albums', $voice->getVar('albums') + 1);
159
+					$voiceHandler->insert($voice, true, $obj);
160
+				}
161
+			}
162
+		}
163
+		if ('' == $obj->getVar('title')) {
164
+			return false;
165
+		}
166 166
 
167
-        return parent::insert($obj, $force);
168
-    }
167
+		return parent::insert($obj, $force);
168
+	}
169 169
 
170
-    public $_objects = ['object' => [], 'array' => []];
170
+	public $_objects = ['object' => [], 'array' => []];
171 171
 
172
-    /**
173
-     * @param null $id
174
-     * @param null $fields
175
-     * @return \XoopsObject
176
-     */
177
-    public function get($id = null, $fields = null)//get($id, $fields = '*')
178
-    {
179
-        $fields = $fields ?: '*';
180
-        if (!isset($this->_objects['object'][$id])) {
181
-            $this->_objects['object'][$id] = parent::get($id, $fields);
182
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
183
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
184
-                $GLOBALS['xoopsDB']->queryF($sql);
185
-            }
186
-        }
172
+	/**
173
+	 * @param null $id
174
+	 * @param null $fields
175
+	 * @return \XoopsObject
176
+	 */
177
+	public function get($id = null, $fields = null)//get($id, $fields = '*')
178
+	{
179
+		$fields = $fields ?: '*';
180
+		if (!isset($this->_objects['object'][$id])) {
181
+			$this->_objects['object'][$id] = parent::get($id, $fields);
182
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
183
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
184
+				$GLOBALS['xoopsDB']->queryF($sql);
185
+			}
186
+		}
187 187
 
188
-        return $this->_objects['object'][$id];
189
-    }
188
+		return $this->_objects['object'][$id];
189
+	}
190 190
 
191
-    /**
192
-     * @param \CriteriaElement|\CriteriaCompo $criteria
193
-     * @param bool $id_as_key
194
-     * @param bool $as_object
195
-     * @return array
196
-     */
197
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
198
-    {
199
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
191
+	/**
192
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
193
+	 * @param bool $id_as_key
194
+	 * @param bool $as_object
195
+	 * @return array
196
+	 */
197
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
198
+	{
199
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
200 200
 
201
-        /* if (!isset($GLOBALS['songlistAdmin'])) {
201
+		/* if (!isset($GLOBALS['songlistAdmin'])) {
202 202
             $id = [];
203 203
             foreach($ret as $data) {
204 204
                 if ($as_object==true) {
@@ -219,69 +219,69 @@  discard block
 block discarded – undo
219 219
             $GLOBALS['xoopsDB']->queryF($sql);
220 220
         }*/
221 221
 
222
-        return $ret;
223
-    }
222
+		return $ret;
223
+	}
224 224
 
225
-    /**
226
-     * @return string
227
-     */
228
-    public function getURL(): string
229
-    {
230
-        global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
231
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
232
-            if (0 != $cid) {
233
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
234
-                $artist        = $artistHandler->get($cid);
235
-                if (\is_object($artist) && !$artist->isNew()) {
236
-                    return XOOPS_URL
237
-                           . '/'
238
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
239
-                           . '/'
240
-                           . $file
241
-                           . '/'
242
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
243
-                           . '/'
244
-                           . $start
245
-                           . '-'
246
-                           . $id
247
-                           . '-'
248
-                           . $op
249
-                           . '-'
250
-                           . $fct
251
-                           . '-'
252
-                           . $gid
253
-                           . '-'
254
-                           . $cid
255
-                           . '/'
256
-                           . \urlencode($value)
257
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
258
-                }
225
+	/**
226
+	 * @return string
227
+	 */
228
+	public function getURL(): string
229
+	{
230
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
231
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
232
+			if (0 != $cid) {
233
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
234
+				$artist        = $artistHandler->get($cid);
235
+				if (\is_object($artist) && !$artist->isNew()) {
236
+					return XOOPS_URL
237
+						   . '/'
238
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
239
+						   . '/'
240
+						   . $file
241
+						   . '/'
242
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
243
+						   . '/'
244
+						   . $start
245
+						   . '-'
246
+						   . $id
247
+						   . '-'
248
+						   . $op
249
+						   . '-'
250
+						   . $fct
251
+						   . '-'
252
+						   . $gid
253
+						   . '-'
254
+						   . $cid
255
+						   . '/'
256
+						   . \urlencode($value)
257
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
258
+				}
259 259
 
260
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
261
-            }
260
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
261
+			}
262 262
 
263
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
264
-        }
263
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
264
+		}
265 265
 
266
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
267
-    }
266
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
267
+	}
268 268
 
269
-    /**
270
-     * @param int $limit
271
-     * @return array
272
-     */
273
-    public function getTop($limit = 1): array
274
-    {
275
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
276
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
277
-        $ret     = [];
278
-        $i       = 0;
279
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
280
-            $ret[$i] = $this->create();
281
-            $ret[$i]->assignVars($row);
282
-            ++$i;
283
-        }
269
+	/**
270
+	 * @param int $limit
271
+	 * @return array
272
+	 */
273
+	public function getTop($limit = 1): array
274
+	{
275
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
276
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
277
+		$ret     = [];
278
+		$i       = 0;
279
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
280
+			$ret[$i] = $this->create();
281
+			$ret[$i]->assignVars($row);
282
+			++$i;
283
+		}
284 284
 
285
-        return $ret;
286
-    }
285
+		return $ret;
286
+	}
287 287
 }
Please login to merge, or discard this patch.
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 use XoopsObject;
9 9
 use XoopsPersistableObjectHandler;
10 10
 
11
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
11
+require_once \dirname(__DIR__).'/include/songlist.object.php';
12 12
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
13 13
 use  XoopsModules\Songlist\Form\FormController;
14 14
 
@@ -46,15 +46,15 @@  discard block
 block discarded – undo
46 46
             $var = \explode(',', $part);
47 47
             if (!empty($var[1]) && !\is_numeric($var[0])) {
48 48
                 $object = $this->create();
49
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
50
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
51
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
49
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
50
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
51
+                    $criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
52 52
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
53
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
55
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
56
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
57
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
53
+                    $criteria->add(new Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
54
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
55
+                    $criteria->add(new Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
56
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
57
+                    $criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
58 58
                 }
59 59
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
60 60
                 $criteria->add(new Criteria($var[0], $var[1]));
@@ -105,16 +105,16 @@  discard block
 block discarded – undo
105 105
         $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
106 106
 
107 107
         if ($object instanceof Songs) {
108
-            if (true === $obj->vars['cid']['changed']) {
109
-                if ($obj->vars['cid']['value'] != $old->vars['cid']['value']) {
108
+            if (true===$obj->vars['cid']['changed']) {
109
+                if ($obj->vars['cid']['value']!=$old->vars['cid']['value']) {
110 110
                     $category = $categoryHandler->get($obj->vars['cid']['value']);
111 111
                     if (\is_object($category)) {
112
-                        $category->setVar('albums', $category->getVar('albums') + 1);
112
+                        $category->setVar('albums', $category->getVar('albums')+1);
113 113
                         $categoryHandler->insert($category, true, $obj);
114
-                        if (!$old->isNew() && $old->vars['cid']['value'] > 0) {
114
+                        if (!$old->isNew() && $old->vars['cid']['value']>0) {
115 115
                             $category = $categoryHandler->get($old->vars['cid']['value']);
116 116
                             if (\is_object($category)) {
117
-                                $category->setVar('albums', $category->getVar('albums') - 1);
117
+                                $category->setVar('albums', $category->getVar('albums')-1);
118 118
                                 $categoryHandler->insert($category, true, $obj);
119 119
                             }
120 120
                         }
@@ -122,22 +122,22 @@  discard block
 block discarded – undo
122 122
                 }
123 123
             }
124 124
 
125
-            if (is_array($obj->vars['aids']['value']) && 0 != \count($obj->vars['aids']['value']) && true === $obj->vars['aids']['changed']) {
125
+            if (is_array($obj->vars['aids']['value']) && 0!=\count($obj->vars['aids']['value']) && true===$obj->vars['aids']['changed']) {
126 126
                 foreach ($obj->vars['aids']['value'] as $aid) {
127
-                    if (!\is_array($aid, $old->getVar('aids')) && 0 != $aid) {
127
+                    if (!\is_array($aid, $old->getVar('aids')) && 0!=$aid) {
128 128
                         $artists = $artistsHandler->get($aid);
129 129
                         if (\is_object($artists)) {
130
-                            $artists->setVar('albums', $artists->getVar('albums') + 1);
130
+                            $artists->setVar('albums', $artists->getVar('albums')+1);
131 131
                             $artistsHandler->insert($artists, true, $obj);
132 132
                         }
133 133
                     }
134 134
                 }
135 135
                 if (!$old->isNew()) {
136 136
                     foreach ($old->getVar('aids') as $aid) {
137
-                        if (!\is_array($aid, $obj->vars['aids']['value']) && 0 != $aid) {
137
+                        if (!\is_array($aid, $obj->vars['aids']['value']) && 0!=$aid) {
138 138
                             $artists = $artistsHandler->get($aid);
139 139
                             if (\is_object($artists)) {
140
-                                $artists->setVar('albums', $artists->getVar('albums') - 1);
140
+                                $artists->setVar('albums', $artists->getVar('albums')-1);
141 141
                                 $artistsHandler->insert($artists, true, $obj);
142 142
                             }
143 143
                         }
@@ -145,22 +145,22 @@  discard block
 block discarded – undo
145 145
                 }
146 146
             }
147 147
 
148
-            if (0 != $object->vars['gid']['value']??'' && true === $object->vars['gid']['changed']??'') {
148
+            if (0!=$object->vars['gid']['value'] ?? '' && true===$object->vars['gid']['changed'] ?? '') {
149 149
                 $genre = $genreHandler->get($object->vars['gid']['value']);
150 150
                 if (\is_object($genre)) {
151
-                    $genre->setVar('albums', $genre->getVar('albums') + 1);
151
+                    $genre->setVar('albums', $genre->getVar('albums')+1);
152 152
                     $genreHandler->insert($genre, true, $obj);
153 153
                 }
154 154
             }
155
-            if (0 != $object->vars['vid']['value']??'' && true === $object->vars['vid']['changed']??'') {
155
+            if (0!=$object->vars['vid']['value'] ?? '' && true===$object->vars['vid']['changed'] ?? '') {
156 156
                 $voice = $voiceHandler->get($object->vars['vid']['value']);
157 157
                 if (\is_object($voice)) {
158
-                    $voice->setVar('albums', $voice->getVar('albums') + 1);
158
+                    $voice->setVar('albums', $voice->getVar('albums')+1);
159 159
                     $voiceHandler->insert($voice, true, $obj);
160 160
                 }
161 161
             }
162 162
         }
163
-        if ('' == $obj->getVar('title')) {
163
+        if (''==$obj->getVar('title')) {
164 164
             return false;
165 165
         }
166 166
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         if (!isset($this->_objects['object'][$id])) {
181 181
             $this->_objects['object'][$id] = parent::get($id, $fields);
182 182
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
183
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
183
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
184 184
                 $GLOBALS['xoopsDB']->queryF($sql);
185 185
             }
186 186
         }
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
     {
230 230
         global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
231 231
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
232
-            if (0 != $cid) {
232
+            if (0!=$cid) {
233 233
                 $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
234 234
                 $artist        = $artistHandler->get($cid);
235 235
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
258 258
                 }
259 259
 
260
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
260
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
261 261
             }
262 262
 
263
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
263
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
264 264
         }
265 265
 
266
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
266
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
267 267
     }
268 268
 
269 269
     /**
@@ -272,11 +272,11 @@  discard block
 block discarded – undo
272 272
      */
273 273
     public function getTop($limit = 1): array
274 274
     {
275
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
275
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
276 276
         $results = $GLOBALS['xoopsDB']->queryF($sql);
277 277
         $ret     = [];
278 278
         $i       = 0;
279
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
279
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
280 280
             $ret[$i] = $this->create();
281 281
             $ret[$i]->assignVars($row);
282 282
             ++$i;
Please login to merge, or discard this patch.
class/FieldHandler.php 2 patches
Indentation   +221 added lines, -221 removed lines patch added patch discarded remove patch
@@ -7,238 +7,238 @@
 block discarded – undo
7 7
  */
8 8
 class FieldHandler extends \XoopsPersistableObjectHandler
9 9
 {
10
-    /**
11
-     * FieldHandler constructor.
12
-     * @param \XoopsDatabase $db
13
-     */
14
-    public function __construct(\XoopsDatabase $db)
15
-    {
16
-        parent::__construct($db, 'songlist_field', Field::class, 'field_id', 'field_title');
17
-    }
10
+	/**
11
+	 * FieldHandler constructor.
12
+	 * @param \XoopsDatabase $db
13
+	 */
14
+	public function __construct(\XoopsDatabase $db)
15
+	{
16
+		parent::__construct($db, 'songlist_field', Field::class, 'field_id', 'field_title');
17
+	}
18 18
 
19
-    /**
20
-     * Read field information from cached storage
21
-     *
22
-     * @param bool $force_update read fields from database and not cached storage
23
-     *
24
-     * @return array|false
25
-     */
26
-    public function loadFields($force_update = false)
27
-    {
28
-        static $fields = [];
29
-        if (!empty($force_update) || 0 == \count($fields)) {
30
-            $criteria = new \Criteria('field_id', 0, '!=');
31
-            $criteria->setSort('field_weight');
32
-            if (0 == $this->getCount($criteria)) {
33
-                return false;
34
-            }
35
-            $field_objs = $this->getObjects($criteria);
36
-            foreach (\array_keys($field_objs) as $i) {
37
-                $fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
38
-            }
39
-        }
19
+	/**
20
+	 * Read field information from cached storage
21
+	 *
22
+	 * @param bool $force_update read fields from database and not cached storage
23
+	 *
24
+	 * @return array|false
25
+	 */
26
+	public function loadFields($force_update = false)
27
+	{
28
+		static $fields = [];
29
+		if (!empty($force_update) || 0 == \count($fields)) {
30
+			$criteria = new \Criteria('field_id', 0, '!=');
31
+			$criteria->setSort('field_weight');
32
+			if (0 == $this->getCount($criteria)) {
33
+				return false;
34
+			}
35
+			$field_objs = $this->getObjects($criteria);
36
+			foreach (\array_keys($field_objs) as $i) {
37
+				$fields[$field_objs[$i]->getVar('field_name')] = $field_objs[$i];
38
+			}
39
+		}
40 40
 
41
-        return $fields;
42
-    }
41
+		return $fields;
42
+	}
43 43
 
44
-    /**
45
-     * save a profile field in the database
46
-     *
47
-     * @param \XoopsObject $obj   reference to the object
48
-     * @param bool         $force whether to force the query execution despite security settings
49
-     * @return bool FALSE if failed, TRUE if already present and unchanged or successful
50
-     * @internal param bool $checkObject check if the object is dirty and clean the attributes
51
-     */
52
-    public function insert(\XoopsObject $obj, $force = false)
53
-    {
54
-        $objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
55
-        $obj->setVar('field_name', \str_replace(' ', '_', $obj->getVar('field_name')));
56
-        $obj->cleanVars();
57
-        $defaultstring = '';
58
-        switch ($obj->getVar('field_type')) {
59
-            case 'datetime':
60
-            case 'date':
61
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_INT);
62
-                $obj->setVar('field_maxlength', 10);
63
-                break;
64
-            case 'longdate':
65
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_MTIME);
66
-                break;
67
-            case 'yesno':
68
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_INT);
69
-                $obj->setVar('field_maxlength', 1);
70
-                break;
71
-            case 'textbox':
72
-                if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
73
-                    $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
74
-                }
75
-                break;
76
-            case 'autotext':
77
-                if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
78
-                    $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTAREA);
79
-                }
80
-                break;
81
-            case 'group_multi':
82
-            case 'select_multi':
83
-            case 'checkbox':
84
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_ARRAY);
85
-                break;
86
-            case 'language':
87
-            case 'timezone':
88
-            case 'theme':
89
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
90
-                break;
91
-            case 'dhtml':
92
-            case 'textarea':
93
-                $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTAREA);
94
-                break;
95
-        }
44
+	/**
45
+	 * save a profile field in the database
46
+	 *
47
+	 * @param \XoopsObject $obj   reference to the object
48
+	 * @param bool         $force whether to force the query execution despite security settings
49
+	 * @return bool FALSE if failed, TRUE if already present and unchanged or successful
50
+	 * @internal param bool $checkObject check if the object is dirty and clean the attributes
51
+	 */
52
+	public function insert(\XoopsObject $obj, $force = false)
53
+	{
54
+		$objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
55
+		$obj->setVar('field_name', \str_replace(' ', '_', $obj->getVar('field_name')));
56
+		$obj->cleanVars();
57
+		$defaultstring = '';
58
+		switch ($obj->getVar('field_type')) {
59
+			case 'datetime':
60
+			case 'date':
61
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_INT);
62
+				$obj->setVar('field_maxlength', 10);
63
+				break;
64
+			case 'longdate':
65
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_MTIME);
66
+				break;
67
+			case 'yesno':
68
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_INT);
69
+				$obj->setVar('field_maxlength', 1);
70
+				break;
71
+			case 'textbox':
72
+				if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
73
+					$obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
74
+				}
75
+				break;
76
+			case 'autotext':
77
+				if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
78
+					$obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTAREA);
79
+				}
80
+				break;
81
+			case 'group_multi':
82
+			case 'select_multi':
83
+			case 'checkbox':
84
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_ARRAY);
85
+				break;
86
+			case 'language':
87
+			case 'timezone':
88
+			case 'theme':
89
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
90
+				break;
91
+			case 'dhtml':
92
+			case 'textarea':
93
+				$obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTAREA);
94
+				break;
95
+		}
96 96
 
97
-        if ('' == $obj->getVar('field_valuetype')) {
98
-            $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
99
-        }
97
+		if ('' == $obj->getVar('field_valuetype')) {
98
+			$obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
99
+		}
100 100
 
101
-        if (!\in_array($obj->getVar('field_name'), $this->getPostVars(), true)) {
102
-            if ($obj->isNew()) {
103
-                //add column to table
104
-                $changetype = 'ADD';
105
-            } else {
106
-                //update column information
107
-                $changetype = 'CHANGE `' . $obj->getVar('field_name', 'n') . '`';
108
-            }
109
-            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? '(' . $obj->getVar('field_maxlength') . ')' : '';
110
-            $notnullstring   = ' NOT NULL';
111
-            //set type
112
-            switch ($obj->getVar('field_valuetype')) {
113
-                default:
114
-                case \XOBJ_DTYPE_ARRAY:
115
-                case \XOBJ_DTYPE_UNICODE_ARRAY:
116
-                    $type = 'mediumtext';
117
-                    break;
118
-                case \XOBJ_DTYPE_UNICODE_EMAIL:
119
-                case \XOBJ_DTYPE_UNICODE_TXTBOX:
120
-                case \XOBJ_DTYPE_UNICODE_URL:
121
-                case \XOBJ_DTYPE_EMAIL:
122
-                case \XOBJ_DTYPE_TXTBOX:
123
-                case \XOBJ_DTYPE_URL:
124
-                    $type = 'varchar';
125
-                    // varchars must have a maxlength
126
-                    if (!$maxlengthstring) {
127
-                        //so set it to max if maxlength is not set - or should it fail?
128
-                        $maxlengthstring = '(255)';
129
-                        $obj->setVar('field_maxlength', 255);
130
-                    }
131
-                    //if ( $obj->getVar('field_default')  ) {
132
-                    $defaultstring = ' DEFAULT ' . $this->db->quote($obj->cleanVars['field_default']);
133
-                    //}
134
-                    break;
135
-                case \XOBJ_DTYPE_INT:
136
-                    $type = 'int';
137
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
138
-                        $defaultstring = " DEFAULT '" . (int)$obj->cleanVars['field_default'] . "'";
139
-                        $obj->setVar('field_default', (int)$obj->cleanVars['field_default']);
140
-                    }
141
-                    break;
142
-                case \XOBJ_DTYPE_DECIMAL:
143
-                    $type = 'decimal(14,6)';
144
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
145
-                        $defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
146
-                        $obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
147
-                    }
148
-                    break;
149
-                case XOBJ_DTYPE_FLOAT:
150
-                    $type = 'float(15,9)';
151
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
152
-                        $defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
153
-                        $obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
154
-                    }
155
-                    break;
156
-                case \XOBJ_DTYPE_OTHER:
157
-                case \XOBJ_DTYPE_UNICODE_TXTAREA:
158
-                case \XOBJ_DTYPE_TXTAREA:
159
-                    $type            = 'text';
160
-                    $maxlengthstring = '';
161
-                    $notnullstring   = '';
162
-                    break;
163
-                case \XOBJ_DTYPE_MTIME:
164
-                    $type            = 'date';
165
-                    $maxlengthstring = '';
166
-                    break;
167
-            }
101
+		if (!\in_array($obj->getVar('field_name'), $this->getPostVars(), true)) {
102
+			if ($obj->isNew()) {
103
+				//add column to table
104
+				$changetype = 'ADD';
105
+			} else {
106
+				//update column information
107
+				$changetype = 'CHANGE `' . $obj->getVar('field_name', 'n') . '`';
108
+			}
109
+			$maxlengthstring = $obj->getVar('field_maxlength') > 0 ? '(' . $obj->getVar('field_maxlength') . ')' : '';
110
+			$notnullstring   = ' NOT NULL';
111
+			//set type
112
+			switch ($obj->getVar('field_valuetype')) {
113
+				default:
114
+				case \XOBJ_DTYPE_ARRAY:
115
+				case \XOBJ_DTYPE_UNICODE_ARRAY:
116
+					$type = 'mediumtext';
117
+					break;
118
+				case \XOBJ_DTYPE_UNICODE_EMAIL:
119
+				case \XOBJ_DTYPE_UNICODE_TXTBOX:
120
+				case \XOBJ_DTYPE_UNICODE_URL:
121
+				case \XOBJ_DTYPE_EMAIL:
122
+				case \XOBJ_DTYPE_TXTBOX:
123
+				case \XOBJ_DTYPE_URL:
124
+					$type = 'varchar';
125
+					// varchars must have a maxlength
126
+					if (!$maxlengthstring) {
127
+						//so set it to max if maxlength is not set - or should it fail?
128
+						$maxlengthstring = '(255)';
129
+						$obj->setVar('field_maxlength', 255);
130
+					}
131
+					//if ( $obj->getVar('field_default')  ) {
132
+					$defaultstring = ' DEFAULT ' . $this->db->quote($obj->cleanVars['field_default']);
133
+					//}
134
+					break;
135
+				case \XOBJ_DTYPE_INT:
136
+					$type = 'int';
137
+					if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
138
+						$defaultstring = " DEFAULT '" . (int)$obj->cleanVars['field_default'] . "'";
139
+						$obj->setVar('field_default', (int)$obj->cleanVars['field_default']);
140
+					}
141
+					break;
142
+				case \XOBJ_DTYPE_DECIMAL:
143
+					$type = 'decimal(14,6)';
144
+					if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
145
+						$defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
146
+						$obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
147
+					}
148
+					break;
149
+				case XOBJ_DTYPE_FLOAT:
150
+					$type = 'float(15,9)';
151
+					if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
152
+						$defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
153
+						$obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
154
+					}
155
+					break;
156
+				case \XOBJ_DTYPE_OTHER:
157
+				case \XOBJ_DTYPE_UNICODE_TXTAREA:
158
+				case \XOBJ_DTYPE_TXTAREA:
159
+					$type            = 'text';
160
+					$maxlengthstring = '';
161
+					$notnullstring   = '';
162
+					break;
163
+				case \XOBJ_DTYPE_MTIME:
164
+					$type            = 'date';
165
+					$maxlengthstring = '';
166
+					break;
167
+			}
168 168
 
169
-            $sql = 'ALTER TABLE `' . $objectsHandler->table . '` ' . $changetype . ' `' . $obj->cleanVars['field_name'] . '` ' . $type . $maxlengthstring . $notnullstring . $defaultstring;
170
-            if (!$this->db->query($sql)) {
171
-                return false;
172
-            }
173
-        }
169
+			$sql = 'ALTER TABLE `' . $objectsHandler->table . '` ' . $changetype . ' `' . $obj->cleanVars['field_name'] . '` ' . $type . $maxlengthstring . $notnullstring . $defaultstring;
170
+			if (!$this->db->query($sql)) {
171
+				return false;
172
+			}
173
+		}
174 174
 
175
-        //change this to also update the cached field information storage
176
-        $obj->setDirty();
177
-        if (!parent::insert($obj, $force)) {
178
-            return false;
179
-        }
175
+		//change this to also update the cached field information storage
176
+		$obj->setDirty();
177
+		if (!parent::insert($obj, $force)) {
178
+			return false;
179
+		}
180 180
 
181
-        return $obj->getVar('field_id');
182
-    }
181
+		return $obj->getVar('field_id');
182
+	}
183 183
 
184
-    /**
185
-     * delete a profile field from the database
186
-     *
187
-     * @param \XoopsObject $obj reference to the object to delete
188
-     * @param bool         $force
189
-     * @return bool FALSE if failed.
190
-     **/
191
-    public function delete(\XoopsObject $obj, $force = false): bool
192
-    {
193
-        $objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
194
-        // remove column from table
195
-        $sql = 'ALTER TABLE ' . $objectsHandler->table . ' DROP `' . $obj->getVar('field_name', 'n') . '`';
196
-        if ($this->db->query($sql)) {
197
-            //change this to update the cached field information storage
198
-            if (!parent::delete($obj, $force)) {
199
-                return false;
200
-            }
184
+	/**
185
+	 * delete a profile field from the database
186
+	 *
187
+	 * @param \XoopsObject $obj reference to the object to delete
188
+	 * @param bool         $force
189
+	 * @return bool FALSE if failed.
190
+	 **/
191
+	public function delete(\XoopsObject $obj, $force = false): bool
192
+	{
193
+		$objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
194
+		// remove column from table
195
+		$sql = 'ALTER TABLE ' . $objectsHandler->table . ' DROP `' . $obj->getVar('field_name', 'n') . '`';
196
+		if ($this->db->query($sql)) {
197
+			//change this to update the cached field information storage
198
+			if (!parent::delete($obj, $force)) {
199
+				return false;
200
+			}
201 201
 
202
-            if ($obj->getVar('field_show') || $obj->getVar('field_edit')) {
203
-                $moduleHandler  = \xoops_getHandler('module');
204
-                $objects_module = $moduleHandler->getByDirname('profile');
205
-                if (\is_object($objects_module)) {
206
-                    // Remove group permissions
207
-                    $grouppermHandler = \xoops_getHandler('groupperm');
208
-                    $criteria         = new \CriteriaCompo(new \Criteria('gperm_modid', $objects_module->getVar('mid')));
209
-                    $criteria->add(new \Criteria('gperm_itemid', $obj->getVar('field_id')));
202
+			if ($obj->getVar('field_show') || $obj->getVar('field_edit')) {
203
+				$moduleHandler  = \xoops_getHandler('module');
204
+				$objects_module = $moduleHandler->getByDirname('profile');
205
+				if (\is_object($objects_module)) {
206
+					// Remove group permissions
207
+					$grouppermHandler = \xoops_getHandler('groupperm');
208
+					$criteria         = new \CriteriaCompo(new \Criteria('gperm_modid', $objects_module->getVar('mid')));
209
+					$criteria->add(new \Criteria('gperm_itemid', $obj->getVar('field_id')));
210 210
 
211
-                    return $grouppermHandler->deleteAll($criteria);
212
-                }
213
-            }
214
-        }
211
+					return $grouppermHandler->deleteAll($criteria);
212
+				}
213
+			}
214
+		}
215 215
 
216
-        return false;
217
-    }
216
+		return false;
217
+	}
218 218
 
219
-    /**
220
-     * Get array of standard variable names (song table)
221
-     *
222
-     * @return array
223
-     */
224
-    public function getPostVars(): array
225
-    {
226
-        return [
227
-            'sid',
228
-            'cid',
229
-            'gid',
230
-            'aids',
231
-            'abid',
232
-            'songid',
233
-            'traxid',
234
-            'title',
235
-            'lyrics',
236
-            'hits',
237
-            'rank',
238
-            'votes',
239
-            'tags',
240
-            'created',
241
-            'updated',
242
-        ];
243
-    }
219
+	/**
220
+	 * Get array of standard variable names (song table)
221
+	 *
222
+	 * @return array
223
+	 */
224
+	public function getPostVars(): array
225
+	{
226
+		return [
227
+			'sid',
228
+			'cid',
229
+			'gid',
230
+			'aids',
231
+			'abid',
232
+			'songid',
233
+			'traxid',
234
+			'title',
235
+			'lyrics',
236
+			'hits',
237
+			'rank',
238
+			'votes',
239
+			'tags',
240
+			'created',
241
+			'updated',
242
+		];
243
+	}
244 244
 }
Please login to merge, or discard this patch.
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
     public function loadFields($force_update = false)
27 27
     {
28 28
         static $fields = [];
29
-        if (!empty($force_update) || 0 == \count($fields)) {
29
+        if (!empty($force_update) || 0==\count($fields)) {
30 30
             $criteria = new \Criteria('field_id', 0, '!=');
31 31
             $criteria->setSort('field_weight');
32
-            if (0 == $this->getCount($criteria)) {
32
+            if (0==$this->getCount($criteria)) {
33 33
                 return false;
34 34
             }
35 35
             $field_objs = $this->getObjects($criteria);
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
                 $obj->setVar('field_maxlength', 1);
70 70
                 break;
71 71
             case 'textbox':
72
-                if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
72
+                if (\XOBJ_DTYPE_INT!=$obj->getVar('field_valuetype')) {
73 73
                     $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
74 74
                 }
75 75
                 break;
76 76
             case 'autotext':
77
-                if (\XOBJ_DTYPE_INT != $obj->getVar('field_valuetype')) {
77
+                if (\XOBJ_DTYPE_INT!=$obj->getVar('field_valuetype')) {
78 78
                     $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTAREA);
79 79
                 }
80 80
                 break;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
                 break;
95 95
         }
96 96
 
97
-        if ('' == $obj->getVar('field_valuetype')) {
97
+        if (''==$obj->getVar('field_valuetype')) {
98 98
             $obj->setVar('field_valuetype', \XOBJ_DTYPE_TXTBOX);
99 99
         }
100 100
 
@@ -104,9 +104,9 @@  discard block
 block discarded – undo
104 104
                 $changetype = 'ADD';
105 105
             } else {
106 106
                 //update column information
107
-                $changetype = 'CHANGE `' . $obj->getVar('field_name', 'n') . '`';
107
+                $changetype = 'CHANGE `'.$obj->getVar('field_name', 'n').'`';
108 108
             }
109
-            $maxlengthstring = $obj->getVar('field_maxlength') > 0 ? '(' . $obj->getVar('field_maxlength') . ')' : '';
109
+            $maxlengthstring = $obj->getVar('field_maxlength')>0 ? '('.$obj->getVar('field_maxlength').')' : '';
110 110
             $notnullstring   = ' NOT NULL';
111 111
             //set type
112 112
             switch ($obj->getVar('field_valuetype')) {
@@ -129,28 +129,28 @@  discard block
 block discarded – undo
129 129
                         $obj->setVar('field_maxlength', 255);
130 130
                     }
131 131
                     //if ( $obj->getVar('field_default')  ) {
132
-                    $defaultstring = ' DEFAULT ' . $this->db->quote($obj->cleanVars['field_default']);
132
+                    $defaultstring = ' DEFAULT '.$this->db->quote($obj->cleanVars['field_default']);
133 133
                     //}
134 134
                     break;
135 135
                 case \XOBJ_DTYPE_INT:
136 136
                     $type = 'int';
137
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
138
-                        $defaultstring = " DEFAULT '" . (int)$obj->cleanVars['field_default'] . "'";
139
-                        $obj->setVar('field_default', (int)$obj->cleanVars['field_default']);
137
+                    if ($obj->getVar('field_default') || ''!==$obj->getVar('field_default')) {
138
+                        $defaultstring = " DEFAULT '".(int) $obj->cleanVars['field_default']."'";
139
+                        $obj->setVar('field_default', (int) $obj->cleanVars['field_default']);
140 140
                     }
141 141
                     break;
142 142
                 case \XOBJ_DTYPE_DECIMAL:
143 143
                     $type = 'decimal(14,6)';
144
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
145
-                        $defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
146
-                        $obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
144
+                    if ($obj->getVar('field_default') || ''!==$obj->getVar('field_default')) {
145
+                        $defaultstring = " DEFAULT '".(float) $obj->cleanVars['field_default']."'";
146
+                        $obj->setVar('field_default', (float) $obj->cleanVars['field_default']);
147 147
                     }
148 148
                     break;
149 149
                 case XOBJ_DTYPE_FLOAT:
150 150
                     $type = 'float(15,9)';
151
-                    if ($obj->getVar('field_default') || '' !== $obj->getVar('field_default')) {
152
-                        $defaultstring = " DEFAULT '" . (float)$obj->cleanVars['field_default'] . "'";
153
-                        $obj->setVar('field_default', (float)$obj->cleanVars['field_default']);
151
+                    if ($obj->getVar('field_default') || ''!==$obj->getVar('field_default')) {
152
+                        $defaultstring = " DEFAULT '".(float) $obj->cleanVars['field_default']."'";
153
+                        $obj->setVar('field_default', (float) $obj->cleanVars['field_default']);
154 154
                     }
155 155
                     break;
156 156
                 case \XOBJ_DTYPE_OTHER:
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
                     break;
167 167
             }
168 168
 
169
-            $sql = 'ALTER TABLE `' . $objectsHandler->table . '` ' . $changetype . ' `' . $obj->cleanVars['field_name'] . '` ' . $type . $maxlengthstring . $notnullstring . $defaultstring;
169
+            $sql = 'ALTER TABLE `'.$objectsHandler->table.'` '.$changetype.' `'.$obj->cleanVars['field_name'].'` '.$type.$maxlengthstring.$notnullstring.$defaultstring;
170 170
             if (!$this->db->query($sql)) {
171 171
                 return false;
172 172
             }
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
     {
193 193
         $objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
194 194
         // remove column from table
195
-        $sql = 'ALTER TABLE ' . $objectsHandler->table . ' DROP `' . $obj->getVar('field_name', 'n') . '`';
195
+        $sql = 'ALTER TABLE '.$objectsHandler->table.' DROP `'.$obj->getVar('field_name', 'n').'`';
196 196
         if ($this->db->query($sql)) {
197 197
             //change this to update the cached field information storage
198 198
             if (!parent::delete($obj, $force)) {
Please login to merge, or discard this patch.
class/utf8map - Copy.php 2 patches
Indentation   +123 added lines, -123 removed lines patch added patch discarded remove patch
@@ -8,47 +8,47 @@  discard block
 block discarded – undo
8 8
  */
9 9
 class Utf8map extends \XoopsObject
10 10
 {
11
-    /**
12
-     * Utf8map constructor.
13
-     * @param null $fid
14
-     */
15
-    public function __construct($fid = null)
16
-    {
17
-        $this->initVar('utfid', XOBJ_DTYPE_INT, 0, false);
18
-        $this->initVar('from', XOBJ_DTYPE_TXTBOX, null, false, 2);
19
-        $this->initVar('to', XOBJ_DTYPE_TXTBOX, null, false, 2);
20
-        $this->initVar('created', XOBJ_DTYPE_INT, 0, false);
21
-        $this->initVar('updated', XOBJ_DTYPE_INT, 0, false);
22
-    }
11
+	/**
12
+	 * Utf8map constructor.
13
+	 * @param null $fid
14
+	 */
15
+	public function __construct($fid = null)
16
+	{
17
+		$this->initVar('utfid', XOBJ_DTYPE_INT, 0, false);
18
+		$this->initVar('from', XOBJ_DTYPE_TXTBOX, null, false, 2);
19
+		$this->initVar('to', XOBJ_DTYPE_TXTBOX, null, false, 2);
20
+		$this->initVar('created', XOBJ_DTYPE_INT, 0, false);
21
+		$this->initVar('updated', XOBJ_DTYPE_INT, 0, false);
22
+	}
23 23
 
24
-    /**
25
-     * @param bool $as_array
26
-     * @return array|string
27
-     */
28
-    public function getForm($as_array = false)
29
-    {
30
-        return songlist_utf8map_get_form($this, $as_array);
31
-    }
24
+	/**
25
+	 * @param bool $as_array
26
+	 * @return array|string
27
+	 */
28
+	public function getForm($as_array = false)
29
+	{
30
+		return songlist_utf8map_get_form($this, $as_array);
31
+	}
32 32
 
33
-    /**
34
-     * @return array
35
-     */
36
-    public function toArray(): array
37
-    {
38
-        $ret  = parent::toArray();
39
-        $form = $this->getForm(true);
40
-        foreach ($form as $key => $element) {
41
-            $ret['form'][$key] = $element->render();
42
-        }
43
-        foreach (['created', 'updated'] as $key) {
44
-            if ($this->getVar($key) > 0) {
45
-                $ret['form'][$key] = date(_DATESTRING, $this->getVar($key));
46
-                $ret[$key]         = date(_DATESTRING, $this->getVar($key));
47
-            }
48
-        }
33
+	/**
34
+	 * @return array
35
+	 */
36
+	public function toArray(): array
37
+	{
38
+		$ret  = parent::toArray();
39
+		$form = $this->getForm(true);
40
+		foreach ($form as $key => $element) {
41
+			$ret['form'][$key] = $element->render();
42
+		}
43
+		foreach (['created', 'updated'] as $key) {
44
+			if ($this->getVar($key) > 0) {
45
+				$ret['form'][$key] = date(_DATESTRING, $this->getVar($key));
46
+				$ret[$key]         = date(_DATESTRING, $this->getVar($key));
47
+			}
48
+		}
49 49
 
50
-        return $ret;
51
-    }
50
+		return $ret;
51
+	}
52 52
 }
53 53
 
54 54
 /**
@@ -56,98 +56,98 @@  discard block
 block discarded – undo
56 56
  */
57 57
 class Utf8mapHandler extends \XoopsPersistableObjectHandler
58 58
 {
59
-    /**
60
-     * Utf8mapHandler constructor.
61
-     * @param \XoopsDatabase $db
62
-     */
63
-    public function __construct(\XoopsDatabase $db)
64
-    {
65
-        parent::__construct($db, 'songlist_utf8map', Utf8map::class, 'utfid', 'from');
66
-    }
59
+	/**
60
+	 * Utf8mapHandler constructor.
61
+	 * @param \XoopsDatabase $db
62
+	 */
63
+	public function __construct(\XoopsDatabase $db)
64
+	{
65
+		parent::__construct($db, 'songlist_utf8map', Utf8map::class, 'utfid', 'from');
66
+	}
67 67
 
68
-    /**
69
-     * @return array
70
-     */
71
-    public function filterFields(): array
72
-    {
73
-        return ['utfid', 'from', 'to', 'created', 'updated'];
74
-    }
68
+	/**
69
+	 * @return array
70
+	 */
71
+	public function filterFields(): array
72
+	{
73
+		return ['utfid', 'from', 'to', 'created', 'updated'];
74
+	}
75 75
 
76
-    /**
77
-     * @param $filter
78
-     * @return \CriteriaCompo
79
-     */
80
-    public function getFilterCriteria($filter): \CriteriaCompo
81
-    {
82
-        $parts    = explode('|', $filter);
83
-        $criteria = new \CriteriaCompo();
84
-        foreach ($parts as $part) {
85
-            $var = explode(',', $part);
86
-            if (!empty($var[1]) && !is_numeric($var[0])) {
87
-                $object = $this->create();
88
-                if (XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
89
-                    || XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
90
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
91
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
92
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
93
-                } elseif (XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
94
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
95
-                } elseif (XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
96
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
97
-                }
98
-            } elseif (!empty($var[1]) && is_numeric($var[0])) {
99
-                $criteria->add(new \Criteria($var[0], $var[1]));
100
-            }
101
-        }
76
+	/**
77
+	 * @param $filter
78
+	 * @return \CriteriaCompo
79
+	 */
80
+	public function getFilterCriteria($filter): \CriteriaCompo
81
+	{
82
+		$parts    = explode('|', $filter);
83
+		$criteria = new \CriteriaCompo();
84
+		foreach ($parts as $part) {
85
+			$var = explode(',', $part);
86
+			if (!empty($var[1]) && !is_numeric($var[0])) {
87
+				$object = $this->create();
88
+				if (XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
89
+					|| XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
90
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
91
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
92
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
93
+				} elseif (XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
94
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
95
+				} elseif (XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
96
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
97
+				}
98
+			} elseif (!empty($var[1]) && is_numeric($var[0])) {
99
+				$criteria->add(new \Criteria($var[0], $var[1]));
100
+			}
101
+		}
102 102
 
103
-        return $criteria;
104
-    }
103
+		return $criteria;
104
+	}
105 105
 
106
-    /**
107
-     * @param        $filter
108
-     * @param        $field
109
-     * @param string $sort
110
-     * @param string $op
111
-     * @param string $fct
112
-     * @return string
113
-     */
114
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
115
-    {
116
-        $ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
117
-        if (is_object($ele)) {
118
-            return $ele->render();
119
-        }
106
+	/**
107
+	 * @param        $filter
108
+	 * @param        $field
109
+	 * @param string $sort
110
+	 * @param string $op
111
+	 * @param string $fct
112
+	 * @return string
113
+	 */
114
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
115
+	{
116
+		$ele = songlist_getFilterElement($filter, $field, $sort, $op, $fct);
117
+		if (is_object($ele)) {
118
+			return $ele->render();
119
+		}
120 120
 
121
-        return ' ';
122
-    }
121
+		return ' ';
122
+	}
123 123
 
124
-    /**
125
-     * @param bool $force
126
-     * @return mixed
127
-     */
128
-    public function insert(\XoopsObject $obj, $force = true)
129
-    {
130
-        if ($obj->isNew()) {
131
-            $obj->setVar('created', time());
132
-        } else {
133
-            $obj->setVar('updated', time());
134
-        }
124
+	/**
125
+	 * @param bool $force
126
+	 * @return mixed
127
+	 */
128
+	public function insert(\XoopsObject $obj, $force = true)
129
+	{
130
+		if ($obj->isNew()) {
131
+			$obj->setVar('created', time());
132
+		} else {
133
+			$obj->setVar('updated', time());
134
+		}
135 135
 
136
-        return parent::insert($obj, $force);
137
-    }
136
+		return parent::insert($obj, $force);
137
+	}
138 138
 
139
-    /**
140
-     * @param string $phrase
141
-     * @param null   $criteria
142
-     * @return string|string[]
143
-     */
144
-    public function convert($phrase = '', $criteria = null)
145
-    {
146
-        foreach ($this->getObjects($criteria, true) as $utfid => $utf8) {
147
-            $phrase = str_replace(mb_strtolower($utf8->getVar('from')), \mb_strtolower($utf8->getVar('to')), $phrase);
148
-            $phrase = str_replace(mb_strtoupper($utf8->getVar('from')), \mb_strtoupper($utf8->getVar('to')), $phrase);
149
-        }
139
+	/**
140
+	 * @param string $phrase
141
+	 * @param null   $criteria
142
+	 * @return string|string[]
143
+	 */
144
+	public function convert($phrase = '', $criteria = null)
145
+	{
146
+		foreach ($this->getObjects($criteria, true) as $utfid => $utf8) {
147
+			$phrase = str_replace(mb_strtolower($utf8->getVar('from')), \mb_strtolower($utf8->getVar('to')), $phrase);
148
+			$phrase = str_replace(mb_strtoupper($utf8->getVar('from')), \mb_strtoupper($utf8->getVar('to')), $phrase);
149
+		}
150 150
 
151
-        return $phrase;
152
-    }
151
+		return $phrase;
152
+	}
153 153
 }
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php declare(strict_types=1);
2 2
 
3
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
4
-require_once \dirname(__DIR__) . '/include/songlist.form.php';
3
+require_once \dirname(__DIR__).'/include/songlist.object.php';
4
+require_once \dirname(__DIR__).'/include/songlist.form.php';
5 5
 
6 6
 /**
7 7
  * Class Utf8map
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
             $ret['form'][$key] = $element->render();
42 42
         }
43 43
         foreach (['created', 'updated'] as $key) {
44
-            if ($this->getVar($key) > 0) {
44
+            if ($this->getVar($key)>0) {
45 45
                 $ret['form'][$key] = date(_DATESTRING, $this->getVar($key));
46 46
                 $ret[$key]         = date(_DATESTRING, $this->getVar($key));
47 47
             }
@@ -85,15 +85,15 @@  discard block
 block discarded – undo
85 85
             $var = explode(',', $part);
86 86
             if (!empty($var[1]) && !is_numeric($var[0])) {
87 87
                 $object = $this->create();
88
-                if (XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
89
-                    || XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
90
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
88
+                if (XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
89
+                    || XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
90
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
91 91
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
92
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
93
-                } elseif (XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
94
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
95
-                } elseif (XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
96
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
92
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
93
+                } elseif (XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
94
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
95
+                } elseif (XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
96
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
97 97
                 }
98 98
             } elseif (!empty($var[1]) && is_numeric($var[0])) {
99 99
                 $criteria->add(new \Criteria($var[0], $var[1]));
Please login to merge, or discard this patch.
class/ArtistsHandler.php 2 patches
Indentation   +234 added lines, -234 removed lines patch added patch discarded remove patch
@@ -15,182 +15,182 @@  discard block
 block discarded – undo
15 15
  */
16 16
 class ArtistsHandler extends \XoopsPersistableObjectHandler
17 17
 {
18
-    /**
19
-     * ArtistsHandler constructor.
20
-     * @param \XoopsDatabase $db
21
-     */
22
-    public function __construct(XoopsDatabase $db)
23
-    {
24
-        parent::__construct($db, 'songlist_artists', Artists::class, 'aid', 'name');
25
-    }
18
+	/**
19
+	 * ArtistsHandler constructor.
20
+	 * @param \XoopsDatabase $db
21
+	 */
22
+	public function __construct(XoopsDatabase $db)
23
+	{
24
+		parent::__construct($db, 'songlist_artists', Artists::class, 'aid', 'name');
25
+	}
26 26
 
27
-    /**
28
-     * @return array
29
-     */
30
-    public function filterFields(): array
31
-    {
32
-        return ['aid', 'cids', 'singer', 'name', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
33
-    }
27
+	/**
28
+	 * @return array
29
+	 */
30
+	public function filterFields(): array
31
+	{
32
+		return ['aid', 'cids', 'singer', 'name', 'albums', 'songs', 'hits', 'rank', 'votes', 'created', 'updated'];
33
+	}
34 34
 
35
-    /**
36
-     * @param $filter
37
-     * @return \CriteriaCompo
38
-     */
39
-    public function getFilterCriteria($filter): CriteriaCompo
40
-    {
41
-        $parts    = \explode('|', $filter);
42
-        $criteria = new CriteriaCompo();
43
-        foreach ($parts as $part) {
44
-            $var = \explode(',', $part);
45
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
46
-                $object = $this->create();
47
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
48
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
49
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
50
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
51
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
52
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
53
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
55
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
56
-                }
57
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
58
-                $criteria->add(new Criteria($var[0], $var[1]));
59
-            }
60
-        }
35
+	/**
36
+	 * @param $filter
37
+	 * @return \CriteriaCompo
38
+	 */
39
+	public function getFilterCriteria($filter): CriteriaCompo
40
+	{
41
+		$parts    = \explode('|', $filter);
42
+		$criteria = new CriteriaCompo();
43
+		foreach ($parts as $part) {
44
+			$var = \explode(',', $part);
45
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
46
+				$object = $this->create();
47
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
48
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
49
+					$criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
50
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
51
+					$criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
52
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
53
+					$criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
55
+					$criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
56
+				}
57
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
58
+				$criteria->add(new Criteria($var[0], $var[1]));
59
+			}
60
+		}
61 61
 
62
-        return $criteria;
63
-    }
62
+		return $criteria;
63
+	}
64 64
 
65
-    /**
66
-     * @param        $filter
67
-     * @param        $field
68
-     * @param string $sort
69
-     * @param string $op
70
-     * @param string $fct
71
-     * @return string
72
-     */
73
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
74
-    {
75
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
76
-        if (\is_object($ele)) {
77
-            return $ele->render();
78
-        }
65
+	/**
66
+	 * @param        $filter
67
+	 * @param        $field
68
+	 * @param string $sort
69
+	 * @param string $op
70
+	 * @param string $fct
71
+	 * @return string
72
+	 */
73
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
74
+	{
75
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
76
+		if (\is_object($ele)) {
77
+			return $ele->render();
78
+		}
79 79
 
80
-        return '&nbsp;';
81
-    }
80
+		return '&nbsp;';
81
+	}
82 82
 
83
-    /**
84
-     * @param bool $force
85
-     * @param null $object
86
-     * @return bool|mixed
87
-     */
88
-    public function insert(\XoopsObject $obj, $force = true, $object = null)
89
-    {
90
-        if ($obj->isNew()) {
91
-            $new = true;
92
-            $old = $this->create();
93
-            $obj->setVar('created', \time());
94
-        } else {
95
-            $new = false;
96
-            $old = $this->get($obj->getVar('aid'));
97
-            $obj->setVar('updated', \time());
98
-        }
83
+	/**
84
+	 * @param bool $force
85
+	 * @param null $object
86
+	 * @return bool|mixed
87
+	 */
88
+	public function insert(\XoopsObject $obj, $force = true, $object = null)
89
+	{
90
+		if ($obj->isNew()) {
91
+			$new = true;
92
+			$old = $this->create();
93
+			$obj->setVar('created', \time());
94
+		} else {
95
+			$new = false;
96
+			$old = $this->get($obj->getVar('aid'));
97
+			$obj->setVar('updated', \time());
98
+		}
99 99
 
100
-        $albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
101
-        $songsHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
102
-        $genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
103
-        $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
104
-        $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
100
+		$albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
101
+		$songsHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
102
+		$genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
103
+		$voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
104
+		$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
105 105
 
106
-        if ($object instanceof Songs) {
107
-            if (true === $object->vars['cid']['changed']) {
108
-                foreach ($obj->vars['cids']['value'] as $cid) {
109
-                    if (is_array( $object->getVar('cid')) && !\in_array($cid, $object->getVar('cid'), true) && 0 != $cid) {
110
-                        $obj->setVar('cids', \array_merge($obj->getVar('cids'), [$object->getVar('cid') => $object->getVar('cid')]));
111
-                        $category = $categoryHandler->get($cid);
112
-                        if (\is_object($category)) {
113
-                            $category->setVar('artists', $category->getVar('artists') + 1);
114
-                            $categoryHandler->insert($category, true, $obj);
115
-                        }
116
-                    }
117
-                }
118
-                if (!$old->isNew()) {
119
-                    foreach ($old->getVar('cids') as $cid) {
120
-                        if (!\in_array($cid, $obj->vars['cids']['value'], true) && 0 != $cid) {
121
-                            $category = $categoryHandler->get($cid);
122
-                            if (\is_object($category)) {
123
-                                $category->setVar('artists', $category->getVar('artists') - 1);
124
-                                $categoryHandler->insert($category, true, $obj);
125
-                            }
126
-                        }
127
-                    }
128
-                }
129
-            }
106
+		if ($object instanceof Songs) {
107
+			if (true === $object->vars['cid']['changed']) {
108
+				foreach ($obj->vars['cids']['value'] as $cid) {
109
+					if (is_array( $object->getVar('cid')) && !\in_array($cid, $object->getVar('cid'), true) && 0 != $cid) {
110
+						$obj->setVar('cids', \array_merge($obj->getVar('cids'), [$object->getVar('cid') => $object->getVar('cid')]));
111
+						$category = $categoryHandler->get($cid);
112
+						if (\is_object($category)) {
113
+							$category->setVar('artists', $category->getVar('artists') + 1);
114
+							$categoryHandler->insert($category, true, $obj);
115
+						}
116
+					}
117
+				}
118
+				if (!$old->isNew()) {
119
+					foreach ($old->getVar('cids') as $cid) {
120
+						if (!\in_array($cid, $obj->vars['cids']['value'], true) && 0 != $cid) {
121
+							$category = $categoryHandler->get($cid);
122
+							if (\is_object($category)) {
123
+								$category->setVar('artists', $category->getVar('artists') - 1);
124
+								$categoryHandler->insert($category, true, $obj);
125
+							}
126
+						}
127
+					}
128
+				}
129
+			}
130 130
 
131
-            if (0 != $object->vars['abid']['value'] && true === $object->vars['aids']['changed']) {
132
-                $album = $albumsHandler->get($object->vars['abid']['value']);
133
-                if (\is_object($album)) {
134
-                    $album->setVar('artists', $album->getVar('artists') + 1);
135
-                    $albumsHandler->insert($album, true, $obj);
136
-                }
137
-            }
131
+			if (0 != $object->vars['abid']['value'] && true === $object->vars['aids']['changed']) {
132
+				$album = $albumsHandler->get($object->vars['abid']['value']);
133
+				if (\is_object($album)) {
134
+					$album->setVar('artists', $album->getVar('artists') + 1);
135
+					$albumsHandler->insert($album, true, $obj);
136
+				}
137
+			}
138 138
 
139
-            if (0 != $object->vars['gid']['value'] && true === $object->vars['gid']['changed']) {
140
-                $genre = $genreHandler->get($object->vars['gid']['value']);
141
-                if (\is_object($genre)) {
142
-                    $genre->setVar('artists', $genre->getVar('artists') + 1);
143
-                    $genreHandler->insert($genre, true, $obj);
144
-                }
145
-            }
146
-            if (0 != $object->vars['vid']['value'] && true === $object->vars['vid']['changed']) {
147
-                $voice = $voiceHandler->get($object->vars['vid']['value']);
148
-                if (\is_object($voice)) {
149
-                    $voice->setVar('artists', $voice->getVar('artists') + 1);
150
-                    $voiceHandler->insert($voice, true, $obj);
151
-                }
152
-            }
153
-        }
139
+			if (0 != $object->vars['gid']['value'] && true === $object->vars['gid']['changed']) {
140
+				$genre = $genreHandler->get($object->vars['gid']['value']);
141
+				if (\is_object($genre)) {
142
+					$genre->setVar('artists', $genre->getVar('artists') + 1);
143
+					$genreHandler->insert($genre, true, $obj);
144
+				}
145
+			}
146
+			if (0 != $object->vars['vid']['value'] && true === $object->vars['vid']['changed']) {
147
+				$voice = $voiceHandler->get($object->vars['vid']['value']);
148
+				if (\is_object($voice)) {
149
+					$voice->setVar('artists', $voice->getVar('artists') + 1);
150
+					$voiceHandler->insert($voice, true, $obj);
151
+				}
152
+			}
153
+		}
154 154
 
155
-        if ('' == $obj->getVar('name')) {
156
-            return false;
157
-        }
155
+		if ('' == $obj->getVar('name')) {
156
+			return false;
157
+		}
158 158
 
159
-        return parent::insert($obj, $force);
160
-    }
159
+		return parent::insert($obj, $force);
160
+	}
161 161
 
162
-    public $_objects = ['object' => [], 'array' => []];
162
+	public $_objects = ['object' => [], 'array' => []];
163 163
 
164
-    /**
165
-     * @param null $id
166
-     * @param null $fields
167
-     * @return \XoopsObject
168
-     */
169
-    public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
170
-    {
171
-        $fields = $fields ?: '*';
172
-        if (!isset($this->_objects['object'][$id])) {
173
-            $this->_objects['object'][$id] = parent::get($id, $fields);
174
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
175
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
176
-                $GLOBALS['xoopsDB']->queryF($sql);
177
-            }
178
-        }
164
+	/**
165
+	 * @param null $id
166
+	 * @param null $fields
167
+	 * @return \XoopsObject
168
+	 */
169
+	public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
170
+	{
171
+		$fields = $fields ?: '*';
172
+		if (!isset($this->_objects['object'][$id])) {
173
+			$this->_objects['object'][$id] = parent::get($id, $fields);
174
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
175
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
176
+				$GLOBALS['xoopsDB']->queryF($sql);
177
+			}
178
+		}
179 179
 
180
-        return $this->_objects['object'][$id];
181
-    }
180
+		return $this->_objects['object'][$id];
181
+	}
182 182
 
183
-    /**
184
-     * @param \CriteriaElement|\CriteriaCompo $criteria
185
-     * @param bool $id_as_key
186
-     * @param bool $as_object
187
-     * @return array
188
-     */
189
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
190
-    {
191
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
183
+	/**
184
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
185
+	 * @param bool $id_as_key
186
+	 * @param bool $as_object
187
+	 * @return array
188
+	 */
189
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
190
+	{
191
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
192 192
 
193
-        /*if (!isset($GLOBALS['songlistAdmin'])) {
193
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
194 194
             $id = [];
195 195
             foreach($ret as $data) {
196 196
                 if ($as_object==true) {
@@ -211,87 +211,87 @@  discard block
 block discarded – undo
211 211
             $GLOBALS['xoopsDB']->queryF($sql);
212 212
         }*/
213 213
 
214
-        return $ret;
215
-    }
214
+		return $ret;
215
+	}
216 216
 
217
-    /**
218
-     * @return string
219
-     */
220
-    public function getURL(): string
221
-    {
222
-        global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
223
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
224
-            if (0 != $cid) {
225
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
226
-                $artist        = $artistHandler->get($cid);
227
-                if (\is_object($artist) && !$artist->isNew()) {
228
-                    return XOOPS_URL
229
-                           . '/'
230
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
231
-                           . '/'
232
-                           . $file
233
-                           . '/'
234
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
235
-                           . '/'
236
-                           . $start
237
-                           . '-'
238
-                           . $id
239
-                           . '-'
240
-                           . $op
241
-                           . '-'
242
-                           . $fct
243
-                           . '-'
244
-                           . $gid
245
-                           . '-'
246
-                           . $cid
247
-                           . '/'
248
-                           . \urlencode($value)
249
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
250
-                }
217
+	/**
218
+	 * @return string
219
+	 */
220
+	public function getURL(): string
221
+	{
222
+		global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
223
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
224
+			if (0 != $cid) {
225
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
226
+				$artist        = $artistHandler->get($cid);
227
+				if (\is_object($artist) && !$artist->isNew()) {
228
+					return XOOPS_URL
229
+						   . '/'
230
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
231
+						   . '/'
232
+						   . $file
233
+						   . '/'
234
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
235
+						   . '/'
236
+						   . $start
237
+						   . '-'
238
+						   . $id
239
+						   . '-'
240
+						   . $op
241
+						   . '-'
242
+						   . $fct
243
+						   . '-'
244
+						   . $gid
245
+						   . '-'
246
+						   . $cid
247
+						   . '/'
248
+						   . \urlencode($value)
249
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
250
+				}
251 251
 
252
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
253
-            }
252
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
253
+			}
254 254
 
255
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
256
-        }
255
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
256
+		}
257 257
 
258
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
259
-    }
258
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
259
+	}
260 260
 
261
-    /**
262
-     * @param null $criteria
263
-     * @return array
264
-     */
265
-    public function getSIDs($criteria = null): array
266
-    {
267
-        $ret         = [];
268
-        $songHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
269
-        foreach ($this->getObjects($criteria, true) as $aid => $object) {
270
-            $crita = new Criteria('aids', '%"' . $aid . '"%', 'LIKE');
271
-            foreach ($songHandler->getObjects($crita, true) as $sid => $song) {
272
-                $ret[$sid] = $sid;
273
-            }
274
-        }
261
+	/**
262
+	 * @param null $criteria
263
+	 * @return array
264
+	 */
265
+	public function getSIDs($criteria = null): array
266
+	{
267
+		$ret         = [];
268
+		$songHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
269
+		foreach ($this->getObjects($criteria, true) as $aid => $object) {
270
+			$crita = new Criteria('aids', '%"' . $aid . '"%', 'LIKE');
271
+			foreach ($songHandler->getObjects($crita, true) as $sid => $song) {
272
+				$ret[$sid] = $sid;
273
+			}
274
+		}
275 275
 
276
-        return $ret;
277
-    }
276
+		return $ret;
277
+	}
278 278
 
279
-    /**
280
-     * @param int $limit
281
-     * @return array
282
-     */
283
-    public function getTop($limit = 1): array
284
-    {
285
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
286
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
287
-        $ret     = [];
288
-        $i       = 0;
289
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
290
-            $ret[$i] = $this->create();
291
-            $ret[$i]->assignVars($row);
292
-            ++$i;
293
-        }
279
+	/**
280
+	 * @param int $limit
281
+	 * @return array
282
+	 */
283
+	public function getTop($limit = 1): array
284
+	{
285
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
286
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
287
+		$ret     = [];
288
+		$i       = 0;
289
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
290
+			$ret[$i] = $this->create();
291
+			$ret[$i]->assignVars($row);
292
+			++$i;
293
+		}
294 294
 
295
-        return $ret;
296
-    }
295
+		return $ret;
296
+	}
297 297
 }
Please login to merge, or discard this patch.
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 use CriteriaCompo;
7 7
 use XoopsDatabase;
8 8
 
9
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
9
+require_once \dirname(__DIR__).'/include/songlist.object.php';
10 10
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
11 11
 use  XoopsModules\Songlist\Form\FormController;
12 12
 
@@ -44,15 +44,15 @@  discard block
 block discarded – undo
44 44
             $var = \explode(',', $part);
45 45
             if (!empty($var[1]) && !\is_numeric($var[0])) {
46 46
                 $object = $this->create();
47
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
48
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
49
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
47
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
48
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
49
+                    $criteria->add(new Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
50 50
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
51
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
52
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
53
-                    $criteria->add(new Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
54
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
55
-                    $criteria->add(new Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
51
+                    $criteria->add(new Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
52
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
53
+                    $criteria->add(new Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
54
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
55
+                    $criteria->add(new Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
56 56
                 }
57 57
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
58 58
                 $criteria->add(new Criteria($var[0], $var[1]));
@@ -104,23 +104,23 @@  discard block
 block discarded – undo
104 104
         $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
105 105
 
106 106
         if ($object instanceof Songs) {
107
-            if (true === $object->vars['cid']['changed']) {
107
+            if (true===$object->vars['cid']['changed']) {
108 108
                 foreach ($obj->vars['cids']['value'] as $cid) {
109
-                    if (is_array( $object->getVar('cid')) && !\in_array($cid, $object->getVar('cid'), true) && 0 != $cid) {
109
+                    if (is_array($object->getVar('cid')) && !\in_array($cid, $object->getVar('cid'), true) && 0!=$cid) {
110 110
                         $obj->setVar('cids', \array_merge($obj->getVar('cids'), [$object->getVar('cid') => $object->getVar('cid')]));
111 111
                         $category = $categoryHandler->get($cid);
112 112
                         if (\is_object($category)) {
113
-                            $category->setVar('artists', $category->getVar('artists') + 1);
113
+                            $category->setVar('artists', $category->getVar('artists')+1);
114 114
                             $categoryHandler->insert($category, true, $obj);
115 115
                         }
116 116
                     }
117 117
                 }
118 118
                 if (!$old->isNew()) {
119 119
                     foreach ($old->getVar('cids') as $cid) {
120
-                        if (!\in_array($cid, $obj->vars['cids']['value'], true) && 0 != $cid) {
120
+                        if (!\in_array($cid, $obj->vars['cids']['value'], true) && 0!=$cid) {
121 121
                             $category = $categoryHandler->get($cid);
122 122
                             if (\is_object($category)) {
123
-                                $category->setVar('artists', $category->getVar('artists') - 1);
123
+                                $category->setVar('artists', $category->getVar('artists')-1);
124 124
                                 $categoryHandler->insert($category, true, $obj);
125 125
                             }
126 126
                         }
@@ -128,31 +128,31 @@  discard block
 block discarded – undo
128 128
                 }
129 129
             }
130 130
 
131
-            if (0 != $object->vars['abid']['value'] && true === $object->vars['aids']['changed']) {
131
+            if (0!=$object->vars['abid']['value'] && true===$object->vars['aids']['changed']) {
132 132
                 $album = $albumsHandler->get($object->vars['abid']['value']);
133 133
                 if (\is_object($album)) {
134
-                    $album->setVar('artists', $album->getVar('artists') + 1);
134
+                    $album->setVar('artists', $album->getVar('artists')+1);
135 135
                     $albumsHandler->insert($album, true, $obj);
136 136
                 }
137 137
             }
138 138
 
139
-            if (0 != $object->vars['gid']['value'] && true === $object->vars['gid']['changed']) {
139
+            if (0!=$object->vars['gid']['value'] && true===$object->vars['gid']['changed']) {
140 140
                 $genre = $genreHandler->get($object->vars['gid']['value']);
141 141
                 if (\is_object($genre)) {
142
-                    $genre->setVar('artists', $genre->getVar('artists') + 1);
142
+                    $genre->setVar('artists', $genre->getVar('artists')+1);
143 143
                     $genreHandler->insert($genre, true, $obj);
144 144
                 }
145 145
             }
146
-            if (0 != $object->vars['vid']['value'] && true === $object->vars['vid']['changed']) {
146
+            if (0!=$object->vars['vid']['value'] && true===$object->vars['vid']['changed']) {
147 147
                 $voice = $voiceHandler->get($object->vars['vid']['value']);
148 148
                 if (\is_object($voice)) {
149
-                    $voice->setVar('artists', $voice->getVar('artists') + 1);
149
+                    $voice->setVar('artists', $voice->getVar('artists')+1);
150 150
                     $voiceHandler->insert($voice, true, $obj);
151 151
                 }
152 152
             }
153 153
         }
154 154
 
155
-        if ('' == $obj->getVar('name')) {
155
+        if (''==$obj->getVar('name')) {
156 156
             return false;
157 157
         }
158 158
 
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
         if (!isset($this->_objects['object'][$id])) {
173 173
             $this->_objects['object'][$id] = parent::get($id, $fields);
174 174
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
175
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
175
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
176 176
                 $GLOBALS['xoopsDB']->queryF($sql);
177 177
             }
178 178
         }
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
     {
222 222
         global $file, $op, $fct, $id, $value, $gid, $vid, $cid, $start, $limit;
223 223
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
224
-            if (0 != $cid) {
224
+            if (0!=$cid) {
225 225
                 $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
226 226
                 $artist        = $artistHandler->get($cid);
227 227
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -249,13 +249,13 @@  discard block
 block discarded – undo
249 249
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
250 250
                 }
251 251
 
252
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
252
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
253 253
             }
254 254
 
255
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
255
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
256 256
         }
257 257
 
258
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
258
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
259 259
     }
260 260
 
261 261
     /**
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
         $ret         = [];
268 268
         $songHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
269 269
         foreach ($this->getObjects($criteria, true) as $aid => $object) {
270
-            $crita = new Criteria('aids', '%"' . $aid . '"%', 'LIKE');
270
+            $crita = new Criteria('aids', '%"'.$aid.'"%', 'LIKE');
271 271
             foreach ($songHandler->getObjects($crita, true) as $sid => $song) {
272 272
                 $ret[$sid] = $sid;
273 273
             }
@@ -282,11 +282,11 @@  discard block
 block discarded – undo
282 282
      */
283 283
     public function getTop($limit = 1): array
284 284
     {
285
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
285
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
286 286
         $results = $GLOBALS['xoopsDB']->queryF($sql);
287 287
         $ret     = [];
288 288
         $i       = 0;
289
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
289
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
290 290
             $ret[$i] = $this->create();
291 291
             $ret[$i]->assignVars($row);
292 292
             ++$i;
Please login to merge, or discard this patch.
class/Field.php 2 patches
Indentation   +465 added lines, -465 removed lines patch added patch discarded remove patch
@@ -12,495 +12,495 @@
 block discarded – undo
12 12
  */
13 13
 class Field extends \XoopsObject
14 14
 {
15
-    public function __construct()
16
-    {
17
-        $this->initVar('field_id', \XOBJ_DTYPE_INT, null);
18
-        $this->initVar('cids', \XOBJ_DTYPE_ARRAY, [0 => '0'], true);
19
-        $this->initVar('field_type', \XOBJ_DTYPE_TXTBOX);
20
-        $this->initVar('field_valuetype', \XOBJ_DTYPE_INT, null, true);
21
-        $this->initVar('field_name', \XOBJ_DTYPE_TXTBOX, null, true);
22
-        $this->initVar('field_title', \XOBJ_DTYPE_TXTBOX);
23
-        $this->initVar('field_description', \XOBJ_DTYPE_TXTAREA);
24
-        $this->initVar('field_required', \XOBJ_DTYPE_INT, 0); //0 = no, 1 = yes
25
-        $this->initVar('field_maxlength', \XOBJ_DTYPE_INT, 0);
26
-        $this->initVar('field_weight', \XOBJ_DTYPE_INT, 0);
27
-        $this->initVar('field_default', \XOBJ_DTYPE_TXTAREA, '');
28
-        $this->initVar('field_notnull', \XOBJ_DTYPE_INT, 1);
29
-        $this->initVar('field_edit', \XOBJ_DTYPE_INT, 0);
30
-        $this->initVar('field_show', \XOBJ_DTYPE_INT, 0);
31
-        $this->initVar('field_config', \XOBJ_DTYPE_INT, 0);
32
-        $this->initVar('field_options', \XOBJ_DTYPE_ARRAY, []);
33
-    }
15
+	public function __construct()
16
+	{
17
+		$this->initVar('field_id', \XOBJ_DTYPE_INT, null);
18
+		$this->initVar('cids', \XOBJ_DTYPE_ARRAY, [0 => '0'], true);
19
+		$this->initVar('field_type', \XOBJ_DTYPE_TXTBOX);
20
+		$this->initVar('field_valuetype', \XOBJ_DTYPE_INT, null, true);
21
+		$this->initVar('field_name', \XOBJ_DTYPE_TXTBOX, null, true);
22
+		$this->initVar('field_title', \XOBJ_DTYPE_TXTBOX);
23
+		$this->initVar('field_description', \XOBJ_DTYPE_TXTAREA);
24
+		$this->initVar('field_required', \XOBJ_DTYPE_INT, 0); //0 = no, 1 = yes
25
+		$this->initVar('field_maxlength', \XOBJ_DTYPE_INT, 0);
26
+		$this->initVar('field_weight', \XOBJ_DTYPE_INT, 0);
27
+		$this->initVar('field_default', \XOBJ_DTYPE_TXTAREA, '');
28
+		$this->initVar('field_notnull', \XOBJ_DTYPE_INT, 1);
29
+		$this->initVar('field_edit', \XOBJ_DTYPE_INT, 0);
30
+		$this->initVar('field_show', \XOBJ_DTYPE_INT, 0);
31
+		$this->initVar('field_config', \XOBJ_DTYPE_INT, 0);
32
+		$this->initVar('field_options', \XOBJ_DTYPE_ARRAY, []);
33
+	}
34 34
 
35
-    /**
36
-     * Extra treatment dealing with non latin encoding
37
-     * Tricky solution
38
-     * @param string $key
39
-     * @param mixed  $value
40
-     * @param bool   $not_gpc
41
-     */
42
-    public function setVar($key, $value, $not_gpc = false): void
43
-    {
44
-        if ('field_options' === $key && \is_array($value)) {
45
-            foreach (\array_keys($value) as $idx) {
46
-                $value[$idx] = base64_encode($value[$idx]);
47
-            }
48
-        }
49
-        parent::setVar($key, $value, $not_gpc);
50
-    }
35
+	/**
36
+	 * Extra treatment dealing with non latin encoding
37
+	 * Tricky solution
38
+	 * @param string $key
39
+	 * @param mixed  $value
40
+	 * @param bool   $not_gpc
41
+	 */
42
+	public function setVar($key, $value, $not_gpc = false): void
43
+	{
44
+		if ('field_options' === $key && \is_array($value)) {
45
+			foreach (\array_keys($value) as $idx) {
46
+				$value[$idx] = base64_encode($value[$idx]);
47
+			}
48
+		}
49
+		parent::setVar($key, $value, $not_gpc);
50
+	}
51 51
 
52
-    /**
53
-     * @param string $key
54
-     * @param string $format
55
-     * @return mixed
56
-     */
57
-    public function getVar($key, $format = 's')
58
-    {
59
-        $value = parent::getVar($key, $format);
60
-        if ('field_options' === $key && !empty($value)) {
61
-            foreach (\array_keys($value) as $idx) {
62
-                $value[$idx] = base64_decode($value[$idx], true);
63
-            }
64
-        }
52
+	/**
53
+	 * @param string $key
54
+	 * @param string $format
55
+	 * @return mixed
56
+	 */
57
+	public function getVar($key, $format = 's')
58
+	{
59
+		$value = parent::getVar($key, $format);
60
+		if ('field_options' === $key && !empty($value)) {
61
+			foreach (\array_keys($value) as $idx) {
62
+				$value[$idx] = base64_decode($value[$idx], true);
63
+			}
64
+		}
65 65
 
66
-        return $value;
67
-    }
66
+		return $value;
67
+	}
68 68
 
69
-    /**
70
-     * Returns a {@link XoopsFormElement} for editing the value of this field
71
-     *
72
-     * @param \XoopsUser     $user    {@link XoopsUser} object to edit the value of
73
-     * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
74
-     *
75
-     * @return \\XoopsFormDhtmlTextArea|\\XoopsFormEditor|\\XoopsFormLabel|\\XoopsFormSelect|\\XoopsFormText|\\XoopsFormTextArea
76
-     */
77
-    public function getEditElement($user, $profile)
78
-    {
79
-        $value = \in_array($this->getVar('field_name'), $this->getPostVars(), true) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
80
-        if (null === $value) {
81
-            $value = $this->getVar('field_default');
82
-        }
83
-        $caption = $this->getVar('field_title');
84
-        $caption = \defined($caption) ? \constant($caption) : $caption;
85
-        $name    = $this->getVar('field_name', 'e');
86
-        $options = $this->getVar('field_options');
87
-        if (\is_array($options)) {
88
-            //asort($options);
69
+	/**
70
+	 * Returns a {@link XoopsFormElement} for editing the value of this field
71
+	 *
72
+	 * @param \XoopsUser     $user    {@link XoopsUser} object to edit the value of
73
+	 * @param ObjectsProfile $profile {@link ObjectsProfile} object to edit the value of
74
+	 *
75
+	 * @return \\XoopsFormDhtmlTextArea|\\XoopsFormEditor|\\XoopsFormLabel|\\XoopsFormSelect|\\XoopsFormText|\\XoopsFormTextArea
76
+	 */
77
+	public function getEditElement($user, $profile)
78
+	{
79
+		$value = \in_array($this->getVar('field_name'), $this->getPostVars(), true) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
80
+		if (null === $value) {
81
+			$value = $this->getVar('field_default');
82
+		}
83
+		$caption = $this->getVar('field_title');
84
+		$caption = \defined($caption) ? \constant($caption) : $caption;
85
+		$name    = $this->getVar('field_name', 'e');
86
+		$options = $this->getVar('field_options');
87
+		if (\is_array($options)) {
88
+			//asort($options);
89 89
 
90
-            foreach (\array_keys($options) as $key) {
91
-                $optval = \defined($options[$key]) ? \constant($options[$key]) : $options[$key];
92
-                $optkey = \defined((string)$key) ? \constant($key) : $key;
93
-                unset($options[$key]);
94
-                $options[$optkey] = $optval;
95
-            }
96
-        }
97
-        require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
98
-        switch ($this->getVar('field_type')) {
99
-            default:
100
-            case 'autotext':
101
-                //autotext is not for editing
102
-                $element = new \XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
103
-                break;
104
-            case 'textbox':
105
-                $element = new \XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
106
-                break;
107
-            case 'textarea':
108
-                $element = new \XoopsFormTextArea($caption, $name, $value, 4, 30);
109
-                break;
110
-            case 'dhtml':
111
-                $element = new \XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
112
-                break;
113
-            case 'editor':
114
-                $editor_config['name']   = $name;
115
-                $editor_config['editor'] = $GLOBALS['songlistModuleConfig']['editor'];
116
-                $editor_config['value']  = $value;
117
-                $editor_config['width']  = $GLOBALS['songlistModuleConfig']['editor_width'];
118
-                $editor_config['height'] = $GLOBALS['songlistModuleConfig']['editor_height'];
119
-                $element                 = new \XoopsFormEditor($caption, $name, $editor_config);
120
-                break;
121
-            case 'select':
122
-                $element = new \XoopsFormSelect($caption, $name, $value);
123
-                // If options do not include an empty element, then add a blank option to prevent any default selection
124
-                if (!\array_key_exists('', $options)) {
125
-                    $element->addOption('', _NONE);
126
-                    //trabis
127
-                    if (1 == $this->getVar('field_required')) {
128
-                        $eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
129
-                        $eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
130
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
131
-                                                           . "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected === true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }"
132
-                                                           . "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
133
-                    }
134
-                }
135
-                $element->addOptionArray($options);
136
-                break;
137
-            case 'select_multi':
138
-                $element = new \XoopsFormSelect($caption, $name, $value, 5, true);
139
-                $element->addOptionArray($options);
140
-                break;
141
-            case 'radio':
142
-                $element = new \XoopsFormRadio($caption, $name, $value);
143
-                $element->addOptionArray($options);
144
-                break;
145
-            case 'checkbox':
146
-                $element = new \XoopsFormCheckBox($caption, $name, $value);
147
-                $element->addOptionArray($options);
148
-                break;
149
-            case 'yesno':
150
-                $element = new \XoopsFormRadioYN($caption, $name, $value);
151
-                break;
152
-            case 'group':
153
-                $element = new \XoopsFormSelectGroup($caption, $name, true, $value);
154
-                break;
155
-            case 'group_multi':
156
-                $element = new \XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
157
-                break;
158
-            case 'language':
159
-                $element = new \XoopsFormSelectLang($caption, $name, $value);
160
-                break;
161
-            case 'date':
162
-                $element = new \XoopsFormTextDateSelect($caption, $name, 15, $value);
163
-                break;
164
-            case 'longdate':
165
-                $element = new \XoopsFormTextDateSelect($caption, $name, 15, \str_replace('-', '/', $value));
166
-                break;
167
-            case 'datetime':
168
-                $element = new XoopsFormDatetime($caption, $name, 15, $value);
169
-                break;
170
-            case 'list':
171
-                $element = new \XoopsFormSelect($caption, $name, $value, 1, $options[0]);
172
-                break;
173
-            case 'timezone':
174
-                $element = new \XoopsFormSelectTimezone($caption, $name, $value);
175
-                $element->setExtra("style='width: 280px;'");
176
-                break;
177
-            case 'rank':
178
-                $element = new \XoopsFormSelect($caption, $name, $value);
90
+			foreach (\array_keys($options) as $key) {
91
+				$optval = \defined($options[$key]) ? \constant($options[$key]) : $options[$key];
92
+				$optkey = \defined((string)$key) ? \constant($key) : $key;
93
+				unset($options[$key]);
94
+				$options[$optkey] = $optval;
95
+			}
96
+		}
97
+		require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
98
+		switch ($this->getVar('field_type')) {
99
+			default:
100
+			case 'autotext':
101
+				//autotext is not for editing
102
+				$element = new \XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
103
+				break;
104
+			case 'textbox':
105
+				$element = new \XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
106
+				break;
107
+			case 'textarea':
108
+				$element = new \XoopsFormTextArea($caption, $name, $value, 4, 30);
109
+				break;
110
+			case 'dhtml':
111
+				$element = new \XoopsFormDhtmlTextArea($caption, $name, $value, 10, 30);
112
+				break;
113
+			case 'editor':
114
+				$editor_config['name']   = $name;
115
+				$editor_config['editor'] = $GLOBALS['songlistModuleConfig']['editor'];
116
+				$editor_config['value']  = $value;
117
+				$editor_config['width']  = $GLOBALS['songlistModuleConfig']['editor_width'];
118
+				$editor_config['height'] = $GLOBALS['songlistModuleConfig']['editor_height'];
119
+				$element                 = new \XoopsFormEditor($caption, $name, $editor_config);
120
+				break;
121
+			case 'select':
122
+				$element = new \XoopsFormSelect($caption, $name, $value);
123
+				// If options do not include an empty element, then add a blank option to prevent any default selection
124
+				if (!\array_key_exists('', $options)) {
125
+					$element->addOption('', _NONE);
126
+					//trabis
127
+					if (1 == $this->getVar('field_required')) {
128
+						$eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
129
+						$eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
130
+						$element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
131
+														   . "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected === true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }"
132
+														   . "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
133
+					}
134
+				}
135
+				$element->addOptionArray($options);
136
+				break;
137
+			case 'select_multi':
138
+				$element = new \XoopsFormSelect($caption, $name, $value, 5, true);
139
+				$element->addOptionArray($options);
140
+				break;
141
+			case 'radio':
142
+				$element = new \XoopsFormRadio($caption, $name, $value);
143
+				$element->addOptionArray($options);
144
+				break;
145
+			case 'checkbox':
146
+				$element = new \XoopsFormCheckBox($caption, $name, $value);
147
+				$element->addOptionArray($options);
148
+				break;
149
+			case 'yesno':
150
+				$element = new \XoopsFormRadioYN($caption, $name, $value);
151
+				break;
152
+			case 'group':
153
+				$element = new \XoopsFormSelectGroup($caption, $name, true, $value);
154
+				break;
155
+			case 'group_multi':
156
+				$element = new \XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
157
+				break;
158
+			case 'language':
159
+				$element = new \XoopsFormSelectLang($caption, $name, $value);
160
+				break;
161
+			case 'date':
162
+				$element = new \XoopsFormTextDateSelect($caption, $name, 15, $value);
163
+				break;
164
+			case 'longdate':
165
+				$element = new \XoopsFormTextDateSelect($caption, $name, 15, \str_replace('-', '/', $value));
166
+				break;
167
+			case 'datetime':
168
+				$element = new XoopsFormDatetime($caption, $name, 15, $value);
169
+				break;
170
+			case 'list':
171
+				$element = new \XoopsFormSelect($caption, $name, $value, 1, $options[0]);
172
+				break;
173
+			case 'timezone':
174
+				$element = new \XoopsFormSelectTimezone($caption, $name, $value);
175
+				$element->setExtra("style='width: 280px;'");
176
+				break;
177
+			case 'rank':
178
+				$element = new \XoopsFormSelect($caption, $name, $value);
179 179
 
180
-                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
181
-                $ranks = \XoopsLists::getUserRankList();
182
-                $element->addOption(0, '--------------');
183
-                $element->addOptionArray($ranks);
184
-                break;
185
-            case 'theme':
186
-                $element = new \XoopsFormSelect($caption, $name, $value);
187
-                $element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
188
-                $handle  = \opendir(XOOPS_THEME_PATH . '/');
189
-                $dirlist = [];
190
-                while (false !== ($file = \readdir($handle))) {
191
-                    if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
192
-                        if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
193
-                            $dirlist[$file] = $file;
194
-                        }
195
-                    }
196
-                }
197
-                \closedir($handle);
198
-                if (!empty($dirlist)) {
199
-                    \asort($dirlist);
200
-                    $element->addOptionArray($dirlist);
201
-                }
202
-                break;
203
-        }
204
-        if ('' != $this->getVar('field_description')) {
205
-            $element->setDescription($this->getVar('field_description'));
206
-        }
180
+				require_once $GLOBALS['xoops']->path('class/xoopslists.php');
181
+				$ranks = \XoopsLists::getUserRankList();
182
+				$element->addOption(0, '--------------');
183
+				$element->addOptionArray($ranks);
184
+				break;
185
+			case 'theme':
186
+				$element = new \XoopsFormSelect($caption, $name, $value);
187
+				$element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
188
+				$handle  = \opendir(XOOPS_THEME_PATH . '/');
189
+				$dirlist = [];
190
+				while (false !== ($file = \readdir($handle))) {
191
+					if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
192
+						if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
193
+							$dirlist[$file] = $file;
194
+						}
195
+					}
196
+				}
197
+				\closedir($handle);
198
+				if (!empty($dirlist)) {
199
+					\asort($dirlist);
200
+					$element->addOptionArray($dirlist);
201
+				}
202
+				break;
203
+		}
204
+		if ('' != $this->getVar('field_description')) {
205
+			$element->setDescription($this->getVar('field_description'));
206
+		}
207 207
 
208
-        return $element;
209
-    }
208
+		return $element;
209
+	}
210 210
 
211
-    /**
212
-     * Returns a {@link XoopsFormElement} for editing the value of this field
213
-     * @return \\XoopsFormLabel|\\XoopsFormSelect|\\XoopsFormText|\\XoopsFormTextArea
214
-     * @internal param XoopsUser $user <a href='psi_element://XoopsUser'>XoopsUser</a> object to edit the value of object to edit the value of
215
-     * @internal param ObjectsProfile $profile <a href='psi_element://ObjectsProfile'>ObjectsProfile</a> object to edit the value of object to edit the value of
216
-     */
217
-    public function getSearchElement()
218
-    {
219
-        $caption = $this->getVar('field_title');
220
-        $caption = \defined($caption) ? \constant($caption) : $caption;
221
-        $name    = $this->getVar('field_name', 'e');
222
-        $options = $this->getVar('field_options');
223
-        if (\is_array($options)) {
224
-            //asort($options);
211
+	/**
212
+	 * Returns a {@link XoopsFormElement} for editing the value of this field
213
+	 * @return \\XoopsFormLabel|\\XoopsFormSelect|\\XoopsFormText|\\XoopsFormTextArea
214
+	 * @internal param XoopsUser $user <a href='psi_element://XoopsUser'>XoopsUser</a> object to edit the value of object to edit the value of
215
+	 * @internal param ObjectsProfile $profile <a href='psi_element://ObjectsProfile'>ObjectsProfile</a> object to edit the value of object to edit the value of
216
+	 */
217
+	public function getSearchElement()
218
+	{
219
+		$caption = $this->getVar('field_title');
220
+		$caption = \defined($caption) ? \constant($caption) : $caption;
221
+		$name    = $this->getVar('field_name', 'e');
222
+		$options = $this->getVar('field_options');
223
+		if (\is_array($options)) {
224
+			//asort($options);
225 225
 
226
-            foreach (\array_keys($options) as $key) {
227
-                $optval = \defined($options[$key]) ? \constant($options[$key]) : $options[$key];
228
-                $optkey = \defined($key) ? \constant($key) : $key;
229
-                unset($options[$key]);
230
-                $options[$optkey] = $optval;
231
-            }
232
-        }
233
-        require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
234
-        switch ($this->getVar('field_type')) {
235
-            default:
236
-            case 'autotext':
237
-                //autotext is not for editing
238
-                $element = new \XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
239
-                break;
240
-            case 'textbox':
241
-                $element = new \XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
242
-                break;
243
-            case 'textarea':
244
-                $element = new \XoopsFormTextArea($caption, $name, $value, 4, 30);
245
-                break;
246
-            case 'dhtml':
247
-                $element = new \XoopsFormText($caption, $name, 35, 255, $value);
248
-                break;
249
-            case 'select':
250
-                $element = new \XoopsFormSelect($caption, $name, $value);
251
-                // If options do not include an empty element, then add a blank option to prevent any default selection
252
-                if (!\array_key_exists('', $options)) {
253
-                    $element->addOption('', _NONE);
254
-                    //trabis
255
-                    if (1 == $this->getVar('field_required')) {
256
-                        $eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
257
-                        $eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
258
-                        $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
259
-                                                           . "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected === true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }"
260
-                                                           . "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
261
-                    }
262
-                    //end
263
-                }
264
-                $element->addOptionArray($options);
265
-                break;
266
-            case 'editor':
267
-                $element = new \XoopsFormText($caption, $name, 35, 255, $value);
268
-                break;
269
-            case 'select_multi':
270
-                $element = new \XoopsFormSelect($caption, $name, $value, 5, true);
271
-                $element->addOptionArray($options);
272
-                break;
273
-            case 'radio':
274
-                $element = new \XoopsFormRadio($caption, $name, $value);
275
-                $element->addOptionArray($options);
276
-                break;
277
-            case 'checkbox':
278
-                $element = new \XoopsFormCheckBox($caption, $name, $value);
279
-                $element->addOptionArray($options);
280
-                break;
281
-            case 'yesno':
282
-                $element = new \XoopsFormRadioYN($caption, $name, $value);
283
-                break;
284
-            case 'group':
285
-                $element = new \XoopsFormSelectGroup($caption, $name, true, $value);
286
-                break;
287
-            case 'group_multi':
288
-                $element = new \XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
289
-                break;
290
-            case 'language':
291
-                $element = new \XoopsFormSelectLang($caption, $name, $value);
292
-                break;
293
-            case 'date':
294
-                $element = new \XoopsFormTextDateSelect($caption, $name, 15, $value);
295
-                break;
296
-            case 'longdate':
297
-                $element = new \XoopsFormTextDateSelect($caption, $name, 15, \str_replace('-', '/', $value));
298
-                break;
299
-            case 'datetime':
300
-                $element = new XoopsFormDatetime($caption, $name, 15, $value);
301
-                break;
302
-            case 'list':
303
-                $element = new \XoopsFormSelect($caption, $name, $value, 1, $options[0]);
304
-                break;
305
-            case 'timezone':
306
-                $element = new \XoopsFormSelectTimezone($caption, $name, $value);
307
-                $element->setExtra("style='width: 280px;'");
308
-                break;
309
-            case 'rank':
310
-                $element = new \XoopsFormSelect($caption, $name, $value);
226
+			foreach (\array_keys($options) as $key) {
227
+				$optval = \defined($options[$key]) ? \constant($options[$key]) : $options[$key];
228
+				$optkey = \defined($key) ? \constant($key) : $key;
229
+				unset($options[$key]);
230
+				$options[$optkey] = $optval;
231
+			}
232
+		}
233
+		require_once $GLOBALS['xoops']->path('class/xoopsformloader.php');
234
+		switch ($this->getVar('field_type')) {
235
+			default:
236
+			case 'autotext':
237
+				//autotext is not for editing
238
+				$element = new \XoopsFormLabel($caption, $this->getOutputValue($user, $profile));
239
+				break;
240
+			case 'textbox':
241
+				$element = new \XoopsFormText($caption, $name, 35, $this->getVar('field_maxlength'), $value);
242
+				break;
243
+			case 'textarea':
244
+				$element = new \XoopsFormTextArea($caption, $name, $value, 4, 30);
245
+				break;
246
+			case 'dhtml':
247
+				$element = new \XoopsFormText($caption, $name, 35, 255, $value);
248
+				break;
249
+			case 'select':
250
+				$element = new \XoopsFormSelect($caption, $name, $value);
251
+				// If options do not include an empty element, then add a blank option to prevent any default selection
252
+				if (!\array_key_exists('', $options)) {
253
+					$element->addOption('', _NONE);
254
+					//trabis
255
+					if (1 == $this->getVar('field_required')) {
256
+						$eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
257
+						$eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
258
+						$element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
259
+														   . "for (i = 0; i < selectBox.options.length; i++  ) { if ( selectBox.options[i].selected === true && selectBox.options[i].value != '' ) { hasSelected = true; break; } }"
260
+														   . "if ( !hasSelected ) { window.alert(\"{$eltmsg}\"); selectBox.focus(); return false; }";
261
+					}
262
+					//end
263
+				}
264
+				$element->addOptionArray($options);
265
+				break;
266
+			case 'editor':
267
+				$element = new \XoopsFormText($caption, $name, 35, 255, $value);
268
+				break;
269
+			case 'select_multi':
270
+				$element = new \XoopsFormSelect($caption, $name, $value, 5, true);
271
+				$element->addOptionArray($options);
272
+				break;
273
+			case 'radio':
274
+				$element = new \XoopsFormRadio($caption, $name, $value);
275
+				$element->addOptionArray($options);
276
+				break;
277
+			case 'checkbox':
278
+				$element = new \XoopsFormCheckBox($caption, $name, $value);
279
+				$element->addOptionArray($options);
280
+				break;
281
+			case 'yesno':
282
+				$element = new \XoopsFormRadioYN($caption, $name, $value);
283
+				break;
284
+			case 'group':
285
+				$element = new \XoopsFormSelectGroup($caption, $name, true, $value);
286
+				break;
287
+			case 'group_multi':
288
+				$element = new \XoopsFormSelectGroup($caption, $name, true, $value, 5, true);
289
+				break;
290
+			case 'language':
291
+				$element = new \XoopsFormSelectLang($caption, $name, $value);
292
+				break;
293
+			case 'date':
294
+				$element = new \XoopsFormTextDateSelect($caption, $name, 15, $value);
295
+				break;
296
+			case 'longdate':
297
+				$element = new \XoopsFormTextDateSelect($caption, $name, 15, \str_replace('-', '/', $value));
298
+				break;
299
+			case 'datetime':
300
+				$element = new XoopsFormDatetime($caption, $name, 15, $value);
301
+				break;
302
+			case 'list':
303
+				$element = new \XoopsFormSelect($caption, $name, $value, 1, $options[0]);
304
+				break;
305
+			case 'timezone':
306
+				$element = new \XoopsFormSelectTimezone($caption, $name, $value);
307
+				$element->setExtra("style='width: 280px;'");
308
+				break;
309
+			case 'rank':
310
+				$element = new \XoopsFormSelect($caption, $name, $value);
311 311
 
312
-                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
313
-                $ranks = \XoopsLists::getUserRankList();
314
-                $element->addOption(0, '--------------');
315
-                $element->addOptionArray($ranks);
316
-                break;
317
-            case 'theme':
318
-                $element = new \XoopsFormSelect($caption, $name, $value);
319
-                $element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
320
-                $handle  = \opendir(XOOPS_THEME_PATH . '/');
321
-                $dirlist = [];
322
-                while (false !== ($file = \readdir($handle))) {
323
-                    if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
324
-                        if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
325
-                            $dirlist[$file] = $file;
326
-                        }
327
-                    }
328
-                }
329
-                \closedir($handle);
330
-                if (!empty($dirlist)) {
331
-                    \asort($dirlist);
332
-                    $element->addOptionArray($dirlist);
333
-                }
334
-                break;
335
-        }
336
-        if ('' != $this->getVar('field_description')) {
337
-            $element->setDescription($this->getVar('field_description'));
338
-        }
312
+				require_once $GLOBALS['xoops']->path('class/xoopslists.php');
313
+				$ranks = \XoopsLists::getUserRankList();
314
+				$element->addOption(0, '--------------');
315
+				$element->addOptionArray($ranks);
316
+				break;
317
+			case 'theme':
318
+				$element = new \XoopsFormSelect($caption, $name, $value);
319
+				$element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
320
+				$handle  = \opendir(XOOPS_THEME_PATH . '/');
321
+				$dirlist = [];
322
+				while (false !== ($file = \readdir($handle))) {
323
+					if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
324
+						if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
325
+							$dirlist[$file] = $file;
326
+						}
327
+					}
328
+				}
329
+				\closedir($handle);
330
+				if (!empty($dirlist)) {
331
+					\asort($dirlist);
332
+					$element->addOptionArray($dirlist);
333
+				}
334
+				break;
335
+		}
336
+		if ('' != $this->getVar('field_description')) {
337
+			$element->setDescription($this->getVar('field_description'));
338
+		}
339 339
 
340
-        return $element;
341
-    }
340
+		return $element;
341
+	}
342 342
 
343
-    /**
344
-     * Returns a value for output of this field
345
-     *
346
-     * @param \XoopsUser     $user    {@link XoopsUser} object to get the value of
347
-     * @param ObjectsProfile $profile object to get the value of
348
-     *
349
-     * @return mixed
350
-     **/
351
-    public function getOutputValue($user, $profile)
352
-    {
353
-        \xoops_loadLanguage('modinfo', 'objects');
343
+	/**
344
+	 * Returns a value for output of this field
345
+	 *
346
+	 * @param \XoopsUser     $user    {@link XoopsUser} object to get the value of
347
+	 * @param ObjectsProfile $profile object to get the value of
348
+	 *
349
+	 * @return mixed
350
+	 **/
351
+	public function getOutputValue($user, $profile)
352
+	{
353
+		\xoops_loadLanguage('modinfo', 'objects');
354 354
 
355
-        $value = \in_array($this->getVar('field_name'), $this->getPostVars(), true) ? $user->getVar($this->getVar('field_name')) : $profile->getVar($this->getVar('field_name'));
355
+		$value = \in_array($this->getVar('field_name'), $this->getPostVars(), true) ? $user->getVar($this->getVar('field_name')) : $profile->getVar($this->getVar('field_name'));
356 356
 
357
-        switch ($this->getVar('field_type')) {
358
-            default:
359
-            case 'textbox':
360
-                if ('url' === $this->getVar('field_name') && '' != $value) {
361
-                    return '<a href="' . \formatURL($value) . '" rel="external">' . $value . '</a>';
362
-                }
357
+		switch ($this->getVar('field_type')) {
358
+			default:
359
+			case 'textbox':
360
+				if ('url' === $this->getVar('field_name') && '' != $value) {
361
+					return '<a href="' . \formatURL($value) . '" rel="external">' . $value . '</a>';
362
+				}
363 363
 
364
-                return $value;
365
-                break;
366
-            case 'editor':
367
-            case 'textarea':
368
-            case 'dhtml':
369
-            case 'theme':
370
-            case 'language':
371
-            case 'list':
372
-                return $value;
373
-                break;
374
-            case 'select':
375
-            case 'radio':
376
-                $options = $this->getVar('field_options');
377
-                if (isset($options[$value])) {
378
-                    $value = \htmlspecialchars(\defined($options[$value]) ? \constant($options[$value]) : $options[$value], \ENT_QUOTES | \ENT_HTML5);
379
-                } else {
380
-                    $value = '';
381
-                }
364
+				return $value;
365
+				break;
366
+			case 'editor':
367
+			case 'textarea':
368
+			case 'dhtml':
369
+			case 'theme':
370
+			case 'language':
371
+			case 'list':
372
+				return $value;
373
+				break;
374
+			case 'select':
375
+			case 'radio':
376
+				$options = $this->getVar('field_options');
377
+				if (isset($options[$value])) {
378
+					$value = \htmlspecialchars(\defined($options[$value]) ? \constant($options[$value]) : $options[$value], \ENT_QUOTES | \ENT_HTML5);
379
+				} else {
380
+					$value = '';
381
+				}
382 382
 
383
-                return $value;
384
-                break;
385
-            case 'select_multi':
386
-            case 'checkbox':
387
-                $options = $this->getVar('field_options');
388
-                $ret     = [];
389
-                if (\count($options) > 0) {
390
-                    foreach (\array_keys($options) as $key) {
391
-                        if (\in_array($key, $value, true)) {
392
-                            $$ret[$key] = \htmlspecialchars(\defined($options[$key]) ? \constant($options[$key]) : $options[$key], \ENT_QUOTES | \ENT_HTML5);
393
-                        }
394
-                    }
395
-                }
383
+				return $value;
384
+				break;
385
+			case 'select_multi':
386
+			case 'checkbox':
387
+				$options = $this->getVar('field_options');
388
+				$ret     = [];
389
+				if (\count($options) > 0) {
390
+					foreach (\array_keys($options) as $key) {
391
+						if (\in_array($key, $value, true)) {
392
+							$$ret[$key] = \htmlspecialchars(\defined($options[$key]) ? \constant($options[$key]) : $options[$key], \ENT_QUOTES | \ENT_HTML5);
393
+						}
394
+					}
395
+				}
396 396
 
397
-                return $ret;
398
-                break;
399
-            case 'group':
400
-                //change to retrieve groups and return name of group
401
-                return $value;
402
-                break;
403
-            case 'group_multi':
404
-                //change to retrieve groups and return array of group names
405
-                return '';
406
-                break;
407
-            case 'longdate':
408
-                //return YYYY/MM/DD format - not optimal as it is not using local date format, but how do we do that
409
-                //when we cannot convert it to a UNIX timestamp?
410
-                return \str_replace('-', '/', $value);
411
-            case 'date':
412
-                return \formatTimestamp($value, 's');
413
-                break;
414
-            case 'datetime':
415
-                if (!empty($value)) {
416
-                    return \formatTimestamp($value, 'm');
417
-                }
397
+				return $ret;
398
+				break;
399
+			case 'group':
400
+				//change to retrieve groups and return name of group
401
+				return $value;
402
+				break;
403
+			case 'group_multi':
404
+				//change to retrieve groups and return array of group names
405
+				return '';
406
+				break;
407
+			case 'longdate':
408
+				//return YYYY/MM/DD format - not optimal as it is not using local date format, but how do we do that
409
+				//when we cannot convert it to a UNIX timestamp?
410
+				return \str_replace('-', '/', $value);
411
+			case 'date':
412
+				return \formatTimestamp($value, 's');
413
+				break;
414
+			case 'datetime':
415
+				if (!empty($value)) {
416
+					return \formatTimestamp($value, 'm');
417
+				}
418 418
 
419
-                return $value = \_MI_SONGLIST_DATENOTSET;
420
-                break;
421
-            case 'autotext':
422
-                $value = $user->getVar($this->getVar('field_name'), 'n'); //autotext can have HTML in it
423
-                $value = \str_replace('{X_UID}', $user->getVar('uid'), $value);
424
-                $value = \str_replace('{X_URL}', XOOPS_URL, $value);
425
-                $value = \str_replace('{X_UNAME}', $user->getVar('uname'), $value);
419
+				return $value = \_MI_SONGLIST_DATENOTSET;
420
+				break;
421
+			case 'autotext':
422
+				$value = $user->getVar($this->getVar('field_name'), 'n'); //autotext can have HTML in it
423
+				$value = \str_replace('{X_UID}', $user->getVar('uid'), $value);
424
+				$value = \str_replace('{X_URL}', XOOPS_URL, $value);
425
+				$value = \str_replace('{X_UNAME}', $user->getVar('uname'), $value);
426 426
 
427
-                return $value;
428
-                break;
429
-            case 'rank':
430
-                $userrank       = $user->rank();
431
-                $user_rankimage = '';
432
-                if (isset($userrank['image']) && '' != $userrank['image']) {
433
-                    $user_rankimage = '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '"><br>';
434
-                }
427
+				return $value;
428
+				break;
429
+			case 'rank':
430
+				$userrank       = $user->rank();
431
+				$user_rankimage = '';
432
+				if (isset($userrank['image']) && '' != $userrank['image']) {
433
+					$user_rankimage = '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '"><br>';
434
+				}
435 435
 
436
-                return $user_rankimage . $userrank['title'];
437
-                break;
438
-            case 'yesno':
439
-                return $value ? _YES : _NO;
440
-                break;
441
-            case 'timezone':
442
-                require_once $GLOBALS['xoops']->path('class/xoopslists.php');
443
-                $timezones = \XoopsLists::getTimeZoneList();
444
-                $value     = empty($value) ? '0' : (string)$value;
436
+				return $user_rankimage . $userrank['title'];
437
+				break;
438
+			case 'yesno':
439
+				return $value ? _YES : _NO;
440
+				break;
441
+			case 'timezone':
442
+				require_once $GLOBALS['xoops']->path('class/xoopslists.php');
443
+				$timezones = \XoopsLists::getTimeZoneList();
444
+				$value     = empty($value) ? '0' : (string)$value;
445 445
 
446
-                return $timezones[\str_replace('.0', '', $value)];
447
-                break;
448
-        }
449
-    }
446
+				return $timezones[\str_replace('.0', '', $value)];
447
+				break;
448
+		}
449
+	}
450 450
 
451
-    /**
452
-     * Returns a value ready to be saved in the database
453
-     *
454
-     * @param mixed $value Value to format
455
-     *
456
-     * @return mixed
457
-     */
458
-    public function getValueForSave($value)
459
-    {
460
-        switch ($this->getVar('field_type')) {
461
-            default:
462
-            case 'textbox':
463
-            case 'textarea':
464
-            case 'dhtml':
465
-            case 'yesno':
466
-            case 'timezone':
467
-            case 'theme':
468
-            case 'language':
469
-            case 'list':
470
-            case 'select':
471
-            case 'radio':
472
-            case 'select_multi':
473
-            case 'checkbox':
474
-            case 'group':
475
-            case 'group_multi':
476
-            case 'longdate':
477
-                return $value;
478
-            case 'date':
479
-                if ('' != $value) {
480
-                    return \strtotime((string)$value);
481
-                }
451
+	/**
452
+	 * Returns a value ready to be saved in the database
453
+	 *
454
+	 * @param mixed $value Value to format
455
+	 *
456
+	 * @return mixed
457
+	 */
458
+	public function getValueForSave($value)
459
+	{
460
+		switch ($this->getVar('field_type')) {
461
+			default:
462
+			case 'textbox':
463
+			case 'textarea':
464
+			case 'dhtml':
465
+			case 'yesno':
466
+			case 'timezone':
467
+			case 'theme':
468
+			case 'language':
469
+			case 'list':
470
+			case 'select':
471
+			case 'radio':
472
+			case 'select_multi':
473
+			case 'checkbox':
474
+			case 'group':
475
+			case 'group_multi':
476
+			case 'longdate':
477
+				return $value;
478
+			case 'date':
479
+				if ('' != $value) {
480
+					return \strtotime((string)$value);
481
+				}
482 482
 
483
-                return $value;
484
-                break;
485
-            case 'datetime':
486
-                if (!empty($value)) {
487
-                    return \strtotime($value['date']??'') + (int)$value['time'];
488
-                }
483
+				return $value;
484
+				break;
485
+			case 'datetime':
486
+				if (!empty($value)) {
487
+					return \strtotime($value['date']??'') + (int)$value['time'];
488
+				}
489 489
 
490
-                return $value;
491
-                break;
492
-        }
493
-    }
490
+				return $value;
491
+				break;
492
+		}
493
+	}
494 494
 
495
-    /**
496
-     * Get names of user variables
497
-     *
498
-     * @return array
499
-     */
500
-    public function getPostVars(): array
501
-    {
502
-        $objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
495
+	/**
496
+	 * Get names of user variables
497
+	 *
498
+	 * @return array
499
+	 */
500
+	public function getPostVars(): array
501
+	{
502
+		$objectsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Extras');
503 503
 
504
-        return $objectsHandler->getPostVars();
505
-    }
504
+		return $objectsHandler->getPostVars();
505
+	}
506 506
 }
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
      */
42 42
     public function setVar($key, $value, $not_gpc = false): void
43 43
     {
44
-        if ('field_options' === $key && \is_array($value)) {
44
+        if ('field_options'===$key && \is_array($value)) {
45 45
             foreach (\array_keys($value) as $idx) {
46 46
                 $value[$idx] = base64_encode($value[$idx]);
47 47
             }
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
     public function getVar($key, $format = 's')
58 58
     {
59 59
         $value = parent::getVar($key, $format);
60
-        if ('field_options' === $key && !empty($value)) {
60
+        if ('field_options'===$key && !empty($value)) {
61 61
             foreach (\array_keys($value) as $idx) {
62 62
                 $value[$idx] = base64_decode($value[$idx], true);
63 63
             }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     public function getEditElement($user, $profile)
78 78
     {
79 79
         $value = \in_array($this->getVar('field_name'), $this->getPostVars(), true) ? $user->getVar($this->getVar('field_name'), 'e') : $profile->getVar($this->getVar('field_name'), 'e');
80
-        if (null === $value) {
80
+        if (null===$value) {
81 81
             $value = $this->getVar('field_default');
82 82
         }
83 83
         $caption = $this->getVar('field_title');
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 
90 90
             foreach (\array_keys($options) as $key) {
91 91
                 $optval = \defined($options[$key]) ? \constant($options[$key]) : $options[$key];
92
-                $optkey = \defined((string)$key) ? \constant($key) : $key;
92
+                $optkey = \defined((string) $key) ? \constant($key) : $key;
93 93
                 unset($options[$key]);
94 94
                 $options[$optkey] = $optval;
95 95
             }
@@ -124,7 +124,7 @@  discard block
 block discarded – undo
124 124
                 if (!\array_key_exists('', $options)) {
125 125
                     $element->addOption('', _NONE);
126 126
                     //trabis
127
-                    if (1 == $this->getVar('field_required')) {
127
+                    if (1==$this->getVar('field_required')) {
128 128
                         $eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
129 129
                         $eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
130 130
                         $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
@@ -185,11 +185,11 @@  discard block
 block discarded – undo
185 185
             case 'theme':
186 186
                 $element = new \XoopsFormSelect($caption, $name, $value);
187 187
                 $element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
188
-                $handle  = \opendir(XOOPS_THEME_PATH . '/');
188
+                $handle  = \opendir(XOOPS_THEME_PATH.'/');
189 189
                 $dirlist = [];
190
-                while (false !== ($file = \readdir($handle))) {
191
-                    if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
192
-                        if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
190
+                while (false!==($file = \readdir($handle))) {
191
+                    if (\is_dir(XOOPS_THEME_PATH.'/'.$file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs'!==\mb_strtolower($file)) {
192
+                        if (\file_exists(XOOPS_THEME_PATH.'/'.$file.'/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
193 193
                             $dirlist[$file] = $file;
194 194
                         }
195 195
                     }
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
                 }
202 202
                 break;
203 203
         }
204
-        if ('' != $this->getVar('field_description')) {
204
+        if (''!=$this->getVar('field_description')) {
205 205
             $element->setDescription($this->getVar('field_description'));
206 206
         }
207 207
 
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
                 if (!\array_key_exists('', $options)) {
253 253
                     $element->addOption('', _NONE);
254 254
                     //trabis
255
-                    if (1 == $this->getVar('field_required')) {
255
+                    if (1==$this->getVar('field_required')) {
256 256
                         $eltmsg                          = empty($caption) ? \sprintf(_FORM_ENTER, $name) : \sprintf(_FORM_ENTER, $caption);
257 257
                         $eltmsg                          = \str_replace('"', '\"', \stripslashes($eltmsg));
258 258
                         $element->customValidationCode[] = "\nvar hasSelected = false; var selectBox = myform.{$name};"
@@ -317,11 +317,11 @@  discard block
 block discarded – undo
317 317
             case 'theme':
318 318
                 $element = new \XoopsFormSelect($caption, $name, $value);
319 319
                 $element->addOption('0', \_AM_SONGLIST_OBJS_MF_SITEDEFAULT);
320
-                $handle  = \opendir(XOOPS_THEME_PATH . '/');
320
+                $handle  = \opendir(XOOPS_THEME_PATH.'/');
321 321
                 $dirlist = [];
322
-                while (false !== ($file = \readdir($handle))) {
323
-                    if (\is_dir(XOOPS_THEME_PATH . '/' . $file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs' !== \mb_strtolower($file)) {
324
-                        if (\file_exists(XOOPS_THEME_PATH . '/' . $file . '/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
322
+                while (false!==($file = \readdir($handle))) {
323
+                    if (\is_dir(XOOPS_THEME_PATH.'/'.$file) && !\preg_match('/^[.]{1,2}$/', $file) && 'cvs'!==\mb_strtolower($file)) {
324
+                        if (\file_exists(XOOPS_THEME_PATH.'/'.$file.'/theme.tpl') && \in_array($file, $GLOBALS['xoopsConfig']['theme_set_allowed'], true)) {
325 325
                             $dirlist[$file] = $file;
326 326
                         }
327 327
                     }
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
                 }
334 334
                 break;
335 335
         }
336
-        if ('' != $this->getVar('field_description')) {
336
+        if (''!=$this->getVar('field_description')) {
337 337
             $element->setDescription($this->getVar('field_description'));
338 338
         }
339 339
 
@@ -357,8 +357,8 @@  discard block
 block discarded – undo
357 357
         switch ($this->getVar('field_type')) {
358 358
             default:
359 359
             case 'textbox':
360
-                if ('url' === $this->getVar('field_name') && '' != $value) {
361
-                    return '<a href="' . \formatURL($value) . '" rel="external">' . $value . '</a>';
360
+                if ('url'===$this->getVar('field_name') && ''!=$value) {
361
+                    return '<a href="'.\formatURL($value).'" rel="external">'.$value.'</a>';
362 362
                 }
363 363
 
364 364
                 return $value;
@@ -386,7 +386,7 @@  discard block
 block discarded – undo
386 386
             case 'checkbox':
387 387
                 $options = $this->getVar('field_options');
388 388
                 $ret     = [];
389
-                if (\count($options) > 0) {
389
+                if (\count($options)>0) {
390 390
                     foreach (\array_keys($options) as $key) {
391 391
                         if (\in_array($key, $value, true)) {
392 392
                             $$ret[$key] = \htmlspecialchars(\defined($options[$key]) ? \constant($options[$key]) : $options[$key], \ENT_QUOTES | \ENT_HTML5);
@@ -429,11 +429,11 @@  discard block
 block discarded – undo
429 429
             case 'rank':
430 430
                 $userrank       = $user->rank();
431 431
                 $user_rankimage = '';
432
-                if (isset($userrank['image']) && '' != $userrank['image']) {
433
-                    $user_rankimage = '<img src="' . XOOPS_UPLOAD_URL . '/' . $userrank['image'] . '" alt="' . $userrank['title'] . '"><br>';
432
+                if (isset($userrank['image']) && ''!=$userrank['image']) {
433
+                    $user_rankimage = '<img src="'.XOOPS_UPLOAD_URL.'/'.$userrank['image'].'" alt="'.$userrank['title'].'"><br>';
434 434
                 }
435 435
 
436
-                return $user_rankimage . $userrank['title'];
436
+                return $user_rankimage.$userrank['title'];
437 437
                 break;
438 438
             case 'yesno':
439 439
                 return $value ? _YES : _NO;
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
             case 'timezone':
442 442
                 require_once $GLOBALS['xoops']->path('class/xoopslists.php');
443 443
                 $timezones = \XoopsLists::getTimeZoneList();
444
-                $value     = empty($value) ? '0' : (string)$value;
444
+                $value     = empty($value) ? '0' : (string) $value;
445 445
 
446 446
                 return $timezones[\str_replace('.0', '', $value)];
447 447
                 break;
@@ -476,15 +476,15 @@  discard block
 block discarded – undo
476 476
             case 'longdate':
477 477
                 return $value;
478 478
             case 'date':
479
-                if ('' != $value) {
480
-                    return \strtotime((string)$value);
479
+                if (''!=$value) {
480
+                    return \strtotime((string) $value);
481 481
                 }
482 482
 
483 483
                 return $value;
484 484
                 break;
485 485
             case 'datetime':
486 486
                 if (!empty($value)) {
487
-                    return \strtotime($value['date']??'') + (int)$value['time'];
487
+                    return \strtotime($value['date'] ?? '')+(int) $value['time'];
488 488
                 }
489 489
 
490 490
                 return $value;
Please login to merge, or discard this patch.
class/RequestsHandler.php 2 patches
Indentation   +195 added lines, -195 removed lines patch added patch discarded remove patch
@@ -11,199 +11,199 @@
 block discarded – undo
11 11
  */
12 12
 class RequestsHandler extends \XoopsPersistableObjectHandler
13 13
 {
14
-    /**
15
-     * RequestsHandler constructor.
16
-     * @param \XoopsDatabase $db
17
-     */
18
-    public function __construct(\XoopsDatabase $db)
19
-    {
20
-        parent::__construct($db, 'songlist_requests', Requests::class, 'rid', 'name');
21
-    }
22
-
23
-    /**
24
-     * @return array
25
-     */
26
-    public function filterFields(): array
27
-    {
28
-        return ['rid', 'artist', 'album', 'title', 'lyrics', 'uid', 'name', 'email', 'songid', 'sid', 'created', 'updated'];
29
-    }
30
-
31
-    /**
32
-     * @param $filter
33
-     * @return \CriteriaCompo
34
-     */
35
-    public function getFilterCriteria($filter): \CriteriaCompo
36
-    {
37
-        $parts    = \explode('|', $filter);
38
-        $criteria = new \CriteriaCompo();
39
-        foreach ($parts as $part) {
40
-            $var = \explode(',', $part);
41
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
42
-                $object = $this->create();
43
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
44
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
45
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
46
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
47
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
48
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
49
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
50
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
51
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
52
-                }
53
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
54
-                $criteria->add(new \Criteria($var[0], $var[1]));
55
-            }
56
-        }
57
-
58
-        return $criteria;
59
-    }
60
-
61
-    /**
62
-     * @param        $filter
63
-     * @param        $field
64
-     * @param string $sort
65
-     * @param string $op
66
-     * @param string $fct
67
-     * @return string
68
-     */
69
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
70
-    {
71
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
72
-        if (\is_object($ele)) {
73
-            return $ele->render();
74
-        }
75
-
76
-        return '&nbsp;';
77
-    }
78
-
79
-    /**
80
-     * @param bool $force
81
-     * @return mixed
82
-     */
83
-    public function insert(\XoopsObject $obj, $force = true)
84
-    {
85
-        if ($obj->isNew()) {
86
-            $obj->setVar('created', \time());
87
-            $new      = true;
88
-            $sendmail = true;
89
-        } else {
90
-            $obj->setVar('updated', \time());
91
-            $new = false;
92
-            if (true === $obj->vars['songid']['changed']) {
93
-                $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
94
-                $criteria     = new \Criteria('songid', $obj->getVar('songid'));
95
-                $songs        = $songsHandler->getObjects($criteria, false);
96
-                if (\is_object($songs[0])) {
97
-                    foreach ($songs[0]->getVar('aids') as $aid) {
98
-                        $ad[] = $aid;
99
-                    }
100
-                    $obj->setVar('sid', $songs[0]->getVar('sid'));
101
-                    $obj->setVar('aid', $ad[0]);
102
-                    $sendmail = true;
103
-                }
104
-            }
105
-        }
106
-        $rid = parent::insert($obj, $force);
107
-        if ($rid) {
108
-            if ($sendmail) {
109
-                if ($new) {
110
-                    \xoops_loadLanguage('email', 'songlist');
111
-                    $xoopsMailer = \xoops_getMailer();
112
-                    $xoopsMailer->setHTML(true);
113
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
114
-                    $xoopsMailer->setTemplate('songlist_request_created.tpl');
115
-                    $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
116
-
117
-                    foreach (\explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email) {
118
-                        $xoopsMailer->setToEmails($email);
119
-                    }
120
-
121
-                    $xoopsMailer->setToEmails($obj->getVar('email'));
122
-
123
-                    $xoopsMailer->assign('SITEURL', XOOPS_URL);
124
-                    $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
125
-                    $xoopsMailer->assign('RID', $rid);
126
-                    $xoopsMailer->assign('TITLE', $obj->getVar('title'));
127
-                    $xoopsMailer->assign('ALBUM', $obj->getVar('album'));
128
-                    $xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
129
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
130
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
131
-
132
-                    $debug = true;
133
-
134
-                    if (!$xoopsMailer->send($debug)) {
135
-                        \xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
136
-                    }
137
-                } else {
138
-                    \xoops_loadLanguage('email', 'songlist');
139
-                    $songsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
140
-                    $artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
141
-                    $albumsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
142
-                    $genreHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
143
-
144
-                    $song = $songsHandler->get($obj->getVar('sid'));
145
-                    if (\is_object($song)) {
146
-                        $sng = $genre->getVar('title');
147
-                    }
148
-                    $album = $albumHandler->get($song->getVar('abid'));
149
-                    if (\is_object($album)) {
150
-                        $alb     = $genre->getVar('title');
151
-                        $alb_img = $genre->getImage();
152
-                    }
153
-                    $genre = $genreHandler->get($song->getVar('abid'));
154
-                    if (\is_object($genre)) {
155
-                        $gen = $genre->getVar('name');
156
-                    }
157
-                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
158
-                    $art     = '';
159
-                    foreach ($artists as $id => $artist) {
160
-                        $art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
161
-                    }
162
-                    $xoopsMailer = \getMailer();
163
-                    $xoopsMailer->setHTML(true);
164
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
165
-                    $xoopsMailer->setTemplate('songlist_request_updated.tpl');
166
-                    $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
167
-
168
-                    $xoopsMailer->setToEmails($obj->getVar('email'));
169
-
170
-                    $xoopsMailer->assign('SITEURL', XOOPS_URL);
171
-                    $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
172
-                    $xoopsMailer->assign('RID', $rid);
173
-                    $xoopsMailer->assign('TITLE', $obj->getVar('title'));
174
-                    $xoopsMailer->assign('ALBUM', $obj->getVar('album'));
175
-                    $xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
176
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
177
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
178
-                    $xoopsMailer->assign('SONGID', $song->getVar('songid'));
179
-                    $xoopsMailer->assign('SONGURL', $song->getURL());
180
-                    $xoopsMailer->assign('FOUNDTITLE', $sng);
181
-                    $xoopsMailer->assign('FOUNDALBUM', $alb);
182
-                    $xoopsMailer->assign('FOUNDARTIST', $art);
183
-                    $xoopsMailer->assign('FOUNDGENRE', $gen);
184
-                    $xoopsMailer->assign('EMAIL', $obj->getVar('email'));
185
-                    $xoopsMailer->assign('NAME', $obj->getVar('name'));
186
-
187
-                    if (!$xoopsMailer->send()) {
188
-                        \xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
189
-                    }
190
-                }
191
-            }
192
-        }
193
-
194
-        return $rid;
195
-    }
196
-
197
-    /**
198
-     * @return string
199
-     */
200
-    public function getURL(): string
201
-    {
202
-        global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
203
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
204
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
205
-        }
206
-
207
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
208
-    }
14
+	/**
15
+	 * RequestsHandler constructor.
16
+	 * @param \XoopsDatabase $db
17
+	 */
18
+	public function __construct(\XoopsDatabase $db)
19
+	{
20
+		parent::__construct($db, 'songlist_requests', Requests::class, 'rid', 'name');
21
+	}
22
+
23
+	/**
24
+	 * @return array
25
+	 */
26
+	public function filterFields(): array
27
+	{
28
+		return ['rid', 'artist', 'album', 'title', 'lyrics', 'uid', 'name', 'email', 'songid', 'sid', 'created', 'updated'];
29
+	}
30
+
31
+	/**
32
+	 * @param $filter
33
+	 * @return \CriteriaCompo
34
+	 */
35
+	public function getFilterCriteria($filter): \CriteriaCompo
36
+	{
37
+		$parts    = \explode('|', $filter);
38
+		$criteria = new \CriteriaCompo();
39
+		foreach ($parts as $part) {
40
+			$var = \explode(',', $part);
41
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
42
+				$object = $this->create();
43
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
44
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
45
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
46
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
47
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
48
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
49
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
50
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
51
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
52
+				}
53
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
54
+				$criteria->add(new \Criteria($var[0], $var[1]));
55
+			}
56
+		}
57
+
58
+		return $criteria;
59
+	}
60
+
61
+	/**
62
+	 * @param        $filter
63
+	 * @param        $field
64
+	 * @param string $sort
65
+	 * @param string $op
66
+	 * @param string $fct
67
+	 * @return string
68
+	 */
69
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
70
+	{
71
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
72
+		if (\is_object($ele)) {
73
+			return $ele->render();
74
+		}
75
+
76
+		return '&nbsp;';
77
+	}
78
+
79
+	/**
80
+	 * @param bool $force
81
+	 * @return mixed
82
+	 */
83
+	public function insert(\XoopsObject $obj, $force = true)
84
+	{
85
+		if ($obj->isNew()) {
86
+			$obj->setVar('created', \time());
87
+			$new      = true;
88
+			$sendmail = true;
89
+		} else {
90
+			$obj->setVar('updated', \time());
91
+			$new = false;
92
+			if (true === $obj->vars['songid']['changed']) {
93
+				$songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
94
+				$criteria     = new \Criteria('songid', $obj->getVar('songid'));
95
+				$songs        = $songsHandler->getObjects($criteria, false);
96
+				if (\is_object($songs[0])) {
97
+					foreach ($songs[0]->getVar('aids') as $aid) {
98
+						$ad[] = $aid;
99
+					}
100
+					$obj->setVar('sid', $songs[0]->getVar('sid'));
101
+					$obj->setVar('aid', $ad[0]);
102
+					$sendmail = true;
103
+				}
104
+			}
105
+		}
106
+		$rid = parent::insert($obj, $force);
107
+		if ($rid) {
108
+			if ($sendmail) {
109
+				if ($new) {
110
+					\xoops_loadLanguage('email', 'songlist');
111
+					$xoopsMailer = \xoops_getMailer();
112
+					$xoopsMailer->setHTML(true);
113
+					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
114
+					$xoopsMailer->setTemplate('songlist_request_created.tpl');
115
+					$xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
116
+
117
+					foreach (\explode('|', $GLOBALS['songlistModuleConfig']['email']) as $email) {
118
+						$xoopsMailer->setToEmails($email);
119
+					}
120
+
121
+					$xoopsMailer->setToEmails($obj->getVar('email'));
122
+
123
+					$xoopsMailer->assign('SITEURL', XOOPS_URL);
124
+					$xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
125
+					$xoopsMailer->assign('RID', $rid);
126
+					$xoopsMailer->assign('TITLE', $obj->getVar('title'));
127
+					$xoopsMailer->assign('ALBUM', $obj->getVar('album'));
128
+					$xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
129
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
130
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
131
+
132
+					$debug = true;
133
+
134
+					if (!$xoopsMailer->send($debug)) {
135
+						\xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
136
+					}
137
+				} else {
138
+					\xoops_loadLanguage('email', 'songlist');
139
+					$songsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
140
+					$artistsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
141
+					$albumsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
142
+					$genreHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
143
+
144
+					$song = $songsHandler->get($obj->getVar('sid'));
145
+					if (\is_object($song)) {
146
+						$sng = $genre->getVar('title');
147
+					}
148
+					$album = $albumHandler->get($song->getVar('abid'));
149
+					if (\is_object($album)) {
150
+						$alb     = $genre->getVar('title');
151
+						$alb_img = $genre->getImage();
152
+					}
153
+					$genre = $genreHandler->get($song->getVar('abid'));
154
+					if (\is_object($genre)) {
155
+						$gen = $genre->getVar('name');
156
+					}
157
+					$artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
158
+					$art     = '';
159
+					foreach ($artists as $id => $artist) {
160
+						$art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
161
+					}
162
+					$xoopsMailer = \getMailer();
163
+					$xoopsMailer->setHTML(true);
164
+					$xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
165
+					$xoopsMailer->setTemplate('songlist_request_updated.tpl');
166
+					$xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
167
+
168
+					$xoopsMailer->setToEmails($obj->getVar('email'));
169
+
170
+					$xoopsMailer->assign('SITEURL', XOOPS_URL);
171
+					$xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']);
172
+					$xoopsMailer->assign('RID', $rid);
173
+					$xoopsMailer->assign('TITLE', $obj->getVar('title'));
174
+					$xoopsMailer->assign('ALBUM', $obj->getVar('album'));
175
+					$xoopsMailer->assign('ARTIST', $obj->getVar('artist'));
176
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
177
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
178
+					$xoopsMailer->assign('SONGID', $song->getVar('songid'));
179
+					$xoopsMailer->assign('SONGURL', $song->getURL());
180
+					$xoopsMailer->assign('FOUNDTITLE', $sng);
181
+					$xoopsMailer->assign('FOUNDALBUM', $alb);
182
+					$xoopsMailer->assign('FOUNDARTIST', $art);
183
+					$xoopsMailer->assign('FOUNDGENRE', $gen);
184
+					$xoopsMailer->assign('EMAIL', $obj->getVar('email'));
185
+					$xoopsMailer->assign('NAME', $obj->getVar('name'));
186
+
187
+					if (!$xoopsMailer->send()) {
188
+						\xoops_error($xoopsMailer->getErrors(true), 'Email Send Error');
189
+					}
190
+				}
191
+			}
192
+		}
193
+
194
+		return $rid;
195
+	}
196
+
197
+	/**
198
+	 * @return string
199
+	 */
200
+	public function getURL(): string
201
+	{
202
+		global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
203
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
204
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
205
+		}
206
+
207
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
208
+	}
209 209
 }
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace XoopsModules\Songlist;
4 4
 
5
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
5
+require_once \dirname(__DIR__).'/include/songlist.object.php';
6 6
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
7 7
 use  XoopsModules\Songlist\Form\FormController;
8 8
 
@@ -40,15 +40,15 @@  discard block
 block discarded – undo
40 40
             $var = \explode(',', $part);
41 41
             if (!empty($var[1]) && !\is_numeric($var[0])) {
42 42
                 $object = $this->create();
43
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
44
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
45
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
43
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
44
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
45
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
46 46
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
47
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
48
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
49
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
50
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
51
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
47
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
48
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
49
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
50
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
51
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
52 52
                 }
53 53
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
54 54
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
         } else {
90 90
             $obj->setVar('updated', \time());
91 91
             $new = false;
92
-            if (true === $obj->vars['songid']['changed']) {
92
+            if (true===$obj->vars['songid']['changed']) {
93 93
                 $songsHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Songs');
94 94
                 $criteria     = new \Criteria('songid', $obj->getVar('songid'));
95 95
                 $songs        = $songsHandler->getObjects($criteria, false);
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
                     \xoops_loadLanguage('email', 'songlist');
111 111
                     $xoopsMailer = \xoops_getMailer();
112 112
                     $xoopsMailer->setHTML(true);
113
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
113
+                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
114 114
                     $xoopsMailer->setTemplate('songlist_request_created.tpl');
115 115
                     $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTMADE, $rid));
116 116
 
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
                     if (\is_object($genre)) {
155 155
                         $gen = $genre->getVar('name');
156 156
                     }
157
-                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '(' . \implode(',', $song->getVar('aid')) . ')', 'IN'), false);
157
+                    $artists = $artistsHandler->getObjects(new \Criteria('aid', '('.\implode(',', $song->getVar('aid')).')', 'IN'), false);
158 158
                     $art     = '';
159 159
                     foreach ($artists as $id => $artist) {
160
-                        $art .= $artist->getVar('name') . ($id < \count($artists) - 1 ? ', ' : '');
160
+                        $art .= $artist->getVar('name').($id<\count($artists)-1 ? ', ' : '');
161 161
                     }
162 162
                     $xoopsMailer = \getMailer();
163 163
                     $xoopsMailer->setHTML(true);
164
-                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/' . $GLOBALS['xoopsConfig']['language'] . '/mail_templates/'));
164
+                    $xoopsMailer->setTemplateDir($GLOBALS['xoops']->path('/modules/songlist/language/'.$GLOBALS['xoopsConfig']['language'].'/mail_templates/'));
165 165
                     $xoopsMailer->setTemplate('songlist_request_updated.tpl');
166 166
                     $xoopsMailer->setSubject(\sprintf(\_MD_SONGLIST_SUBJECT_REQUESTFOUND, $rid));
167 167
 
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
     {
202 202
         global $file, $op, $fct, $id, $value, $gid, $cid, $start, $limit;
203 203
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
204
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $op . '-' . $fct . $GLOBALS['songlistModuleConfig']['endofurl'];
204
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$op.'-'.$fct.$GLOBALS['songlistModuleConfig']['endofurl'];
205 205
         }
206 206
 
207
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct;
207
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct;
208 208
     }
209 209
 }
Please login to merge, or discard this patch.
class/SongsHandler.php 2 patches
Indentation   +375 added lines, -375 removed lines patch added patch discarded remove patch
@@ -11,303 +11,303 @@  discard block
 block discarded – undo
11 11
  */
12 12
 class SongsHandler extends \XoopsPersistableObjectHandler
13 13
 {
14
-    /**
15
-     * SongsHandler constructor.
16
-     * @param \XoopsDatabase $db
17
-     */
18
-    public function __construct(\XoopsDatabase $db)
19
-    {
20
-        $moduleHandler                   = \xoops_getHandler('module');
21
-        $configHandler                   = \xoops_getHandler('config');
22
-        $GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
23
-        $GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
24
-
25
-        parent::__construct($db, 'songlist_songs', Songs::class, 'sid', 'title');
26
-    }
27
-
28
-    /**
29
-     * @return array
30
-     */
31
-    public function filterFields(): array
32
-    {
33
-        return ['sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
34
-    }
35
-
36
-    /**
37
-     * @param $filter
38
-     * @return \CriteriaCompo
39
-     */
40
-    public function getFilterCriteria($filter): \CriteriaCompo
41
-    {
42
-        $parts    = \explode('|', $filter);
43
-        $criteria = new \CriteriaCompo();
44
-        foreach ($parts as $part) {
45
-            $var = \explode(',', $part);
46
-            if (!empty($var[1]) && !\is_numeric($var[0])) {
47
-                $object = $this->create();
48
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
49
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
50
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
51
-                } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
52
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
53
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
54
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
55
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
56
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
57
-                }
58
-            } elseif (!empty($var[1]) && \is_numeric($var[0])) {
59
-                $criteria->add(new \Criteria($var[0], $var[1]));
60
-            }
61
-        }
62
-
63
-        return $criteria;
64
-    }
65
-
66
-    /**
67
-     * @param        $filter
68
-     * @param        $field
69
-     * @param string $sort
70
-     * @param string $op
71
-     * @param string $fct
72
-     * @return string
73
-     */
74
-    public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
75
-    {
76
-        $ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
77
-        if (\is_object($ele)) {
78
-            return $ele->render();
79
-        }
80
-
81
-        return '&nbsp;';
82
-    }
83
-
84
-    /**
85
-     * @param bool $force
86
-     * @param null $object
87
-     * @return bool|mixed
88
-     */
89
-    public function insert(\XoopsObject $obj, $force = true, $object = null)
90
-    {
91
-        if ($obj->isNew()) {
92
-            $new = true;
93
-            $old = $this->create();
94
-            $obj->setVar('created', \time());
95
-        } else {
96
-            $new = false;
97
-            $old = $this->get($obj->getVar('sid'));
98
-            $obj->setVar('updated', \time());
99
-        }
100
-
101
-        $albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
102
-        $artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
103
-        $genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
104
-        $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
105
-        $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
106
-
107
-        if (true === ($obj->vars['gid']['changed']??false)) {
108
-            if ($new || (0 != $obj->vars['gid']['value'])) {
109
-                $genre = $genreHandler->get($obj->vars['gid']['value']);
110
-                if (\is_object($genre)) {
111
-                    $genre->setVar('songs', $genre->getVar('songs') + 1);
112
-                    $genreHandler->insert($genre, true, $obj);
113
-                }
114
-            }
115
-            if (!$old->isNew() && $old->getVar('gid') > 0) {
116
-                $genre = $genreHandler->get($old->vars['gid']['value']);
117
-                if (\is_object($genre)) {
118
-                    $genre->setVar('songs', $genre->getVar('songs') - 1);
119
-                    $genreHandler->insert($genre, true, null);
120
-                }
121
-            }
122
-        }
123
-
124
-        if (true === $obj->vars['vcid']['changed']) {
125
-            if ($new || (0 != $obj->vars['vcid']['value'])) {
126
-                $voice = $voiceHandler->get($obj->vars['vcid']['value']);
127
-                if (\is_object($voice)) {
128
-                    $voice->setVar('songs', $voice->getVar('songs') + 1);
129
-                    $voiceHandler->insert($voice, true, $obj);
130
-                }
131
-            }
132
-            if (!$old->isNew() && $old->getVar('vcid') > 0) {
133
-                $voice = $voiceHandler->get($old->vars['vcid']['value']);
134
-                if (\is_object($voice)) {
135
-                    $voice->setVar('songs', $voice->getVar('songs') - 1);
136
-                    $voiceHandler->insert($voice, true, null);
137
-                }
138
-            }
139
-        }
140
-
141
-        if (true === $obj->vars['cid']['changed']) {
142
-            if (true === $new || (0 != $obj->vars['cid']['value'])) {
143
-                $category = $categoryHandler->get($obj->vars['cid']['value']);
144
-                if (\is_object($category)) {
145
-                    $category->setVar('songs', $category->getVar('songs') + 1);
146
-                    $categoryHandler->insert($category, true, $obj);
147
-                    foreach ($obj->getVar('aids') as $aid) {
148
-                        $artists                   = $artistsHandler->get($aid);
149
-                        $cids                      = $artists->getVar('cids');
150
-                        $cids[$obj->getVar('cid')] = $obj->getVar('cid');
151
-                        if (\is_object($artists)) {
152
-                            $artists->setVar('cids', $cids);
153
-                            $artistsHandler->insert($artists, true, null);
154
-                        }
155
-                    }
156
-                }
157
-            }
158
-            if (!$old->isNew() && $old->getVar('cid') > 0) {
159
-                $category = $categoryHandler->get($old->vars['cid']['value']);
160
-                if (\is_object($category)) {
161
-                    $category->setVar('songs', $category->getVar('songs') - 1);
162
-                    $categoryHandler->insert($category, true, null);
163
-                    foreach ($obj->getVar('aids') as $aid) {
164
-                        $artists = $artistsHandler->get($aid);
165
-                        $cids    = [];
166
-                        foreach ($artists->getVar('cids') as $cid) {
167
-                            if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
168
-                                $cids[$cid] = $cid;
169
-                            }
170
-                        }
171
-                        if (\is_object($artists)) {
172
-                            $artists->setVar('cids', $cids);
173
-                            $artistsHandler->insert($artists, true, null);
174
-                        }
175
-                    }
176
-                }
177
-            }
178
-        }
179
-
180
-        if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
181
-            if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
182
-                foreach ($obj->vars['aids']['value'] as $aid) {
183
-                    if (!\in_array($aid, $old->vars['aids']['value'], true)) {
184
-                        $artists = $artistsHandler->get($aid);
185
-                        if (\is_object($artists)) {
186
-                            $artists->setVar('songs', $artists->getVar('songs') + 1);
187
-                            $artistsHandler->insert($artists, true, $obj);
188
-                            if (true === $new || (0 != $obj->vars['vcid']['value'])) {
189
-                                $voice = $voiceHandler->get($obj->vars['vcid']['value']);
190
-                                if (\is_object($voice)) {
191
-                                    $voice->setVar('artists', $voice->getVar('artists') + 1);
192
-                                    $voiceHandler->insert($voice, true, $obj);
193
-                                }
194
-                            }
195
-                        }
196
-                    }
197
-                }
198
-            }
199
-            if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
200
-                foreach ($old->getVar('aids') as $aid) {
201
-                    if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
202
-                        $artists = $artistsHandler->get($aid);
203
-                        if (\is_object($artists)) {
204
-                            $artists->setVar('songs', $artists->getVar('songs') - 1);
205
-                            $artistsHandler->insert($artists, true, null);
206
-                            if (!$old->isNew() && $old->getVar('vcid') > 0) {
207
-                                $voice = $voiceHandler->get($old->vars['vcid']['value']);
208
-                                if (\is_object($voice)) {
209
-                                    $voice->setVar('artists', $voice->getVar('artists') - 1);
210
-                                    $voiceHandler->insert($voice, true, null);
211
-                                }
212
-                            }
213
-                        }
214
-                    }
215
-                }
216
-            }
217
-        }
218
-
219
-        if (true === $obj->vars['abid']['changed']) {
220
-            if (true === $new || (0 != $obj->vars['abid']['value'])) {
221
-                $album = $albumsHandler->get($obj->vars['abid']['value']);
222
-                if (\is_object($album)) {
223
-                    $album->setVar('songs', $album->getVar('songs') + 1);
224
-                    $albumsHandler->insert($album, true, $obj);
225
-                    if (true === $new || (0 != $obj->vars['vcid']['value'])) {
226
-                        $voice = $voiceHandler->get($obj->vars['vcid']['value']);
227
-                        if (\is_object($voice)) {
228
-                            $voice->setVar('albums', $voice->getVar('albums') + 1);
229
-                            $voiceHandler->insert($voice, true, $obj);
230
-                        }
231
-                    }
232
-                }
233
-            }
234
-            if (!$old->isNew() && $old->getVar('abid') > 0) {
235
-                $album = $albumsHandler->get($obj->vars['abid']['value']);
236
-                if (\is_object($album)) {
237
-                    $album->setVar('songs', $album->getVar('songs') - 1);
238
-                    $albumsHandler->insert($album, true, null);
239
-                    if (!$old->isNew() && $old->getVar('vcid') > 0) {
240
-                        $voice = $voiceHandler->get($old->vars['vcid']['value']);
241
-                        if (\is_object($voice)) {
242
-                            $voice->setVar('albums', $voice->getVar('albums') - 1);
243
-                            $voiceHandler->insert($voice, true, null);
244
-                        }
245
-                    }
246
-                }
247
-            }
248
-        }
249
-
250
-        if ('' == $obj->getVar('title')) {
251
-            return false;
252
-        }
253
-
254
-        $sid = parent::insert($obj, $force);
255
-        if ($obj->vars['abid']['value'] > 0) {
256
-            $album      = $albumsHandler->get($obj->vars['abid']['value']);
257
-            $arry       = $album->getVar('sids');
258
-            $arry[$sid] = $sid;
259
-            if (\is_object($album)) {
260
-                $album->setVar('sids', $arry);
261
-                $albumsHandler->insert($album);
262
-            }
263
-        }
264
-        if (\count($obj->getVar('aids')) > 0) {
265
-            foreach ($obj->getVar('aids') as $aid) {
266
-                $artist     = $artistsHandler->get($aid);
267
-                $arry       = $artist->getVar('sids');
268
-                $arry[$sid] = $sid;
269
-                if (\is_object($artists)) {
270
-                    $artist->setVar('sids', $arry);
271
-                    $artistsHandler->insert($artist);
272
-                }
273
-            }
274
-        }
275
-
276
-        return $sid;
277
-    }
278
-
279
-    public $_objects = ['object' => [], 'array' => []];
280
-
281
-    /**
282
-     * @param null $id
283
-     * @param null $fields
284
-     * @return \XoopsObject
285
-     */
286
-    public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
287
-    {
288
-        $fields = $fields ?: '*';
289
-        if (!isset($this->_objects['object'][$id])) {
290
-            $this->_objects['object'][$id] = parent::get($id, $fields);
291
-            if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
292
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
293
-                $GLOBALS['xoopsDB']->queryF($sql);
294
-            }
295
-        }
296
-
297
-        return $this->_objects['object'][$id];
298
-    }
299
-
300
-    /**
301
-     * @param \CriteriaElement|\CriteriaCompo $criteria
302
-     * @param bool $id_as_key
303
-     * @param bool $as_object
304
-     * @return array
305
-     */
306
-    public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
307
-    {
308
-        $ret = parent::getObjects($criteria, $id_as_key, $as_object);
309
-
310
-        /*if (!isset($GLOBALS['songlistAdmin'])) {
14
+	/**
15
+	 * SongsHandler constructor.
16
+	 * @param \XoopsDatabase $db
17
+	 */
18
+	public function __construct(\XoopsDatabase $db)
19
+	{
20
+		$moduleHandler                   = \xoops_getHandler('module');
21
+		$configHandler                   = \xoops_getHandler('config');
22
+		$GLOBALS['songlistModule']       = $moduleHandler->getByDirname('songlist');
23
+		$GLOBALS['songlistModuleConfig'] = $configHandler->getConfigList($GLOBALS['songlistModule']->getVar('mid'));
24
+
25
+		parent::__construct($db, 'songlist_songs', Songs::class, 'sid', 'title');
26
+	}
27
+
28
+	/**
29
+	 * @return array
30
+	 */
31
+	public function filterFields(): array
32
+	{
33
+		return ['sid', 'cid', 'mp3', 'gid', 'vcid', 'aids', 'abid', 'songid', 'title', 'lyrics', 'hits', 'rank', 'votes', 'tags', 'created', 'updated'];
34
+	}
35
+
36
+	/**
37
+	 * @param $filter
38
+	 * @return \CriteriaCompo
39
+	 */
40
+	public function getFilterCriteria($filter): \CriteriaCompo
41
+	{
42
+		$parts    = \explode('|', $filter);
43
+		$criteria = new \CriteriaCompo();
44
+		foreach ($parts as $part) {
45
+			$var = \explode(',', $part);
46
+			if (!empty($var[1]) && !\is_numeric($var[0])) {
47
+				$object = $this->create();
48
+				if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
49
+					|| \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
50
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
51
+				} elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
52
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
53
+				} elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
54
+					$criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
55
+				} elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
56
+					$criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
57
+				}
58
+			} elseif (!empty($var[1]) && \is_numeric($var[0])) {
59
+				$criteria->add(new \Criteria($var[0], $var[1]));
60
+			}
61
+		}
62
+
63
+		return $criteria;
64
+	}
65
+
66
+	/**
67
+	 * @param        $filter
68
+	 * @param        $field
69
+	 * @param string $sort
70
+	 * @param string $op
71
+	 * @param string $fct
72
+	 * @return string
73
+	 */
74
+	public function getFilterForm($filter, $field, $sort = 'created', $op = 'dashboard', $fct = 'list'): string
75
+	{
76
+		$ele = Utility::getFilterElement($filter, $field, $sort, $op, $fct);
77
+		if (\is_object($ele)) {
78
+			return $ele->render();
79
+		}
80
+
81
+		return '&nbsp;';
82
+	}
83
+
84
+	/**
85
+	 * @param bool $force
86
+	 * @param null $object
87
+	 * @return bool|mixed
88
+	 */
89
+	public function insert(\XoopsObject $obj, $force = true, $object = null)
90
+	{
91
+		if ($obj->isNew()) {
92
+			$new = true;
93
+			$old = $this->create();
94
+			$obj->setVar('created', \time());
95
+		} else {
96
+			$new = false;
97
+			$old = $this->get($obj->getVar('sid'));
98
+			$obj->setVar('updated', \time());
99
+		}
100
+
101
+		$albumsHandler   = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Albums');
102
+		$artistsHandler  = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
103
+		$genreHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Genre');
104
+		$voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
105
+		$categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
106
+
107
+		if (true === ($obj->vars['gid']['changed']??false)) {
108
+			if ($new || (0 != $obj->vars['gid']['value'])) {
109
+				$genre = $genreHandler->get($obj->vars['gid']['value']);
110
+				if (\is_object($genre)) {
111
+					$genre->setVar('songs', $genre->getVar('songs') + 1);
112
+					$genreHandler->insert($genre, true, $obj);
113
+				}
114
+			}
115
+			if (!$old->isNew() && $old->getVar('gid') > 0) {
116
+				$genre = $genreHandler->get($old->vars['gid']['value']);
117
+				if (\is_object($genre)) {
118
+					$genre->setVar('songs', $genre->getVar('songs') - 1);
119
+					$genreHandler->insert($genre, true, null);
120
+				}
121
+			}
122
+		}
123
+
124
+		if (true === $obj->vars['vcid']['changed']) {
125
+			if ($new || (0 != $obj->vars['vcid']['value'])) {
126
+				$voice = $voiceHandler->get($obj->vars['vcid']['value']);
127
+				if (\is_object($voice)) {
128
+					$voice->setVar('songs', $voice->getVar('songs') + 1);
129
+					$voiceHandler->insert($voice, true, $obj);
130
+				}
131
+			}
132
+			if (!$old->isNew() && $old->getVar('vcid') > 0) {
133
+				$voice = $voiceHandler->get($old->vars['vcid']['value']);
134
+				if (\is_object($voice)) {
135
+					$voice->setVar('songs', $voice->getVar('songs') - 1);
136
+					$voiceHandler->insert($voice, true, null);
137
+				}
138
+			}
139
+		}
140
+
141
+		if (true === $obj->vars['cid']['changed']) {
142
+			if (true === $new || (0 != $obj->vars['cid']['value'])) {
143
+				$category = $categoryHandler->get($obj->vars['cid']['value']);
144
+				if (\is_object($category)) {
145
+					$category->setVar('songs', $category->getVar('songs') + 1);
146
+					$categoryHandler->insert($category, true, $obj);
147
+					foreach ($obj->getVar('aids') as $aid) {
148
+						$artists                   = $artistsHandler->get($aid);
149
+						$cids                      = $artists->getVar('cids');
150
+						$cids[$obj->getVar('cid')] = $obj->getVar('cid');
151
+						if (\is_object($artists)) {
152
+							$artists->setVar('cids', $cids);
153
+							$artistsHandler->insert($artists, true, null);
154
+						}
155
+					}
156
+				}
157
+			}
158
+			if (!$old->isNew() && $old->getVar('cid') > 0) {
159
+				$category = $categoryHandler->get($old->vars['cid']['value']);
160
+				if (\is_object($category)) {
161
+					$category->setVar('songs', $category->getVar('songs') - 1);
162
+					$categoryHandler->insert($category, true, null);
163
+					foreach ($obj->getVar('aids') as $aid) {
164
+						$artists = $artistsHandler->get($aid);
165
+						$cids    = [];
166
+						foreach ($artists->getVar('cids') as $cid) {
167
+							if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
168
+								$cids[$cid] = $cid;
169
+							}
170
+						}
171
+						if (\is_object($artists)) {
172
+							$artists->setVar('cids', $cids);
173
+							$artistsHandler->insert($artists, true, null);
174
+						}
175
+					}
176
+				}
177
+			}
178
+		}
179
+
180
+		if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
181
+			if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
182
+				foreach ($obj->vars['aids']['value'] as $aid) {
183
+					if (!\in_array($aid, $old->vars['aids']['value'], true)) {
184
+						$artists = $artistsHandler->get($aid);
185
+						if (\is_object($artists)) {
186
+							$artists->setVar('songs', $artists->getVar('songs') + 1);
187
+							$artistsHandler->insert($artists, true, $obj);
188
+							if (true === $new || (0 != $obj->vars['vcid']['value'])) {
189
+								$voice = $voiceHandler->get($obj->vars['vcid']['value']);
190
+								if (\is_object($voice)) {
191
+									$voice->setVar('artists', $voice->getVar('artists') + 1);
192
+									$voiceHandler->insert($voice, true, $obj);
193
+								}
194
+							}
195
+						}
196
+					}
197
+				}
198
+			}
199
+			if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
200
+				foreach ($old->getVar('aids') as $aid) {
201
+					if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
202
+						$artists = $artistsHandler->get($aid);
203
+						if (\is_object($artists)) {
204
+							$artists->setVar('songs', $artists->getVar('songs') - 1);
205
+							$artistsHandler->insert($artists, true, null);
206
+							if (!$old->isNew() && $old->getVar('vcid') > 0) {
207
+								$voice = $voiceHandler->get($old->vars['vcid']['value']);
208
+								if (\is_object($voice)) {
209
+									$voice->setVar('artists', $voice->getVar('artists') - 1);
210
+									$voiceHandler->insert($voice, true, null);
211
+								}
212
+							}
213
+						}
214
+					}
215
+				}
216
+			}
217
+		}
218
+
219
+		if (true === $obj->vars['abid']['changed']) {
220
+			if (true === $new || (0 != $obj->vars['abid']['value'])) {
221
+				$album = $albumsHandler->get($obj->vars['abid']['value']);
222
+				if (\is_object($album)) {
223
+					$album->setVar('songs', $album->getVar('songs') + 1);
224
+					$albumsHandler->insert($album, true, $obj);
225
+					if (true === $new || (0 != $obj->vars['vcid']['value'])) {
226
+						$voice = $voiceHandler->get($obj->vars['vcid']['value']);
227
+						if (\is_object($voice)) {
228
+							$voice->setVar('albums', $voice->getVar('albums') + 1);
229
+							$voiceHandler->insert($voice, true, $obj);
230
+						}
231
+					}
232
+				}
233
+			}
234
+			if (!$old->isNew() && $old->getVar('abid') > 0) {
235
+				$album = $albumsHandler->get($obj->vars['abid']['value']);
236
+				if (\is_object($album)) {
237
+					$album->setVar('songs', $album->getVar('songs') - 1);
238
+					$albumsHandler->insert($album, true, null);
239
+					if (!$old->isNew() && $old->getVar('vcid') > 0) {
240
+						$voice = $voiceHandler->get($old->vars['vcid']['value']);
241
+						if (\is_object($voice)) {
242
+							$voice->setVar('albums', $voice->getVar('albums') - 1);
243
+							$voiceHandler->insert($voice, true, null);
244
+						}
245
+					}
246
+				}
247
+			}
248
+		}
249
+
250
+		if ('' == $obj->getVar('title')) {
251
+			return false;
252
+		}
253
+
254
+		$sid = parent::insert($obj, $force);
255
+		if ($obj->vars['abid']['value'] > 0) {
256
+			$album      = $albumsHandler->get($obj->vars['abid']['value']);
257
+			$arry       = $album->getVar('sids');
258
+			$arry[$sid] = $sid;
259
+			if (\is_object($album)) {
260
+				$album->setVar('sids', $arry);
261
+				$albumsHandler->insert($album);
262
+			}
263
+		}
264
+		if (\count($obj->getVar('aids')) > 0) {
265
+			foreach ($obj->getVar('aids') as $aid) {
266
+				$artist     = $artistsHandler->get($aid);
267
+				$arry       = $artist->getVar('sids');
268
+				$arry[$sid] = $sid;
269
+				if (\is_object($artists)) {
270
+					$artist->setVar('sids', $arry);
271
+					$artistsHandler->insert($artist);
272
+				}
273
+			}
274
+		}
275
+
276
+		return $sid;
277
+	}
278
+
279
+	public $_objects = ['object' => [], 'array' => []];
280
+
281
+	/**
282
+	 * @param null $id
283
+	 * @param null $fields
284
+	 * @return \XoopsObject
285
+	 */
286
+	public function get($id = null, $fields = null): \XoopsObject//get($id, $fields = '*')
287
+	{
288
+		$fields = $fields ?: '*';
289
+		if (!isset($this->_objects['object'][$id])) {
290
+			$this->_objects['object'][$id] = parent::get($id, $fields);
291
+			if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
292
+				$sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
293
+				$GLOBALS['xoopsDB']->queryF($sql);
294
+			}
295
+		}
296
+
297
+		return $this->_objects['object'][$id];
298
+	}
299
+
300
+	/**
301
+	 * @param \CriteriaElement|\CriteriaCompo $criteria
302
+	 * @param bool $id_as_key
303
+	 * @param bool $as_object
304
+	 * @return array
305
+	 */
306
+	public function &getObjects($criteria = null, $id_as_key = false, $as_object = true): array
307
+	{
308
+		$ret = parent::getObjects($criteria, $id_as_key, $as_object);
309
+
310
+		/*if (!isset($GLOBALS['songlistAdmin'])) {
311 311
             foreach($ret as $data) {
312 312
                 $id = [];
313 313
                 if ($as_object==true) {
@@ -328,82 +328,82 @@  discard block
 block discarded – undo
328 328
             $GLOBALS['xoopsDB']->queryF($sql);
329 329
         }*/
330 330
 
331
-        return $ret;
332
-    }
333
-
334
-    /**
335
-     * @return string
336
-     */
337
-    public function getURL(): string
338
-    {
339
-        global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
340
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
341
-            if (0 != $cid) {
342
-                $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
343
-                $artist        = $artistHandler->get($cid);
344
-                if (\is_object($artist) && !$artist->isNew()) {
345
-                    return XOOPS_URL
346
-                           . '/'
347
-                           . $GLOBALS['songlistModuleConfig']['baseofurl']
348
-                           . '/'
349
-                           . $file
350
-                           . '/'
351
-                           . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
352
-                           . '/'
353
-                           . $start
354
-                           . '-'
355
-                           . $id
356
-                           . '-'
357
-                           . $op
358
-                           . '-'
359
-                           . $fct
360
-                           . '-'
361
-                           . $gid
362
-                           . '-'
363
-                           . $cid
364
-                           . '/'
365
-                           . \urlencode($value)
366
-                           . $GLOBALS['songlistModuleConfig']['endofurl'];
367
-                }
368
-
369
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
370
-            }
371
-
372
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
373
-        }
374
-
375
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
376
-    }
377
-
378
-    /**
379
-     * @return string
380
-     */
381
-    public function getSearchURL(): string
382
-    {
383
-        global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
384
-        if ($GLOBALS['songlistModuleConfig']['htaccess']) {
385
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
386
-        }
387
-
388
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
389
-    }
390
-
391
-    /**
392
-     * @param int $limit
393
-     * @return array
394
-     */
395
-    public function getTop($limit = 1): array
396
-    {
397
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
398
-        $results = $GLOBALS['xoopsDB']->queryF($sql);
399
-        $ret     = [];
400
-        $i       = 0;
401
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
402
-            $ret[$i] = $this->create();
403
-            $ret[$i]->assignVars($row);
404
-            ++$i;
405
-        }
406
-
407
-        return $ret;
408
-    }
331
+		return $ret;
332
+	}
333
+
334
+	/**
335
+	 * @return string
336
+	 */
337
+	public function getURL(): string
338
+	{
339
+		global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
340
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
341
+			if (0 != $cid) {
342
+				$artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
343
+				$artist        = $artistHandler->get($cid);
344
+				if (\is_object($artist) && !$artist->isNew()) {
345
+					return XOOPS_URL
346
+						   . '/'
347
+						   . $GLOBALS['songlistModuleConfig']['baseofurl']
348
+						   . '/'
349
+						   . $file
350
+						   . '/'
351
+						   . \urlencode(\str_replace([' ', \chr(9)], '-', $artist->getVar('name')))
352
+						   . '/'
353
+						   . $start
354
+						   . '-'
355
+						   . $id
356
+						   . '-'
357
+						   . $op
358
+						   . '-'
359
+						   . $fct
360
+						   . '-'
361
+						   . $gid
362
+						   . '-'
363
+						   . $cid
364
+						   . '/'
365
+						   . \urlencode($value)
366
+						   . $GLOBALS['songlistModuleConfig']['endofurl'];
367
+				}
368
+
369
+				return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
370
+			}
371
+
372
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
373
+		}
374
+
375
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
376
+	}
377
+
378
+	/**
379
+	 * @return string
380
+	 */
381
+	public function getSearchURL(): string
382
+	{
383
+		global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
384
+		if ($GLOBALS['songlistModuleConfig']['htaccess']) {
385
+			return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
386
+		}
387
+
388
+		return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
389
+	}
390
+
391
+	/**
392
+	 * @param int $limit
393
+	 * @return array
394
+	 */
395
+	public function getTop($limit = 1): array
396
+	{
397
+		$sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
398
+		$results = $GLOBALS['xoopsDB']->queryF($sql);
399
+		$ret     = [];
400
+		$i       = 0;
401
+		while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
402
+			$ret[$i] = $this->create();
403
+			$ret[$i]->assignVars($row);
404
+			++$i;
405
+		}
406
+
407
+		return $ret;
408
+	}
409 409
 }
Please login to merge, or discard this patch.
Spacing   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace XoopsModules\Songlist;
4 4
 
5
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
5
+require_once \dirname(__DIR__).'/include/songlist.object.php';
6 6
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
7 7
 use  XoopsModules\Songlist\Form\FormController;
8 8
 
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
             $var = \explode(',', $part);
46 46
             if (!empty($var[1]) && !\is_numeric($var[0])) {
47 47
                 $object = $this->create();
48
-                if (\XOBJ_DTYPE_TXTBOX == $object->vars[$var[0]]['data_type']
49
-                    || \XOBJ_DTYPE_TXTAREA == $object->vars[$var[0]]['data_type']) {
50
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%' . $var[1] . '%', ($var[2] ?? 'LIKE')));
48
+                if (\XOBJ_DTYPE_TXTBOX==$object->vars[$var[0]]['data_type']
49
+                    || \XOBJ_DTYPE_TXTAREA==$object->vars[$var[0]]['data_type']) {
50
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%'.$var[1].'%', ($var[2] ?? 'LIKE')));
51 51
                 } elseif (in_array($object->vars[$var[0]]['data_type'], [XOBJ_DTYPE_INT, XOBJ_DTYPE_DECIMAL, XOBJ_DTYPE_FLOAT])) {
52
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
53
-                } elseif (\XOBJ_DTYPE_ENUM == $object->vars[$var[0]]['data_type']) {
54
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', $var[1], ($var[2] ?? '=')));
55
-                } elseif (\XOBJ_DTYPE_ARRAY == $object->vars[$var[0]]['data_type']) {
56
-                    $criteria->add(new \Criteria('`' . $var[0] . '`', '%"' . $var[1] . '";%', ($var[2] ?? 'LIKE')));
52
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
53
+                } elseif (\XOBJ_DTYPE_ENUM==$object->vars[$var[0]]['data_type']) {
54
+                    $criteria->add(new \Criteria('`'.$var[0].'`', $var[1], ($var[2] ?? '=')));
55
+                } elseif (\XOBJ_DTYPE_ARRAY==$object->vars[$var[0]]['data_type']) {
56
+                    $criteria->add(new \Criteria('`'.$var[0].'`', '%"'.$var[1].'";%', ($var[2] ?? 'LIKE')));
57 57
                 }
58 58
             } elseif (!empty($var[1]) && \is_numeric($var[0])) {
59 59
                 $criteria->add(new \Criteria($var[0], $var[1]));
@@ -104,45 +104,45 @@  discard block
 block discarded – undo
104 104
         $voiceHandler    = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Voice');
105 105
         $categoryHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Category');
106 106
 
107
-        if (true === ($obj->vars['gid']['changed']??false)) {
108
-            if ($new || (0 != $obj->vars['gid']['value'])) {
107
+        if (true===($obj->vars['gid']['changed'] ?? false)) {
108
+            if ($new || (0!=$obj->vars['gid']['value'])) {
109 109
                 $genre = $genreHandler->get($obj->vars['gid']['value']);
110 110
                 if (\is_object($genre)) {
111
-                    $genre->setVar('songs', $genre->getVar('songs') + 1);
111
+                    $genre->setVar('songs', $genre->getVar('songs')+1);
112 112
                     $genreHandler->insert($genre, true, $obj);
113 113
                 }
114 114
             }
115
-            if (!$old->isNew() && $old->getVar('gid') > 0) {
115
+            if (!$old->isNew() && $old->getVar('gid')>0) {
116 116
                 $genre = $genreHandler->get($old->vars['gid']['value']);
117 117
                 if (\is_object($genre)) {
118
-                    $genre->setVar('songs', $genre->getVar('songs') - 1);
118
+                    $genre->setVar('songs', $genre->getVar('songs')-1);
119 119
                     $genreHandler->insert($genre, true, null);
120 120
                 }
121 121
             }
122 122
         }
123 123
 
124
-        if (true === $obj->vars['vcid']['changed']) {
125
-            if ($new || (0 != $obj->vars['vcid']['value'])) {
124
+        if (true===$obj->vars['vcid']['changed']) {
125
+            if ($new || (0!=$obj->vars['vcid']['value'])) {
126 126
                 $voice = $voiceHandler->get($obj->vars['vcid']['value']);
127 127
                 if (\is_object($voice)) {
128
-                    $voice->setVar('songs', $voice->getVar('songs') + 1);
128
+                    $voice->setVar('songs', $voice->getVar('songs')+1);
129 129
                     $voiceHandler->insert($voice, true, $obj);
130 130
                 }
131 131
             }
132
-            if (!$old->isNew() && $old->getVar('vcid') > 0) {
132
+            if (!$old->isNew() && $old->getVar('vcid')>0) {
133 133
                 $voice = $voiceHandler->get($old->vars['vcid']['value']);
134 134
                 if (\is_object($voice)) {
135
-                    $voice->setVar('songs', $voice->getVar('songs') - 1);
135
+                    $voice->setVar('songs', $voice->getVar('songs')-1);
136 136
                     $voiceHandler->insert($voice, true, null);
137 137
                 }
138 138
             }
139 139
         }
140 140
 
141
-        if (true === $obj->vars['cid']['changed']) {
142
-            if (true === $new || (0 != $obj->vars['cid']['value'])) {
141
+        if (true===$obj->vars['cid']['changed']) {
142
+            if (true===$new || (0!=$obj->vars['cid']['value'])) {
143 143
                 $category = $categoryHandler->get($obj->vars['cid']['value']);
144 144
                 if (\is_object($category)) {
145
-                    $category->setVar('songs', $category->getVar('songs') + 1);
145
+                    $category->setVar('songs', $category->getVar('songs')+1);
146 146
                     $categoryHandler->insert($category, true, $obj);
147 147
                     foreach ($obj->getVar('aids') as $aid) {
148 148
                         $artists                   = $artistsHandler->get($aid);
@@ -155,16 +155,16 @@  discard block
 block discarded – undo
155 155
                     }
156 156
                 }
157 157
             }
158
-            if (!$old->isNew() && $old->getVar('cid') > 0) {
158
+            if (!$old->isNew() && $old->getVar('cid')>0) {
159 159
                 $category = $categoryHandler->get($old->vars['cid']['value']);
160 160
                 if (\is_object($category)) {
161
-                    $category->setVar('songs', $category->getVar('songs') - 1);
161
+                    $category->setVar('songs', $category->getVar('songs')-1);
162 162
                     $categoryHandler->insert($category, true, null);
163 163
                     foreach ($obj->getVar('aids') as $aid) {
164 164
                         $artists = $artistsHandler->get($aid);
165 165
                         $cids    = [];
166 166
                         foreach ($artists->getVar('cids') as $cid) {
167
-                            if ($cid != $old->getVar('cid') || $cid == $obj->getVar('cid')) {
167
+                            if ($cid!=$old->getVar('cid') || $cid==$obj->getVar('cid')) {
168 168
                                 $cids[$cid] = $cid;
169 169
                             }
170 170
                         }
@@ -177,18 +177,18 @@  discard block
 block discarded – undo
177 177
             }
178 178
         }
179 179
 
180
-        if (true === $obj->vars['aids']['changed'] && 0 != \count($obj->vars['aids']['value'])) {
181
-            if (true === $new || 0 != \count($obj->vars['aids']['value'])) {
180
+        if (true===$obj->vars['aids']['changed'] && 0!=\count($obj->vars['aids']['value'])) {
181
+            if (true===$new || 0!=\count($obj->vars['aids']['value'])) {
182 182
                 foreach ($obj->vars['aids']['value'] as $aid) {
183 183
                     if (!\in_array($aid, $old->vars['aids']['value'], true)) {
184 184
                         $artists = $artistsHandler->get($aid);
185 185
                         if (\is_object($artists)) {
186
-                            $artists->setVar('songs', $artists->getVar('songs') + 1);
186
+                            $artists->setVar('songs', $artists->getVar('songs')+1);
187 187
                             $artistsHandler->insert($artists, true, $obj);
188
-                            if (true === $new || (0 != $obj->vars['vcid']['value'])) {
188
+                            if (true===$new || (0!=$obj->vars['vcid']['value'])) {
189 189
                                 $voice = $voiceHandler->get($obj->vars['vcid']['value']);
190 190
                                 if (\is_object($voice)) {
191
-                                    $voice->setVar('artists', $voice->getVar('artists') + 1);
191
+                                    $voice->setVar('artists', $voice->getVar('artists')+1);
192 192
                                     $voiceHandler->insert($voice, true, $obj);
193 193
                                 }
194 194
                             }
@@ -196,17 +196,17 @@  discard block
 block discarded – undo
196 196
                     }
197 197
                 }
198 198
             }
199
-            if (!$old->isNew() && 0 == \count($old->getVar('aids'))) {
199
+            if (!$old->isNew() && 0==\count($old->getVar('aids'))) {
200 200
                 foreach ($old->getVar('aids') as $aid) {
201 201
                     if (!\in_array($aid, $obj->vars['aids']['value'], true)) {
202 202
                         $artists = $artistsHandler->get($aid);
203 203
                         if (\is_object($artists)) {
204
-                            $artists->setVar('songs', $artists->getVar('songs') - 1);
204
+                            $artists->setVar('songs', $artists->getVar('songs')-1);
205 205
                             $artistsHandler->insert($artists, true, null);
206
-                            if (!$old->isNew() && $old->getVar('vcid') > 0) {
206
+                            if (!$old->isNew() && $old->getVar('vcid')>0) {
207 207
                                 $voice = $voiceHandler->get($old->vars['vcid']['value']);
208 208
                                 if (\is_object($voice)) {
209
-                                    $voice->setVar('artists', $voice->getVar('artists') - 1);
209
+                                    $voice->setVar('artists', $voice->getVar('artists')-1);
210 210
                                     $voiceHandler->insert($voice, true, null);
211 211
                                 }
212 212
                             }
@@ -216,30 +216,30 @@  discard block
 block discarded – undo
216 216
             }
217 217
         }
218 218
 
219
-        if (true === $obj->vars['abid']['changed']) {
220
-            if (true === $new || (0 != $obj->vars['abid']['value'])) {
219
+        if (true===$obj->vars['abid']['changed']) {
220
+            if (true===$new || (0!=$obj->vars['abid']['value'])) {
221 221
                 $album = $albumsHandler->get($obj->vars['abid']['value']);
222 222
                 if (\is_object($album)) {
223
-                    $album->setVar('songs', $album->getVar('songs') + 1);
223
+                    $album->setVar('songs', $album->getVar('songs')+1);
224 224
                     $albumsHandler->insert($album, true, $obj);
225
-                    if (true === $new || (0 != $obj->vars['vcid']['value'])) {
225
+                    if (true===$new || (0!=$obj->vars['vcid']['value'])) {
226 226
                         $voice = $voiceHandler->get($obj->vars['vcid']['value']);
227 227
                         if (\is_object($voice)) {
228
-                            $voice->setVar('albums', $voice->getVar('albums') + 1);
228
+                            $voice->setVar('albums', $voice->getVar('albums')+1);
229 229
                             $voiceHandler->insert($voice, true, $obj);
230 230
                         }
231 231
                     }
232 232
                 }
233 233
             }
234
-            if (!$old->isNew() && $old->getVar('abid') > 0) {
234
+            if (!$old->isNew() && $old->getVar('abid')>0) {
235 235
                 $album = $albumsHandler->get($obj->vars['abid']['value']);
236 236
                 if (\is_object($album)) {
237
-                    $album->setVar('songs', $album->getVar('songs') - 1);
237
+                    $album->setVar('songs', $album->getVar('songs')-1);
238 238
                     $albumsHandler->insert($album, true, null);
239
-                    if (!$old->isNew() && $old->getVar('vcid') > 0) {
239
+                    if (!$old->isNew() && $old->getVar('vcid')>0) {
240 240
                         $voice = $voiceHandler->get($old->vars['vcid']['value']);
241 241
                         if (\is_object($voice)) {
242
-                            $voice->setVar('albums', $voice->getVar('albums') - 1);
242
+                            $voice->setVar('albums', $voice->getVar('albums')-1);
243 243
                             $voiceHandler->insert($voice, true, null);
244 244
                         }
245 245
                     }
@@ -247,12 +247,12 @@  discard block
 block discarded – undo
247 247
             }
248 248
         }
249 249
 
250
-        if ('' == $obj->getVar('title')) {
250
+        if (''==$obj->getVar('title')) {
251 251
             return false;
252 252
         }
253 253
 
254 254
         $sid = parent::insert($obj, $force);
255
-        if ($obj->vars['abid']['value'] > 0) {
255
+        if ($obj->vars['abid']['value']>0) {
256 256
             $album      = $albumsHandler->get($obj->vars['abid']['value']);
257 257
             $arry       = $album->getVar('sids');
258 258
             $arry[$sid] = $sid;
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
                 $albumsHandler->insert($album);
262 262
             }
263 263
         }
264
-        if (\count($obj->getVar('aids')) > 0) {
264
+        if (\count($obj->getVar('aids'))>0) {
265 265
             foreach ($obj->getVar('aids') as $aid) {
266 266
                 $artist     = $artistsHandler->get($aid);
267 267
                 $arry       = $artist->getVar('sids');
@@ -289,7 +289,7 @@  discard block
 block discarded – undo
289 289
         if (!isset($this->_objects['object'][$id])) {
290 290
             $this->_objects['object'][$id] = parent::get($id, $fields);
291 291
             if (!isset($GLOBALS['songlistAdmin']) && \is_object($this->_objects['object'][$id])) {
292
-                $sql = 'UPDATE `' . $this->table . '` set hits=hits+1 where `' . $this->keyName . '` = ' . $this->_objects['object'][$id]->getVar($this->keyName);
292
+                $sql = 'UPDATE `'.$this->table.'` set hits=hits+1 where `'.$this->keyName.'` = '.$this->_objects['object'][$id]->getVar($this->keyName);
293 293
                 $GLOBALS['xoopsDB']->queryF($sql);
294 294
             }
295 295
         }
@@ -338,7 +338,7 @@  discard block
 block discarded – undo
338 338
     {
339 339
         global $file, $op, $fct, $id, $value, $gid, $vid, $vcid, $cid, $start, $limit;
340 340
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
341
-            if (0 != $cid) {
341
+            if (0!=$cid) {
342 342
                 $artistHandler = \XoopsModules\Songlist\Helper::getInstance()->getHandler('Artists');
343 343
                 $artist        = $artistHandler->get($cid);
344 344
                 if (\is_object($artist) && !$artist->isNew()) {
@@ -366,13 +366,13 @@  discard block
 block discarded – undo
366 366
                            . $GLOBALS['songlistModuleConfig']['endofurl'];
367 367
                 }
368 368
 
369
-                return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
369
+                return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
370 370
             }
371 371
 
372
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $id . '-' . $op . '-' . $fct . '-' . $gid . '-' . $cid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
372
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$id.'-'.$op.'-'.$fct.'-'.$gid.'-'.$cid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
373 373
         }
374 374
 
375
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&id=' . $id . '&value=' . \urlencode($value ?? '') . '&gid=' . $gid . '&vid=' . $vid . '&cid=' . $cid . '&start=' . $start;
375
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&id='.$id.'&value='.\urlencode($value ?? '').'&gid='.$gid.'&vid='.$vid.'&cid='.$cid.'&start='.$start;
376 376
     }
377 377
 
378 378
     /**
@@ -382,10 +382,10 @@  discard block
 block discarded – undo
382 382
     {
383 383
         global $file, $op, $fct, $id, $value, $gid, $vcid, $cid, $start, $limit;
384 384
         if ($GLOBALS['songlistModuleConfig']['htaccess']) {
385
-            return XOOPS_URL . '/' . $GLOBALS['songlistModuleConfig']['baseofurl'] . '/' . $file . '/' . $start . '-' . $op . '-' . $fct . '-' . $gid . '-' . ($_GET['cid'] ?? $cid) . '-' . $vcid . '/' . \urlencode($value) . $GLOBALS['songlistModuleConfig']['endofurl'];
385
+            return XOOPS_URL.'/'.$GLOBALS['songlistModuleConfig']['baseofurl'].'/'.$file.'/'.$start.'-'.$op.'-'.$fct.'-'.$gid.'-'.($_GET['cid'] ?? $cid).'-'.$vcid.'/'.\urlencode($value).$GLOBALS['songlistModuleConfig']['endofurl'];
386 386
         }
387 387
 
388
-        return XOOPS_URL . '/modules/songlist/' . $file . '.php?op=' . $op . '&fct=' . $fct . '&value=' . \urlencode($value ?? '') . '&cid=' . $cid . '&gid=' . $gid . '&vcid=' . $vcid . '&start=' . $start;
388
+        return XOOPS_URL.'/modules/songlist/'.$file.'.php?op='.$op.'&fct='.$fct.'&value='.\urlencode($value ?? '').'&cid='.$cid.'&gid='.$gid.'&vcid='.$vcid.'&start='.$start;
389 389
     }
390 390
 
391 391
     /**
@@ -394,11 +394,11 @@  discard block
 block discarded – undo
394 394
      */
395 395
     public function getTop($limit = 1): array
396 396
     {
397
-        $sql     = 'SELECT * FROM `' . $this->table . '` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT ' . $limit;
397
+        $sql     = 'SELECT * FROM `'.$this->table.'` WHERE `rank`>=0 ORDER BY (`rank`/`votes`) DESC LIMIT '.$limit;
398 398
         $results = $GLOBALS['xoopsDB']->queryF($sql);
399 399
         $ret     = [];
400 400
         $i       = 0;
401
-        while (false !== ($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
401
+        while (false!==($row = $GLOBALS['xoopsDB']->fetchArray($results))) {
402 402
             $ret[$i] = $this->create();
403 403
             $ret[$i]->assignVars($row);
404 404
             ++$i;
Please login to merge, or discard this patch.
class/Votes.php 2 patches
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -13,42 +13,42 @@
 block discarded – undo
13 13
  */
14 14
 class Votes extends \XoopsObject
15 15
 {
16
-    /**
17
-     * Votes constructor.
18
-     * @param null $fid
19
-     */
20
-    public function __construct($fid = null)
21
-    {
22
-        $this->initVar('vid', \XOBJ_DTYPE_INT, 0, false);
23
-        $this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
24
-        $this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
25
-        $this->initVar('ip', \XOBJ_DTYPE_TXTBOX, null, false, 64);
26
-        $this->initVar('netaddy', \XOBJ_DTYPE_TXTBOX, null, false, 255);
27
-        $this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
28
-    }
29
-
30
-    /**
31
-     * @param bool $as_array
32
-     * @return array|string
33
-     */
34
-    public function getForm($as_array = false)
35
-    {
36
-        return FormController::votes_get_form($this, $as_array);
37
-    }
38
-
39
-    /**
40
-     * @return array
41
-     */
42
-    public function toArray(): array
43
-    {
44
-        $ret  = parent::toArray();
45
-        $form = $this->getForm(true);
46
-        foreach ($form as $key => $element) {
47
-            $ret['form'][$key] = $element->render();
48
-        }
49
-
50
-        $ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
51
-
52
-        return $ret;
53
-    }
16
+	/**
17
+	 * Votes constructor.
18
+	 * @param null $fid
19
+	 */
20
+	public function __construct($fid = null)
21
+	{
22
+		$this->initVar('vid', \XOBJ_DTYPE_INT, 0, false);
23
+		$this->initVar('sid', \XOBJ_DTYPE_INT, 0, false);
24
+		$this->initVar('uid', \XOBJ_DTYPE_INT, 0, false);
25
+		$this->initVar('ip', \XOBJ_DTYPE_TXTBOX, null, false, 64);
26
+		$this->initVar('netaddy', \XOBJ_DTYPE_TXTBOX, null, false, 255);
27
+		$this->initVar('rank', \XOBJ_DTYPE_DECIMAL, 0, false);
28
+	}
29
+
30
+	/**
31
+	 * @param bool $as_array
32
+	 * @return array|string
33
+	 */
34
+	public function getForm($as_array = false)
35
+	{
36
+		return FormController::votes_get_form($this, $as_array);
37
+	}
38
+
39
+	/**
40
+	 * @return array
41
+	 */
42
+	public function toArray(): array
43
+	{
44
+		$ret  = parent::toArray();
45
+		$form = $this->getForm(true);
46
+		foreach ($form as $key => $element) {
47
+			$ret['form'][$key] = $element->render();
48
+		}
49
+
50
+		$ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
51
+
52
+		return $ret;
53
+	}
54 54
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 namespace XoopsModules\Songlist;
4 4
 
5
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
5
+require_once \dirname(__DIR__).'/include/songlist.object.php';
6 6
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
7 7
 use  XoopsModules\Songlist\Form\FormController;
8 8
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
             $ret['form'][$key] = $element->render();
48 48
         }
49 49
 
50
-        $ret['rank'] = \number_format($this->getVar('rank'), 2) . \_MI_SONGLIST_OFTEN;
50
+        $ret['rank'] = \number_format($this->getVar('rank'), 2).\_MI_SONGLIST_OFTEN;
51 51
 
52 52
         return $ret;
53 53
     }
Please login to merge, or discard this patch.
class/Utf8map.php 2 patches
Indentation   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -15,45 +15,45 @@
 block discarded – undo
15 15
  */
16 16
 class Utf8map extends XoopsObject
17 17
 {
18
-    /**
19
-     * Utf8map constructor.
20
-     * @param null $fid
21
-     */
22
-    public function __construct($fid = null)
23
-    {
24
-        $this->initVar('utfid', \XOBJ_DTYPE_INT, 0, false);
25
-        $this->initVar('from', \XOBJ_DTYPE_TXTBOX, null, false, 2);
26
-        $this->initVar('to', \XOBJ_DTYPE_TXTBOX, null, false, 2);
27
-        $this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
28
-        $this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
29
-    }
30
-
31
-    /**
32
-     * @param bool $as_array
33
-     * @return array|string
34
-     */
35
-    public function getForm($as_array = false)
36
-    {
37
-        return FormController::getFormUtf8map($this, $as_array);
38
-    }
39
-
40
-    /**
41
-     * @return array
42
-     */
43
-    public function toArray(): array
44
-    {
45
-        $ret  = parent::toArray();
46
-        $form = $this->getForm(true);
47
-        foreach ($form as $key => $element) {
48
-            $ret['form'][$key] = $element->render();
49
-        }
50
-        foreach (['created', 'updated'] as $key) {
51
-            if ($this->getVar($key) > 0) {
52
-                $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
53
-                $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
54
-            }
55
-        }
56
-
57
-        return $ret;
58
-    }
18
+	/**
19
+	 * Utf8map constructor.
20
+	 * @param null $fid
21
+	 */
22
+	public function __construct($fid = null)
23
+	{
24
+		$this->initVar('utfid', \XOBJ_DTYPE_INT, 0, false);
25
+		$this->initVar('from', \XOBJ_DTYPE_TXTBOX, null, false, 2);
26
+		$this->initVar('to', \XOBJ_DTYPE_TXTBOX, null, false, 2);
27
+		$this->initVar('created', \XOBJ_DTYPE_INT, 0, false);
28
+		$this->initVar('updated', \XOBJ_DTYPE_INT, 0, false);
29
+	}
30
+
31
+	/**
32
+	 * @param bool $as_array
33
+	 * @return array|string
34
+	 */
35
+	public function getForm($as_array = false)
36
+	{
37
+		return FormController::getFormUtf8map($this, $as_array);
38
+	}
39
+
40
+	/**
41
+	 * @return array
42
+	 */
43
+	public function toArray(): array
44
+	{
45
+		$ret  = parent::toArray();
46
+		$form = $this->getForm(true);
47
+		foreach ($form as $key => $element) {
48
+			$ret['form'][$key] = $element->render();
49
+		}
50
+		foreach (['created', 'updated'] as $key) {
51
+			if ($this->getVar($key) > 0) {
52
+				$ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
53
+				$ret[$key]         = \date(_DATESTRING, $this->getVar($key));
54
+			}
55
+		}
56
+
57
+		return $ret;
58
+	}
59 59
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 
7 7
 \defined('XOOPS_ROOT_PATH') || exit('Restricted access');
8 8
 
9
-require_once \dirname(__DIR__) . '/include/songlist.object.php';
9
+require_once \dirname(__DIR__).'/include/songlist.object.php';
10 10
 // require_once \dirname(__DIR__) . '/include/songlist.form.php';
11 11
 use  XoopsModules\Songlist\Form\FormController;
12 12
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
             $ret['form'][$key] = $element->render();
49 49
         }
50 50
         foreach (['created', 'updated'] as $key) {
51
-            if ($this->getVar($key) > 0) {
51
+            if ($this->getVar($key)>0) {
52 52
                 $ret['form'][$key] = \date(_DATESTRING, $this->getVar($key));
53 53
                 $ret[$key]         = \date(_DATESTRING, $this->getVar($key));
54 54
             }
Please login to merge, or discard this patch.