Fisheye: Tag 14842 refers to a dead (removed) revision in file `branches/5.2.x/core/install/step_templates/fix_paths.tpl'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: branches/5.2.x/core/install/install_toolkit.php
===================================================================
diff -u -r14771 -r14842
--- branches/5.2.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 14771)
+++ branches/5.2.x/core/install/install_toolkit.php	(.../install_toolkit.php)	(revision 14842)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install_toolkit.php 14771 2011-11-21 18:06:39Z alex $
+* @version	$Id: install_toolkit.php 14842 2011-12-08 09:00:44Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -580,19 +580,20 @@
 		 *
 		 * @param string $section
 		 * @param string $key
+		 * @param mixed $default
 		 * @return string|bool
 		 */
-		function getSystemConfig($section, $key)
+		function getSystemConfig($section, $key, $default = false)
 		{
 			if ( !array_key_exists($section, $this->systemConfig) ) {
-				return false;
+				return $default;
 			}
 
 			if ( !array_key_exists($key, $this->systemConfig[$section]) ) {
-				return false;
+				return $default;
 			}
 
-			return $this->systemConfig[$section][$key] ? $this->systemConfig[$section][$key] : false;
+			return $this->systemConfig[$section][$key] ? $this->systemConfig[$section][$key] : $default;
 		}
 
 		/**
@@ -1070,4 +1071,71 @@
 			// return output in case of errors
 			return $output;
 		}
+
+		/**
+		 * Returns cache handlers, that are working
+		 *
+		 * @param string $current
+		 * @return Array
+		 */
+		public function getWorkingCacheHandlers($current = null)
+		{
+			if ( !isset($current) ) {
+				$current = $this->getSystemConfig('Misc', 'CacheHandler');
+			}
+
+			$cache_handlers = Array (
+				'Fake' => 'None', 'Memcache' => 'Memcached', 'XCache' => 'XCache', 'Apc' => 'Alternative PHP Cache'
+			);
+
+			foreach ($cache_handlers AS $class_prefix => $title) {
+				$handler_class = $class_prefix . 'CacheHandler';
+
+				if ( !class_exists($handler_class) ) {
+					unset($cache_handlers[$class_prefix]);
+				}
+				else {
+					$handler = new $handler_class('localhost:11211');
+					/* @var $handler FakeCacheHandler */
+
+					if ( !$handler->isWorking() ) {
+						if ( $current == $class_prefix ) {
+							$cache_handlers[$class_prefix] .= ' (offline)';
+						}
+						else {
+							unset($cache_handlers[$class_prefix]);
+						}
+					}
+				}
+			}
+
+			return $cache_handlers;
+		}
+
+		/**
+		 * Returns compression engines, that are working
+		 *
+		 * @param string $current
+		 * @return Array
+		 */
+		public function getWorkingCompressionEngines($current = null)
+		{
+			if ( !isset($current) ) {
+				$current = $this->getSystemConfig('Misc', 'CompressionEngine');
+			}
+
+			$output = shell_exec('java -version');
+			$compression_engines = Array ('' => 'None', 'yui' => 'YUICompressor (Java)', 'php' => 'PHP-based');
+
+			if ( strpos($output, 'Java Version') === false ) {
+				if ( $current == 'yui' ) {
+					$compression_engines['yui'] .= ' (offline)';
+				}
+				else {
+					unset($compression_engines['yui']);
+				}
+			}
+
+			return $compression_engines;
+		}
 	}
\ No newline at end of file
Index: branches/5.2.x/core/install/steps_db.xml
===================================================================
diff -u -r14244 -r14842
--- branches/5.2.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 14244)
+++ branches/5.2.x/core/install/steps_db.xml	(.../steps_db.xml)	(revision 14842)
@@ -100,6 +100,53 @@
 
 		]]>
 	</step>
+	<step name="sys_config" title="System Configuration">
+		<![CDATA[<p>These are system advanced settings and must be changed with caution. It's <strong><i>not recommended</i></strong> to
+		change these settings unless you exactly know what you are doing. These settings will be stored in <strong>system/config.php</strong>
+		file and can be changed manually if needed.</p>
+		<br/>
+
+		<p><b><i>Web Path to Installation</i></b> - web path to the root of your In-Portal installation. For example,
+		if your In-Portal will be running at http://www.your-website.com, then Web Path to Installation should be set to <b>/</b>
+		since In-Portal is setup in the root of the domain. In case if your In-Portal will be running under
+		 http://www.your-website.com/in-portal/, then it should be set to <b>/in-portal</b> (no trailing slash). This setting is auto-detected during the
+		 initial installation step, but can be adjusted at Installation Maintenance step.</p>
+
+		<p><b><i>Path to Writable folder</i></b> - path to a folder inside your In-Portal installation which can be accessed from the Web
+		 and has writable permissions for the web server. This folder will be used to store dynamic content such as
+		  uploaded and resized images, cached templates and other types of user files. The default value is <b>/system</b>.</p>
+
+		<p><b><i>Path to Restricted folder</i></b> - path to a folder inside or outside your In-Portal installation which will
+		used to store debug files, system logs and other non-public information. This folder must be writable by the web-server
+		 and can be located outside of your In-Portal installation if needed. The default value is <b>/system/.restricted</b> .</p>
+
+		<p><b><i>Path to Admin folder</i></b> - web path to your In-Portal Admin Console folder. The default value is set to
+		 <b>/admin</b> and your Admin Console will be accessible at http://www.your-website.com/admin.
+		 In case if you want your Admin Console to be under http://www.your-website.com/secure-admin (or anything else)
+		 you'll need to rename original <b>admin</b> folder to <b>secure-admin</b> on your filesystem and then set this path to <b>/secure-admin</b> .</p>
+
+		<p><b><i>Path to Admin Interface Presets folder</i></b> - path to a folder inside your In-Portal installation
+		contains Admin Interface Presets. The default value is <b>/admin</b> .</p>
+
+		<p><b><i>Name of Base Application Class</i></b> - default value is <b>kApplication</b> and can change very rarely. </p>
+
+		<p><b><i>Path to Base Application Class file</i></b> - default value is <b>/core/kernel/application.php</b> and can change very rarely.</p>
+
+		<p><b><i>Output Caching Engine</i></b> - provides ability to cache HTML output or other data using various caching engines to
+		 lower the database load. The default value is set to <b>None</b> if no available engines detected. Available options are:
+		  None (Fake), Memcached (Memcache), XCache (XCache) and Alternative PHP Cache (Apc).
+		  Note that only auto-detected caching engines will be available for selection.</p>
+
+		<p><b><i>Location of Memcache Servers</i></b> - host or IP address with port where Memcached Server is running.
+		 Multiple locations of can be listed separated by semi-colon (;). For example, 192.168.1.1:1121;192.168.1.2:1121;192.168.1.3:1121 .</p>
+
+		<p><b><i>CSS/JS Compression Engine</i></b> - provides <a href="http://en.wikipedia.org/wiki/Minification_(programming)">minification</a>
+		 functionality for CSS / Javascript files. The default value is set to <b>PHP-based</b> if no Java is auto-detected on server-side.
+		 Available options are: None (empty), YUICompressor (Java) (yui) and PHP-based (php) .</p>
+
+		<br/>
+		]]>
+	</step>
 	<step name="select_theme" title="Select Default Theme">
 		<![CDATA[<p>Selected theme will be used as a default in your In-Portal website.</p>
 		<p>You can manage your themes in Admin Console under Configuration -> Website -> Themes section.</p>
@@ -160,9 +207,4 @@
 		The characters entered in this field are placed <i>before</i> the names of the tables used by In-Portal.
 		For example, if you enter "inp_" into the prefix field, the table named Category will be named inp_Category.</p>]]>
 	</step>
-    <step name="fix_paths" title="Update Installation Paths">
-    	<![CDATA[The <i>Fix Paths</i> option should be used when the location of the In-Portal files has changed.
-    	For example, if you moved them from one folder to another. It will update all settings and ensure the program
-    	is operational at the new location.]]>
-    </step>
 </steps>
\ No newline at end of file
Index: branches/5.2.x/core/install/step_templates/install_setup.tpl
===================================================================
diff -u -r14572 -r14842
--- branches/5.2.x/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 14572)
+++ branches/5.2.x/core/install/step_templates/install_setup.tpl	(.../install_setup.tpl)	(revision 14842)
@@ -32,14 +32,18 @@
 	$option_tpl = ob_get_clean();
 
 	$options = 	Array (
-						'upgrade'			=>	'Upgrade In-Portal',
-						'clean_reinstall'	=>	'Reinstall In-Portal',
-						'fresh_install'		=>	'Install In-Portal to a New Database',
-						'update_license'	=>	'Update License Information',
-						'db_reconfig'		=>	'Update Database Configuration',
-						'fix_paths'			=>	'Update Installation Paths',
-				);
+		'upgrade'			=>	'Upgrade In-Portal',
+		'clean_reinstall'	=>	'Reinstall In-Portal',
+		'fresh_install'		=>	'Install In-Portal to a New Database',
+		'update_license'	=>	'Update License Information',
+		'update_config'		=>	'Update System Configuration',
+		'db_reconfig'		=>	'Update Database Configuration',
+	);
 
+	if ( !$this->Application->isDebugMode() ) {
+		unset($options['update_config']);
+	}
+
 	$upgradable_modules = $this->GetUpgradableModules();
 	if (!$upgradable_modules) {
 		unset($options['upgrade']);
Index: branches/5.2.x/core/install.php
===================================================================
diff -u -r14699 -r14842
--- branches/5.2.x/core/install.php	(.../install.php)	(revision 14699)
+++ branches/5.2.x/core/install.php	(.../install.php)	(revision 14842)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: install.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: install.php 14842 2011-12-08 09:00:44Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -68,14 +68,14 @@
 		 * @var Array
 		 */
 		var $steps = Array (
-			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
-			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'select_theme', 'security', 'finish'),
+			'fresh_install'		=>	Array ('check_paths', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'sys_config', 'select_theme', 'security', 'finish'),
+			'clean_reinstall'	=>	Array ('check_paths', 'clean_db', 'db_config', 'select_license', /*'download_license',*/ 'select_domain', 'root_password', 'choose_modules', 'post_config', 'sys_config', 'select_theme', 'security', 'finish'),
 			'already_installed'	=>	Array ('check_paths', 'install_setup'),
 
 			'upgrade'			=>	Array ('check_paths', 'install_setup', 'upgrade_modules', 'skin_upgrade', 'security', 'finish'),
 			'update_license'	=>	Array ('check_paths', 'install_setup', 'select_license', /*'download_license',*/ 'select_domain', 'security', 'finish'),
+			'update_config'		=>	Array ('check_paths', 'install_setup', 'sys_config', 'security', 'finish'),
 			'db_reconfig'		=>	Array ('check_paths', 'install_setup', 'db_reconfig', 'security', 'finish'),
-			'fix_paths'			=>	Array ('check_paths', 'install_setup', 'fix_paths', 'security', 'finish'),
 		);
 
 		/**
@@ -236,12 +236,13 @@
 		 * Returns variable from request
 		 *
 		 * @param string $name
+		 * @param mixed $default
 		 * @return string|bool
 		 * @access private
 		 */
-		private function GetVar($name)
+		private function GetVar($name, $default = false)
 		{
-			return array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : false;
+			return array_key_exists($name, $_REQUEST) ? $_REQUEST[$name] : $default;
 		}
 
 		/**
@@ -801,6 +802,18 @@
 					}
 					break;
 
+				case 'sys_config':
+					$config_data = $this->GetVar('system_config');
+
+					foreach ($config_data as $section => $section_vars) {
+						foreach ($section_vars as $var_name => $var_value) {
+							$this->toolkit->setSystemConfig($section, $var_name, $var_value);
+						}
+					}
+
+					$this->toolkit->SaveConfig();
+					break;
+
 				case 'root_password':
 					// update root password in database
 					$password = md5( md5($this->Application->GetVar('root_password')) . 'b38');
@@ -973,10 +986,6 @@
 					}
 					break;
 
-				case 'fix_paths':
-					$this->toolkit->saveConfigValues( $this->Application->GetVar('config') );
-					break;
-
 				case 'finish':
 					// delete cache
 					$this->toolkit->deleteCache();
Index: branches/5.2.x/core/install/step_templates/sys_config.tpl
===================================================================
diff -u
--- branches/5.2.x/core/install/step_templates/sys_config.tpl	(revision 0)
+++ branches/5.2.x/core/install/step_templates/sys_config.tpl	(revision 14842)
@@ -0,0 +1,57 @@
+<?php
+	$settings = Array (
+		'WebsitePath' => Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1, 'default' => '/'),
+		'WriteablePath' => Array ('type' => 'text', 'title' => 'Path to Writable folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system'),
+		'RestrictedPath' => Array ('type' => 'text', 'title' => 'Path to Restricted folder', 'section' => 'Misc', 'required' => 1, 'default' => '/system/.restricted'),
+		'AdminDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin folder', 'section' => 'Misc', 'default' => '/admin'),
+		'AdminPresetsDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin Interface Presets folder', 'section' => 'Misc', 'default' => '/admin'),
+		'ApplicationClass' => Array ('type' => 'text', 'title' => 'Name of Base Application Class', 'section' => 'Misc', 'default' => 'kApplication'),
+		'ApplicationPath' => Array ('type' => 'text', 'title' => 'Path to Base Application Class file', 'section' => 'Misc', 'default' => '/core/kernel/application.php'),
+		'CacheHandler' => Array ('type' => 'select', 'title' => 'Output Caching Engine', 'section' => 'Misc', 'default' => 'Fake'),
+		'MemcacheServers' => Array ('type' => 'text', 'title' => 'Location of Memcache Servers', 'section' => 'Misc', 'default' => 'localhost:11211'),
+		'CompressionEngine' => Array ('type' => 'select', 'title' => 'CSS/JS Compression Engine', 'section' => 'Misc', 'default' => ''),
+	);
+
+	$settings['CacheHandler']['options'] = $this->toolkit->getWorkingCacheHandlers();
+	$settings['CompressionEngine']['options'] = $this->toolkit->getWorkingCompressionEngines();
+
+	$row_class = 'table-color2';
+
+	foreach ($settings as $config_var => $output_params) {
+		$row_class = $row_class == 'table-color1' ? 'table-color2' : 'table-color1';
+		?>
+		<tr class="<?php echo $row_class; ?>">
+			<td class="text">
+				<b><?php echo ($output_params['title'] ? $output_params['title'] : $config_var) . (isset($output_params['required']) ? ' <span class="error">*</span>' : ''); ?>:</b>
+			</td>
+			<td>
+				<?php
+					$config_value =  $this->toolkit->getSystemConfig($output_params['section'], $config_var, $output_params['default']);
+
+					if ( $output_params['type'] == 'text' ) {
+						echo '<input type="text" name="system_config[' . $output_params['section'] . '][' . $config_var . ']" value="' . $config_value . '" class="text" style="width: 200px;"/>';
+					}
+					else {
+						echo '<select name="system_config[' . $output_params['section'] . '][' . $config_var . ']">';
+
+						if ( $output_params['options'][$config_value] == 'None' ) {
+							$tmp_values = array_keys($output_params['options']);
+
+							if ( count($tmp_values) > 1 ) {
+								$config_value = $tmp_values[1];
+							}
+						}
+
+						foreach($output_params['options'] as $option_key => $option_value) {
+							$selected = $option_key == $config_value ? ' selected' : '';
+							echo '<option value="' . $option_key . '"' . $selected . '>' . $option_value . '</option>';
+						}
+
+						echo '</select>';
+					}
+				?>
+			</td>
+		</tr>
+		<?php
+	}
+?>