use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Core\Logger;
+use Friendica\Model\FileTag;
require_once "include/conversation.php";
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
];
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
];
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), '/');
}
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
+use Friendcia\Model\FileTag;
use Friendica\Model\Item;
use Friendica\Database\DBA;
'$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,
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
+use Friendica\Model\FileTag;
require_once 'include/items.php';
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");
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();
}
$cat = unxmlify(trim($_GET['cat']));
$category = (($cat) ? true : false);
- if ($category) {
+
+ if ($category)
+ {
$term = $cat;
}
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();
}
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;
}
}
- 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
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);
}
// 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) {
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
+use Friendica\Model\FileTag;
use Friendica\Model\GContact;
use Friendica\Model\Profile;
$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' : ''));
}
}
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' : ''));
}
}
--- /dev/null
+<?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 <, >, left and right brackets
+ *
+ * @param string $s String to be URL encoded.
+ *
+ * @return string The URL encoded string.
+ */
+ public static function encode($s)
+ {
+ return str_replace(['<', '>', '[', ']'], ['%3c', '%3e', '%5b', '%5d'], $s);
+ }
+
+ /**
+ * @brief 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)
+ {
+ return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
+ }
+
+ /**
+ * @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')
+ {
+ 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]
+ * @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')
+ {
+ $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
+ * @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))
+ {
+ $list .= ',';
+ }
+
+ $list .= self::decode($mtch[1]);
+ }
+ }
+
+ return $list;
+ }
+
+ /**
+ * @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')
+ {
+ 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
+ *
+ * @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)
+ {
+ 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
+ *
+ * @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)
+ {
+ 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;
+ }
+}
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;
$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);
}
}
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) {
projects / friendica.git / commitdiff