more app descriptions

11 files changed, 120 insertions, 124 deletions

diff --git a/Zotlabs/Module/Group.php b/Zotlabs/Module/Group.php
index 993d428f5..a2d55a325 100644
--- a/Zotlabs/Module/Group.php
+++ b/Zotlabs/Module/Group.php
@@ -26,7 +26,7 @@ class Group extends Controller {
 	}
 
 	function post() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
@@ -35,10 +35,10 @@ class Group extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
 			return;
 		}
-	
+
 		if((argc() == 2) && (argv(1) === 'new')) {
 			check_form_security_token_redirectOnErr('/group/new', 'group_edit');
-			
+
 			$name = notags(trim($_POST['groupname']));
 			$public = intval($_POST['public']);
 			$r = group_add(local_channel(),$name,$public);
@@ -49,11 +49,11 @@ class Group extends Controller {
 				notice( t('Could not create privacy group.') . EOL );
 			}
 			goaway(z_root() . '/group');
-	
+
 		}
 		if((argc() == 2) && (intval(argv(1)))) {
 			check_form_security_token_redirectOnErr('/group', 'group_edit');
-			
+
 			$r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
 				intval(argv(1)),
 				intval(local_channel())
@@ -61,12 +61,12 @@ class Group extends Controller {
 			if(! $r) {
 				notice( t('Privacy group not found.') . EOL );
 				goaway(z_root() . '/connections');
-	
+
 			}
 			$group = $r[0];
 			$groupname = notags(trim($_POST['groupname']));
 			$public = intval($_POST['public']);
-	
+
 			$hookinfo = [ 'pgrp_extras' => '', 'group'=>$group['id'] ];
                        	call_hooks ('privacygroup_extras_post',$hookinfo);
 
@@ -83,18 +83,14 @@ class Group extends Controller {
 
 				Libsync::build_sync_packet(local_channel(),null,true);
 			}
-	
+
 			goaway(z_root() . '/group/' . argv(1) . '/' . argv(2));
 		}
-		return;	
+		return;
 	}
-	
+
 	function get() {
 
-		$change = false;
-	
-		logger('mod_group: ' . App::$cmd,LOGGER_DEBUG);
-		
 		if(! local_channel()) {
 			notice( t('Permission denied') . EOL);
 			return;
@@ -103,12 +99,14 @@ class Group extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Privacy Groups')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Privacy Groups App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Management of privacy groups');
-			return $o;
+			$papp = Apps::get_papp('Privacy Groups');
+			return Apps::app_render($papp, 'module');
 		}
 
+		logger('mod_group: ' . App::$cmd,LOGGER_DEBUG);
+
+		$change = false;
+
 		// Switch to text mode interface if we have more than 'n' contacts or group members
 		$switchtotext = get_pconfig(local_channel(),'system','groupedit_image_limit');
 		if($switchtotext === false)
@@ -166,16 +164,16 @@ class Group extends Controller {
 
 		$context = array('$submit' => t('Submit'));
 		$tpl = get_markup_template('group_edit.tpl');
-	
+
 		if((argc() == 3) && (argv(1) === 'drop')) {
 			check_form_security_token_redirectOnErr('/group', 'group_drop', 't');
-			
+
 			if(intval(argv(2))) {
 				$r = q("SELECT gname FROM pgrp WHERE id = %d AND uid = %d LIMIT 1",
 					intval(argv(2)),
 					intval(local_channel())
 				);
-				if($r) 
+				if($r)
 					$result = group_rmv(local_channel(),$r[0]['gname']);
 				if($result) {
 					$hookinfo = [ 'pgrp_extras' => '', 'group' => argv(2) ];
@@ -188,23 +186,23 @@ class Group extends Controller {
 			goaway(z_root() . '/group');
 			// NOTREACHED
 		}
-	
-	
+
+
 		if((argc() > 2) && intval(argv(1)) && argv(2)) {
-	
+
 			check_form_security_token_ForbiddenOnErr('group_member_change', 't');
-	
+
 			$r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and xchan_deleted = 0 and abook_self = 0 and abook_blocked = 0 and abook_pending = 0 limit 1",
 				dbesc(base64url_decode(argv(2))),
 				intval(local_channel())
 			);
 			if(count($r))
 				$change = base64url_decode(argv(2));
-	
+
 		}
-	
+
 		if((argc() > 1) && (intval(argv(1)))) {
-	
+
 			require_once('include/acl_selectors.php');
 			$r = q("SELECT * FROM pgrp WHERE id = %d AND uid = %d AND deleted = 0 LIMIT 1",
 				intval(argv(1)),
@@ -215,28 +213,28 @@ class Group extends Controller {
 				goaway(z_root() . '/connections');
 			}
 			$group = $r[0];
-	
-	
+
+
 			$members = group_get_members($group['id']);
-	
+
 			$preselected = array();
 			if(count($members))	{
 				foreach($members as $member)
 					if(! in_array($member['xchan_hash'],$preselected))
 						$preselected[] = $member['xchan_hash'];
 			}
-	
+
 			if($change) {
-	
+
 				if(in_array($change,$preselected)) {
 					group_rmv_member(local_channel(),$group['gname'],$change);
 				}
 				else {
 					group_add_member(local_channel(),$group['gname'],$change);
 				}
-	
+
 				$members = group_get_members($group['id']);
-	
+
 				$preselected = array();
 				if(count($members))	{
 					foreach($members as $member)
@@ -260,19 +258,19 @@ class Group extends Controller {
 				'$form_security_token_drop' => get_form_security_token("group_drop"),
 				'$pgrp_extras' => $pgrp_extras,
 			);
-	
+
 		}
-	
+
 		if(! isset($group))
 			return;
-	
+
 		$groupeditor = array(
 			'label_members' => t('Group members'),
 			'members' => array(),
 			'label_contacts' => t('Not in this group'),
 			'contacts' => array(),
 		);
-			
+
 		$sec_token = addslashes(get_form_security_token('group_member_change'));
 		$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : 'card');
 		foreach($members as $member) {
@@ -284,11 +282,11 @@ class Group extends Controller {
 			else
 				group_rmv_member(local_channel(),$group['gname'],$member['xchan_hash']);
 		}
-	
+
 		$r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d AND abook_self = 0 and abook_blocked = 0 and abook_pending = 0 and xchan_deleted = 0 order by xchan_name asc",
 			intval(local_channel())
 		);
-	
+
 		if(count($r)) {
 			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : 'card');
 			foreach($r as $member) {
@@ -299,20 +297,20 @@ class Group extends Controller {
 				}
 			}
 		}
-	
+
 		$context['$groupeditor'] = $groupeditor;
 		$context['$desc'] = t('Click a channel to toggle membership');
 		$context['$pgrp_extras'] = $pgrp_extras;
-	
+
 		if($change) {
 			$tpl = get_markup_template('groupeditor.tpl');
 			echo replace_macros($tpl, $context);
 			killme();
 		}
-		
+
 		return replace_macros($tpl, $context);
-	
+
 	}
-	
-	
+
+
 }
diff --git a/Zotlabs/Module/Oauth.php b/Zotlabs/Module/Oauth.php
index 27c062df2..061296257 100644
--- a/Zotlabs/Module/Oauth.php
+++ b/Zotlabs/Module/Oauth.php
@@ -17,22 +17,22 @@ class Oauth extends Controller {
 
 		if(! Apps::system_app_installed(local_channel(), 'OAuth Apps Manager'))
 			return;
-	
+
 		if(x($_POST,'remove')){
 			check_form_security_token_redirectOnErr('/oauth', 'oauth');
-			
+
 			$key = $_POST['remove'];
 			q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
 				dbesc($key),
 				local_channel());
 			goaway(z_root()."/oauth");
-			return;			
+			return;
 		}
-	
+
 		if((argc() > 1) && (argv(1) === 'edit' || argv(1) === 'add') && x($_POST,'submit')) {
-			
+
 			check_form_security_token_redirectOnErr('oauth', 'oauth');
-			
+
 			$name   	= ((x($_POST,'name')) ? escape_tags($_POST['name']) : '');
 			$key		= ((x($_POST,'key')) ? escape_tags($_POST['key']) : '');
 			$secret		= ((x($_POST,'secret')) ? escape_tags($_POST['secret']) : '');
@@ -48,7 +48,7 @@ class Oauth extends Controller {
 				$ok = false;
 				notice( t('Key and Secret are required') . EOL);
 			}
-		
+
 			if($ok) {
 				if ($_POST['submit']==t("Update")){
 					$r = q("UPDATE clients SET
@@ -96,13 +96,11 @@ class Oauth extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'OAuth Apps Manager')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('OAuth Apps Manager App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('OAuth authentication tokens for mobile and remote apps');
-			return $o;
+			$papp = Apps::get_papp('OAuth Apps Manager');
+			return Apps::app_render($papp, 'module');
 		}
 
-			
+
 		if((argc() > 1) && (argv(1) === 'add')) {
 			$tpl = get_markup_template("oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
@@ -118,18 +116,18 @@ class Oauth extends Controller {
 			));
 			return $o;
 		}
-			
+
 		if((argc() > 2) && (argv(1) === 'edit')) {
 			$r = q("SELECT * FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc(argv(2)),
 					local_channel());
-			
+
 			if (!count($r)){
 				notice(t('Application not found.'));
 				return;
 			}
 			$app = $r[0];
-				
+
 			$tpl = get_markup_template("oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("oauth"),
@@ -144,26 +142,26 @@ class Oauth extends Controller {
 			));
 			return $o;
 		}
-			
+
 		if((argc() > 2) && (argv(1) === 'delete')) {
 			check_form_security_token_redirectOnErr('/oauth', 'oauth', 't');
-			
+
 			$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc(argv(2)),
 					local_channel());
 			goaway(z_root()."/oauth");
-			return;			
+			return;
 		}
-			
-			
-		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my 
+
+
+		$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
 				FROM clients
 				LEFT JOIN tokens ON clients.client_id=tokens.client_id
 				WHERE clients.uid IN (%d,0)",
 				local_channel(),
 				local_channel());
-		
-			
+
+
 		$tpl = get_markup_template("oauth.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("oauth"),
@@ -178,7 +176,7 @@ class Oauth extends Controller {
 			'$apps'		=> $r,
 		));
 		return $o;
-			
+
 	}
 
 }
diff --git a/Zotlabs/Module/Oauth2.php b/Zotlabs/Module/Oauth2.php
index db2687b4c..4b0b1991e 100644
--- a/Zotlabs/Module/Oauth2.php
+++ b/Zotlabs/Module/Oauth2.php
@@ -16,11 +16,11 @@ class Oauth2 extends Controller {
 
 		if(! Apps::system_app_installed(local_channel(), 'OAuth2 Apps Manager'))
 			return;
-	
+
 		if(x($_POST,'remove')){
 			check_form_security_token_redirectOnErr('oauth2', 'oauth2');
 			$name   	= ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : '');
-		logger("REMOVE! ".$name." uid: ".local_channel());	
+		logger("REMOVE! ".$name." uid: ".local_channel());
 			$key = $_POST['remove'];
 			q("DELETE FROM oauth_authorization_codes WHERE client_id='%s' AND user_id=%d",
 				dbesc($name),
@@ -35,13 +35,13 @@ class Oauth2 extends Controller {
 				intval(local_channel())
 			);
 			goaway(z_root()."/oauth2");
-			return;			
+			return;
 		}
-	
+
 		if((argc() > 1) && (argv(1) === 'edit' || argv(1) === 'add') && x($_POST,'submit')) {
-			
+
 			check_form_security_token_redirectOnErr('oauth2', 'oauth2');
-			
+
 			$name   	= ((x($_POST,'name')) ? escape_tags(trim($_POST['name'])) : '');
 			$secret		= ((x($_POST,'secret')) ? escape_tags(trim($_POST['secret'])) : '');
 			$redirect	= ((x($_POST,'redirect')) ? escape_tags(trim($_POST['redirect'])) : '');
@@ -53,7 +53,7 @@ class Oauth2 extends Controller {
 				$ok = false;
 				notice( t('Name and Secret are required') . EOL);
 			}
-		
+
 			if($ok) {
 				if ($_POST['submit']==t("Update")){
 					$r = q("UPDATE oauth_clients SET
@@ -61,7 +61,7 @@ class Oauth2 extends Controller {
 								client_secret = '%s',
 								redirect_uri = '%s',
 								grant_types = '%s',
-								scope = '%s', 
+								scope = '%s',
 								user_id = %d
 							WHERE client_id='%s' and user_id = %s",
 							dbesc($name),
@@ -102,12 +102,10 @@ class Oauth2 extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'OAuth2 Apps Manager')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('OAuth2 Apps Manager App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('OAuth2 authenticatication tokens for mobile and remote apps');
-			return $o;
+			$papp = Apps::get_papp('OAuth2 Apps Manager');
+			return Apps::app_render($papp, 'module');
 		}
-			
+
 		if((argc() > 1) && (argv(1) === 'add')) {
 			$tpl = get_markup_template("oauth2_edit.tpl");
 			$o .= replace_macros($tpl, array(
@@ -123,20 +121,20 @@ class Oauth2 extends Controller {
 			));
 			return $o;
 		}
-			
+
 		if((argc() > 2) && (argv(1) === 'edit')) {
 			$r = q("SELECT * FROM oauth_clients WHERE client_id='%s' AND user_id= %d",
 					dbesc(argv(2)),
 					intval(local_channel())
 			);
-			
+
 			if (! $r){
 				notice(t('OAuth2 Application not found.'));
 				return;
 			}
 
 			$app = $r[0];
-				
+
 			$tpl = get_markup_template("oauth2_edit.tpl");
 			$o .= replace_macros($tpl, array(
 				'$form_security_token' => get_form_security_token("oauth2"),
@@ -151,10 +149,10 @@ class Oauth2 extends Controller {
 			));
 			return $o;
 		}
-			
+
 		if((argc() > 2) && (argv(1) === 'delete')) {
 			check_form_security_token_redirectOnErr('oauth2', 'oauth2', 't');
-			
+
 			$r = q("DELETE FROM oauth_clients WHERE client_id = '%s' AND user_id = %d",
 					dbesc(argv(2)),
 					intval(local_channel())
@@ -172,11 +170,11 @@ class Oauth2 extends Controller {
 					intval(local_channel())
 			);
 			goaway(z_root()."/oauth2");
-			return;			
+			return;
 		}
-			
 
-		$r = q("SELECT oauth_clients.*, oauth_access_tokens.access_token as oauth_token, (oauth_clients.user_id = %d) AS my 
+
+		$r = q("SELECT oauth_clients.*, oauth_access_tokens.access_token as oauth_token, (oauth_clients.user_id = %d) AS my
 				FROM oauth_clients
 				LEFT JOIN oauth_access_tokens ON oauth_clients.client_id=oauth_access_tokens.client_id AND
                                                                  oauth_clients.user_id=oauth_access_tokens.user_id
@@ -184,7 +182,7 @@ class Oauth2 extends Controller {
 				intval(local_channel()),
 				intval(local_channel())
 		);
-			
+
 		$tpl = get_markup_template("oauth2.tpl");
 		$o .= replace_macros($tpl, array(
 			'$form_security_token' => get_form_security_token("oauth2"),
@@ -199,7 +197,7 @@ class Oauth2 extends Controller {
 			'$apps'		=> $r,
 		));
 		return $o;
-			
+
 	}
 
 }
diff --git a/Zotlabs/Module/Pdledit.php b/Zotlabs/Module/Pdledit.php
index 36201544f..3b94c9611 100644
--- a/Zotlabs/Module/Pdledit.php
+++ b/Zotlabs/Module/Pdledit.php
@@ -27,10 +27,10 @@ class Pdledit extends Controller {
 		info( t('Layout updated.') . EOL);
 		goaway(z_root() . '/pdledit/' . $_REQUEST['module']);
 	}
-	
-	
+
+
 	function get() {
-	
+
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
 			return;
@@ -39,10 +39,8 @@ class Pdledit extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'PDL Editor')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('PDL Editor App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Provides the ability to edit system page layouts');
-			return $o;
+			$papp = Apps::get_papp('PDL Editor');
+			return Apps::app_render($papp, 'module');
 		}
 
 		if(argc() > 2 && argv(2) === 'reset') {
@@ -68,7 +66,7 @@ class Pdledit extends Controller {
 					$edited[] = substr(str_replace('.pdl','',$rv['k']),4);
 				}
 			}
-			
+
 			$files = glob('Zotlabs/Module/*.php');
 			if($files) {
 				foreach($files as $f) {
@@ -81,21 +79,21 @@ class Pdledit extends Controller {
 			}
 
 			$o .= '</div>';
-			
+
 			// list module pdl files
 			return $o;
 		}
-	
+
 		$t = get_pconfig(local_channel(),'system',$module);
 		$s = file_get_contents(theme_include($module));
 		if(! $t) {
 			$t = $s;
-		}	
+		}
 		if(! $t) {
 			notice( t('Layout not found.') . EOL);
 			return '';
 		}
-	
+
 		$o = replace_macros(get_markup_template('pdledit.tpl'),array(
 			'$header' => t('Edit System Page Description'),
 			'$mname' => t('Module Name:'),
@@ -107,8 +105,8 @@ class Pdledit extends Controller {
 			'$content' => htmlspecialchars($t,ENT_COMPAT,'UTF-8'),
 			'$submit' => t('Submit')
 		));
-	    
+
 		return $o;
 	}
-	
+
 }
diff --git a/Zotlabs/Module/Permcats.php b/Zotlabs/Module/Permcats.php
index 6a599282c..58566373a 100644
--- a/Zotlabs/Module/Permcats.php
+++ b/Zotlabs/Module/Permcats.php
@@ -40,16 +40,16 @@ class Permcats extends Controller {
 				}
 			}
 		}
-		
+
 		\Zotlabs\Lib\Permcat::update(local_channel(),$name,$pcarr);
 
 		Libsync::build_sync_packet();
 
 		info( t('Permission category saved.') . EOL);
-		
+
 		return;
 	}
-	
+
 
 	function get() {
 
@@ -59,16 +59,14 @@ class Permcats extends Controller {
 		if(! Apps::system_app_installed(local_channel(), 'Permission Categories')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Permission Categories App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Create custom connection permission limits');
-			return $o;
+			$papp = Apps::get_papp('Permission Categories');
+			return Apps::app_render($papp, 'module');
 		}
 
 		$channel = App::get_channel();
 
-		if(argc() > 1) 
-			$name = hex2bin(argv(1));			
+		if(argc() > 1)
+			$name = hex2bin(argv(1));
 
 		if(argc() > 2 && argv(2) === 'drop') {
 			\Zotlabs\Lib\Permcat::delete(local_channel(),$name);
@@ -130,5 +128,5 @@ class Permcats extends Controller {
 		));
 		return $o;
 	}
-	
+
 }
diff --git a/app/group.apd b/app/group.apd
index da0b31407..d026ed23d 100644
--- a/app/group.apd
+++ b/app/group.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/group
 requires: local_channel
 name: Privacy Groups
 photo: icon:users
 categories: Networking
+desc: A tool to create and manage privacy groups.
diff --git a/app/oauth.apd b/app/oauth.apd
index 5e69e4401..32a0f6d11 100644
--- a/app/oauth.apd
+++ b/app/oauth.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/oauth
 requires: local_channel
 name: OAuth Apps Manager
 photo: icon:chevron-circle-up
 categories: Access Control
+desc: Manage OAuth authentication tokens for mobile and remote apps.
diff --git a/app/oauth2.apd b/app/oauth2.apd
index 86828bf24..c1422e505 100644
--- a/app/oauth2.apd
+++ b/app/oauth2.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/oauth2
 requires: local_channel
 name: OAuth2 Apps Manager
 photo: icon:chevron-circle-up
 categories: Access Control
+desc: Manage OAuth2 authentication tokens for mobile and remote apps.
diff --git a/app/pdledit.apd b/app/pdledit.apd
index fbc643296..e13c04cb5 100644
--- a/app/pdledit.apd
+++ b/app/pdledit.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/pdledit
 requires: local_channel
 name: PDL Editor
 photo: icon:object-group
 categories: Appearance
+desc: An editor for system page layouts.
diff --git a/app/permcats.apd b/app/permcats.apd
index e9fd6e56f..dd7b36b92 100644
--- a/app/permcats.apd
+++ b/app/permcats.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/permcats
 requires: local_channel
 name: Permission Categories
 photo: icon:unlock-alt
 categories: Access Control
+desc: Create and manage custom connection permission limits.
diff --git a/app/photos.apd b/app/photos.apd
index b28b315cd..e861747cb 100644
--- a/app/photos.apd
+++ b/app/photos.apd
@@ -1,6 +1,7 @@
-version: 2
+version: 3
 url: $baseurl/photos/$nick, $baseurl/settings/photos
 requires: local_channel
 name: Photos
 photo: icon:photo
 categories: nav_featured_app, Multimedia
+desc: A simple tool to view and manage your photos.