XoopsModules25x / songlist

include/JSON.php

Indentation +676 added lines, -676 removed lines

@@ -76,271 +76,271 @@ 
  */
 class ServicesJSON
 {
-    /**
-     * constructs a new JSON instance
-     *
-     * @param int $use object behavior flags; combine with boolean-OR
-     *
-     *                           possible values:
-     *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
-     *                                   "{...}" syntax creates associative arrays
-     *                                   instead of objects in decode().
-     *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
-     *                                   Values which can't be encoded (e.g. resources)
-     *                                   appear as NULL instead of throwing errors.
-     *                                   By default, a deeply-nested resource will
-     *                                   bubble up with an error, so all return values
-     *                                   from encode() should be checked with isError()
-     */
-    public function __construct($use = 0)
-    {
-        $this->use = $use;
-    }
-
-    /**
-     * convert a string from one UTF-16 char to one UTF-8 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf16 UTF-16 character
-     * @return   string  UTF-8 character
-     */
-    public function utf162utf8($utf16): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
-        }
-
-        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
-
-        switch (true) {
-            case ((0x7F & $bytes) == $bytes):
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
-                // return a 2-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
-                // return a 3-byte UTF-8 character
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * convert a string from one UTF-8 char to one UTF-16 char
-     *
-     * Normally should be handled by mb_convert_encoding, but
-     * provides a slower PHP-only method for installations
-     * that lack the multibye string extension.
-     *
-     * @param string $utf8 UTF-8 character
-     * @return   string  UTF-16 character
-     */
-    public function utf82utf16($utf8): string
-    {
-        // oh please oh please oh please oh please oh please
-        if (function_exists('mb_convert_encoding')) {
-            return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
-        }
-
-        switch (mb_strlen($utf8)) {
-            case 1:
-                // this case should never be reached, because we are in ASCII range
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return $utf8;
-            case 2:
-                // return a UTF-16 character from a 2-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
-            case 3:
-                // return a UTF-16 character from a 3-byte UTF-8 char
-                // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
-        }
-
-        // ignoring UTF-32 for now, sorry
-        return '';
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format (and sends JSON Header)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encode($var)
-    {
-        header('Document-type: application/json');
-
-        return $this->encodeUnsafe($var);
-    }
-
-    /**
-     * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function encodeUnsafe($var)
-    {
-        // see bug #16908 - regarding numeric locale printing
-        $lc = setlocale(LC_NUMERIC, 0);
-        setlocale(LC_NUMERIC, 'C');
-        $ret = $this->_encode($var);
-        setlocale(LC_NUMERIC, $lc);
-
-        return $ret;
-    }
-
-    /**
-     * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
-     *
-     * @param mixed $var         any number, boolean, string, array, or object to be encoded.
-     *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
-     *                           if var is a strng, note that encode() always expects it
-     *                           to be in ASCII or UTF-8 format!
-     *
-     * @return   mixed   JSON string representation of input var or an error if a problem occurs
-     */
-    public function _encode($var)
-    {
-        switch (gettype($var)) {
-            case 'boolean':
-                return $var ? 'true' : 'false';
-            case 'NULL':
-                return 'null';
-            case 'integer':
-                return (int)$var;
-            case 'double':
-            case 'float':
-                return (float)$var;
-            case 'string':
-                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
-                $ascii      = '';
-                $strlen_var = mb_strlen($var);
-
-                /*
+	/**
+	 * constructs a new JSON instance
+	 *
+	 * @param int $use object behavior flags; combine with boolean-OR
+	 *
+	 *                           possible values:
+	 *                           - SERVICES_JSON_LOOSE_TYPE:  loose typing.
+	 *                                   "{...}" syntax creates associative arrays
+	 *                                   instead of objects in decode().
+	 *                           - SERVICES_JSON_SUPPRESS_ERRORS:  error suppression.
+	 *                                   Values which can't be encoded (e.g. resources)
+	 *                                   appear as NULL instead of throwing errors.
+	 *                                   By default, a deeply-nested resource will
+	 *                                   bubble up with an error, so all return values
+	 *                                   from encode() should be checked with isError()
+	 */
+	public function __construct($use = 0)
+	{
+		$this->use = $use;
+	}
+
+	/**
+	 * convert a string from one UTF-16 char to one UTF-8 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf16 UTF-16 character
+	 * @return   string  UTF-8 character
+	 */
+	public function utf162utf8($utf16): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+		}
+
+		$bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
+
+		switch (true) {
+			case ((0x7F & $bytes) == $bytes):
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x7F & $bytes);
+			case (0x07FF & $bytes) == $bytes:
+				// return a 2-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
+			case (0xFFFF & $bytes) == $bytes:
+				// return a 3-byte UTF-8 character
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * convert a string from one UTF-8 char to one UTF-16 char
+	 *
+	 * Normally should be handled by mb_convert_encoding, but
+	 * provides a slower PHP-only method for installations
+	 * that lack the multibye string extension.
+	 *
+	 * @param string $utf8 UTF-8 character
+	 * @return   string  UTF-16 character
+	 */
+	public function utf82utf16($utf8): string
+	{
+		// oh please oh please oh please oh please oh please
+		if (function_exists('mb_convert_encoding')) {
+			return mb_convert_encoding($utf8, 'UTF-16', 'UTF-8');
+		}
+
+		switch (mb_strlen($utf8)) {
+			case 1:
+				// this case should never be reached, because we are in ASCII range
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return $utf8;
+			case 2:
+				// return a UTF-16 character from a 2-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+			case 3:
+				// return a UTF-16 character from a 3-byte UTF-8 char
+				// see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+				return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+		}
+
+		// ignoring UTF-32 for now, sorry
+		return '';
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format (and sends JSON Header)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encode($var)
+	{
+		header('Document-type: application/json');
+
+		return $this->encodeUnsafe($var);
+	}
+
+	/**
+	 * encodes an arbitrary variable into JSON format without JSON Header - warning - may allow CSS!!!!)
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function encodeUnsafe($var)
+	{
+		// see bug #16908 - regarding numeric locale printing
+		$lc = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, 'C');
+		$ret = $this->_encode($var);
+		setlocale(LC_NUMERIC, $lc);
+
+		return $ret;
+	}
+
+	/**
+	 * PRIVATE CODE that does the work of encodes an arbitrary variable into JSON format
+	 *
+	 * @param mixed $var         any number, boolean, string, array, or object to be encoded.
+	 *                           see argument 1 to ServicesJSON() above for array-parsing behavior.
+	 *                           if var is a strng, note that encode() always expects it
+	 *                           to be in ASCII or UTF-8 format!
+	 *
+	 * @return   mixed   JSON string representation of input var or an error if a problem occurs
+	 */
+	public function _encode($var)
+	{
+		switch (gettype($var)) {
+			case 'boolean':
+				return $var ? 'true' : 'false';
+			case 'NULL':
+				return 'null';
+			case 'integer':
+				return (int)$var;
+			case 'double':
+			case 'float':
+				return (float)$var;
+			case 'string':
+				// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+				$ascii      = '';
+				$strlen_var = mb_strlen($var);
+
+				/*
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
-                    $ord_var_c = ord($var[$c]);
-
-                    switch (true) {
-                        case 0x08 == $ord_var_c:
-                            $ascii .= '\b';
-                            break;
-                        case 0x09 == $ord_var_c:
-                            $ascii .= '\t';
-                            break;
-                        case 0x0A == $ord_var_c:
-                            $ascii .= '\n';
-                            break;
-                        case 0x0C == $ord_var_c:
-                            $ascii .= '\f';
-                            break;
-                        case 0x0D == $ord_var_c:
-                            $ascii .= '\r';
-                            break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
-                            // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
-                            break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
-                            // characters U-00000000 - U-0000007F (same as ASCII)
-                            $ascii .= $var[$c];
-                            break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
-                            // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
-                                ++$c;
-                                $ascii .= '?';
-                                break;
-                            }
-
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
-                            ++$c;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
-                                $c     += 2;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
-                            $c     += 2;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
-                                $c     += 3;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
-                            $c     += 3;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
-                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
-                                $c     += 4;
-                                $ascii .= '?';
-                                break;
-                            }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
-                            $c     += 4;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
-                                $c     += 5;
-                                $ascii .= '?';
-                                break;
-                            }
-                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                            // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
-                            $c     += 5;
-                            $utf16 = $this->utf82utf16($char);
-                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
-                            break;
-                    }
-                }
-
-                return '"' . $ascii . '"';
-            case 'array':
-                /*
+				for ($c = 0; $c < $strlen_var; ++$c) {
+					$ord_var_c = ord($var[$c]);
+
+					switch (true) {
+						case 0x08 == $ord_var_c:
+							$ascii .= '\b';
+							break;
+						case 0x09 == $ord_var_c:
+							$ascii .= '\t';
+							break;
+						case 0x0A == $ord_var_c:
+							$ascii .= '\n';
+							break;
+						case 0x0C == $ord_var_c:
+							$ascii .= '\f';
+							break;
+						case 0x0D == $ord_var_c:
+							$ascii .= '\r';
+							break;
+						case 0x22 == $ord_var_c:
+						case 0x2F == $ord_var_c:
+						case 0x5C == $ord_var_c:
+							// double quote, slash, slosh
+							$ascii .= '\\' . $var[$c];
+							break;
+						case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+							// characters U-00000000 - U-0000007F (same as ASCII)
+							$ascii .= $var[$c];
+							break;
+						case (0xC0 == ($ord_var_c & 0xE0)):
+							// characters U-00000080 - U-000007FF, mask 110SONGLIST
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 1 >= $strlen_var) {
+								++$c;
+								$ascii .= '?';
+								break;
+							}
+
+							$char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+							++$c;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xE0 == ($ord_var_c & 0xF0)):
+							if ($c + 2 >= $strlen_var) {
+								$c     += 2;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+							$c     += 2;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF0 == ($ord_var_c & 0xF8)):
+							if ($c + 3 >= $strlen_var) {
+								$c     += 3;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-00010000 - U-001FFFFF, mask 11110XXX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+							$c     += 3;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xF8 == ($ord_var_c & 0xFC)):
+							// characters U-00200000 - U-03FFFFFF, mask 111110XX
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							if ($c + 4 >= $strlen_var) {
+								$c     += 4;
+								$ascii .= '?';
+								break;
+							}
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+							$c     += 4;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+						case (0xFC == ($ord_var_c & 0xFE)):
+							if ($c + 5 >= $strlen_var) {
+								$c     += 5;
+								$ascii .= '?';
+								break;
+							}
+							// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+							// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+							$char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+							$c     += 5;
+							$utf16 = $this->utf82utf16($char);
+							$ascii .= sprintf('\u%04s', bin2hex($utf16));
+							break;
+					}
+				}
+
+				return '"' . $ascii . '"';
+			case 'array':
+				/*
                  * As per JSON spec if any array key is not an integer
                  * we must treat the the whole array as an object. We
                  * also try to catch a sparsely populated associative
@@ -358,422 +358,422 @@ 
                  * bracket notation.
                  */
 
-                // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
-                    $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
-
-                    foreach ($properties as $property) {
-                        if ($this->isError($property)) {
-                            return $property;
-                        }
-                    }
-
-                    return '{' . implode(',', $properties) . '}';
-                }
-
-                // treat it like a regular array
-                $elements = array_map([$this, '_encode'], $var);
-
-                foreach ($elements as $element) {
-                    if ($this->isError($element)) {
-                        return $element;
-                    }
-                }
-
-                return '[' . implode(',', $elements) . ']';
-            case 'object':
-                $vars = get_object_vars($var);
-
-                $properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
-
-                foreach ($properties as $property) {
-                    if ($this->isError($property)) {
-                        return $property;
-                    }
-                }
-
-                return '{' . implode(',', $properties) . '}';
-            default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
-        }
-    }
-
-    /**
-     * array-walking function for use in generating JSON-formatted name-value pairs
-     *
-     * @param string $name  name of key to use
-     * @param mixed  $value reference to an array element to be encoded
-     *
-     * @return   string  JSON-formatted name-value pair, like '"name":value'
-     */
-    public function name_value($name, $value)
-    {
-        $encoded_value = $this->_encode($value);
-
-        if ($this->isError($encoded_value)) {
-            return $encoded_value;
-        }
-
-        return $this->_encode((string)$name) . ':' . $encoded_value;
-    }
-
-    /**
-     * reduce a string by removing leading and trailing comments and whitespace
-     *
-     * @param string $str string value to strip of comments and whitespace
-     *
-     * @return   string  string value stripped of comments and whitespace
-     */
-    public function reduce_string($str): string
-    {
-        $str = preg_replace(
-            [
-                // eliminate single line comments in '// ...' form
-                '#^\s*//(.+)$#m',
-
-                // eliminate multi-line comments in '/* ... */' form, at start of string
-                '#^\s*/\*(.+)\*/#Us',
-
-                // eliminate multi-line comments in '/* ... */' form, at end of string
-                '#/\*(.+)\*/\s*$#Us',
-            ],
-            '',
-            $str
-        );
-
-        // eliminate extraneous space
-        return trim($str);
-    }
-
-    /**
-     * decodes a JSON string into appropriate variable
-     *
-     * @param string $str JSON-formatted string
-     *
-     * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
-     *                   corresponding to given JSON input string.
-     *                   See argument 1 to ServicesJSON() above for object-output behavior.
-     *                   Note that decode() always returns strings
-     *                   in ASCII or UTF-8 format!
-     */
-    public function decode($str)
-    {
-        $str = $this->reduce_string($str);
-
-        switch (mb_strtolower($str)) {
-            case 'true':
-                return true;
-            case 'false':
-                return false;
-            case 'null':
-                return null;
-            default:
-                $m = [];
-
-                if (is_numeric($str)) {
-                    // Lookie-loo, it's a number
-
-                    // This would work on its own, but I'm trying to be
-                    // good about returning integers where appropriate:
-                    // return (float)$str;
-
-                    // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
-                }
-
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
-                    // STRINGS RETURNED IN UTF-8 FORMAT
-                    $delim       = mb_substr($str, 0, 1);
-                    $chrs        = mb_substr($str, 1, -1);
-                    $utf8        = '';
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-                        $ord_chrs_c      = ord($chrs[$c]);
-
-                        switch (true) {
-                            case '\b' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x08);
-                                ++$c;
-                                break;
-                            case '\t' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x09);
-                                ++$c;
-                                break;
-                            case '\n' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0A);
-                                ++$c;
-                                break;
-                            case '\f' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0C);
-                                ++$c;
-                                break;
-                            case '\r' === $substr_chrs_c_2:
-                                $utf8 .= chr(0x0D);
-                                ++$c;
-                                break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
-                                    $utf8 .= $chrs[++$c];
-                                }
-                                break;
-                            case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
-                                // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
-                                $utf8  .= $this->utf162utf8($utf16);
-                                $c     += 5;
-                                break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs[$c];
-                                break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
-                                // characters U-00000080 - U-000007FF, mask 110SONGLIST
-                                //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 2);
-                                ++$c;
-                                break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
-                                // characters U-00000800 - U-0000FFFF, mask 1110XXXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 3);
-                                $c    += 2;
-                                break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
-                                // characters U-00010000 - U-001FFFFF, mask 11110XXX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 4);
-                                $c    += 3;
-                                break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
-                                // characters U-00200000 - U-03FFFFFF, mask 111110XX
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 5);
-                                $c    += 4;
-                                break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
-                                // characters U-04000000 - U-7FFFFFFF, mask 1111110X
-                                // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                                $utf8 .= mb_substr($chrs, $c, 6);
-                                $c    += 5;
-                                break;
-                        }
-                    }
-
-                    return $utf8;
-                }
-
-                if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
-                    // array, or object notation
-
-                    if ('[' === $str[0]) {
-                        $stk = [SERVICES_JSON_IN_ARR];
-                        $arr = [];
-                    } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = [];
-                        } else {
-                            $stk = [SERVICES_JSON_IN_OBJ];
-                            $obj = new stdClass();
-                    }
-
-                    array_push(
-                        $stk,
-                        [
-                            'what'  => SERVICES_JSON_SLICE,
-                            'where' => 0,
-                            'delim' => false,
-                        ]
-                    );
-
-                    $chrs = mb_substr($str, 1, -1);
-                    $chrs = $this->reduce_string($chrs);
-
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                            return $arr;
-                        }
-
-                        return $obj;
-                    }
-
-                    //print("\nparsing {$chrs}\n");
-
-                    $strlen_chrs = mb_strlen($chrs);
-
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
-                        $top             = end($stk);
-                        $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
-
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
-                            // found a comma that is not inside a string, array, etc.,
-                            // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
-                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                                // we are in an array, so just push an element onto the stack
-                                $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                                // we are in an object, so figure
-                                // out the property name and set an
-                                // element in an associative array,
-                                // for now
-                                $parts = [];
-
-                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // "name":value pair
-                                    $key = $this->decode($parts[1]);
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
-                                    // name:value pair, where name is unquoted
-                                    $key = $parts[1];
-                                    $val = $this->decode($parts[2]);
-
-                                    if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
-                                        $obj[$key] = $val;
-                                    } else {
-                                        $obj->$key = $val;
-                                    }
-                                }
-                            }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
-                            // found a quote, and we are not inside a string
-                            array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
-                            //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
-                            // found a quote, we're in a string, and it's not escaped
-                            // we know that it's not escaped becase there is _not_ an
-                            // odd number of backslashes at the end of the string so far
-                            array_pop($stk);
-                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-bracket, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
-                            //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
-                            // found a right-bracket, and we're in an array
-                            array_pop($stk);
-                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a left-brace, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
-                            //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
-                            // found a right-brace, and we're in an object
-                            array_pop($stk);
-                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
-                                  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
-                            // found a comment start, and we are in an array, object, or slice
-                            array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
-                            ++$c;
-                            //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
-                            // found a comment end, and we're in one now
-                            array_pop($stk);
-                            ++$c;
-
-                            for ($i = $top['where']; $i <= $c; ++$i) {
-                                $chrs = substr_replace($chrs, ' ', $i, 1);
-                            }
-                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        }
-                    }
-
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
-                        return $arr;
-                    }
-
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
-                        return $obj;
-                    }
-                }
-        }
-    }
-
-    /**
-     * @param      $data
-     * @param null $code
-     * @return bool
-     * @todo Ultimately, this should just call PEAR::isError()
-     */
-    public function isError($data, $code = null): bool
-    {
-        if (class_exists('pear')) {
-            return PEAR::isError($data, $code);
-        }
-
-        if (is_object($data)
-            && ($data instanceof \services_json_error
-                || $data instanceof \services_json_error)) {
-            return true;
-        }
-
-        return false;
-    }
+				// treat as a JSON object
+				if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+					$properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
+
+					foreach ($properties as $property) {
+						if ($this->isError($property)) {
+							return $property;
+						}
+					}
+
+					return '{' . implode(',', $properties) . '}';
+				}
+
+				// treat it like a regular array
+				$elements = array_map([$this, '_encode'], $var);
+
+				foreach ($elements as $element) {
+					if ($this->isError($element)) {
+						return $element;
+					}
+				}
+
+				return '[' . implode(',', $elements) . ']';
+			case 'object':
+				$vars = get_object_vars($var);
+
+				$properties = array_map([$this, 'name_value'], array_keys($vars), array_values($vars));
+
+				foreach ($properties as $property) {
+					if ($this->isError($property)) {
+						return $property;
+					}
+				}
+
+				return '{' . implode(',', $properties) . '}';
+			default:
+				return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+		}
+	}
+
+	/**
+	 * array-walking function for use in generating JSON-formatted name-value pairs
+	 *
+	 * @param string $name  name of key to use
+	 * @param mixed  $value reference to an array element to be encoded
+	 *
+	 * @return   string  JSON-formatted name-value pair, like '"name":value'
+	 */
+	public function name_value($name, $value)
+	{
+		$encoded_value = $this->_encode($value);
+
+		if ($this->isError($encoded_value)) {
+			return $encoded_value;
+		}
+
+		return $this->_encode((string)$name) . ':' . $encoded_value;
+	}
+
+	/**
+	 * reduce a string by removing leading and trailing comments and whitespace
+	 *
+	 * @param string $str string value to strip of comments and whitespace
+	 *
+	 * @return   string  string value stripped of comments and whitespace
+	 */
+	public function reduce_string($str): string
+	{
+		$str = preg_replace(
+			[
+				// eliminate single line comments in '// ...' form
+				'#^\s*//(.+)$#m',
+
+				// eliminate multi-line comments in '/* ... */' form, at start of string
+				'#^\s*/\*(.+)\*/#Us',
+
+				// eliminate multi-line comments in '/* ... */' form, at end of string
+				'#/\*(.+)\*/\s*$#Us',
+			],
+			'',
+			$str
+		);
+
+		// eliminate extraneous space
+		return trim($str);
+	}
+
+	/**
+	 * decodes a JSON string into appropriate variable
+	 *
+	 * @param string $str JSON-formatted string
+	 *
+	 * @return   array|bool|float|int|\stdClass|string|void|null   number, boolean, string, array, or object
+	 *                   corresponding to given JSON input string.
+	 *                   See argument 1 to ServicesJSON() above for object-output behavior.
+	 *                   Note that decode() always returns strings
+	 *                   in ASCII or UTF-8 format!
+	 */
+	public function decode($str)
+	{
+		$str = $this->reduce_string($str);
+
+		switch (mb_strtolower($str)) {
+			case 'true':
+				return true;
+			case 'false':
+				return false;
+			case 'null':
+				return null;
+			default:
+				$m = [];
+
+				if (is_numeric($str)) {
+					// Lookie-loo, it's a number
+
+					// This would work on its own, but I'm trying to be
+					// good about returning integers where appropriate:
+					// return (float)$str;
+
+					// Return float or int, as appropriate
+					return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+				}
+
+				if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+					// STRINGS RETURNED IN UTF-8 FORMAT
+					$delim       = mb_substr($str, 0, 1);
+					$chrs        = mb_substr($str, 1, -1);
+					$utf8        = '';
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c < $strlen_chrs; ++$c) {
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+						$ord_chrs_c      = ord($chrs[$c]);
+
+						switch (true) {
+							case '\b' === $substr_chrs_c_2:
+								$utf8 .= chr(0x08);
+								++$c;
+								break;
+							case '\t' === $substr_chrs_c_2:
+								$utf8 .= chr(0x09);
+								++$c;
+								break;
+							case '\n' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0A);
+								++$c;
+								break;
+							case '\f' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0C);
+								++$c;
+								break;
+							case '\r' === $substr_chrs_c_2:
+								$utf8 .= chr(0x0D);
+								++$c;
+								break;
+							case '\\"' === $substr_chrs_c_2:
+							case '\\\'' === $substr_chrs_c_2:
+							case '\\\\' === $substr_chrs_c_2:
+							case '\\/' === $substr_chrs_c_2:
+								if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
+									|| ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+									$utf8 .= $chrs[++$c];
+								}
+								break;
+							case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
+								// single, escaped unicode character
+								$utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+								$utf8  .= $this->utf162utf8($utf16);
+								$c     += 5;
+								break;
+							case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+								$utf8 .= $chrs[$c];
+								break;
+							case 0xC0 == ($ord_chrs_c & 0xE0):
+								// characters U-00000080 - U-000007FF, mask 110SONGLIST
+								//see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 2);
+								++$c;
+								break;
+							case 0xE0 == ($ord_chrs_c & 0xF0):
+								// characters U-00000800 - U-0000FFFF, mask 1110XXXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 3);
+								$c    += 2;
+								break;
+							case 0xF0 == ($ord_chrs_c & 0xF8):
+								// characters U-00010000 - U-001FFFFF, mask 11110XXX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 4);
+								$c    += 3;
+								break;
+							case 0xF8 == ($ord_chrs_c & 0xFC):
+								// characters U-00200000 - U-03FFFFFF, mask 111110XX
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 5);
+								$c    += 4;
+								break;
+							case 0xFC == ($ord_chrs_c & 0xFE):
+								// characters U-04000000 - U-7FFFFFFF, mask 1111110X
+								// see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+								$utf8 .= mb_substr($chrs, $c, 6);
+								$c    += 5;
+								break;
+						}
+					}
+
+					return $utf8;
+				}
+
+				if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+					// array, or object notation
+
+					if ('[' === $str[0]) {
+						$stk = [SERVICES_JSON_IN_ARR];
+						$arr = [];
+					} elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = [];
+						} else {
+							$stk = [SERVICES_JSON_IN_OBJ];
+							$obj = new stdClass();
+					}
+
+					array_push(
+						$stk,
+						[
+							'what'  => SERVICES_JSON_SLICE,
+							'where' => 0,
+							'delim' => false,
+						]
+					);
+
+					$chrs = mb_substr($str, 1, -1);
+					$chrs = $this->reduce_string($chrs);
+
+					if ('' == $chrs) {
+						if (SERVICES_JSON_IN_ARR == reset($stk)) {
+							return $arr;
+						}
+
+						return $obj;
+					}
+
+					//print("\nparsing {$chrs}\n");
+
+					$strlen_chrs = mb_strlen($chrs);
+
+					for ($c = 0; $c <= $strlen_chrs; ++$c) {
+						$top             = end($stk);
+						$substr_chrs_c_2 = mb_substr($chrs, $c, 2);
+
+						if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+							// found a comma that is not inside a string, array, etc.,
+							// OR we've reached the end of the character list
+							$slice = mb_substr($chrs, $top['where'], $c - $top['where']);
+							array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+							//print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+							if (SERVICES_JSON_IN_ARR == reset($stk)) {
+								// we are in an array, so just push an element onto the stack
+								$arr[] = $this->decode($slice);
+							} elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+								// we are in an object, so figure
+								// out the property name and set an
+								// element in an associative array,
+								// for now
+								$parts = [];
+
+								if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// "name":value pair
+									$key = $this->decode($parts[1]);
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								} elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+									// name:value pair, where name is unquoted
+									$key = $parts[1];
+									$val = $this->decode($parts[2]);
+
+									if ($this->use & SERVICES_JSON_LOOSE_TYPE) {
+										$obj[$key] = $val;
+									} else {
+										$obj->$key = $val;
+									}
+								}
+							}
+						} elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+							// found a quote, and we are not inside a string
+							array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
+							//print("Found start of string at {$c}\n");
+						} elseif (($chrs[$c] == $top['delim'])
+								  && (SERVICES_JSON_IN_STR == $top['what'])
+								  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+							// found a quote, we're in a string, and it's not escaped
+							// we know that it's not escaped becase there is _not_ an
+							// odd number of backslashes at the end of the string so far
+							array_pop($stk);
+							//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+						} elseif (('[' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-bracket, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
+							//print("Found start of array at {$c}\n");
+						} elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+							// found a right-bracket, and we're in an array
+							array_pop($stk);
+							//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('{' === $chrs[$c])
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a left-brace, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
+							//print("Found start of object at {$c}\n");
+						} elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+							// found a right-brace, and we're in an object
+							array_pop($stk);
+							//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						} elseif (('/*' === $substr_chrs_c_2)
+								  && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
+							// found a comment start, and we are in an array, object, or slice
+							array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
+							++$c;
+							//print("Found start of comment at {$c}\n");
+						} elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+							// found a comment end, and we're in one now
+							array_pop($stk);
+							++$c;
+
+							for ($i = $top['where']; $i <= $c; ++$i) {
+								$chrs = substr_replace($chrs, ' ', $i, 1);
+							}
+							//print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+						}
+					}
+
+					if (SERVICES_JSON_IN_ARR == reset($stk)) {
+						return $arr;
+					}
+
+					if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+						return $obj;
+					}
+				}
+		}
+	}
+
+	/**
+	 * @param      $data
+	 * @param null $code
+	 * @return bool
+	 * @todo Ultimately, this should just call PEAR::isError()
+	 */
+	public function isError($data, $code = null): bool
+	{
+		if (class_exists('pear')) {
+			return PEAR::isError($data, $code);
+		}
+
+		if (is_object($data)
+			&& ($data instanceof \services_json_error
+				|| $data instanceof \services_json_error)) {
+			return true;
+		}
+
+		return false;
+	}
 }
 
 if (class_exists('PEAR_Error')) {
-    /**
-     * Class ServicesJSON_Error
-     */
-    class ServicesJSON_Error extends PEAR_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-            parent::__construct($message, $code, $mode, $options, $userinfo);
-        }
-    }
+	/**
+	 * Class ServicesJSON_Error
+	 */
+	class ServicesJSON_Error extends PEAR_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+			parent::__construct($message, $code, $mode, $options, $userinfo);
+		}
+	}
 } else {
-    /**
-     * @todo Ultimately, this class shall be descended from PEAR_Error
-     */
-    class ServicesJSON_Error
-    {
-        /**
-         * ServicesJSON_Error constructor.
-         * @param string $message
-         * @param null   $code
-         * @param null   $mode
-         * @param null   $options
-         * @param null   $userinfo
-         */
-        public function __construct(
-            $message = 'unknown error',
-            $code = null,
-            $mode = null,
-            $options = null,
-            $userinfo = null
-        ) {
-        }
-    }
+	/**
+	 * @todo Ultimately, this class shall be descended from PEAR_Error
+	 */
+	class ServicesJSON_Error
+	{
+		/**
+		 * ServicesJSON_Error constructor.
+		 * @param string $message
+		 * @param null   $code
+		 * @param null   $mode
+		 * @param null   $options
+		 * @param null   $userinfo
+		 */
+		public function __construct(
+			$message = 'unknown error',
+			$code = null,
+			$mode = null,
+			$options = null,
+			$userinfo = null
+		) {
+		}
+	}
 }

Spacing +85 added lines, -85 removed lines

@@ -117,18 +117,18 @@ 
         $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch (true) {
-            case ((0x7F & $bytes) == $bytes):
+            case ((0x7F & $bytes)==$bytes):
                 // this case should never be reached, because we are in ASCII range
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                 return chr(0x7F & $bytes);
-            case (0x07FF & $bytes) == $bytes:
+            case (0x07FF & $bytes)==$bytes:
                 // return a 2-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xC0 | (($bytes >> 6) & 0x1F)) . chr(0x80 | ($bytes & 0x3F));
-            case (0xFFFF & $bytes) == $bytes:
+                return chr(0xC0 | (($bytes >> 6) & 0x1F)).chr(0x80 | ($bytes & 0x3F));
+            case (0xFFFF & $bytes)==$bytes:
                 // return a 3-byte UTF-8 character
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0xE0 | (($bytes >> 12) & 0x0F)) . chr(0x80 | (($bytes >> 6) & 0x3F)) . chr(0x80 | ($bytes & 0x3F));
+                return chr(0xE0 | (($bytes >> 12) & 0x0F)).chr(0x80 | (($bytes >> 6) & 0x3F)).chr(0x80 | ($bytes & 0x3F));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -160,11 +160,11 @@ 
             case 2:
                 // return a UTF-16 character from a 2-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr(0x07 & (ord($utf8[0]) >> 2)) . chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
+                return chr(0x07 & (ord($utf8[0]) >> 2)).chr((0xC0 & (ord($utf8[0]) << 6)) | (0x3F & ord($utf8[1])));
             case 3:
                 // return a UTF-16 character from a 3-byte UTF-8 char
                 // see: https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))) . chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
+                return chr((0xF0 & (ord($utf8[0]) << 4)) | (0x0F & (ord($utf8[1]) >> 2))).chr((0xC0 & (ord($utf8[1]) << 6)) | (0x7F & ord($utf8[2])));
         }
 
         // ignoring UTF-32 for now, sorry
@@ -227,10 +227,10 @@ 
             case 'NULL':
                 return 'null';
             case 'integer':
-                return (int)$var;
+                return (int) $var;
             case 'double':
             case 'float':
-                return (float)$var;
+                return (float) $var;
             case 'string':
                 // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
                 $ascii      = '';
@@ -240,97 +240,97 @@ 
                  * Iterate over every character in the string,
                  * escaping with a slash or encoding to UTF-8 where necessary
                  */
-                for ($c = 0; $c < $strlen_var; ++$c) {
+                for ($c = 0; $c<$strlen_var; ++$c) {
                     $ord_var_c = ord($var[$c]);
 
                     switch (true) {
-                        case 0x08 == $ord_var_c:
+                        case 0x08==$ord_var_c:
                             $ascii .= '\b';
                             break;
-                        case 0x09 == $ord_var_c:
+                        case 0x09==$ord_var_c:
                             $ascii .= '\t';
                             break;
-                        case 0x0A == $ord_var_c:
+                        case 0x0A==$ord_var_c:
                             $ascii .= '\n';
                             break;
-                        case 0x0C == $ord_var_c:
+                        case 0x0C==$ord_var_c:
                             $ascii .= '\f';
                             break;
-                        case 0x0D == $ord_var_c:
+                        case 0x0D==$ord_var_c:
                             $ascii .= '\r';
                             break;
-                        case 0x22 == $ord_var_c:
-                        case 0x2F == $ord_var_c:
-                        case 0x5C == $ord_var_c:
+                        case 0x22==$ord_var_c:
+                        case 0x2F==$ord_var_c:
+                        case 0x5C==$ord_var_c:
                             // double quote, slash, slosh
-                            $ascii .= '\\' . $var[$c];
+                            $ascii .= '\\'.$var[$c];
                             break;
-                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                        case (($ord_var_c>=0x20) && ($ord_var_c<=0x7F)):
                             // characters U-00000000 - U-0000007F (same as ASCII)
                             $ascii .= $var[$c];
                             break;
-                        case (0xC0 == ($ord_var_c & 0xE0)):
+                        case (0xC0==($ord_var_c & 0xE0)):
                             // characters U-00000080 - U-000007FF, mask 110SONGLIST
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 1 >= $strlen_var) {
+                            if ($c+1>=$strlen_var) {
                                 ++$c;
                                 $ascii .= '?';
                                 break;
                             }
 
-                            $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
+                            $char = pack('C*', $ord_var_c, ord($var[$c+1]));
                             ++$c;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xE0 == ($ord_var_c & 0xF0)):
-                            if ($c + 2 >= $strlen_var) {
+                        case (0xE0==($ord_var_c & 0xF0)):
+                            if ($c+2>=$strlen_var) {
                                 $c     += 2;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, @ord($var[$c + 1]), @ord($var[$c + 2]));
+                            $char  = pack('C*', $ord_var_c, @ord($var[$c+1]), @ord($var[$c+2]));
                             $c     += 2;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF0 == ($ord_var_c & 0xF8)):
-                            if ($c + 3 >= $strlen_var) {
+                        case (0xF0==($ord_var_c & 0xF8)):
+                            if ($c+3>=$strlen_var) {
                                 $c     += 3;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-00010000 - U-001FFFFF, mask 11110XXX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]));
                             $c     += 3;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xF8 == ($ord_var_c & 0xFC)):
+                        case (0xF8==($ord_var_c & 0xFC)):
                             // characters U-00200000 - U-03FFFFFF, mask 111110XX
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            if ($c + 4 >= $strlen_var) {
+                            if ($c+4>=$strlen_var) {
                                 $c     += 4;
                                 $ascii .= '?';
                                 break;
                             }
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]));
                             $c     += 4;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
                             break;
-                        case (0xFC == ($ord_var_c & 0xFE)):
-                            if ($c + 5 >= $strlen_var) {
+                        case (0xFC==($ord_var_c & 0xFE)):
+                            if ($c+5>=$strlen_var) {
                                 $c     += 5;
                                 $ascii .= '?';
                                 break;
                             }
                             // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                             // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
-                            $char  = pack('C*', $ord_var_c, ord($var[$c + 1]), ord($var[$c + 2]), ord($var[$c + 3]), ord($var[$c + 4]), ord($var[$c + 5]));
+                            $char  = pack('C*', $ord_var_c, ord($var[$c+1]), ord($var[$c+2]), ord($var[$c+3]), ord($var[$c+4]), ord($var[$c+5]));
                             $c     += 5;
                             $utf16 = $this->utf82utf16($char);
                             $ascii .= sprintf('\u%04s', bin2hex($utf16));
@@ -338,7 +338,7 @@ 
                     }
                 }
 
-                return '"' . $ascii . '"';
+                return '"'.$ascii.'"';
             case 'array':
                 /*
                  * As per JSON spec if any array key is not an integer
@@ -359,7 +359,7 @@ 
                  */
 
                 // treat as a JSON object
-                if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) {
+                if (is_array($var) && count($var) && (array_keys($var)!==range(0, count($var)-1))) {
                     $properties = array_map([$this, 'name_value'], array_keys($var), array_values($var));
 
                     foreach ($properties as $property) {
@@ -368,7 +368,7 @@ 
                         }
                     }
 
-                    return '{' . implode(',', $properties) . '}';
+                    return '{'.implode(',', $properties).'}';
                 }
 
                 // treat it like a regular array
@@ -380,7 +380,7 @@ 
                     }
                 }
 
-                return '[' . implode(',', $elements) . ']';
+                return '['.implode(',', $elements).']';
             case 'object':
                 $vars = get_object_vars($var);
 
@@ -392,9 +392,9 @@ 
                     }
                 }
 
-                return '{' . implode(',', $properties) . '}';
+                return '{'.implode(',', $properties).'}';
             default:
-                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var) . ' can not be encoded as JSON string');
+                return ($this->use & SERVICES_JSON_SUPPRESS_ERRORS) ? 'null' : new ServicesJSON_Error(gettype($var).' can not be encoded as JSON string');
         }
     }
 
@@ -414,7 +414,7 @@ 
             return $encoded_value;
         }
 
-        return $this->_encode((string)$name) . ':' . $encoded_value;
+        return $this->_encode((string) $name).':'.$encoded_value;
     }
 
     /**
@@ -478,84 +478,84 @@ 
                     // return (float)$str;
 
                     // Return float or int, as appropriate
-                    return ((float)$str == (int)$str) ? (int)$str : (float)$str;
+                    return ((float) $str==(int) $str) ? (int) $str : (float) $str;
                 }
 
-                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1] == $m[2]) {
+                if (preg_match('/^("|\').*(\1)$/s', $str, $m) && $m[1]==$m[2]) {
                     // STRINGS RETURNED IN UTF-8 FORMAT
                     $delim       = mb_substr($str, 0, 1);
                     $chrs        = mb_substr($str, 1, -1);
                     $utf8        = '';
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<$strlen_chrs; ++$c) {
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
                         $ord_chrs_c      = ord($chrs[$c]);
 
                         switch (true) {
-                            case '\b' === $substr_chrs_c_2:
+                            case '\b'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x08);
                                 ++$c;
                                 break;
-                            case '\t' === $substr_chrs_c_2:
+                            case '\t'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x09);
                                 ++$c;
                                 break;
-                            case '\n' === $substr_chrs_c_2:
+                            case '\n'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0A);
                                 ++$c;
                                 break;
-                            case '\f' === $substr_chrs_c_2:
+                            case '\f'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0C);
                                 ++$c;
                                 break;
-                            case '\r' === $substr_chrs_c_2:
+                            case '\r'===$substr_chrs_c_2:
                                 $utf8 .= chr(0x0D);
                                 ++$c;
                                 break;
-                            case '\\"' === $substr_chrs_c_2:
-                            case '\\\'' === $substr_chrs_c_2:
-                            case '\\\\' === $substr_chrs_c_2:
-                            case '\\/' === $substr_chrs_c_2:
-                                if (('"' === $delim && '\\\'' !== $substr_chrs_c_2)
-                                    || ("'" === $delim && '\\"' !== $substr_chrs_c_2)) {
+                            case '\\"'===$substr_chrs_c_2:
+                            case '\\\''===$substr_chrs_c_2:
+                            case '\\\\'===$substr_chrs_c_2:
+                            case '\\/'===$substr_chrs_c_2:
+                                if (('"'===$delim && '\\\''!==$substr_chrs_c_2)
+                                    || ("'"===$delim && '\\"'!==$substr_chrs_c_2)) {
                                     $utf8 .= $chrs[++$c];
                                 }
                                 break;
                             case preg_match('/\\\u[0-9A-F]{4}/i', mb_substr($chrs, $c, 6)):
                                 // single, escaped unicode character
-                                $utf16 = chr(hexdec(mb_substr($chrs, $c + 2, 2))) . chr(hexdec(mb_substr($chrs, $c + 4, 2)));
+                                $utf16 = chr(hexdec(mb_substr($chrs, $c+2, 2))).chr(hexdec(mb_substr($chrs, $c+4, 2)));
                                 $utf8  .= $this->utf162utf8($utf16);
                                 $c     += 5;
                                 break;
-                            case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
+                            case ($ord_chrs_c>=0x20) && ($ord_chrs_c<=0x7F):
                                 $utf8 .= $chrs[$c];
                                 break;
-                            case 0xC0 == ($ord_chrs_c & 0xE0):
+                            case 0xC0==($ord_chrs_c & 0xE0):
                                 // characters U-00000080 - U-000007FF, mask 110SONGLIST
                                 //see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 2);
                                 ++$c;
                                 break;
-                            case 0xE0 == ($ord_chrs_c & 0xF0):
+                            case 0xE0==($ord_chrs_c & 0xF0):
                                 // characters U-00000800 - U-0000FFFF, mask 1110XXXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 3);
                                 $c    += 2;
                                 break;
-                            case 0xF0 == ($ord_chrs_c & 0xF8):
+                            case 0xF0==($ord_chrs_c & 0xF8):
                                 // characters U-00010000 - U-001FFFFF, mask 11110XXX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 4);
                                 $c    += 3;
                                 break;
-                            case 0xF8 == ($ord_chrs_c & 0xFC):
+                            case 0xF8==($ord_chrs_c & 0xFC):
                                 // characters U-00200000 - U-03FFFFFF, mask 111110XX
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 5);
                                 $c    += 4;
                                 break;
-                            case 0xFC == ($ord_chrs_c & 0xFE):
+                            case 0xFC==($ord_chrs_c & 0xFE):
                                 // characters U-04000000 - U-7FFFFFFF, mask 1111110X
                                 // see https://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
                                 $utf8 .= mb_substr($chrs, $c, 6);
@@ -570,7 +570,7 @@ 
                 if (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
                     // array, or object notation
 
-                    if ('[' === $str[0]) {
+                    if ('['===$str[0]) {
                         $stk = [SERVICES_JSON_IN_ARR];
                         $arr = [];
                     } elseif ($this->use & SERVICES_JSON_LOOSE_TYPE) {
@@ -593,8 +593,8 @@ 
                     $chrs = mb_substr($str, 1, -1);
                     $chrs = $this->reduce_string($chrs);
 
-                    if ('' == $chrs) {
-                        if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (''==$chrs) {
+                        if (SERVICES_JSON_IN_ARR==reset($stk)) {
                             return $arr;
                         }
 
@@ -605,21 +605,21 @@ 
 
                     $strlen_chrs = mb_strlen($chrs);
 
-                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+                    for ($c = 0; $c<=$strlen_chrs; ++$c) {
                         $top             = end($stk);
                         $substr_chrs_c_2 = mb_substr($chrs, $c, 2);
 
-                        if (($c == $strlen_chrs) || ((',' === $chrs[$c]) && (SERVICES_JSON_SLICE == $top['what']))) {
+                        if (($c==$strlen_chrs) || ((','===$chrs[$c]) && (SERVICES_JSON_SLICE==$top['what']))) {
                             // found a comma that is not inside a string, array, etc.,
                             // OR we've reached the end of the character list
-                            $slice = mb_substr($chrs, $top['where'], $c - $top['where']);
-                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c + 1, 'delim' => false]);
+                            $slice = mb_substr($chrs, $top['where'], $c-$top['where']);
+                            array_push($stk, ['what' => SERVICES_JSON_SLICE, 'where' => $c+1, 'delim' => false]);
                             //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
 
-                            if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                            if (SERVICES_JSON_IN_ARR==reset($stk)) {
                                 // we are in an array, so just push an element onto the stack
                                 $arr[] = $this->decode($slice);
-                            } elseif (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                            } elseif (SERVICES_JSON_IN_OBJ==reset($stk)) {
                                 // we are in an object, so figure
                                 // out the property name and set an
                                 // element in an associative array,
@@ -648,59 +648,59 @@ 
                                     }
                                 }
                             }
-                        } elseif ((('"' === $chrs[$c]) || ("'" === $chrs[$c])) && (SERVICES_JSON_IN_STR != $top['what'])) {
+                        } elseif ((('"'===$chrs[$c]) || ("'"===$chrs[$c])) && (SERVICES_JSON_IN_STR!=$top['what'])) {
                             // found a quote, and we are not inside a string
                             array_push($stk, ['what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]]);
                             //print("Found start of string at {$c}\n");
-                        } elseif (($chrs[$c] == $top['delim'])
-                                  && (SERVICES_JSON_IN_STR == $top['what'])
-                                  && (1 != (mb_strlen(mb_substr($chrs, 0, $c)) - mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\'))) % 2)) {
+                        } elseif (($chrs[$c]==$top['delim'])
+                                  && (SERVICES_JSON_IN_STR==$top['what'])
+                                  && (1!=(mb_strlen(mb_substr($chrs, 0, $c))-mb_strlen(rtrim(mb_substr($chrs, 0, $c), '\\')))%2)) {
                             // found a quote, we're in a string, and it's not escaped
                             // we know that it's not escaped becase there is _not_ an
                             // odd number of backslashes at the end of the string so far
                             array_pop($stk);
                             //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
-                        } elseif (('[' === $chrs[$c])
+                        } elseif (('['===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-bracket, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false]);
                             //print("Found start of array at {$c}\n");
-                        } elseif ((']' === $chrs[$c]) && (SERVICES_JSON_IN_ARR == $top['what'])) {
+                        } elseif ((']'===$chrs[$c]) && (SERVICES_JSON_IN_ARR==$top['what'])) {
                             // found a right-bracket, and we're in an array
                             array_pop($stk);
                             //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('{' === $chrs[$c])
+                        } elseif (('{'===$chrs[$c])
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a left-brace, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false]);
                             //print("Found start of object at {$c}\n");
-                        } elseif (('}' === $chrs[$c]) && (SERVICES_JSON_IN_OBJ == $top['what'])) {
+                        } elseif (('}'===$chrs[$c]) && (SERVICES_JSON_IN_OBJ==$top['what'])) {
                             // found a right-brace, and we're in an object
                             array_pop($stk);
                             //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
-                        } elseif (('/*' === $substr_chrs_c_2)
+                        } elseif (('/*'===$substr_chrs_c_2)
                                   && in_array($top['what'], [SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ], true)) {
                             // found a comment start, and we are in an array, object, or slice
                             array_push($stk, ['what' => SERVICES_JSON_IN_CMT, 'where' => $c, 'delim' => false]);
                             ++$c;
                             //print("Found start of comment at {$c}\n");
-                        } elseif (('*/' === $substr_chrs_c_2) && (SERVICES_JSON_IN_CMT == $top['what'])) {
+                        } elseif (('*/'===$substr_chrs_c_2) && (SERVICES_JSON_IN_CMT==$top['what'])) {
                             // found a comment end, and we're in one now
                             array_pop($stk);
                             ++$c;
 
-                            for ($i = $top['where']; $i <= $c; ++$i) {
+                            for ($i = $top['where']; $i<=$c; ++$i) {
                                 $chrs = substr_replace($chrs, ' ', $i, 1);
                             }
                             //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
                         }
                     }
 
-                    if (SERVICES_JSON_IN_ARR == reset($stk)) {
+                    if (SERVICES_JSON_IN_ARR==reset($stk)) {
                         return $arr;
                     }
 
-                    if (SERVICES_JSON_IN_OBJ == reset($stk)) {
+                    if (SERVICES_JSON_IN_OBJ==reset($stk)) {
                         return $obj;
                     }
                 }

include/onuninstall.php

Indentation +22 added lines, -22 removed lines

@@ -20,8 +20,8 @@ 
  */
 function xoops_module_pre_uninstall_songlist(\XoopsModule $module): bool
 {
-    // Do some synchronization
-    return true;
+	// Do some synchronization
+	return true;
 }
 
 /**
@@ -32,26 +32,26 @@ 
  */
 function xoops_module_uninstall_songlist(\XoopsModule $module): bool
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-    $helper             = Helper::getInstance();
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+	$helper             = Helper::getInstance();
 
-    $success = true;
-    $helper->loadLanguage('admin');
+	$success = true;
+	$helper->loadLanguage('admin');
 
-    // Rename uploads folder to BAK and add date to name
-    $uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
-    $dirInfo = new \SplFileInfo($uploadDirectory);
-    if ($dirInfo->isDir()) {
-        // The directory exists so rename it
-        $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
-            $success = false;
-        }
-    }
-    unset($dirInfo);
-    /*
+	// Rename uploads folder to BAK and add date to name
+	$uploadDirectory = $GLOBALS['xoops']->path("uploads/$moduleDirName");
+	$dirInfo = new \SplFileInfo($uploadDirectory);
+	if ($dirInfo->isDir()) {
+		// The directory exists so rename it
+		$date = date('Y-m-d');
+		if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
+			$module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+			$success = false;
+		}
+	}
+	unset($dirInfo);
+	/*
     //------------ START ----------------
     //------------------------------------------------------------------
     // Remove xsitemap.xml from XOOPS root folder if it exists
@@ -65,6 +65,6 @@ 
 //    return $success && $delOk; // use this if you're using this routine
 */
 
-    return $success;
-    //------------ END  ----------------
+	return $success;
+	//------------ END  ----------------
 }

Spacing +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     if ($dirInfo->isDir()) {
         // The directory exists so rename it
         $date = date('Y-m-d');
-        if (!rename($uploadDirectory, $uploadDirectory . "_bak_$date")) {
-            $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
+        if (!rename($uploadDirectory, $uploadDirectory."_bak_$date")) {
+            $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ERROR_FOLDER_RENAME_FAILED'), $uploadDirectory));
             $success = false;
         }
     }

include/config.php

Indentation +56 added lines, -56 removed lines

@@ -21,63 +21,63 @@
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
 return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
-    'paths'          => [
-        'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
-    ],
-    'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
-    'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
-        //XOOPS_UPLOAD_PATH . '/flags'
-    ],
+	'name'           => $moduleDirNameUpper . ' Module Configurator',
+	'paths'          => [
+		'dirname'    => $moduleDirName,
+		'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
+		'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
+		'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
+		'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+	],
+	'uploadFolders'  => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
+	'copyBlankFiles' => [
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
+		XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+		//XOOPS_UPLOAD_PATH . '/flags'
+	],
 
-    'copyTestFolders' => [
-        //[
-        //    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
-        //    XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
-        //]
-    ],
+	'copyTestFolders' => [
+		//[
+		//    constant($moduleDirNameUpper . '_PATH') . '/testdata/images',
+		//    XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/images',
+		//]
+	],
 
-    'templateFolders' => [
-        '/templates/',
-        '/templates/blocks/',
-        '/templates/admin/',
-    ],
-    'oldFiles'        => [
-        '/class/request.php',
-        '/class/registry.php',
-        '/class/utilities.php',
-        '/class/util.php',
-        // '/include/constants.php',
-        // '/include/functions.php',
-        '/ajaxrating.txt',
-    ],
-    'oldFolders'      => [
-        '/images',
-        '/css',
-        '/js',
-        '/tcpdf',
-        '/images',
-    ],
-    'renameTables'    => [//         'XX_archive'     => 'ZZZZ_archive',
-    ],
-    'moduleStats'     => [
-        //            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
-        //            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
-        //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
-    ],
-    'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
+	'templateFolders' => [
+		'/templates/',
+		'/templates/blocks/',
+		'/templates/admin/',
+	],
+	'oldFiles'        => [
+		'/class/request.php',
+		'/class/registry.php',
+		'/class/utilities.php',
+		'/class/util.php',
+		// '/include/constants.php',
+		// '/include/functions.php',
+		'/ajaxrating.txt',
+	],
+	'oldFolders'      => [
+		'/images',
+		'/css',
+		'/js',
+		'/tcpdf',
+		'/images',
+	],
+	'renameTables'    => [//         'XX_archive'     => 'ZZZZ_archive',
+	],
+	'moduleStats'     => [
+		//            'totalcategories' => $helper->getHandler('Category')->getCategoriesCount(-1),
+		//            'totalitems'      => $helper->getHandler('Item')->getItemsCount(),
+		//            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
+	],
+	'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
                      <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
 ];

Spacing +14 added lines, -14 removed lines

@@ -20,26 +20,26 @@ 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
 
-return (object)[
-    'name'           => $moduleDirNameUpper . ' Module Configurator',
+return (object) [
+    'name'           => $moduleDirNameUpper.' Module Configurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
@@ -79,5 +79,5 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif') . "' alt='XOOPS Project'></a>",
+                     <img src='" . Admin::iconUrl('xoopsmicrobutton.gif')."' alt='XOOPS Project'></a>",
 ];

include/common.php

Indentation +31 added lines, -31 removed lines

@@ -39,19 +39,19 @@ 
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
 if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+	define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
+	define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
+	define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
+	define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
+	define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
+	define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+	define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
+	define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
+	define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+	'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
+	'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
+	'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
+	'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
+	'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
+	'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
+	'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
+	'0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
+	'1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
 ];
 
 $debug = false;
@@ -77,23 +77,23 @@ 
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof \XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $GLOBALS['xoopsTpl'] = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
 $GLOBALS['xoopsTpl']->assign('mod_url', $helper->url());
 // Local icons path
 if (is_object($helper->getModule())) {
-    $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
-    $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
+	$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
+	$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
-    $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+	$GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
-    $langman = D3LanguageManager::getInstance();
-    $langman->read('main.php', $moduleDirName);
+	require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
+	$langman = D3LanguageManager::getInstance();
+	$langman->read('main.php', $moduleDirName);
 }

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
 use XoopsModules\Songlist;
 use XoopsModules\Songlist\Helper;
 
-require_once \dirname(__DIR__) . '/preloads/autoloader.php';
+require_once \dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
@@ -38,20 +38,20 @@ 
 //$categoryHandler     = new Songlist\CategoryHandler($db);
 //$downloadHandler     = new Songlist\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', '16');
@@ -60,15 +60,15 @@ 
 //$pathModIcon32 = \XoopsModules\Songlist\Helper::getInstance()->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -87,13 +87,13 @@ 
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 xoops_loadLanguage('main', $moduleDirName);
 if (class_exists('D3LanguageManager')) {
-    require_once XOOPS_TRUST_PATH . "/libs/altsys/class/D3LanguageManager.class.php";
+    require_once XOOPS_TRUST_PATH."/libs/altsys/class/D3LanguageManager.class.php";
     $langman = D3LanguageManager::getInstance();
     $langman->read('main.php', $moduleDirName);
 }

include/onupdate.php

Indentation +73 added lines, -73 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Songlist;
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
-    || !$GLOBALS['xoopsUser']->isAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+	|| !$GLOBALS['xoopsUser']->isAdmin()) {
+	exit('Restricted access' . PHP_EOL);
 }
 
 /**
@@ -30,16 +30,16 @@ 
  */
 function xoops_module_pre_update_songlist(\XoopsModule $module): bool
 {
-    $moduleDirName = \basename(\dirname(__DIR__));
-    /** @var Songlist\Helper $helper */
-    /** @var Songlist\Utility $utility */
-    $helper  = Songlist\Helper::getInstance();
-    $utility = new Songlist\Utility();
+	$moduleDirName = \basename(\dirname(__DIR__));
+	/** @var Songlist\Helper $helper */
+	/** @var Songlist\Utility $utility */
+	$helper  = Songlist\Helper::getInstance();
+	$utility = new Songlist\Utility();
 
-    $xoopsSuccess = $utility::checkVerXoops($module);
-    $phpSuccess   = $utility::checkVerPhp($module);
+	$xoopsSuccess = $utility::checkVerXoops($module);
+	$phpSuccess   = $utility::checkVerPhp($module);
 
-    return $xoopsSuccess && $phpSuccess;
+	return $xoopsSuccess && $phpSuccess;
 }
 
 /**
@@ -51,18 +51,18 @@ 
  */
 function xoops_module_update_songlist(\XoopsModule $module, $previousVersion = null): bool
 {
-    $moduleDirName      = \basename(\dirname(__DIR__));
-    $moduleDirNameUpper = \mb_strtoupper($moduleDirName);
-
-    /** @var Songlist\Helper $helper */ /** @var Songlist\Utility $utility */
-    /** @var Songlist\Common\Configurator $configurator */
-    $helper       = Songlist\Helper::getInstance();
-    $utility      = new Songlist\Utility();
-    $configurator = new Songlist\Common\Configurator();
-
-    if ($previousVersion < 240) {
-        //delete old HTML templates
-        /*
+	$moduleDirName      = \basename(\dirname(__DIR__));
+	$moduleDirNameUpper = \mb_strtoupper($moduleDirName);
+
+	/** @var Songlist\Helper $helper */ /** @var Songlist\Utility $utility */
+	/** @var Songlist\Common\Configurator $configurator */
+	$helper       = Songlist\Helper::getInstance();
+	$utility      = new Songlist\Utility();
+	$configurator = new Songlist\Common\Configurator();
+
+	if ($previousVersion < 240) {
+		//delete old HTML templates
+		/*
         if (count($configurator->templateFolders) > 0) {
             foreach ($configurator->templateFolders as $folder) {
                 $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
@@ -80,55 +80,55 @@ 
             }
         }
 */
-        //  ---  DELETE OLD FILES ---------------
-        if (count($configurator->oldFiles) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
-                if (is_file($tempFile)) {
-                    unlink($tempFile);
-                }
-            }
-        }
-
-        //  ---  DELETE OLD FOLDERS ---------------
-        xoops_load('XoopsFile');
-        if (count($configurator->oldFolders) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
-                /** @var XoopsObjectHandler $folderHandler */
-                $folderHandler = XoopsFile::getHandler('folder', $tempFolder);
-                $folderHandler->delete($tempFolder);
-            }
-        }
-
-        //  ---  CREATE FOLDERS ---------------
-        if (count($configurator->uploadFolders) > 0) {
-            //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
-            foreach (array_keys($configurator->uploadFolders) as $i) {
-                $utility::createFolder($configurator->uploadFolders[$i]);
-            }
-        }
-
-        //  ---  COPY blank.png FILES ---------------
-        if (count($configurator->copyBlankFiles) > 0) {
-            $file = \dirname(__DIR__) . '/assets/images/blank.png';
-            foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
-                $utility::copyFile($file, $dest);
-            }
-        }
-
-        //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.tpl%\'';
-        $GLOBALS['xoopsDB']->queryF($sql);
-
-        /** @var \XoopsGroupPermHandler $grouppermHandler */
-        $grouppermHandler = xoops_getHandler('groupperm');
-
-        return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
-    }
-
-    return true;
+		//  ---  DELETE OLD FILES ---------------
+		if (count($configurator->oldFiles) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFiles) as $i) {
+				$tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+				if (is_file($tempFile)) {
+					unlink($tempFile);
+				}
+			}
+		}
+
+		//  ---  DELETE OLD FOLDERS ---------------
+		xoops_load('XoopsFile');
+		if (count($configurator->oldFolders) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->oldFolders) as $i) {
+				$tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+				/** @var XoopsObjectHandler $folderHandler */
+				$folderHandler = XoopsFile::getHandler('folder', $tempFolder);
+				$folderHandler->delete($tempFolder);
+			}
+		}
+
+		//  ---  CREATE FOLDERS ---------------
+		if (count($configurator->uploadFolders) > 0) {
+			//    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
+			foreach (array_keys($configurator->uploadFolders) as $i) {
+				$utility::createFolder($configurator->uploadFolders[$i]);
+			}
+		}
+
+		//  ---  COPY blank.png FILES ---------------
+		if (count($configurator->copyBlankFiles) > 0) {
+			$file = \dirname(__DIR__) . '/assets/images/blank.png';
+			foreach (array_keys($configurator->copyBlankFiles) as $i) {
+				$dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+				$utility::copyFile($file, $dest);
+			}
+		}
+
+		//delete .html entries from the tpl table
+		$sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.tpl%\'';
+		$GLOBALS['xoopsDB']->queryF($sql);
+
+		/** @var \XoopsGroupPermHandler $grouppermHandler */
+		$grouppermHandler = xoops_getHandler('groupperm');
+
+		return $grouppermHandler->deleteByModule($module->getVar('mid'), 'item_read');
+	}
+
+	return true;
 }

Spacing +11 added lines, -11 removed lines

@@ -19,7 +19,7 @@ 
 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof \XoopsUser)
     || !$GLOBALS['xoopsUser']->isAdmin()) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -60,7 +60,7 @@ 
     $utility      = new Songlist\Utility();
     $configurator = new Songlist\Common\Configurator();
 
-    if ($previousVersion < 240) {
+    if ($previousVersion<240) {
         //delete old HTML templates
         /*
         if (count($configurator->templateFolders) > 0) {
@@ -81,10 +81,10 @@ 
         }
 */
         //  ---  DELETE OLD FILES ---------------
-        if (count($configurator->oldFiles) > 0) {
+        if (count($configurator->oldFiles)>0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFiles[$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -93,10 +93,10 @@ 
 
         //  ---  DELETE OLD FOLDERS ---------------
         xoops_load('XoopsFile');
-        if (count($configurator->oldFolders) > 0) {
+        if (count($configurator->oldFolders)>0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+                $tempFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFolders[$i]);
                 /** @var XoopsObjectHandler $folderHandler */
                 $folderHandler = XoopsFile::getHandler('folder', $tempFolder);
                 $folderHandler->delete($tempFolder);
@@ -104,7 +104,7 @@ 
         }
 
         //  ---  CREATE FOLDERS ---------------
-        if (count($configurator->uploadFolders) > 0) {
+        if (count($configurator->uploadFolders)>0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->uploadFolders) as $i) {
                 $utility::createFolder($configurator->uploadFolders[$i]);
@@ -112,16 +112,16 @@ 
         }
 
         //  ---  COPY blank.png FILES ---------------
-        if (count($configurator->copyBlankFiles) > 0) {
-            $file = \dirname(__DIR__) . '/assets/images/blank.png';
+        if (count($configurator->copyBlankFiles)>0) {
+            $file = \dirname(__DIR__).'/assets/images/blank.png';
             foreach (array_keys($configurator->copyBlankFiles) as $i) {
-                $dest = $configurator->copyBlankFiles[$i] . '/blank.png';
+                $dest = $configurator->copyBlankFiles[$i].'/blank.png';
                 $utility::copyFile($file, $dest);
             }
         }
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.tpl%\'';
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n').'\' AND `tpl_file` LIKE \'%.tpl%\'';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         /** @var \XoopsGroupPermHandler $grouppermHandler */

request.php

Indentation +42 added lines, -42 removed lines

@@ -19,48 +19,48 @@
 $requestsHandler = Helper::getInstance()->getHandler('Requests');
 
 switch ($op) {
-    default:
-    case 'request':
-        $url = $requestsHandler->getURL();
-        if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
-            header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
-            exit(0);
-        }
+	default:
+	case 'request':
+		$url = $requestsHandler->getURL();
+		if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
+			header('HTTP/1.1 301 Moved Permanently');
+			header('Location: ' . $url);
+			exit(0);
+		}
 
-        switch ($fct) {
-            case 'save':
-                if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
-                    $request = $requestsHandler->create();
-                    $request->setVars($_POST[0]);
-                    $rid = $requestsHandler->insert($request);
-                    if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
-                    } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
-                    }
-                    exit;
-                    break;
-                }
-                $error = _MD_SONGLIST_MSG_EMAILNOTSET;
+		switch ($fct) {
+			case 'save':
+				if (checkEmail($_POST[0]['email'], true) && !empty($_POST[0]['email'])) {
+					$request = $requestsHandler->create();
+					$request->setVars($_POST[0]);
+					$rid = $requestsHandler->insert($request);
+					if ($rid) {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+					} else {
+						redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+					}
+					exit;
+					break;
+				}
+				$error = _MD_SONGLIST_MSG_EMAILNOTSET;
 
-            // no break
-            default:
-            case 'list':
-                $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
-                require_once $GLOBALS['xoops']->path('/header.php');
-                if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
-                    $GLOBALS['loaded_jquery'] = true;
-                }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
-                $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
-                $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
-                $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
-                if (mb_strlen($error ?? '')) {
-                    xoops_error($error);
-                }
-                require_once $GLOBALS['xoops']->path('/footer.php');
-                break;
-        }
+			// no break
+			default:
+			case 'list':
+				$GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
+				require_once $GLOBALS['xoops']->path('/header.php');
+				if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
+					$GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+					$GLOBALS['loaded_jquery'] = true;
+				}
+				$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+				$GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
+				$GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
+				$GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));
+				if (mb_strlen($error ?? '')) {
+					xoops_error($error);
+				}
+				require_once $GLOBALS['xoops']->path('/footer.php');
+				break;
+		}
 }

Spacing +6 added lines, -6 removed lines

@@ -6,7 +6,7 @@ 
 use XoopsModules\Songlist\RequestsHandler;
 use XoopsModules\Songlist\Form\FormController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $file, $op, $fct, $id, $value, $gid, $cid, $singer, $start, $limit;
 
@@ -24,7 +24,7 @@ 
         $url = $requestsHandler->getURL();
         if (!mb_strpos($url, $_SERVER['REQUEST_URI']) && empty($_POST)) {
             header('HTTP/1.1 301 Moved Permanently');
-            header('Location: ' . $url);
+            header('Location: '.$url);
             exit(0);
         }
 
@@ -35,9 +35,9 @@ 
                     $request->setVars($_POST[0]);
                     $rid = $requestsHandler->insert($request);
                     if ($rid) {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTSENT);
                     } else {
-                        redirect_header($_SERVER['SCRIPT_NAME'] . "?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
+                        redirect_header($_SERVER['SCRIPT_NAME']."?op=item&fct=list&id=$id&value=$value&start=$start&limit=$limit", 10, _MD_SONGLIST_MSG_REQUESTNOTSENT);
                     }
                     exit;
                     break;
@@ -50,10 +50,10 @@ 
                 $GLOBALS['xoopsOption']['template_main'] = 'songlist_requests_index.tpl';
                 require_once $GLOBALS['xoops']->path('/header.php');
                 if ($GLOBALS['songlistModuleConfig']['force_jquery'] && !isset($GLOBALS['loaded_jquery'])) {
-                    $GLOBALS['xoTheme']->addScript(XOOPS_URL . _MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
+                    $GLOBALS['xoTheme']->addScript(XOOPS_URL._MI_SONGLIST_JQUERY, ['type' => 'text/javascript']);
                     $GLOBALS['loaded_jquery'] = true;
                 }
-                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . _MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
+                $GLOBALS['xoTheme']->addStylesheet(XOOPS_URL._MI_SONGLIST_STYLESHEET, ['type' => 'text/css']);
                 $GLOBALS['xoopsTpl']->assign('xoConfig', $GLOBALS['songlistModuleConfig']);
                 $GLOBALS['xoopsTpl']->assign('php_self', $_SERVER['SCRIPT_NAME']);
                 $GLOBALS['xoopsTpl']->assign('form', FormController::getFormRequests(false, false));

view.tag.php

Spacing +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php declare(strict_types=1);
 
-require_once __DIR__ . '/header.php';
-require_once XOOPS_ROOT_PATH . '/modules/tag/view.tag.php';
+require_once __DIR__.'/header.php';
+require_once XOOPS_ROOT_PATH.'/modules/tag/view.tag.php';

preloads/autoloader.php

Indentation +21 added lines, -21 removed lines

@@ -4,31 +4,31 @@
  * @see https://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class): void {
-        // project-specific namespace prefix
-        $prefix = 'XoopsModules\\Songlist\\';
+	static function ($class): void {
+		// project-specific namespace prefix
+		$prefix = 'XoopsModules\\Songlist\\';
 
-        // base directory for the namespace prefix
-        $baseDir = \dirname(__DIR__) . '/class/';
+		// base directory for the namespace prefix
+		$baseDir = \dirname(__DIR__) . '/class/';
 
-        // does the class use the namespace prefix?
-        $len = mb_strlen($prefix);
+		// does the class use the namespace prefix?
+		$len = mb_strlen($prefix);
 
-        if (0 !== strncmp($prefix, $class, $len)) {
-            return;
-        }
+		if (0 !== strncmp($prefix, $class, $len)) {
+			return;
+		}
 
-        // get the relative class name
-        $relativeClass = mb_substr($class, $len);
+		// get the relative class name
+		$relativeClass = mb_substr($class, $len);
 
-        // replace the namespace prefix with the base directory, replace namespace
-        // separators with directory separators in the relative class name, append
-        // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+		// replace the namespace prefix with the base directory, replace namespace
+		// separators with directory separators in the relative class name, append
+		// with .php
+		$file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
 
-        // if the file exists, require it
-        if (is_file($file)) {
-            require_once $file;
-        }
-    }
+		// if the file exists, require it
+		if (is_file($file)) {
+			require_once $file;
+		}
+	}
 );

Spacing +4 added lines, -4 removed lines

@@ -4,17 +4,17 @@ 
  * @see https://www.php-fig.org/psr/psr-4/examples/
  */
 spl_autoload_register(
-    static function ($class): void {
+    static function($class): void {
         // project-specific namespace prefix
         $prefix = 'XoopsModules\\Songlist\\';
 
         // base directory for the namespace prefix
-        $baseDir = \dirname(__DIR__) . '/class/';
+        $baseDir = \dirname(__DIR__).'/class/';
 
         // does the class use the namespace prefix?
         $len = mb_strlen($prefix);
 
-        if (0 !== strncmp($prefix, $class, $len)) {
+        if (0!==strncmp($prefix, $class, $len)) {
             return;
         }
 
@@ -24,7 +24,7 @@ 
         // replace the namespace prefix with the base directory, replace namespace
         // separators with directory separators in the relative class name, append
         // with .php
-        $file = $baseDir . str_replace('\\', '/', $relativeClass) . '.php';
+        $file = $baseDir.str_replace('\\', '/', $relativeClass).'.php';
 
         // if the file exists, require it
         if (is_file($file)) {

preloads/core.php

Indentation +8 added lines, -8 removed lines

@@ -20,12 +20,12 @@
  */
 class SonglistCorePreload extends \XoopsPreloadItem
 {
-    // to add PSR-4 autoloader
-    /**
-     * @param $args
-     */
-    public static function eventCoreIncludeCommonEnd($args): void
-    {
-        require_once __DIR__ . '/autoloader.php';
-    }
+	// to add PSR-4 autoloader
+	/**
+	 * @param $args
+	 */
+	public static function eventCoreIncludeCommonEnd($args): void
+	{
+		require_once __DIR__ . '/autoloader.php';
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -26,6 +26,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args): void
     {
-        require_once __DIR__ . '/autoloader.php';
+        require_once __DIR__.'/autoloader.php';
     }
 }