From 3a604029eb741519cb4f79b850900e8cb70f10ec Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Tue, 30 Oct 2018 14:51:21 -0400
Subject: [PATCH 1/3] Create FileTag class

create class and move functions
---
 include/text.php      | 202 +-------------------------------
 src/Model/FileTag.php | 266 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 271 insertions(+), 197 deletions(-)
 create mode 100644 src/Model/FileTag.php

diff --git a/include/text.php b/include/text.php
index aae739312..aa4b2c8db 100644
--- a/include/text.php
+++ b/include/text.php
@@ -24,6 +24,7 @@ use Friendica\Util\Map;
 use Friendica\Util\Proxy as ProxyUtils;
 
 use Friendica\Core\Logger;
+use Friendica\Model\FileTag;
 
 require_once "include/conversation.php";
 
@@ -1099,9 +1100,9 @@ function get_cats_and_terms($item)
 	if ($cnt) {
 		foreach ($matches as $mtch) {
 			$categories[] = [
-				'name' => xmlify(file_tag_decode($mtch[1])),
+				'name' => xmlify(FileTag::decode($mtch[1])),
 				'url' =>  "#",
-				'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(file_tag_decode($mtch[1])):""),
+				'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . xmlify(FileTag::decode($mtch[1])):""),
 				'first' => $first,
 				'last' => false
 			];
@@ -1120,9 +1121,9 @@ function get_cats_and_terms($item)
 		if ($cnt) {
 			foreach ($matches as $mtch) {
 				$folders[] = [
-					'name' => xmlify(file_tag_decode($mtch[1])),
+					'name' => xmlify(FileTag::decode($mtch[1])),
 					'url' =>  "#",
-					'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . xmlify(file_tag_decode($mtch[1])) : ""),
+					'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . xmlify(FileTag::decode($mtch[1])) : ""),
 					'first' => $first,
 					'last' => false
 				];
@@ -1360,199 +1361,6 @@ function item_post_type($item) {
 	return L10n::t('post');
 }
 
-// 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
-// and save to file categories in square brackets.
-// To do this we need to escape these characters if they appear in our tag.
-
-function file_tag_encode($s) {
-	return str_replace(['<','>','[',']'],['%3c','%3e','%5b','%5d'],$s);
-}
-
-function file_tag_decode($s) {
-	return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
-}
-
-function file_tag_file_query($table,$s,$type = 'file') {
-
-	if ($type == 'file') {
-		$str = preg_quote('[' . str_replace('%', '%%', file_tag_encode($s)) . ']');
-	} else {
-		$str = preg_quote('<' . str_replace('%', '%%', file_tag_encode($s)) . '>');
-	}
-	return " AND " . (($table) ? DBA::escape($table) . '.' : '') . "file regexp '" . DBA::escape($str) . "' ";
-}
-
-// ex. given music,video return <music><video> or [music][video]
-function file_tag_list_to_file($list, $type = 'file') {
-	$tag_list = '';
-	if (strlen($list)) {
-		$list_array = explode(",",$list);
-		if ($type == 'file') {
-			$lbracket = '[';
-			$rbracket = ']';
-		} else {
-			$lbracket = '<';
-			$rbracket = '>';
-		}
-
-		foreach ($list_array as $item) {
-			if (strlen($item)) {
-				$tag_list .= $lbracket . file_tag_encode(trim($item))  . $rbracket;
-			}
-		}
-	}
-	return $tag_list;
-}
-
-// ex. given <music><video>[friends], return music,video or friends
-function file_tag_file_to_list($file, $type = 'file') {
-	$matches = false;
-	$list = '';
-	if ($type == 'file') {
-		$cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
-	} else {
-		$cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
-	}
-	if ($cnt) {
-		foreach ($matches as $mtch) {
-			if (strlen($list)) {
-				$list .= ',';
-			}
-			$list .= file_tag_decode($mtch[1]);
-		}
-	}
-
-	return $list;
-}
-
-function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
-	// $file_old - categories previously associated with an item
-	// $file_new - new list of categories for an item
-
-	if (!intval($uid)) {
-		return false;
-	} elseif ($file_old == $file_new) {
-		return true;
-	}
-
-	$saved = PConfig::get($uid, 'system', 'filetags');
-	if (strlen($saved)) {
-		if ($type == 'file') {
-			$lbracket = '[';
-			$rbracket = ']';
-			$termtype = TERM_FILE;
-		} else {
-			$lbracket = '<';
-			$rbracket = '>';
-			$termtype = TERM_CATEGORY;
-		}
-
-		$filetags_updated = $saved;
-
-		// check for new tags to be added as filetags in pconfig
-		$new_tags = [];
-		$check_new_tags = explode(",",file_tag_file_to_list($file_new,$type));
-
-		foreach ($check_new_tags as $tag) {
-			if (!stristr($saved,$lbracket . file_tag_encode($tag) . $rbracket)) {
-				$new_tags[] = $tag;
-			}
-		}
-
-		$filetags_updated .= file_tag_list_to_file(implode(",",$new_tags),$type);
-
-		// check for deleted tags to be removed from filetags in pconfig
-		$deleted_tags = [];
-		$check_deleted_tags = explode(",",file_tag_file_to_list($file_old,$type));
-
-		foreach ($check_deleted_tags as $tag) {
-			if (!stristr($file_new,$lbracket . file_tag_encode($tag) . $rbracket)) {
-				$deleted_tags[] = $tag;
-			}
-		}
-
-		foreach ($deleted_tags as $key => $tag) {
-			$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-				DBA::escape($tag),
-				intval(TERM_OBJ_POST),
-				intval($termtype),
-				intval($uid));
-
-			if (DBA::isResult($r)) {
-				unset($deleted_tags[$key]);
-			} else {
-				$filetags_updated = str_replace($lbracket . file_tag_encode($tag) . $rbracket,'',$filetags_updated);
-			}
-		}
-
-		if ($saved != $filetags_updated) {
-			PConfig::set($uid, 'system', 'filetags', $filetags_updated);
-		}
-		return true;
-	} elseif (strlen($file_new)) {
-		PConfig::set($uid, 'system', 'filetags', $file_new);
-	}
-	return true;
-}
-
-function file_tag_save_file($uid, $item_id, $file)
-{
-	if (!intval($uid)) {
-		return false;
-	}
-
-	$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
-	if (DBA::isResult($item)) {
-		if (!stristr($item['file'],'[' . file_tag_encode($file) . ']')) {
-			$fields = ['file' => $item['file'] . '[' . file_tag_encode($file) . ']'];
-			Item::update($fields, ['id' => $item_id]);
-		}
-		$saved = PConfig::get($uid, 'system', 'filetags');
-		if (!strlen($saved) || !stristr($saved, '[' . file_tag_encode($file) . ']')) {
-			PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
-		}
-		info(L10n::t('Item filed'));
-	}
-	return true;
-}
-
-function file_tag_unsave_file($uid, $item_id, $file, $cat = false)
-{
-	if (!intval($uid)) {
-		return false;
-	}
-
-	if ($cat == true) {
-		$pattern = '<' . file_tag_encode($file) . '>' ;
-		$termtype = TERM_CATEGORY;
-	} else {
-		$pattern = '[' . file_tag_encode($file) . ']' ;
-		$termtype = TERM_FILE;
-	}
-
-	$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
-	if (!DBA::isResult($item)) {
-		return false;
-	}
-
-	$fields = ['file' => str_replace($pattern,'',$item['file'])];
-	Item::update($fields, ['id' => $item_id]);
-
-	$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
-		DBA::escape($file),
-		intval(TERM_OBJ_POST),
-		intval($termtype),
-		intval($uid)
-	);
-	if (!DBA::isResult($r)) {
-		$saved = PConfig::get($uid, 'system', 'filetags');
-		PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
-	}
-
-	return true;
-}
-
 function normalise_openid($s) {
 	return trim(str_replace(['http://', 'https://'], ['', ''], $s), '/');
 }
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
new file mode 100644
index 000000000..d2937a731
--- /dev/null
+++ b/src/Model/FileTag.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * @file src/Model/FileTag.php
+ */
+
+namespace Friendica\Model;
+
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+
+/**
+ * @brief This class handles FileTag related functions
+ */
+class FileTag
+{
+    // 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
+    // and save to file categories in square brackets.
+    // To do this we need to escape these characters if they appear in our tag.
+
+    /**
+     * @brief URL encode &lt, &gt, left and right brackets
+     */
+    public static function encode($s)
+    {
+        return str_replace(['<', '>', '[', ']'], ['%3c', '%3e', '%5b', '%5d'], $s);
+    }
+
+    /**
+     * @brief URL decode &lt, &gt, left and right brackets
+     */
+    public static function decode($s)
+    {
+        return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
+    }
+
+    /**
+     * @brief Query files for tag
+     */
+    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) . "' ";
+    }
+
+    /**
+     * @brief Get file tags from list
+     * 
+     * ex. given music,video return <music><video> or [music][video]
+     */
+    public static function listToFile($list, $type = 'file')
+    {
+        $tag_list = '';
+        if (strlen($list)) {
+            $list_array = explode(",", $list);
+            if ($type == 'file') {
+                $lbracket = '[';
+                $rbracket = ']';
+            } else {
+                $lbracket = '<';
+                $rbracket = '>';
+            }
+
+            foreach ($list_array as $item)
+            {
+                if (strlen($item))
+                {
+                    $tag_list .= $lbracket . self::encode(trim($item))  . $rbracket;
+                }
+            }
+        }
+
+        return $tag_list;
+    }
+
+    /**
+     * @brief Get list from file tags
+     * 
+     * ex. given <music><video>[friends], return music,video or friends
+     */
+    public static function fileToList($file, $type = 'file')
+    {
+        $matches = false;
+        $list = '';
+        if ($type == 'file') {
+            $cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
+        } else {
+            $cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
+        }
+        if ($cnt) {
+            foreach ($matches as $mtch) {
+                if (strlen($list)) {
+                    $list .= ',';
+                }
+                $list .= self::decode($mtch[1]);
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * @brief Update file tags in PConfig
+     */
+    public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
+    {
+        // $file_old - categories previously associated with an item
+        // $file_new - new list of categories for an item
+
+        if (!intval($uid)) {
+            return false;
+        } elseif ($file_old == $file_new) {
+            return true;
+        }
+
+        $saved = PConfig::get($uid, 'system', 'filetags');
+
+        if (strlen($saved))
+        {
+            if ($type == 'file') {
+                $lbracket = '[';
+                $rbracket = ']';
+                $termtype = TERM_FILE;
+            } else {
+                $lbracket = '<';
+                $rbracket = '>';
+                $termtype = TERM_CATEGORY;
+            }
+
+            $filetags_updated = $saved;
+
+            // check for new tags to be added as filetags in pconfig
+            $new_tags = [];
+            $check_new_tags = explode(",", self::fileToList($file_new, $type));
+
+            foreach ($check_new_tags as $tag)
+            {
+                if (!stristr($saved,$lbracket . self::encode($tag) . $rbracket)) {
+                    $new_tags[] = $tag;
+                }
+            }
+
+            $filetags_updated .= self::listToFile(implode(",", $new_tags), $type);
+
+            // check for deleted tags to be removed from filetags in pconfig
+            $deleted_tags = [];
+            $check_deleted_tags = explode(",", self::fileToList($file_old, $type));
+
+            foreach ($check_deleted_tags as $tag)
+            {
+                if (!stristr($file_new,$lbracket . self::encode($tag) . $rbracket)) {
+                    $deleted_tags[] = $tag;
+                }
+            }
+
+            foreach ($deleted_tags as $key => $tag)
+            {
+                $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+                    DBA::escape($tag),
+                    intval(TERM_OBJ_POST),
+                    intval($termtype),
+                    intval($uid));
+
+                if (DBA::isResult($r)) {
+                    unset($deleted_tags[$key]);
+                } else {
+                    $filetags_updated = str_replace($lbracket . self::encode($tag) . $rbracket, '', $filetags_updated);
+                }
+            }
+
+            if ($saved != $filetags_updated)
+            {
+                PConfig::set($uid, 'system', 'filetags', $filetags_updated);
+            }
+
+            return true;
+        } elseif (strlen($file_new)) {
+            PConfig::set($uid, 'system', 'filetags', $file_new);
+        }
+
+        return true;
+    }
+
+    /**
+     * @brief Add tag to file
+     */
+    public static function saveFile($uid, $item_id, $file)
+    {
+        if (!intval($uid))
+        {
+            return false;
+        }
+
+        $item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
+        if (DBA::isResult($item))
+        {
+            if (!stristr($item['file'], '[' . self::encode($file) . ']'))
+            {
+                $fields = ['file' => $item['file'] . '[' . self::encode($file) . ']'];
+                Item::update($fields, ['id' => $item_id]);
+            }
+
+            $saved = PConfig::get($uid, 'system', 'filetags');
+
+            if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']'))
+            {
+                PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
+            }
+
+            info(L10n::t('Item filed'));
+        }
+
+        return true;
+    }
+
+    /**
+     * @brief Remove tag from file
+     */
+    public static function unsaveFile($uid, $item_id, $file, $cat = false)
+    {
+        if (!intval($uid))
+        {
+            return false;
+        }
+
+        if ($cat == true) {
+            $pattern = '<' . self::encode($file) . '>' ;
+            $termtype = TERM_CATEGORY;
+        } else {
+            $pattern = '[' . self::encode($file) . ']' ;
+            $termtype = TERM_FILE;
+        }
+
+        $item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
+
+        if (!DBA::isResult($item))
+        {
+            return false;
+        }
+
+        $fields = ['file' => str_replace($pattern, '', $item['file'])];
+        Item::update($fields, ['id' => $item_id]);
+
+        $r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
+            DBA::escape($file),
+            intval(TERM_OBJ_POST),
+            intval($termtype),
+            intval($uid)
+        );
+
+        if (!DBA::isResult($r))
+        {
+            $saved = PConfig::get($uid, 'system', 'filetags');
+            PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+        }
+
+        return true;
+    }
+}

From d9b558a8ede11be1c486d562dfe0495902b57e6e Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Tue, 30 Oct 2018 14:51:45 -0400
Subject: [PATCH 2/3] Update function calls

update function calls to new class.
---
 mod/editpost.php       |  3 ++-
 mod/filer.php          |  5 +++--
 mod/filerm.php         | 19 +++++++++++--------
 mod/item.php           | 19 ++++++++++++-------
 src/Content/Widget.php |  8 +++++---
 src/Model/Item.php     | 19 +++++++++++++------
 src/Protocol/DFRN.php  |  2 +-
 7 files changed, 47 insertions(+), 28 deletions(-)

diff --git a/mod/editpost.php b/mod/editpost.php
index 780145ed3..83fcdca56 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -8,6 +8,7 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
+use Friendcia\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Database\DBA;
 
@@ -118,7 +119,7 @@ function editpost_content(App $a)
 		'$jotnets' => $jotnets,
 		'$title' => htmlspecialchars($item['title']),
 		'$placeholdertitle' => L10n::t('Set title'),
-		'$category' => file_tag_file_to_list($item['file'], 'category'),
+		'$category' => FileTag::fileToList($item['file'], 'category'),
 		'$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''),
 		'$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'),
 		'$lockstate' => $lockstate,
diff --git a/mod/filer.php b/mod/filer.php
index cd2a41dfd..050fa7063 100644
--- a/mod/filer.php
+++ b/mod/filer.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
+use Friendica\Model\FileTag;
 
 require_once 'include/items.php';
 
@@ -22,11 +23,11 @@ function filer_content(App $a)
 
 	if ($item_id && strlen($term)) {
 		// file item
-		file_tag_save_file(local_user(), $item_id, $term);
+		FileTag::saveFile(local_user(), $item_id, $term);
 	} else {
 		// return filer dialog
 		$filetags = PConfig::get(local_user(), 'system', 'filetags');
-		$filetags = file_tag_file_to_list($filetags, 'file');
+		$filetags = FileTag::fileToList($filetags, 'file');
 		$filetags = explode(",", $filetags);
 
 		$tpl = get_markup_template("filer_dialog.tpl");
diff --git a/mod/filerm.php b/mod/filerm.php
index 18908c3bb..d899d8f3f 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -3,10 +3,12 @@
 use Friendica\App;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
+use Friendica\Model\FileTag;
 
-function filerm_content(App $a) {
-
-	if (! local_user()) {
+function filerm_content(App $a)
+{
+	if (! local_user())
+	{
 		killme();
 	}
 
@@ -14,7 +16,9 @@ function filerm_content(App $a) {
 	$cat = unxmlify(trim($_GET['cat']));
 
 	$category = (($cat) ? true : false);
-	if ($category) {
+
+	if ($category)
+	{
 		$term = $cat;
 	}
 
@@ -22,11 +26,10 @@ function filerm_content(App $a) {
 
 	Logger::log('filerm: tag ' . $term . ' item ' . $item_id);
 
-	if ($item_id && strlen($term)) {
-		file_tag_unsave_file(local_user(),$item_id,$term, $category);
+	if ($item_id && strlen($term))
+	{
+		FileTag::unsaveFile(local_user(), $item_id, $term, $category);
 	}
 
-	//$a->internalRedirect('network');
-
 	killme();
 }
diff --git a/mod/item.php b/mod/item.php
index 6e7e86fe7..c7dbfd21c 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -29,6 +29,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Conversation;
+use Friendica\Model\FileTag;
 use Friendica\Model\Item;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\Email;
@@ -291,17 +292,21 @@ function item_post(App $a) {
 		}
 	}
 
-	if (!empty($categories)) {
+	if (!empty($categories))
+	{
 		// get the "fileas" tags for this post
-		$filedas = file_tag_file_to_list($categories, 'file');
+		$filedas = FileTag::fileToList($categories, 'file');
 	}
+
 	// save old and new categories, so we can determine what needs to be deleted from pconfig
 	$categories_old = $categories;
-	$categories = file_tag_list_to_file(trim(defaults($_REQUEST, 'category', '')), 'category');
+	$categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category');
 	$categories_new = $categories;
-	if (!empty($filedas)) {
+
+	if (!empty($filedas))
+	{
 		// append the fileas stuff to the new categories list
-		$categories .= file_tag_list_to_file($filedas, 'file');
+		$categories .= FileTag::listToFile($filedas, 'file');
 	}
 
 	// get contact info for poster
@@ -712,7 +717,7 @@ function item_post(App $a) {
 		Item::update($fields, ['id' => $post_id]);
 
 		// update filetags in pconfig
-		file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');
+		FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
 
 		if (!empty($_REQUEST['return']) && strlen($return_path)) {
 			Logger::log('return: ' . $return_path);
@@ -749,7 +754,7 @@ function item_post(App $a) {
 	}
 
 	// update filetags in pconfig
-	file_tag_update_pconfig($uid, $categories_old, $categories_new, 'category');
+	FileTag::updatePconfig($uid, $categories_old, $categories_new, 'category');
 
 	// These notifications are sent if someone else is commenting other your wall
 	if ($parent) {
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index faba55b7a..8dd71b8bf 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -14,6 +14,7 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
 use Friendica\Model\GContact;
 use Friendica\Model\Profile;
 
@@ -185,8 +186,9 @@ class Widget
 		$terms = array();
 		$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
 		if ($cnt) {
-			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_decode($mtch[1]));
+			foreach ($matches as $mtch)
+			{
+				$unescaped = xmlify(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
@@ -226,7 +228,7 @@ class Widget
 
 		if ($cnt) {
 			foreach ($matches as $mtch) {
-				$unescaped = xmlify(file_tag_decode($mtch[1]));
+				$unescaped = xmlify(FileTag::decode($mtch[1]));
 				$terms[] = array('name' => $unescaped, 'selected' => (($selected == $unescaped) ? 'selected' : ''));
 			}
 		}
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 4e854e45c..8e0a397e2 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -18,6 +18,7 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
 use Friendica\Model\PermissionSet;
 use Friendica\Model\ItemURI;
 use Friendica\Object\Image;
@@ -1002,18 +1003,24 @@ class Item extends BaseObject
 
 		$matches = false;
 		$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
-		if ($cnt) {
-			foreach ($matches as $mtch) {
-				file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],true);
+
+		if ($cnt)
+		{
+			foreach ($matches as $mtch)
+			{
+				FileTag::unsaveFile($item['uid'], $item['id'], $mtch[1],true);
 			}
 		}
 
 		$matches = false;
 
 		$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
-		if ($cnt) {
-			foreach ($matches as $mtch) {
-				file_tag_unsave_file($item['uid'], $item['id'], $mtch[1],false);
+
+		if ($cnt)
+		{
+			foreach ($matches as $mtch)
+			{
+				FileTag::unsaveFile($item['uid'], $item['id'], $mtch[1],false);
 			}
 		}
 
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index b48dc0a8d..07a56cf24 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -245,7 +245,7 @@ class DFRN
 				intval(TERM_CATEGORY),
 				intval($owner_id)
 			);
-			//$sql_extra .= file_tag_file_query('item',$category,'category');
+			//$sql_extra .= FileTag::fileQuery('item',$category,'category');
 		}
 
 		if ($public_feed && ! $converse) {

From 02be1d316d777c9ceaea15e3be30b1121a4769cb Mon Sep 17 00:00:00 2001
From: Adam Magness <adam.magness@gmail.com>
Date: Wed, 31 Oct 2018 07:32:22 -0400
Subject: [PATCH 3/3] Documentation

add proper documentation.
---
 src/Model/FileTag.php | 57 ++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 51 insertions(+), 6 deletions(-)

diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index d2937a731..d3baffdd4 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -22,6 +22,10 @@ class FileTag
 
     /**
      * @brief URL encode &lt, &gt, left and right brackets
+     * 
+     * @param string $s String to be URL encoded.
+     * 
+     * @return string   The URL encoded string.
      */
     public static function encode($s)
     {
@@ -30,6 +34,10 @@ class FileTag
 
     /**
      * @brief URL decode &lt, &gt, left and right brackets
+     * 
+     * @param string $s The URL encoded string to be decoded
+     * 
+     * @return string   The decoded string.
      */
     public static function decode($s)
     {
@@ -38,6 +46,12 @@ class FileTag
 
     /**
      * @brief 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')
     {
@@ -54,6 +68,10 @@ class FileTag
      * @brief Get file tags from list
      * 
      * ex. given music,video return <music><video> or [music][video]
+     * @param string $list  A comma delimited list of tags.
+     * @param string $type  Optional file type.
+     * 
+     * @return string       A list of file tags.
      */
     public static function listToFile($list, $type = 'file')
     {
@@ -84,21 +102,31 @@ class FileTag
      * @brief Get list from file tags
      * 
      * ex. given <music><video>[friends], return music,video or friends
+     * @param string $file  File tags
+     * @param string $type  Optional file type.
+     * 
+     * @return string       Comma delimited list of tag names.
      */
     public static function fileToList($file, $type = 'file')
     {
         $matches = false;
         $list = '';
+
         if ($type == 'file') {
             $cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
         } else {
             $cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
         }
-        if ($cnt) {
-            foreach ($matches as $mtch) {
-                if (strlen($list)) {
+
+        if ($cnt)
+        {
+            foreach ($matches as $mtch)
+            {
+                if (strlen($list))
+                {
                     $list .= ',';
                 }
+
                 $list .= self::decode($mtch[1]);
             }
         }
@@ -108,12 +136,16 @@ class FileTag
 
     /**
      * @brief Update file tags in PConfig
+     * 
+     * @param int $uid          Unique Identity.
+     * @param string $file_old  Categories previously associated with an item
+     * @param string $file_new  New list of categories for an item
+     * @param string $type      Optional file type.
+     * 
+     * @return boolean          A value indicating success or failure.
      */
     public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
     {
-        // $file_old - categories previously associated with an item
-        // $file_new - new list of categories for an item
-
         if (!intval($uid)) {
             return false;
         } elseif ($file_old == $file_new) {
@@ -190,6 +222,12 @@ class FileTag
 
     /**
      * @brief Add tag to file
+     * 
+     * @param int $uid      Unique identity.
+     * @param int $item_id  Item identity.
+     * @param string $file  File tag.
+     * 
+     * @return boolean      A value indicating success or failure.
      */
     public static function saveFile($uid, $item_id, $file)
     {
@@ -222,6 +260,13 @@ class FileTag
 
     /**
      * @brief Remove tag from file
+     * 
+     * @param int $uid      Unique identity.
+     * @param int $item_id  Item identity.
+     * @param string $file  File tag.
+     * @param boolean $cat  Optional value indicating the term type (i.e. Category or File)
+     * 
+     * @return boolean      A value indicating success or failure.
      */
     public static function unsaveFile($uid, $item_id, $file, $cat = false)
     {