mirror of
https://github.com/wallabag/wallabag.git
synced 2024-11-27 11:31:05 +00:00
Fixed errors and changed source of flattrs
Fixed errors, and the number displayed is no longer the number of peope who has flattred an article, but the number of flattrs he has got.
This commit is contained in:
parent
a322312740
commit
af1d279226
2 changed files with 9 additions and 9 deletions
|
@ -255,14 +255,15 @@ class Poche
|
|||
$tpl_vars = array(
|
||||
'entry' => $entry,
|
||||
'content' => $content,
|
||||
'flattr' => $flattr,
|
||||
'flattr' => $flattr
|
||||
);
|
||||
}
|
||||
}
|
||||
else {
|
||||
Tools::logm('error in view call : entry is null');
|
||||
}
|
||||
break;
|
||||
default: # home, favorites and archive views
|
||||
default : // home, favorites and archive views
|
||||
$entries = $this->store->getEntriesByView($view, $this->user->getId());
|
||||
$tpl_vars = array(
|
||||
'entries' => '',
|
||||
|
@ -577,7 +578,6 @@ class FlattrItem{
|
|||
public function checkitem($urltoflattr){
|
||||
$this->cacheflattrfile($urltoflattr);
|
||||
$flattrResponse = file_get_contents("cache/flattr/".base64_encode($urltoflattr).".cache");
|
||||
var_dump($flattrResponse);
|
||||
if($flattrResponse != FALSE){
|
||||
$result = json_decode($flattrResponse);
|
||||
if (isset($result->message)){
|
||||
|
@ -588,7 +588,7 @@ class FlattrItem{
|
|||
elseif ($result->link) {
|
||||
$this->status = "flattred";
|
||||
$this->flattrItemURL = $result->link;
|
||||
$this->numflattrs = $result->flattrs_user_count;
|
||||
$this->numflattrs = $result->flattrs;
|
||||
}
|
||||
else{
|
||||
$this->status = "not flattrable";
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
{% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@getpoche" target="_blank" class="tool twitter" title="{% trans "tweet" %}"><span>{% trans "tweet" %}</span></a></li>{% endif %}
|
||||
{% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&body={{ entry.url|url_encode }}%20via%20@getpoche" class="tool email" title="{% trans "email" %}"><span>{% trans "email" %}</span></a></li>{% endif %}
|
||||
{% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
|
||||
<li>{% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} <a href="{{ flattr.flattrItemURL }}" >This thing has already been flattred by {{ flattr.numflattrs }} users and can be flattred !</a>{% else %}This article cannot be flattred{% endif %}</li>
|
||||
<li>{% if flattr.status == "flattrable" %} This thing is flattrable !{% elseif flattr.status == "flattred" %} <a href="{{ flattr.flattrItemURL }}" >This thing has already been flattred {{ flattr.numflattrs }} times and can be flattred !</a>{% else %}This article cannot be flattred{% endif %}</li>
|
||||
</ul>
|
||||
<p>{% trans "this article appears wrong?" %} <a href="https://github.com/inthepoche/poche/issues/new">{% trans "create an issue" %}</a> {% trans "or" %} <a href="mailto:support@inthepoche.com?subject=Wrong%20display%20in%20poche&body={{ entry.url|url_encode }}">{% trans "contact us by mail" %}</a></p>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue