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

Fix formatting of Model\FileTag 

- Normalize indent style
- Remove extraneous new lines after ifs/foreachs
This commit is contained in:
Hypolite Petovan 2019-05-27 17:12:19 -04:00
parent f225752f8a
commit 96402e306a
1 changed files with 209 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
src/Model/FileTag.php
View File

@ -11,16 +11,16 @@ use Friendica\Database\DBA;
/**
* @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 &lt, &gt, left and right brackets
* @brief URL encode <, >, left and right brackets
*
* @param string $s String to be URL encoded.
*
@ -32,7 +32,7 @@ class FileTag
}
/**
* @brief URL decode &lt, &gt, left and right brackets
* @brief URL decode <, >, left and right brackets
*
* @param string $s The URL encoded string to be decoded
*
@ -85,10 +85,8 @@ class FileTag
$rbracket = '>';
}
foreach ($list_array as $item)
{
if (strlen($item))
{
foreach ($list_array as $item) {
if (strlen($item)) {
$tag_list .= $lbracket . self::encode(trim($item)) . $rbracket;
}
}
@ -117,12 +115,9 @@ class FileTag
$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 .= ',';
}
@ -142,7 +137,7 @@ class FileTag
* @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')
{
@ -154,8 +149,7 @@ class FileTag
$saved = PConfig::get($uid, 'system', 'filetags');
if (strlen($saved))
{
if (strlen($saved)) {
if ($type == 'file') {
$lbracket = '[';
$rbracket = ']';
@ -172,9 +166,8 @@ class FileTag
$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)) {
foreach ($check_new_tags as $tag) {
if (!stristr($saved, $lbracket . self::encode($tag) . $rbracket)) {
$new_tags[] = $tag;
}
}
@ -185,18 +178,16 @@ class FileTag
$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)) {
foreach ($check_deleted_tags as $tag) {
if (!stristr($file_new, $lbracket . self::encode($tag) . $rbracket)) {
$deleted_tags[] = $tag;
}
}
foreach ($deleted_tags as $key => $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(Term::OBJECT_TYPE_POST),
intval($termtype),
intval($uid));
@ -207,8 +198,7 @@ class FileTag
}
}
if ($saved != $filetags_updated)
{
if ($saved != $filetags_updated) {
PConfig::set($uid, 'system', 'filetags', $filetags_updated);
}
@ -232,24 +222,20 @@ class FileTag
*/
public static function saveFile($uid, $item_id, $file)
{
if (!intval($uid))
{
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) . ']'))
{
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) . ']'))
{
if (!strlen($saved) || !stristr($saved, '[' . self::encode($file) . ']')) {
PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
}
@ -272,23 +258,21 @@ class FileTag
*/
public static function unsaveFile($uid, $item_id, $file, $cat = false)
{
if (!intval($uid))
{
if (!intval($uid)) {
return false;
}
if ($cat == true) {
$pattern = '<' . self::encode($file) . '>';
$termtype = TERM_CATEGORY;
$termtype = Term::CATEGORY;
} else {
$pattern = '[' . self::encode($file) . ']';
$termtype = TERM_FILE;
$termtype = Term::FILE;
}
$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
if (!DBA::isResult($item))
{
if (!DBA::isResult($item)) {
return false;
}
@ -298,13 +282,12 @@ class FileTag
$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(Term::OBJECT_TYPE_POST),
intval($termtype),
intval($uid)
);
if (!DBA::isResult($r))
{
if (!DBA::isResult($r)) {
$saved = PConfig::get($uid, 'system', 'filetags');
PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
}