Index: install/english.lang
===================================================================
--- install/english.lang (revision 14826)
+++ install/english.lang (working copy)
@@ -139,7 +139,6 @@
QWxsb3cgdG8gc2VsZWN0IG1lbWJlcnNoaXAgZ3JvdXAgb24gRnJvbnQtZW5k
TGlzdCBhdXRvbWF0aWMgcmVmcmVzaCBpbnRlcnZhbHMgKGluIG1pbnV0ZXMp
QmFja3VwIFBhdGg=
- Q2FjaGluZyBFbmdpbmU=
U3dpdGNoIENhdGFsb2cgdGFicyBiYXNlZCBvbiBNb2R1bGU=
Q2hlY2sgU3RvcCBXb3Jkcw==
RGVmYXVsdCBDU1YgRXhwb3J0IERlbGltaXRlcg==
@@ -167,7 +166,6 @@
TWFpbGluZyBMaXN0IFF1ZXVlIFBlciBTdGVw
TWFpbGluZyBMaXN0IFNlbmQgUGVyIFN0ZXA=
TWF4aW11bSBudW1iZXIgb2YgaW1hZ2Vz
- TWVtY2FjaGUgU2VydmVycw==
RGVmYXVsdCBVUkwgRW5kaW5nIGluIFNFTy1mcmllbmRseSBtb2Rl
VGVtcGxhdGUgZm9yICJJbnN1ZmZpY2llbnQgUGVybWlzc2lvbnMiIEVycm9y
R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=
@@ -637,7 +635,6 @@
U2luZ2xlIFBocmFzZSBMYWJlbCBwZXIgbGluZSAoZm9ybWF0czogbGFfU2FtcGxlTGFiZWwsIGx1X0Zyb250RW5kTGFiZWwp
VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n
SW1hZ2UgRmlsZXM=
- TXVsdGlwbGUgTWVtY2FjaGVkIHNlcnZlcnMgY2FuIGJlIGxpc3RlZCBzZXBhcmF0ZWQgYnkgc2VtaS1jb2xvbiAoOykuIEZvciBleGFtcGxlLCAxOTIuMTY4LjEuMToxMTIxOzE5Mi4xNjguMS4yOjExMjE7MTkyLjE2OC4xLjM6MTEyMQ==
SG93IHNvb24gKGluIHNlY29uZHMpIHRoZSBzZWN0aW9uIGNhY2hlIHNob3VsZCBhdXRvLWV4cGlyZSBhZnRlciBpdCdzIGNyZWF0aW9uLiBCeSBkZWZhdWx0IHN5c3RlbSB0ZW5kcyB0byByZWJ1aWxkIHRoZSBjYWNoZSBvbmx5IHdoZW4gaXQncyBwcm9wZXJ0aWVzIG9yIGVsZW1lbnRzIGhhdmUgY2hhbmdlZC4=
U2VhcmNoIGZvciBhbGwgZW50ZXJlZCBrZXl3b3JkcywgaW5zdGVhZCBvZiBhbnkgb25lIG9mIHRoZW0=
UE9QMyBTZXJ2ZXIgUG9ydC4gRm9yIGV4LiAiMTEwIiBmb3IgcmVndWxhciBjb25uZWN0aW9uLCAiOTk1IiBmb3Igc2VjdXJlIGNvbm5lY3Rpb24u
@@ -1020,7 +1017,6 @@
U2VuZGVyIEluZm9ybWF0aW9u
U2V0dGluZ3M=
QWRtaW4gQ29uc29sZSBTZXR0aW5ncw==
- Q2FjaGluZyBTZXR0aW5ncw==
Q1NWIEV4cG9ydCBTZXR0aW5ncw==
TWFpbGluZyBTZXR0aW5ncw==
U2Vzc2lvbiBTZXR0aW5ncw==
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 14826)
+++ install/install_data.sql (working copy)
@@ -94,8 +94,6 @@
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes||1=la_Quotes', 70.02, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux||1=la_Windows', 70.03, 0, 1, NULL);
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCSVExport', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode||1=la_Regular', 70.04, 0, 1, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'CacheHandler', 'Fake', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCaching', 'la_config_CacheHandler', 'select', NULL, 'Fake=la_None||Memcache=+Memcached||Apc=+Alternative PHP Cache||XCache=+XCache', 80.01, 0, 0, NULL);
-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MemcacheServers', 'localhost:11211', 'In-Portal', 'in-portal:configure_advanced', 'la_section_SettingsCaching', 'la_config_MemcacheServers', 'text', NULL, '', 80.02, 0, 0, 'la_hint_MemcacheServers');
# Section "in-portal:configure_users":
INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Allow_New', '3', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_users_allow_new', 'radio', '', '1=la_opt_UserInstantRegistration||2=la_opt_UserNotAllowedRegistration||3=la_opt_UserUponApprovalRegistration||4=la_opt_UserEmailActivation', 10.01, 0, 1, NULL);
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 14826)
+++ install/upgrades.sql (working copy)
@@ -2294,4 +2294,11 @@
KEY ItemPrefix (ItemPrefix),
KEY ItemId (ItemId),
KEY ReportedById (ReportedById)
-);
\ No newline at end of file
+);
+
+DELETE FROM Phrase
+WHERE PhraseKey IN (
+ 'LA_SECTION_SETTINGSCACHING', 'LA_CONFIG_CACHEHANDLER', 'LA_CONFIG_MEMCACHESERVERS', 'LA_HINT_MEMCACHESERVERS'
+);
+
+DELETE FROM ConfigurationValues WHERE VariableName IN ('CacheHandler', 'MemcacheServers');
\ No newline at end of file
Index: kernel/utility/cache.php
===================================================================
--- kernel/utility/cache.php (revision 14826)
+++ kernel/utility/cache.php (working copy)
@@ -109,29 +109,22 @@
$this->siteKeyName = 'site_serial:' . crc32(SQL_TYPE . '://' . SQL_USER . ':' . SQL_PASS . '@' . SQL_SERVER . ':' . TABLE_PREFIX . ':' . SQL_DB);
// get cache handler class to use
- if ( isset($vars['CacheHandler']) ) {
- // for advanced users, who want to save one SQL on each page load
- $handler_class = $vars['CacheHandler'] . 'CacheHandler';
- }
- else {
- $this->Application->Conn->nextQueryFromMaster = true;
- $handler_class = $this->Application->ConfigValue('CacheHandler') . 'CacheHandler';
- }
+ $handler_class = (isset($vars['CacheHandler']) ? $vars['CacheHandler'] : '') . 'CacheHandler';
- // defined cache handler doen't exist -> use default
- if (!class_exists($handler_class)) {
+ // defined cache handler doesn't exist -> use default
+ if ( !class_exists($handler_class) ) {
$handler_class = 'FakeCacheHandler';
}
$handler = new $handler_class();
- if (!$handler->isWorking()) {
+ if ( !$handler->isWorking() ) {
// defined cache handler is not working -> use default
trigger_error('Failed to initialize "' . $handler_class . '" caching handler.', E_USER_WARNING);
$handler = new FakeCacheHandler();
}
- elseif ($this->Application->isDebugMode() && ($handler->cachingType == CACHING_TYPE_MEMORY)) {
+ elseif ( $this->Application->isDebugMode() && ($handler->cachingType == CACHING_TYPE_MEMORY) ) {
$this->Application->Debugger->appendHTML('Memory Caching: "' . $handler_class . '"');
}
@@ -518,39 +511,31 @@
var $cachingType = CACHING_TYPE_MEMORY;
- function MemcacheCacheHandler()
+ function MemcacheCacheHandler($default_servers = '')
{
$vars = kUtil::getConfigVars();
+ $memcached_servers = isset($vars['MemcacheServers']) ? $vars['MemcacheServers'] : $default_servers;
- if ( array_key_exists('MemcacheServers', $vars) ) {
- // for advanced users, who want to save one SQL on each page load
- $memcached_servers = $vars['MemcacheServers'];
- }
- else {
- $application =& kApplication::Instance();
- $memcached_servers = $application->ConfigValue('MemcacheServers');
- }
-
- if ($memcached_servers && class_exists('Memcache')) {
+ if ( $memcached_servers && class_exists('Memcache') ) {
$this->_enabled = true;
$this->_handler = new Memcache();
$servers = explode(';', $memcached_servers);
- foreach ($servers as $server) {
- if ( preg_match('/(.*):([\d]+)$/', $server, $regs) ) {
- // "hostname:port" OR "unix:///path/to/socket:0"
- $server = $regs[1];
- $port = $regs[2];
- }
- else {
- $port = 11211;
- }
+ foreach ($servers as $server) {
+ if ( preg_match('/(.*):([\d]+)$/', $server, $regs) ) {
+ // "hostname:port" OR "unix:///path/to/socket:0"
+ $server = $regs[1];
+ $port = $regs[2];
+ }
+ else {
+ $port = 11211;
+ }
- $this->_handler->addServer($server, $port);
- }
+ $this->_handler->addServer($server, $port);
+ }
- // verify, that memcache server is working
- if (!$this->_handler->set('test', 1)) {
+ // verify, that memcache server is working
+ if ( !$this->_handler->set('test', 1) ) {
$this->_enabled = false;
}
}