Notifies => Notifications

[friendica.git] / src / Model / FileTag.php

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index c743cb127827946ebcc03b163044a7e02d9a8f63..9908c8a33328309136b487f0068651d12f2c457e 100644 (file)
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -5,12 +5,11 @@
 
 namespace Friendica\Model;
 
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
 
 /**
- * @brief This class handles FileTag related functions
+ * This class handles FileTag related functions
  *
  * post categories and "save to file" use the same item.file table for storage.
  * We will differentiate the different uses by wrapping categories in angle brackets
@@ -20,7 +19,7 @@ use Friendica\Database\DBA;
 class FileTag
 {
        /**
-        * @brief URL encode <, >, left and right brackets
+        * URL encode <, >, left and right brackets
         *
         * @param string $s String to be URL encoded.
         *
@@ -32,7 +31,7 @@ class FileTag
        }
 
        /**
-        * @brief URL decode <, >, left and right brackets
+        * URL decode <, >, left and right brackets
         *
         * @param string $s The URL encoded string to be decoded
         *
@@ -44,7 +43,7 @@ class FileTag
        }
 
        /**
-        * @brief Query files for tag
+        * Query files for tag
         *
         * @param string $table The table to be queired.
         * @param string $s     The search term
@@ -124,7 +123,7 @@ class FileTag
        }
 
        /**
-        * @brief      Get file tags from list
+        * Get file tags from list
         *
         * ex. given music,video return <music><video> or [music][video]
         * @param string $list A comma delimited list of tags.
@@ -133,7 +132,7 @@ class FileTag
         * @return string       A list of file tags.
         * @deprecated since 2019.06 use arrayToFile() instead
         */
-       public static function listToFile($list, $type = 'file')
+       public static function listToFile(string $list, string $type = 'file')
        {
                $list_array = explode(',', $list);
 
@@ -141,7 +140,7 @@ class FileTag
        }
 
        /**
-        * @brief      Get list from file tags
+        * Get list from file tags
         *
         * ex. given <music><video>[friends], return music,video or friends
         * @param string $file File tags
@@ -150,13 +149,13 @@ class FileTag
         * @return string       Comma delimited list of tag names.
         * @deprecated since 2019.06 use fileToArray() instead
         */
-       public static function fileToList($file, $type = 'file')
+       public static function fileToList(string $file, $type = 'file')
        {
                return implode(',', self::fileToArray($file, $type));
        }
 
        /**
-        * @brief Update file tags in PConfig
+        * Update file tags in PConfig
         *
         * @param int    $uid      Unique Identity.
         * @param string $file_old Categories previously associated with an item
@@ -166,7 +165,7 @@ class FileTag
         * @return boolean          A value indicating success or failure.
         * @throws \Exception
         */
-       public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
+       public static function updatePconfig(int $uid, string $file_old, string $file_new, string $type = 'file')
        {
                if (!intval($uid)) {
                        return false;
@@ -174,7 +173,7 @@ class FileTag
                        return true;
                }
 
-               $saved = PConfig::get($uid, 'system', 'filetags');
+               $saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
                if (strlen($saved)) {
                        if ($type == 'file') {
@@ -222,19 +221,19 @@ class FileTag
                        }
 
                        if ($saved != $filetags_updated) {
-                               PConfig::set($uid, 'system', 'filetags', $filetags_updated);
+                               DI::pConfig()->set($uid, 'system', 'filetags', $filetags_updated);
                        }
 
                        return true;
                } elseif (strlen($file_new)) {
-                       PConfig::set($uid, 'system', 'filetags', $file_new);
+                       DI::pConfig()->set($uid, 'system', 'filetags', $file_new);
                }
 
                return true;
        }
 
        /**
-        * @brief Add tag to file
+        * Add tag to file
         *
         * @param int    $uid     Unique identity.
         * @param int    $item_id Item identity.
@@ -256,20 +255,20 @@ class FileTag
                                Item::update($fields, ['id' => $item_id]);
                        }
 
-                       $saved = PConfig::get($uid, 'system', 'filetags');
+                       $saved = DI::pConfig()->get($uid, 'system', 'filetags');
 
                        if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
-                               PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
+                               DI::pConfig()->set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
                        }
 
-                       info(L10n::t('Item filed'));
+                       info(DI::l10n()->t('Item filed'));
                }
 
                return true;
        }
 
        /**
-        * @brief Remove tag from file
+        * Remove tag from file
         *
         * @param int     $uid     Unique identity.
         * @param int     $item_id Item identity.
@@ -311,8 +310,8 @@ class FileTag
                );
 
                if (!DBA::isResult($r)) {
-                       $saved = PConfig::get($uid, 'system', 'filetags');
-                       PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+                       $saved = DI::pConfig()->get($uid, 'system', 'filetags');
+                       DI::pConfig()->set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
                }
 
                return true;