Procházet zdrojové kódy

Move another function

move get_plink to Item class, and also fix up getApp since we extend BaseObject
tags/2019.01
Adam Magness před 2 roky
rodič
revize
7cb9138201
4 změnil soubory, kde provedl 39 přidání a 40 odebrání
  1. +1
    -1
      include/conversation.php
  2. +0
    -36
      include/text.php
  3. +37
    -2
      src/Model/Item.php
  4. +1
    -1
      src/Object/Post.php

+ 1
- 1
include/conversation.php Zobrazit soubor

@@ -689,7 +689,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ
'owner_name' => $owner_name_e,
'owner_url' => $owner_url,
'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
'plink' => get_plink($item),
'plink' => Item::getPlink($item),
'edpost' => false,
'isstarred' => $isstarred,
'star' => $star,


+ 0
- 36
include/text.php Zobrazit soubor

@@ -493,42 +493,6 @@ function get_cats_and_terms($item)
return [$categories, $folders];
}


/**
* get private link for item
* @param array $item
* @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
*/
function get_plink($item) {
$a = get_app();

if ($a->user['nickname'] != "") {
$ret = [
//'href' => "display/" . $a->user['nickname'] . "/" . $item['id'],
'href' => "display/" . $item['guid'],
'orig' => "display/" . $item['guid'],
'title' => L10n::t('View on separate page'),
'orig_title' => L10n::t('view on separate page'),
];

if (x($item, 'plink')) {
$ret["href"] = $a->removeBaseURL($item['plink']);
$ret["title"] = L10n::t('link to source');
}

} elseif (x($item, 'plink') && ($item['private'] != 1)) {
$ret = [
'href' => $item['plink'],
'orig' => $item['plink'],
'title' => L10n::t('link to source'),
];
} else {
$ret = [];
}

return $ret;
}

/**
* return number of bytes in size (K, M, G)
* @param string $size_str


+ 37
- 2
src/Model/Item.php Zobrazit soubor

@@ -3297,7 +3297,7 @@ class Item extends BaseObject
|| $rendered_hash != hash("md5", $item["body"])
|| Config::get("system", "ignore_cache")
) {
$a = get_app();
$a = self::getApp();
redir_private_images($a, $item);

$item["rendered-html"] = prepare_text($item["body"]);
@@ -3348,7 +3348,7 @@ class Item extends BaseObject
*/
public static function prepareBody(array &$item, $attach = false, $is_preview = false)
{
$a = get_app();
$a = self::getApp();
Addon::callHooks('prepare_body_init', $item);

// In order to provide theme developers more possibilities, event items
@@ -3509,4 +3509,39 @@ class Item extends BaseObject

return $hook_data['html'];
}

/**
* get private link for item
* @param array $item
* @return boolean|array False if item has not plink, otherwise array('href'=>plink url, 'title'=>translated title)
*/
public static function getPlink($item)
{
$a = self::getApp();

if ($a->user['nickname'] != "") {
$ret = [
'href' => "display/" . $item['guid'],
'orig' => "display/" . $item['guid'],
'title' => L10n::t('View on separate page'),
'orig_title' => L10n::t('view on separate page'),
];

if (x($item, 'plink')) {
$ret["href"] = $a->removeBaseURL($item['plink']);
$ret["title"] = L10n::t('link to source');
}

} elseif (x($item, 'plink') && ($item['private'] != 1)) {
$ret = [
'href' => $item['plink'],
'orig' => $item['plink'],
'title' => L10n::t('link to source'),
];
} else {
$ret = [];
}

return $ret;
}
}

+ 1
- 1
src/Object/Post.php Zobrazit soubor

@@ -392,7 +392,7 @@ class Post extends BaseObject
'owner_url' => $this->getOwnerUrl(),
'owner_photo' => $a->removeBaseURL(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
'owner_name' => htmlentities($owner_name_e),
'plink' => get_plink($item),
'plink' => Item::getPlink($item),
'edpost' => Feature::isEnabled($conv->getProfileOwner(), 'edit_posts') ? $edpost : '',
'isstarred' => $isstarred,
'star' => Feature::isEnabled($conv->getProfileOwner(), 'star_posts') ? $star : '',


Načítá se…
Zrušit
Uložit