X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFileTag.php;h=eded02a0a63f0ff3ebfc23107e6e3a4213c6665d;hb=8b26d488add6859be8d3b865122dfb6a6401d24d;hp=a2c8bb43972a426e9647d7a5866915a2acd5d247;hpb=c6b45a958e3b09bc8f3950a718c181dfc9e0b910;p=friendica.git diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php index a2c8bb4397..eded02a0a6 100644 --- a/src/Model/FileTag.php +++ b/src/Model/FileTag.php @@ -1,6 +1,6 @@ , left and right brackets * * @param string $s String to be URL encoded. - * * @return string The URL encoded string. */ - public static function encode($s) + private static function encode(string $s): string { return str_replace(['<', '>', '[', ']'], ['%3c', '%3e', '%5b', '%5d'], $s); } @@ -51,34 +46,13 @@ class FileTag * URL decode <, >, left and right brackets * * @param string $s The URL encoded string to be decoded - * * @return string The decoded string. */ - public static function decode($s) + private static function decode(string $s): string { return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s); } - /** - * Query files for tag - * - * @param string $table The table to be queired. - * @param string $s The search term - * @param string $type Optional file type. - * - * @return string Query string. - */ - public static function fileQuery($table, $s, $type = 'file') - { - if ($type == 'file') { - $str = preg_quote('[' . str_replace('%', '%%', self::encode($s)) . ']'); - } else { - $str = preg_quote('<' . str_replace('%', '%%', self::encode($s)) . '>'); - } - - return " AND " . (($table) ? DBA::escape($table) . '.' : '') . "file regexp '" . DBA::escape($str) . "' "; - } - /** * Get file tags from array * @@ -86,10 +60,9 @@ class FileTag * * @param array $array A list of tags. * @param string $type Optional file type. - * * @return string A list of file tags. */ - public static function arrayToFile(array $array, string $type = 'file') + public static function arrayToFile(array $array, string $type = 'file'): string { $tag_list = ''; if ($type == 'file') { @@ -116,10 +89,9 @@ class FileTag * * @param string $file File tags * @param string $type Optional file type. - * * @return array List of tag names. */ - public static function fileToArray(string $file, string $type = 'file') + public static function fileToArray(string $file, string $type = 'file'): array { $matches = []; $return = []; @@ -138,184 +110,4 @@ class FileTag return $return; } - - /** - * Get file tags from list - * - * ex. given music,video return