Fix formatting of Model\FileTag
- Normalize indent style - Remove extraneous new lines after ifs/foreachs
This commit is contained in:
parent
f225752f8a
commit
96402e306a
|
|
@ -11,127 +11,122 @@ use Friendica\Database\DBA;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief This class handles FileTag related functions
|
* @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
|
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
|
* @brief URL encode <, >, left and right brackets
|
||||||
// and save to file categories in square brackets.
|
*
|
||||||
// To do this we need to escape these characters if they appear in our tag.
|
* @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 encode <, >, left and right brackets
|
* @brief URL decode <, >, left and right brackets
|
||||||
*
|
*
|
||||||
* @param string $s String to be URL encoded.
|
* @param string $s The URL encoded string to be decoded
|
||||||
*
|
*
|
||||||
* @return string The URL encoded string.
|
* @return string The decoded string.
|
||||||
*/
|
*/
|
||||||
public static function encode($s)
|
public static function decode($s)
|
||||||
{
|
{
|
||||||
return str_replace(['<', '>', '[', ']'], ['%3c', '%3e', '%5b', '%5d'], $s);
|
return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief URL decode <, >, left and right brackets
|
* @brief Query files for tag
|
||||||
*
|
*
|
||||||
* @param string $s The URL encoded string to be decoded
|
* @param string $table The table to be queired.
|
||||||
*
|
* @param string $s The search term
|
||||||
* @return string The decoded string.
|
* @param string $type Optional file type.
|
||||||
*/
|
*
|
||||||
public static function decode($s)
|
* @return string Query string.
|
||||||
{
|
*/
|
||||||
return str_replace(['%3c', '%3e', '%5b', '%5d'], ['<', '>', '[', ']'], $s);
|
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 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) {
|
||||||
* @brief Get file tags from list
|
if (strlen($item)) {
|
||||||
*
|
$tag_list .= $lbracket . self::encode(trim($item)) . $rbracket;
|
||||||
* 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)
|
return $tag_list;
|
||||||
{
|
}
|
||||||
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') {
|
||||||
* @brief Get list from file tags
|
$cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
|
||||||
*
|
} else {
|
||||||
* ex. given <music><video>[friends], return music,video or friends
|
$cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
|
||||||
* @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') {
|
if ($cnt) {
|
||||||
$cnt = preg_match_all('/\[(.*?)\]/', $file, $matches, PREG_SET_ORDER);
|
foreach ($matches as $mtch) {
|
||||||
} else {
|
if (strlen($list)) {
|
||||||
$cnt = preg_match_all('/<(.*?)>/', $file, $matches, PREG_SET_ORDER);
|
$list .= ',';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($cnt)
|
$list .= self::decode($mtch[1]);
|
||||||
{
|
}
|
||||||
foreach ($matches as $mtch)
|
}
|
||||||
{
|
|
||||||
if (strlen($list))
|
|
||||||
{
|
|
||||||
$list .= ',';
|
|
||||||
}
|
|
||||||
|
|
||||||
$list .= self::decode($mtch[1]);
|
return $list;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return $list;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Update file tags in PConfig
|
* @brief Update file tags in PConfig
|
||||||
|
|
@ -142,83 +137,78 @@ class FileTag
|
||||||
* @param string $type Optional file type.
|
* @param string $type Optional file type.
|
||||||
*
|
*
|
||||||
* @return boolean A value indicating success or failure.
|
* @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')
|
public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
|
||||||
{
|
{
|
||||||
if (!intval($uid)) {
|
if (!intval($uid)) {
|
||||||
return false;
|
return false;
|
||||||
} elseif ($file_old == $file_new) {
|
} elseif ($file_old == $file_new) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
$saved = PConfig::get($uid, 'system', 'filetags');
|
$saved = PConfig::get($uid, 'system', 'filetags');
|
||||||
|
|
||||||
if (strlen($saved))
|
if (strlen($saved)) {
|
||||||
{
|
if ($type == 'file') {
|
||||||
if ($type == 'file') {
|
$lbracket = '[';
|
||||||
$lbracket = '[';
|
$rbracket = ']';
|
||||||
$rbracket = ']';
|
$termtype = TERM_FILE;
|
||||||
$termtype = TERM_FILE;
|
} else {
|
||||||
} else {
|
$lbracket = '<';
|
||||||
$lbracket = '<';
|
$rbracket = '>';
|
||||||
$rbracket = '>';
|
$termtype = TERM_CATEGORY;
|
||||||
$termtype = TERM_CATEGORY;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$filetags_updated = $saved;
|
$filetags_updated = $saved;
|
||||||
|
|
||||||
// check for new tags to be added as filetags in pconfig
|
// check for new tags to be added as filetags in pconfig
|
||||||
$new_tags = [];
|
$new_tags = [];
|
||||||
$check_new_tags = explode(",", self::fileToList($file_new, $type));
|
$check_new_tags = explode(",", self::fileToList($file_new, $type));
|
||||||
|
|
||||||
foreach ($check_new_tags as $tag)
|
foreach ($check_new_tags as $tag) {
|
||||||
{
|
if (!stristr($saved, $lbracket . self::encode($tag) . $rbracket)) {
|
||||||
if (!stristr($saved,$lbracket . self::encode($tag) . $rbracket)) {
|
$new_tags[] = $tag;
|
||||||
$new_tags[] = $tag;
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$filetags_updated .= self::listToFile(implode(",", $new_tags), $type);
|
$filetags_updated .= self::listToFile(implode(",", $new_tags), $type);
|
||||||
|
|
||||||
// check for deleted tags to be removed from filetags in pconfig
|
// check for deleted tags to be removed from filetags in pconfig
|
||||||
$deleted_tags = [];
|
$deleted_tags = [];
|
||||||
$check_deleted_tags = explode(",", self::fileToList($file_old, $type));
|
$check_deleted_tags = explode(",", self::fileToList($file_old, $type));
|
||||||
|
|
||||||
foreach ($check_deleted_tags as $tag)
|
foreach ($check_deleted_tags as $tag) {
|
||||||
{
|
if (!stristr($file_new, $lbracket . self::encode($tag) . $rbracket)) {
|
||||||
if (!stristr($file_new,$lbracket . self::encode($tag) . $rbracket)) {
|
$deleted_tags[] = $tag;
|
||||||
$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",
|
||||||
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
|
DBA::escape($tag),
|
||||||
DBA::escape($tag),
|
intval(Term::OBJECT_TYPE_POST),
|
||||||
intval(TERM_OBJ_POST),
|
intval($termtype),
|
||||||
intval($termtype),
|
intval($uid));
|
||||||
intval($uid));
|
|
||||||
|
|
||||||
if (DBA::isResult($r)) {
|
if (DBA::isResult($r)) {
|
||||||
unset($deleted_tags[$key]);
|
unset($deleted_tags[$key]);
|
||||||
} else {
|
} else {
|
||||||
$filetags_updated = str_replace($lbracket . self::encode($tag) . $rbracket, '', $filetags_updated);
|
$filetags_updated = str_replace($lbracket . self::encode($tag) . $rbracket, '', $filetags_updated);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($saved != $filetags_updated)
|
if ($saved != $filetags_updated) {
|
||||||
{
|
PConfig::set($uid, 'system', 'filetags', $filetags_updated);
|
||||||
PConfig::set($uid, 'system', 'filetags', $filetags_updated);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} elseif (strlen($file_new)) {
|
} elseif (strlen($file_new)) {
|
||||||
PConfig::set($uid, 'system', 'filetags', $file_new);
|
PConfig::set($uid, 'system', 'filetags', $file_new);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Add tag to file
|
* @brief Add tag to file
|
||||||
|
|
@ -230,34 +220,30 @@ class FileTag
|
||||||
* @return boolean A value indicating success or failure.
|
* @return boolean A value indicating success or failure.
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public static function saveFile($uid, $item_id, $file)
|
public static function saveFile($uid, $item_id, $file)
|
||||||
{
|
{
|
||||||
if (!intval($uid))
|
if (!intval($uid)) {
|
||||||
{
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
|
$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
|
||||||
if (DBA::isResult($item))
|
if (DBA::isResult($item)) {
|
||||||
{
|
if (!stristr($item['file'], '[' . self::encode($file) . ']')) {
|
||||||
if (!stristr($item['file'], '[' . self::encode($file) . ']'))
|
$fields = ['file' => $item['file'] . '[' . self::encode($file) . ']'];
|
||||||
{
|
Item::update($fields, ['id' => $item_id]);
|
||||||
$fields = ['file' => $item['file'] . '[' . self::encode($file) . ']'];
|
}
|
||||||
Item::update($fields, ['id' => $item_id]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$saved = PConfig::get($uid, 'system', 'filetags');
|
$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) . ']');
|
||||||
PConfig::set($uid, 'system', 'filetags', $saved . '[' . self::encode($file) . ']');
|
}
|
||||||
}
|
|
||||||
|
|
||||||
info(L10n::t('Item filed'));
|
info(L10n::t('Item filed'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Remove tag from file
|
* @brief Remove tag from file
|
||||||
|
|
@ -270,45 +256,42 @@ class FileTag
|
||||||
* @return boolean A value indicating success or failure.
|
* @return boolean A value indicating success or failure.
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public static function unsaveFile($uid, $item_id, $file, $cat = false)
|
public static function unsaveFile($uid, $item_id, $file, $cat = false)
|
||||||
{
|
{
|
||||||
if (!intval($uid))
|
if (!intval($uid)) {
|
||||||
{
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if ($cat == true) {
|
if ($cat == true) {
|
||||||
$pattern = '<' . self::encode($file) . '>';
|
$pattern = '<' . self::encode($file) . '>';
|
||||||
$termtype = TERM_CATEGORY;
|
$termtype = Term::CATEGORY;
|
||||||
} else {
|
} else {
|
||||||
$pattern = '[' . self::encode($file) . ']';
|
$pattern = '[' . self::encode($file) . ']';
|
||||||
$termtype = TERM_FILE;
|
$termtype = Term::FILE;
|
||||||
}
|
}
|
||||||
|
|
||||||
$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
|
$item = Item::selectFirst(['file'], ['id' => $item_id, 'uid' => $uid]);
|
||||||
|
|
||||||
if (!DBA::isResult($item))
|
if (!DBA::isResult($item)) {
|
||||||
{
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
$fields = ['file' => str_replace($pattern, '', $item['file'])];
|
$fields = ['file' => str_replace($pattern, '', $item['file'])];
|
||||||
|
|
||||||
Item::update($fields, ['id' => $item_id]);
|
Item::update($fields, ['id' => $item_id]);
|
||||||
|
|
||||||
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
|
$r = q("SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d",
|
||||||
DBA::escape($file),
|
DBA::escape($file),
|
||||||
intval(TERM_OBJ_POST),
|
intval(Term::OBJECT_TYPE_POST),
|
||||||
intval($termtype),
|
intval($termtype),
|
||||||
intval($uid)
|
intval($uid)
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!DBA::isResult($r))
|
if (!DBA::isResult($r)) {
|
||||||
{
|
$saved = PConfig::get($uid, 'system', 'filetags');
|
||||||
$saved = PConfig::get($uid, 'system', 'filetags');
|
PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
|
||||||
PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
|
}
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue