clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace deprecated string-bases Model\FileTag calls with array-based ones

This commit is contained in:
Hypolite Petovan 2019-05-27 17:17:53 -04:00
parent 6de3449cae
commit 0fadc7730c
4 changed files with 30 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/text.php
View File

@ -8,10 +8,8 @@ use Friendica\Content\Smilies;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\FileTag; use Friendica\Model\FileTag;
use Friendica\Util\Strings; use Friendica\Util\Strings;
use Friendica\Util\XML;
/** /**
* Turn user/group ACLs stored as angle bracketed text into arrays * Turn user/group ACLs stored as angle bracketed text into arrays
@ -186,44 +184,35 @@ function get_cats_and_terms($item)
{ {
$categories = []; $categories = [];
$folders = []; $folders = [];
$matches = [];
$first = true; $first = true;
$cnt = preg_match_all('/<(.*?)>/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) { foreach (FileTag::fileToArray($item['file'], 'category') as $savedFolderName) {
foreach ($matches as $mtch) {
$categories[] = [ $categories[] = [
'name' => XML::escape(FileTag::decode($mtch[1])), 'name' => $savedFolderName,
'url' => "#", 'url' => "#",
'removeurl' => ((local_user() == $item['uid'])?'filerm/' . $item['id'] . '?f=&cat=' . XML::escape(FileTag::decode($mtch[1])):""), 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&cat=' . rawurlencode($savedFolderName) : ""),
'first' => $first, 'first' => $first,
'last' => false 'last' => false
]; ];
$first = false; $first = false;
} }
}
if (count($categories)) { if (count($categories)) {
$categories[count($categories) - 1]['last'] = true; $categories[count($categories) - 1]['last'] = true;
} }
if (local_user() == $item['uid']) { if (local_user() == $item['uid']) {
$matches = []; foreach (FileTag::fileToArray($item['file']) as $savedFolderName) {
$first = true;
$cnt = preg_match_all('/\[(.*?)\]/', $item['file'], $matches, PREG_SET_ORDER);
if ($cnt) {
foreach ($matches as $mtch) {
$folders[] = [ $folders[] = [
'name' => XML::escape(FileTag::decode($mtch[1])), 'name' => $savedFolderName,
'url' => "#", 'url' => "#",
'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . XML::escape(FileTag::decode($mtch[1])) : ""), 'removeurl' => ((local_user() == $item['uid']) ? 'filerm/' . $item['id'] . '?f=&term=' . rawurlencode($savedFolderName) : ""),
'first' => $first, 'first' => $first,
'last' => false 'last' => false
]; ];
$first = false; $first = false;
} }
} }
}
if (count($folders)) { if (count($folders)) {
$folders[count($folders) - 1]['last'] = true; $folders[count($folders) - 1]['last'] = true;

10
mod/item.php
View File

@ -327,10 +327,9 @@ function item_post(App $a) {
} }
} }
if (!empty($categories)) if (!empty($categories)) {
{
// get the "fileas" tags for this post // 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 // save old and new categories, so we can determine what needs to be deleted from pconfig
@ -338,10 +337,9 @@ function item_post(App $a) {
$categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category'); $categories = FileTag::listToFile(trim(defaults($_REQUEST, 'category', '')), 'category');
$categories_new = $categories; $categories_new = $categories;
if (!empty($filedas)) if (!empty($filedas)) {
{
// append the fileas stuff to the new categories list // append the fileas stuff to the new categories list
$categories .= FileTag::listToFile($filedas, 'file'); $categories .= FileTag::arrayToFile($filedas);
} }
// get contact info for poster // get contact info for poster

24
src/Content/Widget.php
View File

@ -256,7 +256,7 @@ class Widget
* @param string $baseurl baseurl * @param string $baseurl baseurl
* @param string $selected optional, default empty * @param string $selected optional, default empty
* @return string|void * @return string|void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Exception
*/ */
public static function fileAs($baseurl, $selected = '') public static function fileAs($baseurl, $selected = '')
{ {
@ -269,15 +269,9 @@ class Widget
return; return;
} }
$matches = []; $terms = [];
$terms = array(); foreach (FileTag::fileToArray($saved) as $savedFolderName) {
$cnt = preg_match_all('/\[(.*?)\]/', $saved, $matches, PREG_SET_ORDER); $terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
if ($cnt) {
foreach ($matches as $mtch)
{
$unescaped = XML::escape(FileTag::decode($mtch[1]));
$terms[] = ['ref' => $unescaped, 'name' => $unescaped];
}
} }
return self::filter( return self::filter(
@ -312,15 +306,9 @@ class Widget
return; return;
} }
$matches = [];
$terms = array(); $terms = array();
$cnt = preg_match_all('/<(.*?)>/', $saved, $matches, PREG_SET_ORDER); foreach (FileTag::fileToArray($saved, 'category') as $savedFolderName) {
$terms[] = ['ref' => $savedFolderName, 'name' => $savedFolderName];
if ($cnt) {
foreach ($matches as $mtch) {
$unescaped = XML::escape(FileTag::decode($mtch[1]));
$terms[] = ['ref' => $unescaped, 'name' => $unescaped];
}
} }
return self::filter( return self::filter(

3
src/Module/Filer/SaveTag.php
View File

@ -41,8 +41,7 @@ class SaveTag extends BaseModule
// return filer dialog // return filer dialog
$filetags = PConfig::get(local_user(), 'system', 'filetags'); $filetags = PConfig::get(local_user(), 'system', 'filetags');
$filetags = Model\FileTag::fileToList($filetags, 'file'); $filetags = Model\FileTag::fileToArray($filetags);
$filetags = explode(",", $filetags);
$tpl = Renderer::getMarkupTemplate("filer_dialog.tpl"); $tpl = Renderer::getMarkupTemplate("filer_dialog.tpl");
echo Renderer::replaceMacros($tpl, [ echo Renderer::replaceMacros($tpl, [