friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Standards

This commit is contained in:
Michael 2017-12-21 22:54:58 +00:00
parent 4dcf14f62e
commit 2e022733f6
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/like.php
View File

@ -24,7 +24,7 @@ use Friendica\Protocol\Diaspora;
function do_like($item_id, $verb) { function do_like($item_id, $verb) {
$a = get_app(); $a = get_app();
if (! local_user() && ! remote_user()) { if (!local_user() && !remote_user()) {
return false; return false;
} }
@ -73,21 +73,21 @@ function do_like($item_id, $verb) {
dbesc($item_id) dbesc($item_id)
); );
if (! $item_id || ! DBM::is_result($items)) { if (!$item_id || !DBM::is_result($items)) {
logger('like: unknown item ' . $item_id); logger('like: unknown item ' . $item_id);
return false; return false;
} }
$item = $items[0]; $item = $items[0];
if (! can_write_wall($a, $item['uid'])) { if (!can_write_wall($a, $item['uid'])) {
logger('like: unable to write on wall ' . $item['uid']); logger('like: unable to write on wall ' . $item['uid']);
return false; return false;
} }
// Retrieves the local post owner // Retrieves the local post owner
$owners = q("SELECT `contact`.* FROM `contact` $owners = q("SELECT `contact`.* FROM `contact`
WHERE `contact`.`self` = 1 WHERE `contact`.`self`
AND `contact`.`uid` = %d", AND `contact`.`uid` = %d",
intval($item['uid']) intval($item['uid'])
); );

29
mod/like.php
View File

@ -3,33 +3,35 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/security.php'); require_once 'include/security.php';
require_once('include/bbcode.php'); require_once 'include/bbcode.php';
require_once('include/items.php'); require_once 'include/items.php';
require_once('include/like.php'); require_once 'include/like.php';
function like_content(App $a) { function like_content(App $a) {
if(! local_user() && ! remote_user()) { if (!local_user() && !remote_user()) {
return false; return false;
} }
$verb = notags(trim($_GET['verb'])); $verb = notags(trim($_GET['verb']));
if(! $verb) if (!$verb) {
$verb = 'like'; $verb = 'like';
}
$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0); $item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
$r = do_like($item_id, $verb); $r = do_like($item_id, $verb);
if (!$r) return; if (!$r) {
return;
}
// See if we've been passed a return path to redirect to // See if we've been passed a return path to redirect to
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : ''); $return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
like_content_return(System::baseUrl(), $return_path); like_content_return(System::baseUrl(), $return_path);
killme(); // NOTREACHED killme(); // NOTREACHED
// return; // NOTREACHED
} }
@ -37,15 +39,16 @@ function like_content(App $a) {
// then redirect back to the calling page. If not, just quietly end // then redirect back to the calling page. If not, just quietly end
function like_content_return($baseurl, $return_path) { function like_content_return($baseurl, $return_path) {
if ($return_path) {
if($return_path) {
$rand = '_=' . time(); $rand = '_=' . time();
if(strpos($return_path, '?')) $rand = "&$rand"; if (strpos($return_path, '?')) {
else $rand = "?$rand"; $rand = "&$rand";
} else {
$rand = "?$rand";
}
goaway($baseurl . "/" . $return_path . $rand); goaway($baseurl . "/" . $return_path . $rand);
} }
killme(); killme();
} }