Merge remote-tracking branch 'mike/master' into dev

5 files changed, 62 insertions, 57 deletions

diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php
index 47bce6c2b..cfb513365 100644
--- a/Zotlabs/Module/Cover_photo.php
+++ b/Zotlabs/Module/Cover_photo.php
@@ -64,12 +64,12 @@ class Cover_photo extends \Zotlabs\Web\Controller {
 				$image_id = substr($image_id,0,-2);
 			}
 				
-	
-			$srcX = $_POST['xstart'];
-			$srcY = $_POST['ystart'];
-			$srcW = $_POST['xfinal'] - $srcX;
-			$srcH = $_POST['yfinal'] - $srcY;
-	
+
+
+			$srcX = intval($_POST['xstart']);
+			$srcY = intval($_POST['ystart']);
+			$srcW = intval($_POST['xfinal']) - $srcX;
+			$srcH = intval($_POST['yfinal']) - $srcY;
 	
 			$r = q("select gender from profile where uid = %d and is_default = 1 limit 1",
 				intval(local_channel())
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index b07824363..6d9fde17c 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -9,9 +9,41 @@ require_once('include/items.php');
 
 class Like extends \Zotlabs\Web\Controller {
 
-	function get() {
+
+
+	private function reaction_to_activity($reaction) {
+
+		$acts = [
+			'like'        => ACTIVITY_LIKE ,
+			'dislike'     => ACTIVITY_DISLIKE ,
+			'agree'       => ACTIVITY_AGREE ,
+			'disagree'    => ACTIVITY_DISAGREE ,
+			'abstain'     => ACTIVITY_ABSTAIN ,
+			'attendyes'   => ACTIVITY_ATTEND ,
+			'attendno'    => ACTIVITY_ATTENDNO ,
+			'attendmaybe' => ACTIVITY_ATTENDMAYBE 
+		];
+
+		// unlike (etc.) reactions are an undo of positive reactions, rather than a negative action.
+		// The activity is the same in undo actions and will have the same activity mapping
+
+		if(substr($reaction,0,2) === 'un') {
+			$reaction = substr($reaction,2);
+		}
+
+		if(array_key_exists($reaction,$acts)) {
+			return $acts[$reaction];
+		}
+
+		return EMPTY_STR;
+
+	}
+
+
+
+	public function get() {
 	
-		$o = '';
+		$o = EMPTY_STR;
 
 		$sys_channel = get_sys_channel();
 		$sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0);
@@ -35,48 +67,17 @@ class Like extends \Zotlabs\Web\Controller {
 		if(! $verb)
 			$verb = 'like';
 	
-		switch($verb) {
-			case 'like':
-			case 'unlike':
-				$activity = ACTIVITY_LIKE;
-				break;
-			case 'dislike':
-			case 'undislike':
-				$activity = ACTIVITY_DISLIKE;
-				break;
-			case 'agree':
-			case 'unagree':
-				$activity = ACTIVITY_AGREE;
-				break;
-			case 'disagree':
-			case 'undisagree':
-				$activity = ACTIVITY_DISAGREE;
-				break;
-			case 'abstain':
-			case 'unabstain':
-				$activity = ACTIVITY_ABSTAIN;
-				break;
-			case 'attendyes':
-			case 'unattendyes':
-				$activity = ACTIVITY_ATTEND;
-				break;
-			case 'attendno':
-			case 'unattendno':
-				$activity = ACTIVITY_ATTENDNO;
-				break;
-			case 'attendmaybe':
-			case 'unattendmaybe':
-				$activity = ACTIVITY_ATTENDMAYBE;
-				break;
-			default:
-				return;
-				break;
+		$activity = $this->reaction_to_activity($verb);
+
+		if(! $activity) {
+			return EMPTY_STR; 
 		}
+
 	
 		$extended_like = false;
 		$object = $target = null;
-		$post_type = '';
-		$objtype = '';
+		$post_type = EMPTY_STR;
+		$objtype = EMPTY_STR;
 	
 		if(argc() == 3) {
 	
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index 45a606d5f..222b92721 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -1,10 +1,11 @@
 <?php
 namespace Zotlabs\Module;
 
-/* @file profile_photo.php
-   @brief Module-file with functions for handling of profile-photos
-
-*/
+/*
+ * @file Profile_photo.php
+ * @brief Module-file with functions for handling of profile-photos
+ *
+ */
 
 
 require_once('include/photo/photo_driver.php');
@@ -55,6 +56,10 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	        
 		if((array_key_exists('cropfinal',$_POST)) && (intval($_POST['cropfinal']) == 1)) {
 	
+			// logger('crop: ' . print_r($_POST,true));
+
+
+
 			// phase 2 - we have finished cropping
 	
 			if(argc() != 2) {
@@ -86,10 +91,10 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			} 
 
 	
-			$srcX = $_POST['xstart'];
-			$srcY = $_POST['ystart'];
-			$srcW = $_POST['xfinal'] - $srcX;
-			$srcH = $_POST['yfinal'] - $srcY;
+			$srcX = intval($_POST['xstart']);
+			$srcY = intval($_POST['ystart']);
+			$srcW = intval($_POST['xfinal']) - $srcX;
+			$srcH = intval($_POST['yfinal']) - $srcY;
 
 			$r = q("SELECT * FROM photo WHERE resource_id = '%s' AND uid = %d AND imgscale = %d LIMIT 1",
 				dbesc($image_id),
diff --git a/Zotlabs/Module/Settings/Permcats.php b/Zotlabs/Module/Settings/Permcats.php
index 336f69653..535399083 100644
--- a/Zotlabs/Module/Settings/Permcats.php
+++ b/Zotlabs/Module/Settings/Permcats.php
@@ -49,7 +49,7 @@ class Permcats {
 
 
 		if(argc() > 2) 
-			$name = argv(2);			
+			$name = hex2bin(argv(2));			
 
 		if(argc() > 3 && argv(3) === 'drop') {
 			\Zotlabs\Lib\Permcat::delete(local_channel(),$name);
@@ -70,7 +70,7 @@ class Permcats {
 				if(($pc['name']) && ($name) && ($pc['name'] == $name))
 					$existing = $pc['perms'];
 				if(! $pc['system'])
-					$permcats[$pc['name']] = $pc['localname'];
+					$permcats[bin2hex($pc['name'])] = $pc['localname'];
 			}
 		}
 
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index fafd51f65..92ee78cc6 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -5,7 +5,6 @@ namespace Zotlabs\Module;
 class Siteinfo extends \Zotlabs\Web\Controller {
 
 	function init() {
-logger(print_r($_REQUEST,true));
 		if (argv(1) === 'json' || $_REQUEST['module_format'] === 'json') {
 			$data = get_site_info();
 			json_return_and_die($data);