Index: core/units/helpers/minifiers/minify_helper.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/helpers/minifiers/minify_helper.php (revision 15928) +++ core/units/helpers/minifiers/minify_helper.php (revision ) @@ -200,14 +200,14 @@ */ public function compressString(&$string, $extension) { - $vars = kUtil::getConfigVars(); + $compression_engine = kUtil::getSystemConfig()->get('CompressionEngine'); - if ( !array_key_exists('CompressionEngine', $vars) ) { + if ( !$compression_engine ) { // compression method not specified - use none return; } - switch ( $vars['CompressionEngine'] ) { + switch ( $compression_engine ) { case 'yui': $this->compressViaJava($string, $extension); break; \ No newline at end of file Index: core/install/step_templates/security.tpl IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/step_templates/security.tpl (revision 15908) +++ core/install/step_templates/security.tpl (revision ) @@ -12,7 +12,7 @@ $output = ''; $write_check = true; - $check_paths = Array ('/', '/index.php', $this->toolkit->defaultWritablePath . '/config.php', ADMIN_DIRECTORY . '/index.php'); + $check_paths = Array ('/', '/index.php', $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . '/config.php', ADMIN_DIRECTORY . '/index.php'); foreach ($check_paths as $check_path) { $path_secure = true; \ No newline at end of file Index: core/install/install_toolkit.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/install_toolkit.php (revision 15928) +++ core/install/install_toolkit.php (revision ) @@ -61,35 +61,13 @@ var $Conn = null; /** - * Path to config.php + * System config object to access data from config.php * - * @var string - */ - var $INIFile = ''; - - /** - * Parsed data from config.php - * * @var Array */ - var $systemConfig = Array (); + public $systemConfig; /** - * Tells, that system config was changed - * - * @var bool - * @access public - */ - public $systemConfigChanged = false; - - /** - * Path, used by system to store data on filesystem - * - * @var string - */ - var $defaultWritablePath = ''; - - /** * Installator instance * * @var kInstallator @@ -98,7 +76,7 @@ function kInstallToolkit() { - $this->defaultWritablePath = DIRECTORY_SEPARATOR . 'system'; + $this->systemConfig = new kSystemConfig(true, false); if ( class_exists('kApplication') ) { // auto-setup in case of separate module install @@ -107,10 +85,6 @@ $this->Conn =& $this->Application->GetADODBConnection(); } - - $this->INIFile = FULL_PATH . $this->defaultWritablePath . DIRECTORY_SEPARATOR . 'config.php'; - - $this->systemConfig = $this->ParseConfig(true); } /** @@ -209,14 +183,14 @@ $file_data = array_map('trim', $file_data); if ($modules_helper->verifyLicense($file_data[0])) { - $this->setSystemConfig('Intechnic', 'License', $file_data[0]); + $this->systemConfig->set('License', 'Intechnic', $file_data[0]); if (array_key_exists(1, $file_data)) { - $this->setSystemConfig('Intechnic', 'LicenseCode', $file_data[1]); + $this->systemConfig->set('LicenseCode', 'Intechnic', $file_data[1]); } else { - $this->setSystemConfig('Intechnic', 'LicenseCode'); + $this->systemConfig->set('LicenseCode', 'Intechnic'); } - $this->SaveConfig(); + $this->systemConfig->save(); } else { // invalid license received from licensing server @@ -257,7 +231,7 @@ } // get table prefix from config, because application may not be available here - $table_prefix = $this->getSystemConfig('Database', 'TablePrefix'); + $table_prefix = $this->systemConfig->get('TablePrefix', 'Database'); if ($module_name == 'kernel') { $module_name = 'in-portal'; @@ -278,7 +252,7 @@ function SetModuleRootCategory($module_name, $category_id = 0) { // get table prefix from config, because application may not be available here - $table_prefix = $this->getSystemConfig('Database', 'TablePrefix'); + $table_prefix = $this->systemConfig->get('TablePrefix', 'Database'); if ($module_name == 'kernel') { $module_name = 'in-portal'; @@ -355,11 +329,12 @@ */ function RunSQLText(&$sqls, $replace_from = null, $replace_to = null, $start_from = 0) { - $table_prefix = $this->getSystemConfig('Database', 'TablePrefix'); + $table_prefix = $this->systemConfig->get('TablePrefix', 'Database'); // add prefix to all tables if (strlen($table_prefix) > 0) { $replacements = Array ('INSERT INTO ', 'UPDATE ', 'ALTER TABLE ', 'DELETE FROM ', 'REPLACE INTO '); + foreach ($replacements as $replacement) { $sqls = str_replace($replacement, $replacement . $table_prefix, $sqls); } @@ -394,7 +369,7 @@ } $sql_count = count($sqls); - $db_collation = $this->getSystemConfig('Database', 'DBCollation'); + $db_collation = $this->systemConfig->get('DBCollation', 'Database'); for ($i = $start_from; $i < $sql_count; $i++) { $sql = $sqls[$i]; @@ -502,147 +477,14 @@ return $this->Conn->GetCol($sql, $id_field); } - function ParseConfig($parse_section = false) - { - if (!file_exists($this->INIFile)) { - return Array (); - } - - if (file_exists($this->INIFile) && !is_readable($this->INIFile)) { - die('Could Not Open Ini File'); - } - - $contents = file($this->INIFile); - - if ($contents && $contents[0] == '<' . '?' . 'php die() ?' . ">\n") { - // format of "config.php" file before 5.1.0 version - array_shift($contents); - - return $this->parseIniString(implode('', $contents), $parse_section); - } - - $_CONFIG = Array (); - require($this->INIFile); - - if ($parse_section) { - return $_CONFIG; - } - - $ret = Array (); - - foreach ($_CONFIG as $section => $section_variables) { - $ret = array_merge($ret, $section_variables); - } - - return $ret; - } - /** - * Equivalent for "parse_ini_string" function available since PHP 5.3.0 - * - * @param string $ini - * @param bool $process_sections - * @param int $scanner_mode - * @return Array - */ - function parseIniString($ini, $process_sections = false, $scanner_mode = null) - { - # Generate a temporary file. - $tempname = tempnam('/tmp', 'ini'); - $fp = fopen($tempname, 'w'); - fwrite($fp, $ini); - $ini = parse_ini_file($tempname, !empty($process_sections)); - fclose($fp); - @unlink($tempname); - - return $ini; - } - - function SaveConfig($silent = false) - { - if (!is_writable($this->INIFile) && !is_writable(dirname($this->INIFile))) { - $error_msg = 'Cannot write to "' . $this->INIFile . '" file'; - - if ($silent) { - trigger_error($error_msg, E_USER_WARNING); - } - else { - throw new Exception($error_msg); - } - - return ; - } - - $fp = fopen($this->INIFile, 'w'); - fwrite($fp, '<' . '?' . 'php' . "\n\n"); - - foreach ($this->systemConfig as $section_name => $section_data) { - foreach ($section_data as $key => $value) { - fwrite($fp, '$_CONFIG[\'' . $section_name . '\'][\'' . $key . '\'] = \'' . addslashes($value) . '\';' . "\n"); - } - - fwrite($fp, "\n"); - } - - fclose($fp); - - $this->systemConfigChanged = false; - } - - /** - * Sets value to system config (yet SaveConfig must be called to write it to file) - * - * @param string $section - * @param string $key - * @param string $value - */ - function setSystemConfig($section, $key, $value = null) - { - $this->systemConfigChanged = true; - - if (isset($value)) { - if (!array_key_exists($section, $this->systemConfig)) { - // create section, when missing - $this->systemConfig[$section] = Array (); - } - - // create key in section - $this->systemConfig[$section][$key] = $value; - return ; - } - - unset($this->systemConfig[$section][$key]); - } - - /** - * Returns information from system config - * - * @param string $section - * @param string $key - * @param mixed $default - * @return string|bool - */ - function getSystemConfig($section, $key, $default = false) - { - if ( !array_key_exists($section, $this->systemConfig) ) { - return $default; - } - - if ( !array_key_exists($key, $this->systemConfig[$section]) ) { - return $default; - } - - return isset($this->systemConfig[$section][$key]) ? $this->systemConfig[$section][$key] : $default; - } - - /** * Checks if system config is present and is not empty * * @return bool */ function systemConfigFound() { - return file_exists($this->INIFile) && $this->systemConfig; + return $this->systemConfig->exists(); } /** @@ -653,7 +495,7 @@ */ function sectionFound($section) { - return array_key_exists($section, $this->systemConfig); + return $this->systemConfig->sectionFound($section); } /** @@ -912,7 +754,7 @@ */ function deleteEditTables() { - $table_prefix = $this->getSystemConfig('Database', 'TablePrefix'); + $table_prefix = $this->systemConfig->get('TablePrefix', 'Database'); $tables = $this->Conn->GetCol('SHOW TABLES'); $mask_edit_table = '/' . $table_prefix . 'ses_(.*)_edit_(.*)/'; @@ -1124,7 +966,7 @@ public function getWorkingCacheHandlers($current = null) { if ( !isset($current) ) { - $current = $this->getSystemConfig('Misc', 'CacheHandler'); + $current = $this->systemConfig->get('CacheHandler', 'Misc'); } $cache_handler = $this->Application->makeClass('kCache'); @@ -1166,7 +1008,7 @@ public function getWorkingCompressionEngines($current = null) { if ( !isset($current) ) { - $current = $this->getSystemConfig('Misc', 'CompressionEngine'); + $current = $this->systemConfig->get('CompressionEngine', 'Misc'); } $output = shell_exec('java -version 2>&1'); \ No newline at end of file Index: core/install.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install.php (revision 15929) +++ core/install.php (revision ) @@ -154,39 +154,20 @@ { include_once(FULL_PATH . REL_PATH . '/kernel/kbase.php'); // required by kDBConnection class include_once(FULL_PATH . REL_PATH . '/kernel/utility/multibyte.php'); // emulating multi-byte php extension + include_once(FULL_PATH . REL_PATH . '/kernel/utility/system_config.php'); require_once(FULL_PATH . REL_PATH . '/install/install_toolkit.php'); // toolkit required for module installations to installator + $this->toolkit = new kInstallToolkit(); $this->toolkit->setInstallator($this); - $this->StepDBFile = FULL_PATH.'/'.REL_PATH.'/install/steps_db.xml'; - - $base_path = rtrim(preg_replace('/'.preg_quote(rtrim(REL_PATH, '/'), '/').'$/', '', str_replace('\\', '/', dirname($_SERVER['PHP_SELF']))), '/'); - $this->baseURL = 'http://'.$_SERVER['HTTP_HOST'].$base_path.'/core/install/'; - + $this->baseURL = 'http://' . $_SERVER['HTTP_HOST'] . $this->toolkit->systemConfig->get('WebsitePath', 'Misc') . '/core/install/'; set_error_handler( Array(&$this, 'ErrorHandler') ); - if (file_exists($this->toolkit->INIFile)) { + if ( $this->toolkit->systemConfigFound() ) { // if config.php found, then check his write permission too - $this->writeableFolders[] = $this->toolkit->defaultWritablePath . '/config.php'; + $this->writeableFolders[] = $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . '/config.php'; } - if ( !$this->toolkit->getSystemConfig('Misc', 'WriteablePath') ) { - $this->toolkit->setSystemConfig('Misc', 'WriteablePath', $this->toolkit->defaultWritablePath); - } - - if ( !$this->toolkit->getSystemConfig('Misc', 'RestrictedPath') ) { - $this->toolkit->setSystemConfig('Misc', 'RestrictedPath', $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . '.restricted'); - } - - if ( !$this->toolkit->getSystemConfig('Misc', 'WebsitePath') ) { - $this->toolkit->setSystemConfig('Misc', 'WebsitePath', $base_path); - } - - if ( $this->toolkit->systemConfigChanged ) { - // immediately save, because this paths will be used in kApplication class later - $this->toolkit->SaveConfig(true); - } - $this->currentStep = $this->GetVar('step'); // can't check login on steps where no application present anyways :) @@ -310,7 +291,7 @@ break; case 'check_paths': - $writeable_base = $this->toolkit->getSystemConfig('Misc', 'WriteablePath'); + $writeable_base = $this->toolkit->systemConfig->get('WriteablePath', 'Misc'); foreach ($this->writeableFolders as $folder_path) { $file_path = FULL_PATH . str_replace('$1', $writeable_base, $folder_path); if (file_exists($file_path) && !is_writable($file_path)) { @@ -350,10 +331,10 @@ $submit_value = $this->GetVar($field_name); if ($submit_value !== false) { - $this->toolkit->setSystemConfig('Database', $field_name, $submit_value); + $this->toolkit->systemConfig->set($field_name, 'Database', $submit_value); } /*else { - $this->toolkit->setSystemConfig('Database', $field_name, ''); + $this->toolkit->systemConfig->set($field_name, 'Database', ''); }*/ } break; @@ -425,7 +406,7 @@ 'login' => md5($username), 'password' => md5($password), 'action' => 'check', - 'license_code' => base64_encode( $this->toolkit->getSystemConfig('Intechnic', 'LicenseCode') ), + 'license_code' => base64_encode( $this->toolkit->systemConfig->get('LicenseCode', 'Intechnic') ), 'version' => '4.3.0',//$this->toolkit->GetMaxModuleVersion('core/'), 'domain' => base64_encode($_SERVER['HTTP_HOST']), ); @@ -472,7 +453,8 @@ } $write_check = true; - $check_paths = Array ('/', '/index.php', $this->toolkit->defaultWritablePath . '/config.php', ADMIN_DIRECTORY . '/index.php'); + $check_paths = Array ('/', '/index.php', $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . '/config.php', ADMIN_DIRECTORY . '/index.php'); + foreach ($check_paths as $check_path) { $path_check_status = $this->toolkit->checkWritePermissions(FULL_PATH . $check_path); @@ -542,7 +524,7 @@ $section_name = 'Database'; $required_fields = Array ('DBType', 'DBHost', 'DBName', 'DBUser', 'DBCollation'); foreach ($required_fields as $required_field) { - if (!$this->toolkit->getSystemConfig($section_name, $required_field)) { + if (!$this->toolkit->systemConfig->get($required_field, $section_name)) { $status = false; $this->errorMessage = 'Please fill all required fields'; break; @@ -629,16 +611,16 @@ case 'db_reconfig': // store db configuration $sql = 'SHOW COLLATION - LIKE \''.$this->toolkit->getSystemConfig('Database', 'DBCollation').'\''; + LIKE \''.$this->toolkit->systemConfig->get('DBCollation', 'Database').'\''; $collation_info = $this->Conn->Query($sql); if ($collation_info) { - $this->toolkit->setSystemConfig('Database', 'DBCharset', $collation_info[0]['Charset']); + $this->toolkit->systemConfig->set('DBCharset', 'Database', $collation_info[0]['Charset']); // database is already connected, that's why set collation on the fly - $this->Conn->Query('SET NAMES \''.$this->toolkit->getSystemConfig('Database', 'DBCharset').'\' COLLATE \''.$this->toolkit->getSystemConfig('Database', 'DBCollation').'\''); + $this->Conn->Query('SET NAMES \''.$this->toolkit->systemConfig->get('DBCharset', 'Database').'\' COLLATE \''.$this->toolkit->systemConfig->get('DBCollation', 'Database').'\''); } - $this->toolkit->SaveConfig(); + $this->toolkit->systemConfig->save(); if ($this->currentStep == 'db_config') { if ($this->GetVar('UseExistingSetup')) { @@ -652,7 +634,7 @@ $this->toolkit->RunSQL('/core/install/install_data.sql'); // create category using sql, because Application is not available here - $table_name = $this->toolkit->getSystemConfig('Database', 'TablePrefix') . 'IdGenerator'; + $table_name = $this->toolkit->systemConfig->get('TablePrefix', 'Database') . 'IdGenerator'; $this->Conn->Query('UPDATE ' . $table_name . ' SET lastid = lastid + 1'); $resource_id = $this->Conn->GetOne('SELECT lastid FROM ' . $table_name); if ($resource_id === false) { @@ -667,7 +649,7 @@ 'ResourceId' => $resource_id - 1, 'l1_Description' => 'Content', 'Status' => 4, ); - $this->Conn->doInsert($fields_hash, $this->toolkit->getSystemConfig('Database', 'TablePrefix') . 'Categories'); + $this->Conn->doInsert($fields_hash, $this->toolkit->systemConfig->get('TablePrefix', 'Database') . 'Categories'); $this->toolkit->SetModuleRootCategory('Core', $this->Conn->getInsertID()); @@ -696,9 +678,9 @@ /* @var $modules_helper kModulesHelper */ if ($modules_helper->verifyLicense($file_data[1])) { - $this->toolkit->setSystemConfig('Intechnic', 'License', $file_data[1]); - $this->toolkit->setSystemConfig('Intechnic', 'LicenseCode', $file_data[2]); - $this->toolkit->SaveConfig(); + $this->toolkit->systemConfig->set('License', 'Intechnic', $file_data[1]); + $this->toolkit->systemConfig->set('LicenseCode', 'Intechnic', $file_data[2]); + $this->toolkit->systemConfig->save(); } else { $this->errorMessage = 'Invalid License File'; @@ -710,7 +692,7 @@ break; case 3: // Use Existing License - $license_hash = $this->toolkit->getSystemConfig('Intechnic', 'License'); + $license_hash = $this->toolkit->systemConfig->get('License', 'Intechnic'); if ($license_hash) { $modules_helper = $this->Application->recallObject('ModulesHelper'); /* @var $modules_helper kModulesHelper */ @@ -728,9 +710,9 @@ case 4: // Skip License (Local Domain Installation) if ($this->toolkit->sectionFound('Intechnic')) { // remove any previous license information - $this->toolkit->setSystemConfig('Intechnic', 'License'); - $this->toolkit->setSystemConfig('Intechnic', 'LicenseCode'); - $this->toolkit->SaveConfig(); + $this->toolkit->systemConfig->set('License', 'Intechnic'); + $this->toolkit->systemConfig->set('LicenseCode', 'Intechnic'); + $this->toolkit->systemConfig->save(); } break; } @@ -819,7 +801,7 @@ // get domain name as entered by user on the form $domain = $this->GetVar('domain') == 1 ? $_SERVER['HTTP_HOST'] : str_replace(' ', '', $this->GetVar('other')); - $license_hash = $this->toolkit->getSystemConfig('Intechnic', 'License'); + $license_hash = $this->toolkit->systemConfig->get('License', 'Intechnic'); if ($license_hash) { // when license present, then extract domain from it $license_hash = base64_decode($license_hash); @@ -833,8 +815,8 @@ if ($domain != '') { if (strstr($domain, $license_domain) || $modules_helper->_IsLocalSite($domain)) { - $this->toolkit->setSystemConfig('Misc', 'Domain', $domain); - $this->toolkit->SaveConfig(); + $this->toolkit->systemConfig->set('Domain', 'Misc', $domain); + $this->toolkit->systemConfig->save(); } else { $this->errorMessage = 'Domain name entered does not match domain name in the license!'; @@ -850,11 +832,11 @@ 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->systemConfig->set($var_name, $section, $var_value); } } - $this->toolkit->SaveConfig(); + $this->toolkit->systemConfig->save(); break; case 'root_password': @@ -864,8 +846,8 @@ $config_values = Array ( 'RootPass' => $password_formatter->hashPassword($this->Application->GetVar('root_password')), - 'Backup_Path' => FULL_PATH . $this->toolkit->getSystemConfig('Misc', 'WriteablePath') . DIRECTORY_SEPARATOR . 'backupdata', - 'DefaultEmailSender' => 'portal@' . $this->toolkit->getSystemConfig('Misc', 'Domain') + 'Backup_Path' => FULL_PATH . $this->toolkit->systemConfig->get('WriteablePath', 'Misc') . DIRECTORY_SEPARATOR . 'backupdata', + 'DefaultEmailSender' => 'portal@' . $this->toolkit->systemConfig->get('Domain', 'Misc') ); $site_timezone = date_default_timezone_get(); @@ -939,7 +921,7 @@ FROM ' . $theme_table . ' WHERE ' . $theme_id_field . ' = ' . $theme_id; $theme_name = $this->Conn->GetOne($sql); - $site_path = $this->toolkit->getSystemConfig('Misc', 'WebsitePath') . '/'; + $site_path = $this->toolkit->systemConfig->get('WebsitePath','Misc') . '/'; $file_helper = $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ @@ -1350,14 +1332,14 @@ $required_keys = Array ('DBType', 'DBUser', 'DBName'); foreach ($required_keys as $required_key) { - if (!$this->toolkit->getSystemConfig('Database', $required_key)) { + if (!$this->toolkit->systemConfig->get($required_key, 'Database')) { // one of required db connection settings missing -> abort connection return false; } } - $this->Conn = new kDBConnection($this->toolkit->getSystemConfig('Database', 'DBType'), Array(&$this, 'DBErrorHandler')); - $this->Conn->setup( $this->toolkit->systemConfig ); + $this->Conn = new kDBConnection($this->toolkit->systemConfig->get('DBType', 'Database'), Array(&$this, 'DBErrorHandler')); + $this->Conn->setup($this->toolkit->systemConfig->getData()); // setup toolkit too $this->toolkit->Conn =& $this->Conn; @@ -1372,7 +1354,7 @@ */ function AlreadyInstalled() { - $table_prefix = $this->toolkit->getSystemConfig('Database', 'TablePrefix'); + $table_prefix = $this->toolkit->systemConfig->get('TablePrefix', 'Database'); $settings_table = $this->TableExists('ConfigurationValues') ? 'ConfigurationValues' : 'SystemSettings'; $sql = 'SELECT VariableValue @@ -1389,7 +1371,7 @@ // 2. user has all types of permissions in database // 3. database environment settings met minimum requirements - if (mb_strlen($this->toolkit->getSystemConfig('Database', 'TablePrefix')) > 7) { + if (mb_strlen($this->toolkit->systemConfig->get('TablePrefix', 'Database')) > 7) { $this->errorMessage = 'Table prefix should not be longer than 7 characters'; return false; } @@ -1464,7 +1446,7 @@ */ function TableExists($tables) { - $prefix = $this->toolkit->getSystemConfig('Database', 'TablePrefix'); + $prefix = $this->toolkit->systemConfig->get('TablePrefix', 'Database'); $all_found = true; $tables = explode(',', $tables); Index: core/install/step_templates/sys_config.tpl IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/install/step_templates/sys_config.tpl (revision 15908) +++ core/install/step_templates/sys_config.tpl (revision ) @@ -1,19 +1,19 @@ 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' => ''), - 'WebsiteCharset' => Array ('type' => 'text', 'title' => 'Website Charset', 'section' => 'Misc', 'required' => 1, 'default' => 'utf-8'), - 'EnableSystemLog' => Array ('type' => 'radio', 'title' => 'Enable "System Log"', 'section' => 'Misc', 'required' => 1, 'default' => '0'), - 'SystemLogMaxLevel' => Array ('type' => 'select', 'title' => 'Highest "Log Level", that will be saved in "System Log"', 'section' => 'Misc', 'required' => 1, 'default' => '5'), - 'TrustProxy' => Array ('type' => 'radio', 'title' => 'Trust Proxy', 'section' => 'Misc', 'required' => 1, 'default' => '0'), + 'WebsitePath' => Array ('type' => 'text', 'title' => 'Web Path to Installation', 'section' => 'Misc', 'required' => 1), + 'WriteablePath' => Array ('type' => 'text', 'title' => 'Path to Writable folder', 'section' => 'Misc', 'required' => 1), + 'RestrictedPath' => Array ('type' => 'text', 'title' => 'Path to Restricted folder', 'section' => 'Misc', 'required' => 1), + 'AdminDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin folder', 'section' => 'Misc'), + 'AdminPresetsDirectory' => Array ('type' => 'text', 'title' => 'Path to Admin Interface Presets folder', 'section' => 'Misc'), + 'ApplicationClass' => Array ('type' => 'text', 'title' => 'Name of Base Application Class', 'section' => 'Misc'), + 'ApplicationPath' => Array ('type' => 'text', 'title' => 'Path to Base Application Class file', 'section' => 'Misc'), + 'CacheHandler' => Array ('type' => 'select', 'title' => 'Output Caching Engine', 'section' => 'Misc'), + 'MemcacheServers' => Array ('type' => 'text', 'title' => 'Location of Memcache Servers', 'section' => 'Misc'), + 'CompressionEngine' => Array ('type' => 'select', 'title' => 'CSS/JS Compression Engine', 'section' => 'Misc'), + 'WebsiteCharset' => Array ('type' => 'text', 'title' => 'Website Charset', 'section' => 'Misc', 'required' => 1), + 'EnableSystemLog' => Array ('type' => 'radio', 'title' => 'Enable "System Log"', 'section' => 'Misc', 'required' => 1), + 'SystemLogMaxLevel' => Array ('type' => 'select', 'title' => 'Highest "Log Level", that will be saved in "System Log"', 'section' => 'Misc', 'required' => 1), + 'TrustProxy' => Array ('type' => 'radio', 'title' => 'Trust Proxy', 'section' => 'Misc', 'required' => 1), ); $settings['CacheHandler']['options'] = $this->toolkit->getWorkingCacheHandlers(); @@ -36,7 +36,7 @@