Attached Files |
compression_engine_setting_integration.patch [^] (2,564 bytes) 2011-12-07 08:37
[Show Content]
Index: minify_helper.php
===================================================================
--- minify_helper.php (revision 14836)
+++ minify_helper.php (working copy)
@@ -182,35 +182,57 @@
*/
public function compressString(&$string, $extension)
{
- $tmp_file = tempnam('/tmp', 'to_compress_');
- $fp = fopen($tmp_file, 'w');
- fwrite($fp, $string);
- fclose($fp);
+ $vars = kUtil::getConfigVars();
- $command = 'java -jar ' . dirname(__FILE__) . DIRECTORY_SEPARATOR . 'yuicompressor-2.4.2.jar --type ' . $extension . ' --charset utf-8 ' . $tmp_file;
- $compressed_string = shell_exec($command);
+ if ( !array_key_exists('CompressionEngine', $vars) ) {
+ // compression method not specified - use none
+ return;
+ }
- unlink($tmp_file);
+ switch ( $vars['CompressionEngine'] ) {
+ case 'yui':
+ $this->compressViaJava($string, $extension);
+ break;
- if (!is_null($compressed_string) && $compressed_string) {
- $string = $compressed_string;
- return ;
+ case 'php':
+ $this->compressViaPHP($string, $extension);
+ break;
}
+ }
- // failed to compress using YUICompressor (maybe java not installed)
+ /**
+ * Compresses string using YUI compressor (uses Java)
+ *
+ * @param string $string
+ * @param string $extension
+ * @return void
+ * @access protected
+ */
+ protected function compressViaJava(&$string, $extension)
+ {
+ $tmp_file = tempnam('/tmp', 'to_compress_');
+ file_put_contents($tmp_file, $string);
- if ($extension == 'js') {
- $minifier =& $this->Application->makeClass('JsMinifyHelper');
- /* @var $minifier JsMinifyHelper */
+ $command = 'java -jar ' . dirname(__FILE__) . DIRECTORY_SEPARATOR . 'yuicompressor-2.4.2.jar --type ' . $extension . ' --charset utf-8 ' . $tmp_file;
+ $string = shell_exec($command);
- $string = $minifier->minify($string);
- }
- elseif ($extension == 'css') {
- $minifier =& $this->Application->makeClass('CssMinifyHelper');
- /* @var $minifier CssMinifyHelper */
+ unlink($tmp_file);
+ }
- $string = $minifier->minify($string);
- }
+ /**
+ * Compresses string using PHP compressor
+ *
+ * @param string $string
+ * @param string $extension
+ * @return void
+ * @access protected
+ */
+ protected function compressViaPHP(&$string, $extension)
+ {
+ $minifier =& $this->Application->makeClass($extension == 'js' ? 'JsMinifyHelper' : 'CssMinifyHelper');
+ /* @var $minifier JsMinifyHelper */
+
+ $string = $minifier->minify($string);
}
/**
remove_memcache_settings_from_db.patch [^] (10,097 bytes) 2011-12-07 10:48
[Show Content]
Index: install/english.lang
===================================================================
--- install/english.lang (revision 14826)
+++ install/english.lang (working copy)
@@ -139,7 +139,6 @@
<PHRASE Label="la_config_AllowSelectGroupOnFront" Module="Core" Type="1">QWxsb3cgdG8gc2VsZWN0IG1lbWJlcnNoaXAgZ3JvdXAgb24gRnJvbnQtZW5k</PHRASE>
<PHRASE Label="la_config_AutoRefreshIntervals" Module="Core" Type="1">TGlzdCBhdXRvbWF0aWMgcmVmcmVzaCBpbnRlcnZhbHMgKGluIG1pbnV0ZXMp</PHRASE>
<PHRASE Label="la_config_backup_path" Module="Core" Type="1">QmFja3VwIFBhdGg=</PHRASE>
- <PHRASE Label="la_config_CacheHandler" Module="Core" Type="1">Q2FjaGluZyBFbmdpbmU=</PHRASE>
<PHRASE Label="la_config_CatalogPreselectModuleTab" Module="Core" Type="1">U3dpdGNoIENhdGFsb2cgdGFicyBiYXNlZCBvbiBNb2R1bGU=</PHRASE>
<PHRASE Label="la_config_CheckStopWords" Module="Core" Type="1">Q2hlY2sgU3RvcCBXb3Jkcw==</PHRASE>
<PHRASE Label="la_config_CSVExportDelimiter" Module="Core" Type="1">RGVmYXVsdCBDU1YgRXhwb3J0IERlbGltaXRlcg==</PHRASE>
@@ -167,7 +166,6 @@
<PHRASE Label="la_config_MailingListQueuePerStep" Module="Core" Type="1">TWFpbGluZyBMaXN0IFF1ZXVlIFBlciBTdGVw</PHRASE>
<PHRASE Label="la_config_MailingListSendPerStep" Module="Core" Type="1">TWFpbGluZyBMaXN0IFNlbmQgUGVyIFN0ZXA=</PHRASE>
<PHRASE Label="la_config_MaxImageCount" Module="Core" Type="1">TWF4aW11bSBudW1iZXIgb2YgaW1hZ2Vz</PHRASE>
- <PHRASE Label="la_config_MemcacheServers" Module="Core" Type="1">TWVtY2FjaGUgU2VydmVycw==</PHRASE>
<PHRASE Label="la_config_ModRewriteUrlEnding" Module="Core" Type="1">RGVmYXVsdCBVUkwgRW5kaW5nIGluIFNFTy1mcmllbmRseSBtb2Rl</PHRASE>
<PHRASE Label="la_config_nopermission_template" Module="Core" Type="1">VGVtcGxhdGUgZm9yICJJbnN1ZmZpY2llbnQgUGVybWlzc2lvbnMiIEVycm9y</PHRASE>
<PHRASE Label="la_config_OutputCompressionLevel" Module="Core" Type="1">R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=</PHRASE>
@@ -637,7 +635,6 @@
<PHRASE Label="la_hint_ExportPhrases" Module="Core" Type="1">U2luZ2xlIFBocmFzZSBMYWJlbCBwZXIgbGluZSAoZm9ybWF0czogbGFfU2FtcGxlTGFiZWwsIGx1X0Zyb250RW5kTGFiZWwp</PHRASE>
<PHRASE Label="la_hint_ForceModRewriteUrlEnding" Module="Core" Type="1">VXNlciB3aWxsIGJlIGF1dG9tYXRpY2FsbHkgcmVkaXJlY3RlZCB0byB0aGUgc2VsZWN0ZWQgVXJsIEVuZGluZyBpbiBjYXNlIHdoZW4gY3VycmVudCBwYWdlIHVybCBoYXMgYSBkaWZmZXJlbnQgZW5kaW5n</PHRASE>
<PHRASE Label="la_hint_ImageFiles" Module="Core" Type="1">SW1hZ2UgRmlsZXM=</PHRASE>
- <PHRASE Label="la_hint_MemcacheServers" Module="Core" Type="1">TXVsdGlwbGUgTWVtY2FjaGVkIHNlcnZlcnMgY2FuIGJlIGxpc3RlZCBzZXBhcmF0ZWQgYnkgc2VtaS1jb2xvbiAoOykuIEZvciBleGFtcGxlLCAxOTIuMTY4LjEuMToxMTIxOzE5Mi4xNjguMS4yOjExMjE7MTkyLjE2OC4xLjM6MTEyMQ==</PHRASE>
<PHRASE Label="la_hint_PageExpiration" Module="Core" Type="1">SG93IHNvb24gKGluIHNlY29uZHMpIHRoZSBzZWN0aW9uIGNhY2hlIHNob3VsZCBhdXRvLWV4cGlyZSBhZnRlciBpdCdzIGNyZWF0aW9uLiBCeSBkZWZhdWx0IHN5c3RlbSB0ZW5kcyB0byByZWJ1aWxkIHRoZSBjYWNoZSBvbmx5IHdoZW4gaXQncyBwcm9wZXJ0aWVzIG9yIGVsZW1lbnRzIGhhdmUgY2hhbmdlZC4=</PHRASE>
<PHRASE Label="la_hint_PerformExactSearch" Module="Core" Type="1">U2VhcmNoIGZvciBhbGwgZW50ZXJlZCBrZXl3b3JkcywgaW5zdGVhZCBvZiBhbnkgb25lIG9mIHRoZW0=</PHRASE>
<PHRASE Label="la_hint_PopPort" Module="Core" Type="1">UE9QMyBTZXJ2ZXIgUG9ydC4gRm9yIGV4LiAiMTEwIiBmb3IgcmVndWxhciBjb25uZWN0aW9uLCAiOTk1IiBmb3Igc2VjdXJlIGNvbm5lY3Rpb24u</PHRASE>
@@ -1020,7 +1017,6 @@
<PHRASE Label="la_section_SenderInfo" Module="Core" Type="1">U2VuZGVyIEluZm9ybWF0aW9u</PHRASE>
<PHRASE Label="la_section_Settings" Module="Core" Type="1">U2V0dGluZ3M=</PHRASE>
<PHRASE Label="la_section_SettingsAdmin" Module="Core" Type="1">QWRtaW4gQ29uc29sZSBTZXR0aW5ncw==</PHRASE>
- <PHRASE Label="la_section_SettingsCaching" Module="Core" Type="1">Q2FjaGluZyBTZXR0aW5ncw==</PHRASE>
<PHRASE Label="la_section_SettingsCSVExport" Module="Core" Type="1">Q1NWIEV4cG9ydCBTZXR0aW5ncw==</PHRASE>
<PHRASE Label="la_section_SettingsMailling" Module="Core" Type="1">TWFpbGluZyBTZXR0aW5ncw==</PHRASE>
<PHRASE Label="la_section_SettingsSession" Module="Core" Type="1">U2Vzc2lvbiBTZXR0aW5ncw==</PHRASE>
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 "<strong>' . $handler_class . '</strong>" 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: "<strong>' . $handler_class . '</strong>"');
}
@@ -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;
}
}
|