return local_user() && $admin_email && in_array(defaults($a->user, 'email', ''), $adminlist);
}
-/**
- * @brief Returns querystring as string from a mapped array.
- *
- * @param array $params mapped array with query parameters
- * @param string $name of parameter, default null
- *
- * @return string
- */
-function build_querystring($params, $name = null)
-{
- $ret = "";
- foreach ($params as $key => $val) {
- if (is_array($val)) {
- /// @TODO maybe not compare against null, use is_null()
- if ($name == null) {
- $ret .= build_querystring($val, $key);
- } else {
- $ret .= build_querystring($val, $name . "[$key]");
- }
- } else {
- $val = urlencode($val);
- /// @TODO maybe not compare against null, use is_null()
- if ($name != null) {
- /// @TODO two string concated, can be merged to one
- $ret .= $name . "[$key]" . "=$val&";
- } else {
- $ret .= "$key=$val&";
- }
- }
- }
- return $ret;
-}
-
function explode_querystring($query)
{
$arg_st = strpos($query, '?');
use Friendica\Content\Text\BBCode;
use Friendica\Core\Protocol;
use Friendica\Model\Contact;
-
use Friendica\Model\FileTag;
use Friendica\Util\Strings;
-use Friendica\Util\XML;
/**
* Turn user/group ACLs stored as angle bracketed text into arrays
{
$categories = [];
$folders = [];
-
- $matches = [];
$first = true;
- $cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
- if ($cnt) {
- foreach ($matches as $mtch) {
- $categories[] = [
- 'name' => XML::escape(FileTag::decode($mtch[1])),
- 'url' => "#",
- 'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . XML::escape(FileTag::decode($mtch[1])):""),
- 'first' => $first,
- 'last' => false
- ];
- $first = false;
- }
+
+ foreach (FileTag::fileToArray($item['file'], 'category') as $savedFolderName) {
+ $categories[] = [
+ 'name' => $savedFolderName,
+ 'url' => "#",
+ 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&cat=' . rawurlencode($savedFolderName) : ""),
+ 'first' => $first,
+ 'last' => false
+ ];
+ $first = false;
}
if (count($categories)) {
}
if (local_user() == $item['uid']) {
- $matches = [];
- $first = true;
- $cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
- if ($cnt) {
- foreach ($matches as $mtch) {
- $folders[] = [
- 'name' => XML::escape(FileTag::decode($mtch[1])),
- 'url' => "#",
- 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . XML::escape(FileTag::decode($mtch[1])) : ""),
- 'first' => $first,
- 'last' => false
- ];
- $first = false;
- }
+ foreach (FileTag::fileToArray($item['file']) as $savedFolderName) {
+ $folders[] = [
+ 'name' => $savedFolderName,
+ 'url' => "#",
+ 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . rawurlencode($savedFolderName) : ""),
+ 'first' => $first,
+ 'last' => false
+ ];
+ $first = false;
}
}
}
}
- if (!empty($categories))
- {
+ if (!empty($categories)) {
// get the "fileas" tags for this post
- $filedas = FileTag::fileToList($categories, 'file');
+ $filedas = FileTag::fileToArray($categories);
}
// save old and new categories, so we can determine what needs to be deleted from pconfig
$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 .= FileTag::listToFile($filedas, 'file');
+ $categories .= FileTag::arrayToFile($filedas);
}
// get contact info for poster
// convert query string to array. remove friendica args
$query_array = [];
- $query_string = str_replace($a->cmd . '?', '', $a->query_string);
- parse_str($query_string, $query_array);
- array_shift($query_array);
+ parse_str(parse_url($a->query_string, PHP_URL_QUERY), $query_array);
// fetch last used network view and redirect if needed
if (!$is_a_date_query) {
if ($remember_tab) {
// redirect if current selected tab is '/network' and
- // last selected tab is _not_ '/network?f=&order=comment'.
+ // last selected tab is _not_ '/network?order=comment'.
// and this isn't a date query
$tab_baseurls = [
'', //bookmarked
];
$tab_args = [
- 'f=&order=comment', //all
- 'f=&order=post', //postord
- 'f=&conv=1', //conv
+ 'order=comment', //all
+ 'order=post', //postord
+ 'conv=1', //conv
'', //new
- 'f=&star=1', //starred
- 'f=&bmark=1', //bookmarked
+ 'star=1', //starred
+ 'bmark=1', //bookmarked
];
$k = array_search('active', $last_sel_tabs);
if ($remember_tab) {
$net_args = array_merge($query_array, $net_args);
- $net_queries = build_querystring($net_args);
+ $net_queries = http_build_query($net_args);
$redir_url = ($net_queries ? $net_baseurl . '?' . $net_queries : $net_baseurl);
*
* urls -> returns
* '/network' => $no_active = 'active'
- * '/network?f=&order=comment' => $comment_active = 'active'
- * '/network?f=&order=post' => $postord_active = 'active'
- * '/network?f=&conv=1', => $conv_active = 'active'
+ * '/network?order=comment' => $comment_active = 'active'
+ * '/network?order=post' => $postord_active = 'active'
+ * '/network?conv=1', => $conv_active = 'active'
* '/network/new', => $new_active = 'active'
- * '/network?f=&star=1', => $starred_active = 'active'
- * '/network?f=&bmark=1', => $bookmarked_active = 'active'
+ * '/network?star=1', => $starred_active = 'active'
+ * '/network?bmark=1', => $bookmarked_active = 'active'
*
* @param App $a
* @return array ($no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active);
$tabs = [
[
'label' => L10n::t('Commented Order'),
- 'url' => str_replace('/new', '', $cmd) . '?f=&order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
+ 'url' => str_replace('/new', '', $cmd) . '?order=comment' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $all_active,
'title' => L10n::t('Sort by Comment Date'),
'id' => 'commented-order-tab',
],
[
'label' => L10n::t('Posted Order'),
- 'url' => str_replace('/new', '', $cmd) . '?f=&order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
+ 'url' => str_replace('/new', '', $cmd) . '?order=post' . (!empty($_GET['cid']) ? '&cid=' . $_GET['cid'] : ''),
'sel' => $postord_active,
'title' => L10n::t('Sort by Post Date'),
'id' => 'posted-order-tab',
$tabs[] = [
'label' => L10n::t('Personal'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
+ 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&conv=1',
'sel' => $conv_active,
'title' => L10n::t('Posts that mention or involve you'),
'id' => 'personal-tab',
if (Feature::isEnabled(local_user(), 'new_tab')) {
$tabs[] = [
'label' => L10n::t('New'),
- 'url' => 'network/new' . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : ''),
+ 'url' => 'network/new' . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : ''),
'sel' => $new_active,
'title' => L10n::t('Activity Stream - by date'),
'id' => 'activitiy-by-date-tab',
if (Feature::isEnabled(local_user(), 'link_tab')) {
$tabs[] = [
'label' => L10n::t('Shared Links'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
+ 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&bmark=1',
'sel' => $bookmarked_active,
'title' => L10n::t('Interesting Links'),
'id' => 'shared-links-tab',
$tabs[] = [
'label' => L10n::t('Starred'),
- 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?f=&cid=' . $_GET['cid'] : '/?f=') . '&star=1',
+ 'url' => str_replace('/new', '', $cmd) . (!empty($_GET['cid']) ? '/?cid=' . $_GET['cid'] : '/?f=') . '&star=1',
'sel' => $starred_active,
'title' => L10n::t('Favourite Posts'),
'id' => 'starred-posts-tab',
// Compatibility with the Android Diaspora client
if ($this->module == 'stream') {
- $this->internalRedirect('network?f=&order=post');
+ $this->internalRedirect('network?order=post');
}
if ($this->module == 'conversations') {
}
if ($this->module == 'commented') {
- $this->internalRedirect('network?f=&order=comment');
+ $this->internalRedirect('network?order=comment');
}
if ($this->module == 'liked') {
- $this->internalRedirect('network?f=&order=comment');
+ $this->internalRedirect('network?order=comment');
}
if ($this->module == 'activity') {
- $this->internalRedirect('network/?f=&conv=1');
+ $this->internalRedirect('network?conv=1');
}
if (($this->module == 'status_messages') && ($this->cmd == 'status_messages/new')) {
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [
- 'url' => 'network?f=&cid=' . $contact['id'],
+ 'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],
* @param string $baseurl baseurl
* @param string $selected optional, default empty
* @return string|void
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
public static function fileAs($baseurl, $selected = '')
{
return;
}
- $matches = [];
- $terms = array();
- $cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER);
- if ($cnt) {
- foreach ($matches as $mtch)
- {
- $unescaped = XML::escape(FileTag::decode($mtch[1]));
- $terms[] = ['ref' => $unescaped, 'name' => $unescaped];
- }
+ $terms = [];
+ foreach (FileTag::fileToArray($saved) as $savedFolderName) {
+ $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
}
return self::filter(
return;
}
- $matches = [];
$terms = array();
- $cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER);
-
- if ($cnt) {
- foreach ($matches as $mtch) {
- $unescaped = XML::escape(FileTag::decode($mtch[1]));
- $terms[] = ['ref' => $unescaped, 'name' => $unescaped];
- }
+ foreach (FileTag::fileToArray($saved, 'category') as $savedFolderName) {
+ $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
}
return self::filter(
/**
* @brief 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
+ * and save to file categories in square brackets.
+ * To do this we need to escape these characters if they appear in our tag.
*/
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 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) . "' ";
+ }
+
+ /**
+ * Get file tags from array
+ *
+ * ex. given [music,video] return <music><video> or [music][video]
+ *
+ * @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')
+ {
+ $tag_list = '';
+ if ($type == 'file') {
+ $lbracket = '[';
+ $rbracket = ']';
+ } else {
+ $lbracket = '<';
+ $rbracket = '>';
+ }
+
+ foreach ($array as $item) {
+ if (strlen($item)) {
+ $tag_list .= $lbracket . self::encode(trim($item)) . $rbracket;
+ }
+ }
+
+ return $tag_list;
+ }
+
+ /**
+ * Get tag 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 array List of tag names.
+ */
+ public static function fileToArray(string $file, string $type = 'file')
+ {
+ $matches = [];
+ $return = [];
+
+ 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 $match) {
+ $return[] = self::decode($match[1]);
+ }
+ }
+
+ return $return;
+ }
+
+ /**
+ * @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.
+ * @deprecated since 2019.06 use arrayToFile() instead
+ */
+ public static function listToFile($list, $type = 'file')
+ {
+ $list_array = explode(',', $list);
+
+ return self::arrayToFile($list_array, $type);
+ }
+
+ /**
+ * @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.
+ * @deprecated since 2019.06 use fileToArray() instead
+ */
+ public static function fileToList($file, $type = 'file')
+ {
+ return implode(',', self::fileToArray($file, $type));
+ }
/**
* @brief Update file tags in PConfig
* @param string $type Optional file type.
*
* @return boolean A value indicating success or failure.
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \Exception
*/
- 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;
- }
+ 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 = [];
+ foreach (self::fileToArray($file_new, $type) as $tag) {
+ if (!stristr($saved, $lbracket . self::encode($tag) . $rbracket)) {
+ $new_tags[] = $tag;
+ }
+ }
+
+ $filetags_updated .= self::arrayToFile($new_tags, $type);
+
+ // check for deleted tags to be removed from filetags in pconfig
+ $deleted_tags = [];
+ foreach (self::fileToArray($file_old, $type) 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::OBJECT_TYPE_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
* @return boolean A value indicating success or failure.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- 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;
- }
+ 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
* @return boolean A value indicating success or failure.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- 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;
- }
+ 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::OBJECT_TYPE_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;
+ }
}
info('Item was not deleted');
}
- $app->internalRedirect('/network?f=&file=' . rawurlencode($term));
+ $app->internalRedirect('network?file=' . rawurlencode($term));
}
}
// return filer dialog
$filetags = PConfig::get(local_user(), 'system', 'filetags');
- $filetags = Model\FileTag::fileToList($filetags, 'file');
- $filetags = explode(",", $filetags);
+ $filetags = Model\FileTag::fileToArray($filetags);
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
echo Renderer::replaceMacros($tpl, [
--- /dev/null
+<?php
+
+namespace Friendica\Test\src\Model;
+
+use Friendica\Model\FileTag;
+use PHPUnit\Framework\TestCase;
+
+class FileTagTest extends TestCase
+{
+ public function dataArrayToFile()
+ {
+ return [
+ 'list-category' => [
+ 'array' => ['1', '2', '3', 'a', 'b', 'c'],
+ 'type' => 'category',
+ 'file' => '<1><2><3><a><b><c>',
+ ],
+ 'list-file' => [
+ 'array' => ['1', '2', '3', 'a', 'b', 'c'],
+ 'type' => 'file',
+ 'file' => '[1][2][3][a][b][c]',
+ ],
+ 'chevron-category' => [
+ 'array' => ['Left < Center > Right'],
+ 'type' => 'category',
+ 'file' => '<Left %3c Center %3e Right>',
+ ],
+ 'bracket-file' => [
+ 'array' => ['Glass [half-full]'],
+ 'type' => 'file',
+ 'file' => '[Glass %5bhalf-full%5d]',
+ ],
+ /** @see https://github.com/friendica/friendica/issues/7171 */
+ 'bug-7171-category' => [
+ 'array' => ['Science, Health, Medicine'],
+ 'type' => 'category',
+ 'file' => '<Science, Health, Medicine>',
+ ],
+ 'bug-7171-file' => [
+ 'array' => ['Science, Health, Medicine'],
+ 'type' => 'file',
+ 'file' => '[Science, Health, Medicine]',
+ ],
+ ];
+ }
+
+ /**
+ * Test convert saved folders arrays to a file/category field
+ * @dataProvider dataArrayToFile
+ *
+ * @param array $array
+ * @param string $type
+ * @param string $file
+ */
+ public function testArrayToFile(array $array, string $type, string $file)
+ {
+ $this->assertEquals($file, FileTag::arrayToFile($array, $type));
+ }
+
+ public function dataFileToArray()
+ {
+ return [
+ 'list-category' => [
+ 'file' => '<1><2><3><a><b><c>',
+ 'type' => 'category',
+ 'array' => ['1', '2', '3', 'a', 'b', 'c'],
+ ],
+ 'list-file' => [
+ 'file' => '[1][2][3][a][b][c]',
+ 'type' => 'file',
+ 'array' => ['1', '2', '3', 'a', 'b', 'c'],
+ ],
+ 'combinedlist-category' => [
+ 'file' => '[1][2][3]<a><b><c>',
+ 'type' => 'category',
+ 'array' => ['a', 'b', 'c'],
+ ],
+ 'combinedlist-file' => [
+ 'file' => '[1][2][3]<a><b><c>',
+ 'type' => 'file',
+ 'array' => ['1', '2', '3'],
+ ],
+ 'chevron-category' => [
+ 'file' => '<Left %3c Center %3e Right>',
+ 'type' => 'category',
+ 'array' => ['Left < Center > Right'],
+ ],
+ 'bracket-file' => [
+ 'file' => '[Glass %5bhalf-full%5d]',
+ 'type' => 'file',
+ 'array' => ['Glass [half-full]'],
+ ],
+ /** @see https://github.com/friendica/friendica/issues/7171 */
+ 'bug-7171-category' => [
+ 'file' => '<Science, Health, Medicine>',
+ 'type' => 'category',
+ 'array' => ['Science, Health, Medicine'],
+ ],
+ 'bug-7171-file' => [
+ 'file' => '[Science, Health, Medicine]',
+ 'type' => 'file',
+ 'array' => ['Science, Health, Medicine'],
+ ],
+ ];
+ }
+
+ /**
+ * Test convert different saved folders to a file/category field
+ * @dataProvider dataFileToArray
+ *
+ * @param string $file
+ * @param string $type
+ * @param array $array
+ */
+ public function testFileToArray(string $file, string $type, array $array)
+ {
+ $this->assertEquals($array, FileTag::fileToArray($file, $type));
+ }
+}
<ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear">
- <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network/?f=&remove=1&search={{$search.encodedterm}}"></a>
+ <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network?remove=1&search={{$search.encodedterm}}"></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>
</li>
{{/foreach}}
<ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear">
- <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network/?f=&remove=1&search={{$search.encodedterm}}">
+ <a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network?remove=1&search={{$search.encodedterm}}">
<i class="fa fa-trash" aria-hidden="true"></i>
</a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>
{{foreach $saved as $search}}
<li class="tool {{if $search.selected}}selected{{/if}}">
<a href="search?search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
- <a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
+ <a href="network?remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
</li>
{{/foreach}}
</ul>
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [
- 'url' => 'network?f=&cid=' . $contact['id'],
+ 'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],
projects / friendica.git / commitdiff