Merge branch '2.6RC'2.6

8 files changed, 303 insertions, 21 deletions

diff --git a/Zotlabs/Widget/Activity.php b/Zotlabs/Widget/Activity.php
index 7264a3360..04e9fc4b1 100644
--- a/Zotlabs/Widget/Activity.php
+++ b/Zotlabs/Widget/Activity.php
@@ -50,7 +50,7 @@ class Activity {
 			$o .= '<h3>' . t('Activity','widget') . '</h3><ul class="nav nav-pills flex-column">';
 
 			foreach($arr as $rv) {
-				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-default float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>';
+				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&xchan=' . urlencode($rv['author_xchan']) . '" ><span class="badge badge-secondary float-right">' . ((intval($rv['total'])) ? intval($rv['total']) : '') . '</span><img src="' . $rv['author']['xchan_photo_s'] . '" class="menu-img-1" /> ' . $rv['author']['xchan_name'] . '</a></li>';
 			}
 			$o .= '</ul></div>';
 		}
diff --git a/Zotlabs/Widget/Cdav.php b/Zotlabs/Widget/Cdav.php
new file mode 100644
index 000000000..60a860f93
--- /dev/null
+++ b/Zotlabs/Widget/Cdav.php
@@ -0,0 +1,176 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+
+
+class Cdav {
+
+	function widget() {
+		if(!local_channel())
+			return;
+
+		$channel = \App::get_channel();
+		$principalUri = 'principals/' . $channel['channel_address'];
+
+		if(!cdav_principal($principalUri))
+			return;
+
+		$pdo = \DBA::$dba->db;
+
+		require_once 'vendor/autoload.php';
+
+		$o = '';
+
+		if(argc() == 2 && argv(1) === 'calendar') {
+
+			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
+
+			$sabrecals = $caldavBackend->getCalendarsForUser($principalUri);
+
+			//TODO: we should probably also check for permission to send stream here
+			$local_channels = q("SELECT * FROM channel LEFT JOIN abook ON abook_xchan = channel_hash WHERE channel_system = 0 AND channel_removed = 0 AND channel_hash != '%s' AND abook_channel = %d",
+				dbesc($channel['channel_hash']),
+				intval($channel['channel_id'])
+			);
+
+			$sharee_options .= '<option value="">' . t('Select Channel') . '</option>' . "\r\n";
+			foreach($local_channels as $local_channel) {
+				$sharee_options .= '<option value="' . $local_channel['channel_hash'] . '">' . $local_channel['channel_name'] . '</option>' . "\r\n";
+			}
+
+			$access_options = '<option value="3">' . t('Read-write') . '</option>' . "\r\n";
+			$access_options .= '<option value="2">' . t('Read-only') . '</option>' . "\r\n";
+
+			//list calendars
+			foreach($sabrecals as $sabrecal) {
+				if($sabrecal['share-access'] == 1)
+					$access = '';
+				if($sabrecal['share-access'] == 2)
+					$access = 'read';
+				if($sabrecal['share-access'] == 3)
+					$access = 'read-write';
+
+				$invites = $caldavBackend->getInvites($sabrecal['id']);
+
+				$json_source = '/cdav/calendar/json/' . $sabrecal['id'][0] . '/' . $sabrecal['id'][1];
+
+				$switch = get_pconfig(local_channel(), 'cdav_calendar', $sabrecal['id'][0]);
+
+				$color = (($sabrecal['{http://apple.com/ns/ical/}calendar-color']) ? $sabrecal['{http://apple.com/ns/ical/}calendar-color'] : '#3a87ad');
+
+				$editable = (($sabrecal['share-access'] == 2) ? 'false' : 'true'); // false/true must be string since we're passing it to javascript
+
+				$sharees = [];
+				$share_displayname = [];
+				foreach($invites as $invite) {
+					if(strpos($invite->href, 'mailto:') !== false) {
+						$sharee = channelx_by_hash(substr($invite->href, 7));
+						$sharees[] = [
+							'name' => $sharee['channel_name'],
+							'access' => (($invite->access == 3) ? ' (RW)' : ' (R)'),
+							'hash' => $sharee['channel_hash']
+						];
+					}
+				}
+
+				if(!$access) {
+					$my_calendars[] = [
+						'ownernick' => $channel['channel_address'],
+						'uri' => $sabrecal['uri'],
+						'displayname' => $sabrecal['{DAV:}displayname'],
+						'calendarid' => $sabrecal['id'][0],
+						'instanceid' => $sabrecal['id'][1],
+						'json_source' => $json_source,
+						'color' => $color,
+						'editable' => $editable,
+						'switch' => $switch,
+						'sharees' => $sharees
+					];
+				}
+				else {
+					$shared_calendars[] = [
+						'ownernick' => $channel['channel_address'],
+						'uri' => $sabrecal['uri'],
+						'displayname' => $sabrecal['{DAV:}displayname'],
+						'calendarid' => $sabrecal['id'][0],
+						'instanceid' => $sabrecal['id'][1],
+						'json_source' => $json_source,
+						'color' => $color,
+						'editable' => $editable,
+						'switch' => $switch,
+						'sharer' => $sabrecal['{urn:ietf:params:xml:ns:caldav}calendar-description'],
+						'access' => $access
+					];
+				}
+
+				if(!$access || $access === 'read-write') {
+					$writable_calendars[] = [
+						'displayname' => ((!$access) ? $sabrecal['{DAV:}displayname'] : $share_displayname[0]),
+						'id' => $sabrecal['id']
+					];
+				}
+			}
+
+			$o .= replace_macros(get_markup_template('cdav_widget_calendar.tpl'), [
+				'$my_calendars_label' => t('My Calendars'),
+				'$my_calendars' => $my_calendars,
+				'$shared_calendars_label' => t('Shared Calendars'),
+				'$shared_calendars' => $shared_calendars,
+				'$sharee_options' => $sharee_options,
+				'$access_options' => $access_options,
+				'$share_label' => t('Share this calendar'),
+				'$share' => t('Share'),
+				'$edit_label' => t('Calendar name and color'),
+				'$edit' => t('Edit'),
+				'$create_label' => t('Create new calendar'),
+				'$create' => t('Create'),
+				'$create_placeholder' => t('Calendar Name'),
+				'$tools_label' => t('Calendar Tools'),
+				'$import_label' => t('Import calendar'),
+				'$import_placeholder' => t('Select a calendar to import to'),
+				'$upload' => t('Upload'),
+				'$writable_calendars' => $writable_calendars
+			]);
+
+			return $o;
+
+		}
+
+		if(argc() >= 2 && argv(1) === 'addressbook') {
+
+			$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
+
+			$sabreabooks = $carddavBackend->getAddressBooksForUser($principalUri);
+
+			//list addressbooks
+			foreach($sabreabooks as $sabreabook) {
+				$addressbooks[] = [
+					'ownernick' => $channel['channel_address'],
+					'uri' => $sabreabook['uri'],
+					'displayname' => $sabreabook['{DAV:}displayname'],
+					'id' => $sabreabook['id']
+	
+				];
+			}
+
+			$o .= replace_macros(get_markup_template('cdav_widget_addressbook.tpl'), [
+				'$addressbooks_label' => t('Addressbooks'),
+				'$addressbooks' => $addressbooks,
+				'$edit_label' => t('Addressbook name'),
+				'$edit' => t('Edit'),
+				'$create_label' => t('Create new addressbook'),
+				'$create_placeholder' => t('Addressbook Name'),
+				'$create' => t('Create'),
+				'$tools_label' => t('Addressbook Tools'),
+				'$import_label' => t('Import addressbook'),
+				'$import_placeholder' => t('Select an addressbook to import to'),
+				'$upload' => t('Upload')
+			]);
+
+			return $o;
+
+		}
+
+	}
+}
\ No newline at end of file
diff --git a/Zotlabs/Widget/Conversations.php b/Zotlabs/Widget/Conversations.php
index 27e517c02..56510750f 100644
--- a/Zotlabs/Widget/Conversations.php
+++ b/Zotlabs/Widget/Conversations.php
@@ -12,10 +12,6 @@ class Conversations {
 		if(argc() > 1) {
 
 			switch(argv(1)) {
-				case 'combined':
-					$mailbox = 'combined';
-					$header = t('Conversations');
-					break;
 				case 'inbox':
 					$mailbox = 'inbox';
 					$header = t('Received Messages');
@@ -44,6 +40,8 @@ class Conversations {
 
 			foreach($r as $rr) {
 
+				$selected = ((argc() == 3) ? intval(argv(2)) == intval($rr['id']) : $r[0]['id'] == $rr['id']);
+
 				$messages[] = array(
 					'mailbox'      => $mailbox,
 					'id'           => $rr['id'],
@@ -58,7 +56,7 @@ class Conversations {
 					'body'         => $rr['body'],
 					'date'         => datetime_convert('UTC',date_default_timezone_get(),$rr['created'], 'c'),
 					'seen'         => $rr['seen'],
-					'selected'     => ((argv(2)) ? (argv(2) == $rr['id']) : ($r[0]['id'] == $rr['id']))
+					'selected'     => ((argv(1) != 'new') ? $selected : '')
 				);
 			}
 
@@ -71,4 +69,6 @@ class Conversations {
 		}
 		return $o;
 	}
+
 }
+
diff --git a/Zotlabs/Widget/Forums.php b/Zotlabs/Widget/Forums.php
index 67e498b24..002c0ee21 100644
--- a/Zotlabs/Widget/Forums.php
+++ b/Zotlabs/Widget/Forums.php
@@ -87,7 +87,7 @@ class Forums {
 			foreach($r1 as $rr) {
 				if($unseen && (! intval($rr['unseen'])))
 					continue;
-				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge badge-default float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>';
+				$o .= '<li class="nav-item"><a class="nav-link" href="network?f=&pf=1&cid=' . $rr['abook_id'] . '" ><span class="badge badge-secondary float-right">' . ((intval($rr['unseen'])) ? intval($rr['unseen']) : '') . '</span><img class ="menu-img-1" src="' . $rr['xchan_photo_s'] . '" /> ' . $rr['xchan_name'] . '</a></li>';
 			}
 			$o .= '</ul></div>';
 		}
diff --git a/Zotlabs/Widget/Portfolio.php b/Zotlabs/Widget/Portfolio.php
new file mode 100644
index 000000000..216ca952c
--- /dev/null
+++ b/Zotlabs/Widget/Portfolio.php
@@ -0,0 +1,108 @@
+<?php
+
+namespace Zotlabs\Widget;
+
+require_once('include/attach.php');
+
+class Portfolio {
+
+	function widget($args) {
+
+
+		$owner_uid = \App::$profile_uid;
+		$sql_extra = permissions_sql($owner_uid);
+
+
+		if(! perm_is_allowed($owner_uid,get_observer_hash(),'view_storage'))
+			return '';
+
+		if($args['album'])
+			$album = $args['album'];
+		if($args['title'])
+			$title = $args['title'];
+
+		/**
+		 * This may return incorrect permissions if you have multiple directories of the same name.
+		 * It is a limitation of the photo table using a name for a photo album instead of a folder hash
+		 */
+
+		if($album) {
+			$x = q("select hash from attach where filename = '%s' and uid = %d limit 1",
+				dbesc($album),
+				intval($owner_uid)
+			);
+			if($x) {
+				$y = attach_can_view_folder($owner_uid,get_observer_hash(),$x[0]['hash']);
+				if(! $y)
+					return '';
+			}
+		}
+
+		$order = 'DESC';
+
+		$r = q("SELECT p.resource_id, p.id, p.filename, p.mimetype, p.imgscale, p.description, p.created FROM photo p INNER JOIN
+			(SELECT resource_id, max(imgscale) imgscale FROM photo WHERE uid = %d AND album = '%s' AND imgscale <= 4 AND photo_usage IN ( %d, %d ) $sql_extra GROUP BY resource_id) ph
+			ON (p.resource_id = ph.resource_id AND p.imgscale = ph.imgscale)
+			ORDER BY created $order ",
+			intval($owner_uid),
+			dbesc($album),
+			intval(PHOTO_NORMAL),
+			intval(PHOTO_PROFILE)
+		);
+
+		//edit album name
+		$album_edit = null;
+
+		$photos = array();
+		if($r) {
+			$twist = 'rotright';
+			foreach($r as $rr) {
+
+				if($twist == 'rotright')
+					$twist = 'rotleft';
+				else
+					$twist = 'rotright';
+
+				$ext = $phototypes[$rr['mimetype']];
+
+				$imgalt_e = $rr['filename'];
+				$desc_e = $rr['description'];
+
+				$imagelink = (z_root() . '/photos/' . \App::$profile['channel_address'] . '/image/' . $rr['resource_id']);
+
+
+				$photos[] = array(
+					'id' => $rr['id'],
+					'twist' => ' ' . $twist . rand(2,4),
+					'link' => $imagelink,
+					'title' => t('View Photo'),
+					'src' => z_root() . '/photo/' . $rr['resource_id'] . '-' . $rr['imgscale'] . '.' .$ext,
+                                        'fullsrc' => z_root() . '/photo/' . $rr['resource_id'] . '-' . '1' . '.' .$ext,
+                                        'resource_id' => $rr['resource_id'],
+					'alt' => $imgalt_e,
+					'desc'=> $desc_e,
+					'ext' => $ext,
+					'hash'=> $rr['resource_id'],
+					'unknown' => t('Unknown')
+				);
+			}
+		}
+
+
+		$tpl = get_markup_template('photo_album_portfolio.tpl');
+		$o .= replace_macros($tpl, array(
+			'$photos' => $photos,
+			'$album' => (($title) ? $title : $album),
+			'$album_id' => rand(),
+			'$album_edit' => array(t('Edit Album'), $album_edit),
+			'$can_post' => false,
+			'$upload' => array(t('Upload'), z_root() . '/photos/' . \App::$profile['channel_address'] . '/upload/' . bin2hex($album)),
+			'$order' => false,
+			'$upload_form' => $upload_form,
+			'$usage' => $usage_message
+		));
+	
+		return $o;
+	}
+}
+
diff --git a/Zotlabs/Widget/Settings_menu.php b/Zotlabs/Widget/Settings_menu.php
index 753390c23..c15ad0980 100644
--- a/Zotlabs/Widget/Settings_menu.php
+++ b/Zotlabs/Widget/Settings_menu.php
@@ -79,11 +79,13 @@ class Settings_menu {
 			'selected' => ''
 		);
 
-		$tabs[] =	array(
-			'label' => t('Connected apps'),
-			'url' => z_root() . '/settings/oauth',
-			'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
-		);
+		if(get_account_techlevel() > 0) {
+			$tabs[] =	array(
+				'label' => t('Connected apps'),
+				'url' => z_root() . '/settings/oauth',
+				'selected' => ((argv(1) === 'oauth') ? 'active' : ''),
+			);
+		}
 
 		if(get_account_techlevel() > 2) {
 			$tabs[] =	array(
diff --git a/Zotlabs/Widget/Tasklist.php b/Zotlabs/Widget/Tasklist.php
index 6f7a8aaed..3961eecce 100644
--- a/Zotlabs/Widget/Tasklist.php
+++ b/Zotlabs/Widget/Tasklist.php
@@ -8,8 +8,8 @@ class Tasklist {
 
 	function widget($arr) {
 
-	if (! local_channel())
-		return;
+		if (! local_channel())
+			return;
 
 		$o .= '<script>var tasksShowAll = 0; $(document).ready(function() { tasksFetch(); $("#tasklist-new-form").submit(function(event) { event.preventDefault(); $.post( "tasks/new", $("#tasklist-new-form").serialize(), function(data) { tasksFetch();  $("#tasklist-new-summary").val(""); } ); return false; } )});</script>';
 		$o .= '<script>function taskComplete(id) { $.post("tasks/complete/"+id, function(data) { tasksFetch();}); }
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index 53966b06f..a07c348ff 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -11,14 +11,8 @@ class Wiki_pages {
 			return;
 
 		if(! $arr['resource_id']) {
-
-			$c = \App::get_channel();
-
-			if(! $c)
-				$c = channelx_by_nick(argv(1));
-
+			$c = channelx_by_nick(argv(1));
 			$w = \Zotlabs\Lib\NativeWiki::exists_by_name($c['channel_id'],argv(2));
-
 			$arr = array(
 				'resource_id' => $w['resource_id'],
 				'channel_id' => $c['channel_id'],
@@ -29,6 +23,8 @@ class Wiki_pages {
 
 		$wikiname = '';
 
+		$wikiname = '';
+
 		$pages = array();
 
 		$p = \Zotlabs\Lib\NativeWikiPage::page_list($arr['channel_id'],get_observer_hash(),$arr['resource_id']);