Progress implementing zip file export

2 files changed, 9 insertions, 42 deletions

diff --git a/include/text.php b/include/text.php
index c8e0b1888..1729048e9 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2267,11 +2267,11 @@ function design_tools() {
 }
 
 /**
- * @brief Creates website import tools menu
+ * @brief Creates website portation tools menu
  *
  * @return string
  */
-function website_import_tools() {
+function website_portation_tools() {
 
 	$channel  = App::get_channel();
 	$sys = false;
@@ -2282,7 +2282,7 @@ function website_import_tools() {
 		$sys = true;
 	}
 
-	return replace_macros(get_markup_template('website_import_tools.tpl'), array(
+	return replace_macros(get_markup_template('website_portation_tools.tpl'), array(
 		'$title' => t('Import'),
 		'$import_label' => t('Import website...'),
 		'$import_placeholder' => t('Select folder to import'),
@@ -2290,29 +2290,11 @@ function website_import_tools() {
 		'$file_import_text' => t('Import from cloud files:'),
 		'$desc' => t('/cloud/channel/path/to/folder'),
 		'$hint' => t('Enter path to website files'),
-		'$select' => t('Select folder'),
-	));
-}
-
-/**
- * @brief Creates website export tools menu
- *
- * @return string
- */
-function website_export_tools() {
-
-	$channel  = App::get_channel();
-	$sys = false;
-
-	if(App::$is_sys && is_site_admin()) {
-		require_once('include/channel.php');
-		$channel = get_sys_channel();
-		$sys = true;
-	}
-
-	return replace_macros(get_markup_template('website_export_tools.tpl'), array(
-		'$title' => t('Export'),
+		'$select' => t('Select folder'),			
 		'$export_label' => t('Export website...'),
+		'$file_download_text' => t('Export to a zip file'),
+		'$filename_desc' => t('website.zip'),
+		'$filename_hint' => t('Enter a name for the zip file.'),
 	));
 }
 
diff --git a/include/widgets.php b/include/widgets.php
index fc2a9830b..2f8416f8e 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -779,7 +779,7 @@ function widget_design_tools($arr) {
 	return design_tools();
 }
 
-function widget_website_import_tools($arr) {
+function widget_website_portation_tools($arr) {
 
 	// mod menu doesn't load a profile. For any modules which load a profile, check it.
 	// otherwise local_channel() is sufficient for permissions.
@@ -791,22 +791,7 @@ function widget_website_import_tools($arr) {
 	if(! local_channel())
 		return '';
 
-	return website_import_tools();
-}
-
-function widget_website_export_tools($arr) {
-
-	// mod menu doesn't load a profile. For any modules which load a profile, check it.
-	// otherwise local_channel() is sufficient for permissions.
-
-	if(App::$profile['profile_uid']) 
-		if((App::$profile['profile_uid'] != local_channel()) && (! App::$is_sys))
-			return '';
- 
-	if(! local_channel())
-		return '';
-
-	return website_export_tools();
+	return website_portation_tools();
 }
 
 function widget_findpeople($arr) {