Use the current install's configuration values, update to 1.13

symphonycms · Apr 18, 2011 · 7f14723 · 7f14723
1 parent 5119d20
commit 7f14723
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 37 deletions.
diff --git a/README.markdown b/README.markdown
@@ -3,12 +3,12 @@
 This extension exports your Symphony website.
 It is part of the Symphony core download package.
 
-- Version: 1.12
-- Date: 2nd January 2011
+- Version: 1.13
+- Date: 18th April 2011
 - Requirements: Symphony 2.2 or above, ZIP enabled (--enable-zip)
 - Author: Alistair Kearney, alistair@symphony-cms.com
-- Constributors: [A list of contributors can be found in the commit history](http://github.com/pointybeard/export_ensemble/commits/master)
-- GitHub Repository: <http://github.com/pointybeard/export_ensemble>
+- Constributors: [A list of contributors can be found in the commit history](http://github.com/symphonycms/export_ensemble/commits/master)
+- GitHub Repository: <http://github.com/symphonycms/export_ensemble>
 
 ## Synopsis
 
@@ -24,6 +24,11 @@ Information about [installing and updating extensions](http://symphony-cms.com/l
 
 ## Change Log
 
+**Version 1.13**
+
+- Use the current Symphony install configuration values instead of always using the defaults
+- Export Ensemble is now dynamic and uses the the current Symphony version instead of being hardcoded
+
 **Version 1.12**
 
 - Compatibility changes for 2.2

diff --git a/extension.driver.php b/extension.driver.php
@@ -3,13 +3,23 @@
 	Class extension_export_ensemble extends Extension{
 
 		public function about(){
-			return array('name' => 'Export Ensemble',
-						 'version' => '1.12',
-						 'release-date' => '2011-01-02',
-						 'author' => array('name' => 'Alistair Kearney',
-										   'website' => 'http://pointybeard.com',
-										   'email' => 'alistair@pointybeard.com')
-				 		);
+			return array(
+				'name' => 'Export Ensemble',
+				'version' => '1.13',
+				'release-date' => '2011-04-18',
+				'author' => array(
+					array(
+						'name' => 'Alistair Kearney',
+						'website' => 'http://pointybeard.com',
+						'email' => 'alistair@pointybeard.com'
+					),
+					array(
+						'name' => 'Symphony Team',
+						'website' => 'http://symphony-cms.com',
+						'email' => 'team@symphony-cms.com'
+					)
+				)
+			);
 		}
 
 		public function getSubscribedDelegates(){
@@ -119,13 +129,11 @@ private function __export(){
 
 			$install_template = str_replace(
 				array(
-					'<!-- BUILD -->',
 					'<!-- VERSION -->',
 					'<!-- CONFIGURATION -->'
 				),
 
 				array(
-					Symphony::Configuration()->get('build', 'symphony'),
 					Symphony::Configuration()->get('version', 'symphony'),
 					trim($config_string),
 				),
@@ -165,7 +173,7 @@ private function __export(){
 			header('Content-type: application/octet-stream');
 			header('Expires: ' . gmdate('D, d M Y H:i:s') . ' GMT');
 
-		    header(
+			header(
 				sprintf(
 					'Content-disposition: attachment; filename=%s-ensemble.zip',
 					Lang::createFilename(
@@ -174,7 +182,7 @@ private function __export(){
 				)
 			);
 
-		    header('Pragma: no-cache');
+			header('Pragma: no-cache');
 
 			readfile(TMP . '/ensemble.tmp.zip');
 			unlink(TMP . '/ensemble.tmp.zip');

diff --git a/lib/installer.tpl b/lib/installer.tpl
@@ -30,7 +30,7 @@
 	}
 
 	// Defines
-	define('kVERSION', '2.2RC1');
+	define('kVERSION', '<!-- VERSION -->');
 	define('kINSTALL_ASSET_LOCATION', './symphony/assets/installer');
 	define('kINSTALL_FILENAME', basename(__FILE__));
 	define('DOCROOT', rtrim(dirname(__FILE__), '\\/'));
@@ -172,27 +172,7 @@
 
 		$conf = array();
 
-		$conf['admin']['max_upload_size'] = '5242880';
-		$conf['symphony']['pagination_maximum_rows'] = '17';
-		$conf['symphony']['allow_page_subscription'] = '1';
-		$conf['symphony']['lang'] = Lang::get();
-		$conf['symphony']['version'] = kVERSION;
-		$conf['symphony']['pages_table_nest_children'] = 'yes';
-		$conf['symphony']['strict_error_handling'] = 'yes';
-		$conf['log']['archive'] = '1';
-		$conf['log']['maxsize'] = '102400';
-		$conf['general']['sitename'] = 'Symphony CMS';
-		$conf['image']['cache'] = '1';
-		$conf['image']['quality'] = '90';
-		$conf['database']['driver'] = 'mysql';
-		$conf['database']['character_set'] = 'utf8';
-		$conf['database']['character_encoding'] = 'utf8';
-		$conf['database']['runtime_character_set_alter'] = '1';
-		$conf['database']['query_caching'] = 'default';
-		$conf['public']['display_event_xml_in_source'] = 'yes';
-		$conf['region']['time_format'] = 'H:i';
-		$conf['region']['date_format'] = 'd F Y';
-		$conf['region']['datetime_separator'] = ' ';
+		<!-- CONFIGURATION -->
 
 		return $conf;