Merge branch '6.2RC'6.2

1 files changed, 14 insertions, 16 deletions

diff --git a/Zotlabs/Module/Uexport.php b/Zotlabs/Module/Uexport.php
index 55c316317..d73bc40d4 100644
--- a/Zotlabs/Module/Uexport.php
+++ b/Zotlabs/Module/Uexport.php
@@ -24,26 +24,26 @@ class Uexport extends Controller {
 			if(argc() > 1 && intval(argv(1)) > 1900) {
 				$year = intval(argv(1));
 			}
-	
+
 			if(argc() > 2 && intval(argv(2)) > 0 && intval(argv(2)) <= 12) {
 				$month = intval(argv(2));
 			}
-	
+
 			header('content-type: application/json');
 			header('content-disposition: attachment; filename="' . $channel['channel_address'] . (($year) ? '-' . $year : '') . (($month) ? '-' . $month : '') . (($_REQUEST['sections']) ? '-' . $_REQUEST['sections'] : '')  . '.json"' );
-	
+
 			if($year) {
 				echo json_encode(identity_export_year(local_channel(),$year,$month, $zap_compat));
 				killme();
 			}
-	
+
 			if(argc() > 1 && argv(1) === 'basic') {
 				echo json_encode(identity_basic_export(local_channel(),$sections, $zap_compat));
 				killme();
 			}
-	
+
 			// Warning: this option may consume a lot of memory
-	
+
 			if(argc() > 1 && argv(1) === 'complete') {
 				$sections = get_default_export_sections();
 				$sections[] = 'items';
@@ -52,20 +52,18 @@ class Uexport extends Controller {
 			}
 		}
 	}
-		
+
 	function get() {
 
 		if(! Apps::system_app_installed(local_channel(), 'Channel Export')) {
 			//Do not display any associated widgets at this point
 			App::$pdl = '';
-
-			$o = '<b>' . t('Channel Export App') . ' (' . t('Not Installed') . '):</b><br>';
-			$o .= t('Export your channel');
-			return $o;
+			$papp = Apps::get_papp('Channel Export');
+			return Apps::app_render($papp, 'module');
 		}
-	
+
 		$y = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
-	
+
 		$yearurl = z_root() . '/uexport/' . $y;
 		$janurl = z_root() . '/uexport/' . $y . '/1';
 		$impurl = '/import_items';
@@ -77,14 +75,14 @@ class Uexport extends Controller {
 			'$full' => t('Export your channel information and recent content to a JSON backup that can be restored or imported to another server hub. This backs up all of your connections, permissions, profile data and several months of posts. This file may be VERY large.  Please be patient - it may take several minutes for this download to begin.'),
 
 			'$by_year' => t('Export your posts from a given year.'),
-	
+
 			'$extra' => t('You may also export your posts and conversations for a particular year or month. Adjust the date in your browser location bar to select other dates. If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'),
 			'$extra2' => sprintf( t('To select all posts for a given year, such as this year, visit <a href="%1$s">%2$s</a>'),$yearurl,$yearurl),
 			'$extra3' => sprintf( t('To select all posts for a given month, such as January of this year, visit <a href="%1$s">%2$s</a>'),$janurl,$janurl),
 			'$extra4' => sprintf( t('These content files may be imported or restored by visiting <a href="%1$s">%2$s</a> on any site containing your channel. For best results please import or restore these in date order (oldest first).'),$impurl,$impurl)
-			
+
 		));
 	return $o;
 	}
-	
+
 }