Merge branch 'dev'

10 files changed, 206 insertions, 157 deletions

diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php
index 368a9229d..4ca109495 100644
--- a/Zotlabs/Daemon/Notifier.php
+++ b/Zotlabs/Daemon/Notifier.php
@@ -488,7 +488,7 @@ class Notifier {
 		// Now we have collected recipients (except for external mentions, FIXME)
 		// Let's reduce this to a set of hubs; checking that the site is not dead.
 
-		$hubs = q("select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc left join site on site_url = hubloc_url
+		$hubs = dbq("select hubloc.*, site.site_crypto, site.site_flags, site.site_dead from hubloc left join site on site_url = hubloc_url
 			where hubloc_hash in (" . protect_sprintf(implode(',', self::$recipients)) . ")
 			and hubloc_error = 0 and hubloc_deleted = 0"
 		);
@@ -550,7 +550,9 @@ class Notifier {
 						if (!array_key_exists($hub['hubloc_site_id'], $hub_env)) {
 							$hub_env[$hub['hubloc_site_id']] = [];
 						}
-						$hub_env[$hub['hubloc_site_id']][] = $er;
+						if (!in_array($er, $hub_env[$hub['hubloc_site_id']])) {
+							$hub_env[$hub['hubloc_site_id']][] = $er;
+						}
 					}
 				}
 			}
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index d02dab739..fdc7d4567 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -256,7 +256,7 @@ class Enotify {
 
 		$itemlink =  $params['link'];
 
-		if (array_key_exists('item',$params) && (! activity_match($params['item']['verb'],ACTIVITY_LIKE))) {
+		if (array_key_exists('item',$params) && activity_match($params['item']['verb'],ACTIVITY_LIKE)) {
 			if(! $always_show_in_notices  || !($vnotify & VNOTIFY_LIKE)) {
 				logger('notification: not a visible activity. Ignoring.');
 				pop_lang();
diff --git a/Zotlabs/Lib/Libsync.php b/Zotlabs/Lib/Libsync.php
index c4f1b20ea..23573e837 100644
--- a/Zotlabs/Lib/Libsync.php
+++ b/Zotlabs/Lib/Libsync.php
@@ -768,14 +768,13 @@ class Libsync {
 
 				// match as many fields as possible in case anything at all changed.
 
-				$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_id_url = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_site_id = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
+				$r = q("select * from hubloc where hubloc_hash = '%s' and hubloc_guid = '%s' and hubloc_guid_sig = '%s' and hubloc_id_url = '%s' and hubloc_url = '%s' and hubloc_url_sig = '%s' and hubloc_host = '%s' and hubloc_addr = '%s' and hubloc_callback = '%s' and hubloc_sitekey = '%s' ",
 					dbesc($sender['hash']),
 					dbesc($sender['id']),
 					dbesc($sender['id_sig']),
 					dbesc($location['id_url']),
 					dbesc($location['url']),
 					dbesc($location['url_sig']),
-					dbesc($location['site_id']),
 					dbesc($location['host']),
 					dbesc($location['address']),
 					dbesc($location['callback']),
@@ -784,6 +783,15 @@ class Libsync {
 				if ($r) {
 					logger('Hub exists: ' . $location['url'], LOGGER_DEBUG);
 
+					// generate a new hubloc_site_id if it's wrong due to historical bugs 2021-11-30
+
+					if ($r[0]['hubloc_site_id'] !== $location['site_id']) {
+						q("update hubloc set hubloc_site_id = '%s' where hubloc_id = %d",
+							dbesc(Libzot::make_xchan_hash($location['url'], $location['sitekey'])),
+							intval($r[0]['hubloc_id'])
+						);
+					}
+
 					// update connection timestamp if this is the site we're talking to
 					// This only happens when called from import_xchan
 
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 6261a2f06..4ebd2ee29 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -66,8 +66,7 @@ class Channel extends Controller {
 			$sigdata = HTTPSig::verify(file_get_contents('php://input'), EMPTY_STR, 'zot6');
 
 			if ($sigdata && $sigdata['signer'] && $sigdata['header_valid']) {
-				$data = json_encode(Libzot::zotinfo(['address' => $channel['channel_address'], 'target_url' => $sigdata['signer']]));
-
+				$data = json_encode(Libzot::zotinfo(['guid_hash' => $channel['channel_hash'], 'target_url' => $sigdata['signer']]));
 				$s = q("select site_crypto, hubloc_sitekey from site left join hubloc on hubloc_url = site_url where hubloc_id_url = '%s' and hubloc_network = 'zot6' limit 1",
 					dbesc($sigdata['signer'])
 				);
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index e3fe4a954..8b36e8396 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -91,6 +91,12 @@ class Like extends Controller {
 			'id'      => $arr['item']['id'],
 			'html'    => conversation($items, $conv_mode, true, $page_mode),
 		];
+
+		// mod photos
+		if (isset($_REQUEST['reload']) && $_REQUEST['reload']) {
+			$ret['reload'] = 1;
+		}
+
 		return $ret;
 
 	}
diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php
index d6c80b653..6681cdcf9 100644
--- a/Zotlabs/Module/Profile_photo.php
+++ b/Zotlabs/Module/Profile_photo.php
@@ -23,79 +23,79 @@ require_once('include/channel.php');
 
 class Profile_photo extends \Zotlabs\Web\Controller {
 
-	
+
 	/* @brief Initalize the profile-photo edit view
 	 *
 	 * @return void
 	 *
 	 */
-	
+
 	function init() {
-	
+
 		if(! local_channel()) {
 			return;
 		}
-	
+
 		$channel = \App::get_channel();
 		profile_load($channel['channel_address']);
-	
+
 	}
-	
+
 	/* @brief Evaluate posted values
 	 *
 	 * @param $a Current application
 	 * @return void
 	 *
 	 */
-	
+
 	function post() {
-	
+
 		if(! local_channel()) {
 			return;
 		}
-		
+
 		$channel = \App::get_channel();
-		
+
 		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-		
+
 		// Remove cover photo
 		if(isset($_POST['remove'])) {
-			
+
 			$r = q("SELECT resource_id FROM photo WHERE photo_usage = %d AND uid = %d LIMIT 1",
 				intval(PHOTO_PROFILE),
 				intval(local_channel())
 			);
-			
+
 			if($r) {
 			    q("update photo set photo_usage = %d where photo_usage = %d and uid = %d",
 			    	intval(PHOTO_NORMAL),
 				    intval(PHOTO_PROFILE),
 				    intval(local_channel())
 			    );
-			
+
 				$sync = attach_export_data($channel,$r[0]['resource_id']);
 				if($sync)
 				   Libsync:: build_sync_packet($channel['channel_id'],array('file' => array($sync)));
 			}
-			
+
 			$_SESSION['reload_avatar'] = true;
-			
+
 			goaway(z_root() . '/profiles');
 		}
-	        
+
 		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) {
 				notice( t('Image uploaded but image cropping failed.') . EOL );
 				return;
 			}
-	
+
 			$image_id = argv(1);
-	
+
 			if(substr($image_id,-2,1) == '-') {
 				$scale = substr($image_id,-1,1);
 				$image_id = substr($image_id,0,-2);
@@ -104,7 +104,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 
 			// unless proven otherwise
 			$is_default_profile = 1;
-	
+
 			if($_REQUEST['profile']) {
 				$r = q("select id, profile_guid, is_default, gender from profile where id = %d and uid = %d limit 1",
 					intval($_REQUEST['profile']),
@@ -115,9 +115,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					if(! intval($profile['is_default']))
 						$is_default_profile = 0;
 				}
-			} 
+			}
+
 
-	
 			$srcX = intval($_POST['xstart']);
 			$srcY = intval($_POST['ystart']);
 			$srcW = intval($_POST['xfinal']) - $srcX;
@@ -128,36 +128,36 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				dbesc(local_channel()),
 				intval($scale));
 			if($r) {
-	
+
 				$base_image = $r[0];
 				$base_image['content'] = (($r[0]['os_storage']) ? @file_get_contents(dbunescbin($base_image['content'])) : dbunescbin($base_image['content']));
-			
+
 				$im = photo_factory($base_image['content'], $base_image['mimetype']);
 				if($im->is_valid()) {
-	
+
 					$im->cropImage(300,$srcX,$srcY,$srcW,$srcH);
-	
+
 					$aid = get_account_id();
-	
-					$p = [ 
-						'aid'          => $aid, 
-						'uid'          => local_channel(), 
+
+					$p = [
+						'aid'          => $aid,
+						'uid'          => local_channel(),
 						'resource_id'  => $base_image['resource_id'],
-						'filename'     => $base_image['filename'], 
+						'filename'     => $base_image['filename'],
 						'album'        => t('Profile Photos'),
 						'os_path'      => $base_image['os_path'],
 						'display_path' => $base_image['display_path'],
 						'photo_usage'  => PHOTO_PROFILE,
 						'edited'	   => dbescdate($base_image['edited'])
 					];
-	
+
 					$p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
-	
+
 					$r1 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_300);
-	
+
 					$im->scaleImage(80);
 					$r2 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_80);
-				
+
 					$im->scaleImage(48);
 					$r3 = $im->storeThumbnail($p, PHOTO_RES_PROFILE_48);
 
@@ -184,12 +184,12 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 								@unlink(dbunescbin($xx['content']));
 							}
 						}
-						
+
 						return;
 					}
-	
+
 					// If setting for the default profile, unset the profile photo flag from any other photos I own
-	
+
 					if($is_default_profile) {
 
 						$r = q("update profile set photo = '%s', thumb = '%s' where is_default = 1 and uid = %d",
@@ -206,10 +206,10 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 							dbesc($base_image['resource_id']),
 							intval(local_channel())
 						);
-	
+
 
 						send_profile_photo_activity($channel,$base_image,$profile);
-	
+
 					}
 					else {
 						$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
@@ -219,19 +219,19 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 							intval(local_channel())
 						);
 					}
-	
+
 					// set $send to false in profiles_build_sync() to return the data
-					// so that we only send one sync packet. 
+					// so that we only send one sync packet.
 
 					$sync_profiles = profiles_build_sync(local_channel(),false);
-	
+
 					// We'll set the updated profile-photo timestamp even if it isn't the default profile,
 					// so that browsers will do a cache update unconditionally
 					// Also set links back to site-specific profile photo url in case it was
-					// changed to a generic URL by a clone operation. Otherwise the new photo may 
+					// changed to a generic URL by a clone operation. Otherwise the new photo may
 					// not get pushed to other sites correctly.
-	
-					$r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'  
+
+					$r = q("UPDATE xchan set xchan_photo_mimetype = '%s', xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s'
 						where xchan_hash = '%s'",
 						dbesc($im->getType()),
 						dbescdate($base_image['edited']),
@@ -250,29 +250,29 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 
 					// Similarly, tell the nav bar to bypass the cache and update the avatar image.
 					$_SESSION['reload_avatar'] = true;
-	
+
 					info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
-	
+
 					// Update directory in background
 					\Zotlabs\Daemon\Master::Summon(array('Directory',$channel['channel_id']));
-	
+
 				}
 				else
 					notice( t('Unable to process image') . EOL);
 			}
-	
+
 			goaway(z_root() . '/profiles');
 			return; // NOTREACHED
 		}
-	
+
 		// A new photo was uploaded. Store it and save some important details
 		// in App::$data for use in the cropping function
- 	
-	
+
+
 		$hash = photo_new_resource();
 		$importing = false;
 		$smallest = 0;
-	
+
 
 		if($_REQUEST['importfile']) {
 			$hash = $_REQUEST['importfile'];
@@ -280,24 +280,21 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		}
 		else {
 			require_once('include/attach.php');
-	
-			$res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash, 'nosync' => true));
-	
-			logger('attach_store: ' . print_r($res,true));
+			$res = attach_store(\App::get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash, 'nosync' => true, 'source' => 'photos'));
 		}
-	
+
 		if(($res && intval($res['data']['is_photo'])) || $importing) {
 			$i = q("select * from photo where resource_id = '%s' and uid = %d order by imgscale",
 				dbesc($hash),
 				intval(local_channel())
 			);
-	
+
 			if(! $i) {
 				notice( t('Image upload failed.') . EOL );
 				return;
 			}
 			$os_storage = false;
-	
+
 			foreach($i as $ii) {
 				if(intval($ii['imgscale']) < PHOTO_RES_640) {
 					$smallest = intval($ii['imgscale']);
@@ -307,53 +304,53 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				}
 			}
 		}
-	
+
 		$imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata));
 		$ph = photo_factory($imagedata, $filetype);
-	
+
 		if(! $ph->is_valid()) {
 			notice( t('Unable to process image.') . EOL );
 			return;
 		}
-	
+
 		return $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
 
 		// This will "fall through" to the get() method, and since
-		// App::$data['imagecrop'] is set, it will proceed to cropping 
-		// rather than present the upload form		
+		// App::$data['imagecrop'] is set, it will proceed to cropping
+		// rather than present the upload form
 	}
-	
-	
+
+
 	/* @brief Generate content of profile-photo view
 	 *
 	 * @param $a Current application
 	 * @return void
 	 *
 	 */
-	
-	
+
+
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL );
 			return;
 		}
-	
+
 		$channel = \App::get_channel();
 		$pf = 0;
 		$newuser = false;
-	
+
 		if(argc() == 2 && argv(1) === 'new')
 			$newuser = true;
-	
+
 		if(argv(1) === 'use') {
 			if (argc() < 3) {
 				notice( t('Permission denied.') . EOL );
 				return;
 			};
-				        
+
 			$resource_id = argv(2);
-	
+
 
 			$pf = (($_REQUEST['pf']) ? intval($_REQUEST['pf']) : 0);
 
@@ -384,9 +381,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				if($rr['imgscale'] == PHOTO_RES_PROFILE_80)
 					$havescale = true;
 			}
-	
+
 			// set an already loaded and cropped photo as profile photo
-	
+
 			if($havescale) {
 				// unset any existing profile photos
 				$x = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
@@ -396,19 +393,19 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				);
 
 				$edited = datetime_convert();
-				
+
 				$x = q("UPDATE photo SET photo_usage = %d, edited = '%s' WHERE uid = %d AND resource_id = '%s' AND imgscale > 0",
 					intval(PHOTO_PROFILE),
 					dbescdate($edited),
 					intval(local_channel()),
 					dbesc($resource_id)
 				);
-	
+
 				$x = q("UPDATE xchan SET xchan_photo_date = '%s' WHERE xchan_hash = '%s'",
 					dbescdate($edited),
 					dbesc($channel['xchan_hash'])
 				);
-	
+
 				photo_profile_setperms(local_channel(),$resource_id,$_REQUEST['profile']);
 
 				$sync = attach_export_data($channel,$resource_id);
@@ -418,25 +415,25 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				$_SESSION['reload_avatar'] = true;
 
 				\Zotlabs\Daemon\Master::Summon(array('Directory',local_channel()));
-				
+
 				goaway(z_root() . '/profiles');
 			}
-	
+
 			$r = q("SELECT content, mimetype, resource_id, os_storage FROM photo WHERE id = %d and uid = %d limit 1",
 				intval($r[0]['id']),
 				intval(local_channel())
-	
+
 			);
 			if(! $r) {
 				notice( t('Photo not available.') . EOL );
 				return;
 			}
-	
+
 			if(intval($r[0]['os_storage']))
 				$data = @file_get_contents(dbunescbin($r[0]['content']));
 			else
-				$data = dbunescbin($r[0]['content']); 
-	
+				$data = dbunescbin($r[0]['content']);
+
 			$ph = photo_factory($data, $r[0]['mimetype']);
 			$smallest = 0;
 			if($ph->is_valid()) {
@@ -445,7 +442,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					dbesc($r[0]['resource_id']),
 					intval(local_channel())
 				);
-	
+
 				if($i) {
 					$hash = $i[0]['resource_id'];
 					foreach($i as $ii) {
@@ -455,7 +452,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 					}
 	            }
 	        }
-	 
+
 			if($multi_profiles) {
 				\App::$data['importfile'] = $resource_id;
 			}
@@ -466,7 +463,7 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			// falls through with App::$data['imagecrop'] set so we go straight to the cropping section
 
 		}
-	
+
 
 		// present an upload form
 
@@ -485,14 +482,14 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 		}
 
 		$importing = ((array_key_exists('importfile',\App::$data)) ? true : false);
-	
+
 		if(! x(\App::$data,'imagecrop')) {
-	
+
 			$tpl = get_markup_template('profile_photo.tpl');
-	
+
 			$o .= replace_macros($tpl,array(
 				'$user' => \App::$channel['channel_address'],
-				'$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')), 
+				'$info' => ((count($profiles) > 1) ? t('Your default profile photo is visible to anybody on the internet. Profile photos for alternate profiles will inherit the permissions of the profile') : t('Your profile photo is visible to anybody on the internet and may be distributed to other websites.')),
 				'$importfile' => (($importing) ? \App::$data['importfile'] : ''),
 				'$lbl_upfile' => t('Upload File:'),
 				'$lbl_profiles' => t('Select a profile:'),
@@ -515,9 +512,9 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 				'$form_security_token' => get_form_security_token("profile_photo"),
 				'$select' => t('Select existing photo'),
 			));
-			
+
 			call_hooks('profile_photo_content_end', $o);
-			
+
 			return $o;
 		}
 		else {
@@ -539,10 +536,10 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 			));
 			return $o;
 		}
-	
+
 		return; // NOTREACHED
 	}
-	
+
 	/* @brief Generate the UI for photo-cropping
 	 *
 	 * @param $a Current application
@@ -550,32 +547,32 @@ class Profile_photo extends \Zotlabs\Web\Controller {
 	 * @return void
 	 *
 	 */
-	
-	
-	
+
+
+
 	function profile_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
-	
+
 		$max_length = get_config('system','max_image_length');
 		if(! $max_length)
 			$max_length = MAX_IMAGE_LENGTH;
 		if($max_length > 0)
 			$ph->scaleImage($max_length);
-	
+
 		\App::$data['width']  = $ph->getWidth();
 		\App::$data['height'] = $ph->getHeight();
-	
+
 		if(\App::$data['width'] < 500 || \App::$data['height'] < 500) {
 			$ph->scaleImageUp(400);
 			\App::$data['width']  = $ph->getWidth();
 			\App::$data['height'] = $ph->getHeight();
 		}
-	
-	
+
+
 		\App::$data['imagecrop'] = $hash;
 		\App::$data['imagecrop_resolution'] = $smallest;
 		\App::$page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
 		return;
 	}
-	
-	
+
+
 }
diff --git a/Zotlabs/Module/Profiles.php b/Zotlabs/Module/Profiles.php
index 73bae45e8..1512148b1 100644
--- a/Zotlabs/Module/Profiles.php
+++ b/Zotlabs/Module/Profiles.php
@@ -189,7 +189,6 @@ class Profiles extends \Zotlabs\Web\Controller {
 			}
 
 			$chan = \App::get_channel();
-
 			profile_load($chan['channel_address'],$r[0]['id']);
 		}
 	}
@@ -657,6 +656,7 @@ class Profiles extends \Zotlabs\Web\Controller {
 				intval($id),
 				intval(local_channel())
 			);
+
 			if(! $r) {
 				notice( t('Profile not found.') . EOL);
 				return;
diff --git a/Zotlabs/Web/HttpMeta.php b/Zotlabs/Web/HttpMeta.php
index ceaa82162..7cf93dda9 100644
--- a/Zotlabs/Web/HttpMeta.php
+++ b/Zotlabs/Web/HttpMeta.php
@@ -6,71 +6,108 @@ namespace Zotlabs\Web;
 class HttpMeta {
 
 	private $vars = null;
-	private $og = null;
+	private $og   = null;
 
 	function __construct() {
 
-		$this->vars = array();
-		$this->og = array();
+		$this->vars = [];
+		$this->og   = [];
+		$this->ogproperties = [];
 
 	}
 
-	function set($property,$value) {
-		if(strpos($property,'og:') === 0)
-			$this->og[$property] = $value;
-		else
+	//Set Meta Value
+	//   Mode:
+	//      0 = Default - set if no value currently exists
+	//	1 = Overwrite - replace existing value(s)
+	//	2 = Multi - append to the array of values
+	function set($property,$value,$mode=0) {
+		$ogallowsmulti = ['image','audio','video'];
+		if (strpos($property,'og:') === 0) {
+			$count = 0;
+			foreach ($this->og as $ogk => $ogdata) {
+				if (strpos($ogdata['property'],$property) === 0) {
+					if ($mode == 1) {
+						unset($this->og[$ogk]);
+						unset($this->ogproperties[$property]);
+					}
+					elseif ($mode == 0) {
+						return;
+					}
+					elseif ($value == $ogdata['value']) {
+						return;
+					}
+					else {
+						$count++;
+					}
+				}
+			}
+
+			if ($value !== null) {
+				//mode = 1 with value === null will delete the property entirely.
+				$components = explode(':',$property);
+				$ogp=$components[1];
+
+				if (!$count || in_array($ogp,$ogallowsmulti)) {
+					$this->og[]=['property'=>$property,'value'=>$value];
+					$this->ogproperties[$property] = $property;
+				}
+			}
+		} else {
 			$this->vars[$property] = $value;
+		}
 	}
 
 	function check_required() {
-		if(
-			($this->og) 
-			&& array_key_exists('og:title',$this->og) 
-			&& array_key_exists('og:type', $this->og) 
-			&& array_key_exists('og:image',$this->og) 
-			&& array_key_exists('og:url',  $this->og)
-		)
+		if (
+			in_array('og:title',$this->ogproperties)
+			&& in_array('og:type', $this->ogproperties)
+			&& (in_array('og:image',$this->ogproperties)
+				|| in_array('og:image:url',$this->ogproperties))
+			&& (array_key_exists('og:url', $this->ogproperties)
+				|| array_key_exists('og:url:secure_url',  $this->ogproperties))
+                        && array_key_exists('og:description',  $this->ogproperties)
+		) {
 			return true;
+		}
 		return false;
 	}
 
 	function get_field($field) {
-		if(strpos($field,'og:') === 0)
-			$arr = $this->og;
-		else
+		if (strpos($field,'og:') === 0) {
+			foreach ($this->og as $ogdata) {
+				if (strpos($ogdata['property'],$field) === 0) {
+					$arr[$field][] = $ogdata['value'];
+				}
+			}
+		}
+		else {
 			$arr = $this->vars;
+		}
 
-		if($arr && array_key_exists($field,$arr) && $arr[$field])
+		if (isset($arr) && is_array($arr) && array_key_exists($field,$arr) && $arr[$field]) {
 			return $arr[$field];
+		}
 		return false;
 	}
 
 
 	function get() {
+		// use 'name' for most meta fields, and 'property' for opengraph properties
 		$o = '';
-		if($this->vars) {
-			foreach($this->vars as $k => $v) {
-				$o .= '<meta property="' . $k . '" content="' . urlencode($v) . '" />' . "\r\n" ;
+		if ($this->vars) {
+			foreach ($this->vars as $k => $v) {
+				$o .= '<meta name="' . htmlspecialchars($k,ENT_COMPAT,'UTF-8',false) . '" content="' . htmlspecialchars($v,ENT_COMPAT,'UTF-8',false) . '" />' . "\r\n" ;
 			}
 		}
-		if($this->check_required()) {
-			$arrayproperties = [ 'og:image' ];
-			foreach($this->og as $k => $v) {
-				if (in_array($k,$arrayproperties)) {
-					if (is_array($v)) {
-						foreach ($v as $v2) {
-							$o .= '<meta property="' . $k . '" content="' . $v2 . '" />' . "\r\n" ;
-						}
-					} else {
-						$o .= '<meta property="' . $k . '" content="' . $v . '" />' . "\r\n" ;
-					}
-				} else {
-					$o .= '<meta property="' . $k . '" content="' . $v . '" />' . "\r\n" ;
-				}
+		if ($this->check_required()) {
+			foreach ($this->og as $ogdata) {
+				$o .= '<meta property="' . htmlspecialchars($ogdata['property'],ENT_COMPAT,'UTF-8',false) . '" content="' . htmlspecialchars($ogdata['value'],ENT_COMPAT,'UTF-8',false) . '" />' . "\r\n" ;
 			}
 		}
-		if($o)
+		if ($o) {
 			return "\r\n" . $o;
+		}
 		return $o;
 	}
 
diff --git a/Zotlabs/Widget/Fullprofile.php b/Zotlabs/Widget/Fullprofile.php
index d7340ef40..e8ed13811 100644
--- a/Zotlabs/Widget/Fullprofile.php
+++ b/Zotlabs/Widget/Fullprofile.php
@@ -11,6 +11,6 @@ class Fullprofile {
 
 		$block = observer_prohibited();
 
-		return profile_sidebar(\App::$profile, $block);
+		return profile_sidebar(\App::$profile, $block, true, true);
 	}
 }
diff --git a/Zotlabs/Widget/Profile.php b/Zotlabs/Widget/Profile.php
index bffd910b6..8bd624c0f 100644
--- a/Zotlabs/Widget/Profile.php
+++ b/Zotlabs/Widget/Profile.php
@@ -7,7 +7,7 @@ class Profile {
 
 	function widget($args) {
 		$block = observer_prohibited();
-		return profile_sidebar(\App::$profile, $block, true);
+		return profile_sidebar(\App::$profile, $block, true, false);
 	}
 
-}
\ No newline at end of file
+}