Standards
This commit is contained in:
		
					parent
					
						
							
								4dcf14f62e
							
						
					
				
			
			
				commit
				
					
						2e022733f6
					
				
			
		
					 2 changed files with 20 additions and 17 deletions
				
			
		| 
						 | 
				
			
			@ -24,7 +24,7 @@ use Friendica\Protocol\Diaspora;
 | 
			
		|||
function do_like($item_id, $verb) {
 | 
			
		||||
	$a = get_app();
 | 
			
		||||
 | 
			
		||||
	if (! local_user() && ! remote_user()) {
 | 
			
		||||
	if (!local_user() && !remote_user()) {
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -73,21 +73,21 @@ function do_like($item_id, $verb) {
 | 
			
		|||
		dbesc($item_id)
 | 
			
		||||
	);
 | 
			
		||||
 | 
			
		||||
	if (! $item_id || ! DBM::is_result($items)) {
 | 
			
		||||
	if (!$item_id || !DBM::is_result($items)) {
 | 
			
		||||
		logger('like: unknown item ' . $item_id);
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	$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']);
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Retrieves the local post owner
 | 
			
		||||
	$owners = q("SELECT `contact`.* FROM `contact`
 | 
			
		||||
		WHERE `contact`.`self` = 1
 | 
			
		||||
		WHERE `contact`.`self`
 | 
			
		||||
		AND `contact`.`uid` = %d",
 | 
			
		||||
		intval($item['uid'])
 | 
			
		||||
	);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										29
									
								
								mod/like.php
									
										
									
									
									
								
							
							
						
						
									
										29
									
								
								mod/like.php
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -3,33 +3,35 @@
 | 
			
		|||
use Friendica\App;
 | 
			
		||||
use Friendica\Core\System;
 | 
			
		||||
 | 
			
		||||
require_once('include/security.php');
 | 
			
		||||
require_once('include/bbcode.php');
 | 
			
		||||
require_once('include/items.php');
 | 
			
		||||
require_once('include/like.php');
 | 
			
		||||
require_once 'include/security.php';
 | 
			
		||||
require_once 'include/bbcode.php';
 | 
			
		||||
require_once 'include/items.php';
 | 
			
		||||
require_once 'include/like.php';
 | 
			
		||||
 | 
			
		||||
function like_content(App $a) {
 | 
			
		||||
	if(! local_user() && ! remote_user()) {
 | 
			
		||||
	if (!local_user() && !remote_user()) {
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	$verb = notags(trim($_GET['verb']));
 | 
			
		||||
 | 
			
		||||
	if(! $verb)
 | 
			
		||||
	if (!$verb) {
 | 
			
		||||
		$verb = 'like';
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
 | 
			
		||||
 | 
			
		||||
	$r = do_like($item_id, $verb);
 | 
			
		||||
	if (!$r) return;
 | 
			
		||||
	if (!$r) {
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// See if we've been passed a return path to redirect to
 | 
			
		||||
	$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
 | 
			
		||||
 | 
			
		||||
	like_content_return(System::baseUrl(), $return_path);
 | 
			
		||||
	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
 | 
			
		||||
 | 
			
		||||
function like_content_return($baseurl, $return_path) {
 | 
			
		||||
 | 
			
		||||
	if($return_path) {
 | 
			
		||||
	if ($return_path) {
 | 
			
		||||
		$rand = '_=' . time();
 | 
			
		||||
		if(strpos($return_path, '?')) $rand = "&$rand";
 | 
			
		||||
		else $rand = "?$rand";
 | 
			
		||||
		if (strpos($return_path, '?')) {
 | 
			
		||||
			$rand = "&$rand";
 | 
			
		||||
		} else {
 | 
			
		||||
			$rand = "?$rand";
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		goaway($baseurl . "/" . $return_path . $rand);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	killme();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue