Merge remote-tracking branch 'upstream/dev' into doco

4 files changed, 40 insertions, 69 deletions

diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php
index 251533e68..829ca71e4 100644
--- a/Zotlabs/Module/Admin/Site.php
+++ b/Zotlabs/Module/Admin/Site.php
@@ -22,6 +22,7 @@ class Site {
 		$banner				=	((x($_POST,'banner'))			? trim($_POST['banner'])				: false);
 
 		$admininfo			=	((x($_POST,'admininfo'))		? trim($_POST['admininfo'])				: false);
+		$siteinfo			=	((x($_POST,'siteinfo'))		    ? trim($_POST['siteinfo'])				: '');
 		$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
 		$theme				=	((x($_POST,'theme'))			? notags(trim($_POST['theme']))				: '');
 		$theme_mobile			=	((x($_POST,'theme_mobile'))		? notags(trim($_POST['theme_mobile']))			: '');
@@ -97,6 +98,7 @@ class Site {
 			linkify_tags($a, $admininfo, local_channel());
 			set_config('system', 'admininfo', $admininfo);
 		}
+		set_config('system','siteinfo',$siteinfo);
 		set_config('system', 'language', $language);
 		set_config('system', 'theme', $theme);
 		if ( $theme_mobile === '---' ) {
@@ -273,6 +275,7 @@ class Site {
 
 			'$banner'			=> array('banner', t("Banner/Logo"), $banner, ""),
 			'$admininfo'		=> array('admininfo', t("Administrator Information"), $admininfo, t("Contact information for site administrators.  Displayed on siteinfo page.  BBCode can be used here")),
+			'$siteinfo'		=> array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site.  Displayed on siteinfo page.  BBCode can be used here")),
 			'$language' 		=> array('language', t("System language"), get_config('system','language'), "", $lang_choices),
 			'$theme' 			=> array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
 			'$theme_mobile' 	=> array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile),
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index 9dfa871f7..5968ccde6 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -48,9 +48,6 @@ class Connedit extends \Zotlabs\Web\Controller {
 	
 	}
 
-	static public function xchan_name_sort($a,$b) {
-		return strcasecmp($a['xchan_name'],$b['xchan_name']);
-	}
 	
 	/* @brief Evaluate posted values and set changes
 	 *
@@ -401,6 +398,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 			return login();
 		}
 	
+		$section = ((array_key_exists('section',$_REQUEST)) ? $_REQUEST['section'] : '');
 		$channel = \App::get_channel();
 		$my_perms = get_channel_default_perms(local_channel());
 		$role = get_pconfig(local_channel(),'system','permissions_role');
@@ -557,12 +555,11 @@ class Connedit extends \Zotlabs\Web\Controller {
 			$contact_id = \App::$poi['abook_id'];
 			$contact = \App::$poi;
 
-			$cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0",
+			$cn = q("SELECT abook_id, xchan_name from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_self = 0 order by xchan_name",
 				intval(local_channel())
 			);
-			if($cn) {
-				usort($cn, '\\Zotlabs\\Module\\Connedit::xchan_name_sort');
 
+			if($cn) {
 				$pntotal = count($cn);
 
 				for($x = 0; $x < $pntotal; $x ++) {
@@ -783,6 +780,7 @@ class Connedit extends \Zotlabs\Web\Controller {
 				'$header'         => (($self) ? t('Connection Default Permissions') : sprintf( t('Connection: %s'),$contact['xchan_name'])),
 				'$autoperms'      => array('autoperms',t('Apply these permissions automatically'), ((get_pconfig(local_channel(),'system','autoperms')) ? 1 : 0), t('Connection requests will be approved without your interaction'), $yes_no),
 				'$addr'           => $contact['xchan_addr'],
+				'$section'        => $section,
 				'$addr_text'      => t('This connection\'s primary address is'),
 				'$loc_text'       => t('Available locations:'),
 				'$locstr'         => $locstr,
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index a15e2896d..461db1752 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -15,63 +15,33 @@ class Siteinfo extends \Zotlabs\Web\Controller {
 	
 	function get() {
 	
-		if(! get_config('system','hidden_version_siteinfo')) {
-			$version = sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version());
-			if(@is_dir('.git') && function_exists('shell_exec')) {
-				$commit = @shell_exec('git log -1 --format="%h"');
-				$tag = \Zotlabs\Lib\System::get_std_version(); // @shell_exec('git describe --tags --abbrev=0');
-			}
-			if(! isset($commit) || strlen($commit) > 16)
-				$commit = '';
-		}
-		else {
-		        $version = $commit = '';
-		}
+		$siteinfo = replace_macros(get_markup_template('siteinfo.tpl'),
+			[ 
+				'$title' => t('About this site'),
+				'$sitenametxt' => t('Site Name'),
+				'$sitename' => \Zotlabs\Lib\System::get_site_name(),
+				'$headline' => t('Site Information'),
+				'$site_about' => bbcode(get_config('system','siteinfo')),
+				'$admin_headline' => t('Administrator'),
+				'$admin_about' => bbcode(get_config('system','admininfo')),
+				'$terms' => t('Terms of Service'),
+				'$prj_header' => t('Software and Project information'),
+				'$prj_name' => t('This site is powered by $Projectname'),
+				'$prj_transport' => t('Federated and decentralised networking and identity services provided by Zot'),
+				'$transport_link' => '<a href="http://zotlabs.com">http://zotlabs.com</a>',
+				'$prj_version' => ((get_config('system','hidden_version_siteinfo')) ? '' : sprintf( t('Version %s'), \Zotlabs\Lib\System::get_project_version())),
+				'$prj_linktxt' => t('Project homepage'),
+				'$prj_srctxt' => t('Developer homepage'),
+				'$prj_link' => \Zotlabs\Lib\System::get_project_link(),
+				'$prj_src' => \Zotlabs\Lib\System::get_project_srclink(),
+			]
+		);
 
-		$plugins_list = implode(', ',visible_plugin_list());
+		call_hooks('about_hook', $siteinfo); 	
+
+		return $siteinfo;
 
-		if($plugins_list)
-	        $plugins_text = t('Installed plugins/addons/apps:');
-		else
-			$plugins_text = t('No installed plugins/addons/apps');
-	
-		$txt = get_config('system','admininfo');
-		$admininfo = bbcode($txt);
-	
-		if(file_exists('doc/site_donate.html'))
-			$donate .= file_get_contents('doc/site_donate.html');
-	
-		if(function_exists('sys_getloadavg'))
-			$loadavg = sys_getloadavg();
-	
-		$o = replace_macros(get_markup_template('siteinfo.tpl'), array(
-			'$title' => t('$Projectname'),
-			'$description' => t('This is a hub of $Projectname - a global cooperative network of decentralized privacy enhanced websites.'),
-			'$version' => $version,
-			'$tag_txt' => t('Tag: '),
-			'$tag' => $tag,
-			'$polled' => t('Last background fetch: '),
-			'$lastpoll' => get_poller_runtime(),
-			'$load_average' => t('Current load average: '),
-			'$loadavg_all' => $loadavg[0] . ', ' . $loadavg[1] . ', ' . $loadavg[2],		
-			'$commit' => $commit,
-			'$web_location' => t('Running at web location') . ' ' . z_root(),
-			'$visit' => t('Please visit <a href="http://hubzilla.org">hubzilla.org</a> to learn more about $Projectname.'),
-			'$bug_text' => t('Bug reports and issues: please visit'),
-			'$bug_link_url' => 'https://github.com/redmatrix/hubzilla/issues',
-			'$bug_link_text' => t('$projectname issues'),
-			'$contact' => t('Suggestions, praise, etc. - please email "redmatrix" at librelist - dot com'),
-			'$donate' => $donate,
-			'$adminlabel' => t('Site Administrators'),
-			'$admininfo' => $admininfo,
-			'$plugins_text' => $plugins_text,
-			'$plugins_list' => $plugins_list
-	        ));
-	
-		call_hooks('about_hook', $o); 	
-	
-		return $o;
-	
 	}
+
 	
 }
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 37ebe2a38..edd783a62 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -34,10 +34,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 			notice( t('Not found') . EOL);
      		return;
  		}
-	
-		$tab = 'wiki';
-	
-	
+
 		require_once('include/wiki.php');
 		require_once('include/acl_selectors.php');
 		require_once('include/conversation.php');
@@ -151,6 +148,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 						'$create' => t('Create New'),
 						'$submit' => t('Submit'),
 						'$wikiName' => array('wikiName', t('Wiki name')),
+						'$mimeType' => array('mimeType', t('Content type'), '', '', ['text/markdown' => 'Markdown', 'text/bbcode' => 'BB Code']),
 						'$name' => t('Name'),
 						'$lockstate' => $x['lockstate'],
 						'$acl' => $x['acl'],
@@ -315,17 +313,19 @@ class Wiki extends \Zotlabs\Web\Controller {
 			if (local_channel() !== intval($owner['channel_id'])) {
 				goaway('/' . argv(0) . '/' . $nick . '/');
 			} 
-
 			$wiki = array(); 
 			// Generate new wiki info from input name
 			$wiki['postVisible'] = ((intval($_POST['postVisible']) === 0) ? 0 : 1);
 			$wiki['rawName'] = $_POST['wikiName'];
 			$wiki['htmlName'] = escape_tags($_POST['wikiName']);
 			$wiki['urlName'] = urlencode($_POST['wikiName']); 
+			$wiki['mimeType'] = $_POST['mimeType'];
+
 			if($wiki['urlName'] === '') {				
 				notice( t('Error creating wiki. Invalid name.') . EOL);
 				goaway('/wiki');
 			}
+
 			// Get ACL for permissions
 			$acl = new \Zotlabs\Access\AccessList($owner);
 			$acl->set_from_array($_POST);
@@ -387,7 +387,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 						'commit_msg' => t('New page created'), 
 						'resource_id' => $resource_id, 
 						'observer' => $ob,
-						'files' => array($page['page']['urlName'].'.md')
+						'files' => array($page['page']['fileName'])
 						));
 				if($commit['success']) {
 					json_return_and_die(array('url' => '/'.argv(0).'/'.argv(1).'/'.$page['wiki']['urlName'].'/'.$page['page']['urlName'], 'success' => true));
@@ -443,7 +443,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 						'commit_msg' => $commitMsg, 
 						'resource_id' => $resource_id, 
 						'observer' => $ob,
-						'files' => array($pageUrlName.'.md')
+						'files' => array($saved['fileName'])
 						));
 				if($commit['success']) {
 					json_return_and_die(array('message' => 'Wiki git repo commit made', 'success' => true));
@@ -582,7 +582,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 						'commit_msg' => 'Renamed ' . urldecode($pageUrlName) . ' to ' . $renamed['page']['htmlName'], 
 						'resource_id' => $resource_id, 
 						'observer' => $ob,
-						'files' => array($pageUrlName . '.md', $renamed['page']['fileName']),
+						'files' => array($pageUrlName . substr($renamed['page']['fileName'], -3), $renamed['page']['fileName']),
 						'all' => true
 						));
 				if($commit['success']) {