Merge https://github.com/redmatrix/redmatrix into pending_merge

2 files changed, 27 insertions, 2 deletions

diff --git a/mod/uexport.php b/mod/uexport.php
index fbbe9953b..06b9d90ea 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -41,12 +41,27 @@ function uexport_init(&$a) {
 }
 	
 function uexport_content(&$a) {
+    
+	$y = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
+	$ly = $y-1;
+
+	$expurl = z_root() . '/uexport';
 	$o = replace_macros(get_markup_template('uexport.tpl'), array(
 		'$title' => t('Export Channel'),
 		'$basictitle' => t('Export Channel'),
-		'$basic' => t('Export your basic channel information to a small file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but	does not contain your content.'),
+		'$basic' => t('Export your basic channel information to a file.  This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new server hub, but does not contain your content.'),
 		'$fulltitle' => t('Export Content'),
-		'$full' => t('Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large.  Please be patient - it may take several minutes for this download to begin.')
+		'$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 or month:'),
+
+		'$extra' => t('You may also export your posts and conversations for a particular year or month. Click on one of the recent years or months below.'),
+		'$extra2' => sprintf( '<a href="%1$s/%2$s">%2$s</a>: <a href="%1$s/%2$s/1">' . t('Jan') . '</a> <a href="%1$s/%2$s/2">' . t('Feb') . '</a> <a href="%1$s/%2$s/3">' . t('Mar') . '</a> <a href="%1$s/%2$s/4">' . t('Apr') . '</a> <a href="%1$s/%2$s/5">' . t('May') . '</a> <a href="%1$s/%2$s/6">' . t('Jun') . '</a> <a href="%1$s/%2$s/7">' . t('Jul') . '</a> <a href="%1$s/%2$s/8">' . t('Aug') . '</a> <a href="%1$s/%2$s/9">' . t('Sep') . '</a> <a href="%1$s/%2$s/10"> ' . t('Oct') . '</a> <a href="%1$s/%2$s/11">' . t('Nov') . '</a> <a href="%1$s/%2$s/12">' . t('Dec') . '</a>',$expurl,$ly),	
+		'$extra3' => sprintf( '<a href="%1$s/%2$s">%2$s</a>: <a href="%1$s/%2$s/1">' . t('Jan') . '</a> <a href="%1$s/%2$s/2">' . t('Feb') . '</a> <a href="%1$s/%2$s/3">' . t('Mar') . '</a> <a href="%1$s/%2$s/4">' . t('Apr') . '</a> <a href="%1$s/%2$s/5">' . t('May') . '</a> <a href="%1$s/%2$s/6">' . t('Jun') . '</a> <a href="%1$s/%2$s/7">' . t('Jul') . '</a> <a href="%1$s/%2$s/8">' . t('Aug') . '</a> <a href="%1$s/%2$s/9">' . t('Sep') . '</a> <a href="%1$s/%2$s/10"> ' . t('Oct') . '</a> <a href="%1$s/%2$s/11">' . t('Nov') . '</a> <a href="%1$s/%2$s/12">' . t('Dec') . '</a>',$expurl,$y),		
+		'$extra4' => t('If the export fails (possibly due to memory exhaustion on your server hub), please try again selecting a more limited date range.'),
+		'$extra5' => sprintf( t('Or adjust the date in your browser location bar to select other dates. For example the year 2013; <a href="%1$s/2013">%1$s/2013</a> or the month September 2013; <a href="%1$s/2013/9">%1$s/2013/9</a>'),$expurl),
+		'$extra6' => t('Please visit') . ' https://hub.tld/import_items ' . t('on another hub to import the backup files(s).'),
+		'$extra7' => t('We advise you to clone the channel on the new hub first and than to import the backup file(s) (from the same channel) in chronological order. Importing the backup files into another channel will certainly give permission issues.')
+		
 	));
 return $o;
 }
diff --git a/view/tpl/uexport.tpl b/view/tpl/uexport.tpl
index b9a1b9572..8fea26404 100644
--- a/view/tpl/uexport.tpl
+++ b/view/tpl/uexport.tpl
@@ -8,5 +8,15 @@
 
 		<p><b><a href="uexport/complete">{{$fulltitle}}</a></b></p>
 		<p>{{$full}}</p>
+		<p><em>{{$by_year}}</em></p>
+		<p>{{$extra}}</p><br />
+		<ul>
+		<li>{{$extra2}}</li><br />
+		<li>{{$extra3}}</li><br />
+		</ul>
+		<p>{{$extra4}}</p>
+		<p>{{$extra5}}</p>
+		<p><strong>{{$extra6}}</strong> {{$extra7}}</p>
+
 	</div>
 </div>