Index: branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -r5632 -r5642
--- branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 5632)
+++ branches/unlabeled/unlabeled-1.58.2/core/kernel/utility/unit_config_reader.php (.../unit_config_reader.php) (revision 5642)
@@ -47,6 +47,7 @@
'SessionTimeout',
'UseModRewrite',
'UseOutputCompression',
+ 'OutputCompressionLevel',
);
foreach ($config_vars as $var) {
Index: branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php
===================================================================
diff -u -r5632 -r5642
--- branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5632)
+++ branches/unlabeled/unlabeled-1.155.2/core/kernel/application.php (.../application.php) (revision 5642)
@@ -227,6 +227,9 @@
if ($this->UseOutputCompression()) {
header('Content-Encoding: gzip');
safeDefine('DBG_COMPRESS_OUTPUT', 1);
+ $level = $this->ConfigValue('OutputCompressionLevel');
+ if ($level < 0 || $level > 9) $level = 7;
+ safeDefine('DBG_COMPRESSION_LEVEL', $level);
}
$this->HttpQuery =& $this->recallObject('HTTPQuery');
@@ -689,7 +692,7 @@
$this->HTML .= $this->Debugger->printReport(true);
}
- echo $this->UseOutputCompression() ? gzencode($this->HTML) : $this->HTML;
+ echo $this->UseOutputCompression() ? gzencode($this->HTML, DBG_COMPRESSION_LEVEL) : $this->HTML;
$this->UpdateCache();
@@ -707,7 +710,7 @@
$session->SaveData();
//$this->SaveBlocksCache();
}
-
+
/**
* Checks if output compression options is available
*
@@ -1389,7 +1392,7 @@
}
$buffer_content = ob_get_clean();
- echo $this->UseOutputCompression() ? gzencode($buffer_content) : $buffer_content;
+ echo $this->UseOutputCompression() ? gzencode($buffer_content, DBG_COMPRESSION_LEVEL) : $buffer_content;
$session =& $this->recallObject('Session');
$session->SaveData();
Index: branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang
===================================================================
diff -u -r5590 -r5642
--- branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang (.../english.lang) (revision 5590)
+++ branches/unlabeled/unlabeled-1.96.2/admin/install/langpacks/english.lang (.../english.lang) (revision 5642)
@@ -125,13 +125,15 @@
UmVkaXJlY3QgdG8gSFRUUCB3aGVuIFNTTCBpcyBub3QgcmVxdWlyZWQ=
TmFtZQ==
SW5zdWZmaWNlbnQgcGVybWlzc2lvbnMgdGVtcGxhdGU=
+ R1pJUCBjb21wcmVzc2lvbiBsZXZlbCAwLTk=
UmVnaXN0cmF0aW9uIE51bWJlcg==
UmVxdWlyZSBTU0wgZm9yIGxvZ2luICYgY2hlY2tvdXQ=
U2VydmVyIE5hbWU=
U2VydmVyIFBhdGg=
VGltZSB6b25lIG9mIHRoZSBzaXRl
U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp
VGltZSB6b25lIG9mIHRoZSBzZXJ2ZXI=
+ RW5hYmxlIEhUTUwgR1pJUCBjb21wcmVzc2lvbg==
VXNlIEphdmFTY3JpcHQgcmVkaXJlY3Rpb24gYWZ0ZXIgbG9naW4vbG9nb3V0IChmb3IgSUlTKQ==
VXNlIE1PRCBSRVdSSVRF
RW5hYmxlIE1PRF9SRVdSSVRFIGZvciBTU0w=
@@ -1054,6 +1056,7 @@
Q2F0ZWdvcnk=
Q2Vuc29yc2hpcA==
Q2l0eQ==
+ WW91IGFyZSBhYm91dCB0byBjbGVhciBjbGlwYm9hcmQgY29udGVudCENClByZXNzIE9LIHRvIGNvbnRpbnVlIG9yIENhbmNlbCB0byByZXR1cm4gdG8gcHJldmlvdXMgc2NyZWVuLg==
U2VjdGlvbiBDb21pbmcgU29vbg==
Q29tcGxldGU=
Q29uZmlndXJhdGlvbg==
@@ -1354,6 +1357,7 @@
QmFjaw==
QmFu
Q2FuY2Vs
+ Q2xlYXIgQ2xpcGJvYXJk
Q2xvbmU=
Q2xvc2U=
Q29udGludWUgTGluayBWYWxpZGF0aW9u
Index: branches/unlabeled/unlabeled-1.70.2/admin/install/inportal_data.sql
===================================================================
diff -u -r5629 -r5642
--- branches/unlabeled/unlabeled-1.70.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5629)
+++ branches/unlabeled/unlabeled-1.70.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5642)
@@ -61,6 +61,7 @@
INSERT INTO ConfigurationAdmin VALUES ('UseCronForRegularEvent', 'la_Text_Website', 'la_UseCronForRegularEvent', 'checkbox', NULL, NULL, 10.15, 0, 0);
INSERT INTO ConfigurationAdmin VALUES ('NoPermissionTemplate', 'la_Text_Website', 'la_config_nopermission_template', 'text', '', '', 10.17, 0, 0);
INSERT INTO ConfigurationAdmin (VariableName, heading, prompt, element_type, validation, ValueList, DisplayOrder, GroupDisplayOrder, Install) VALUES ('UseOutputCompression', 'la_Text_Website', 'la_config_UseOutputCompression', 'checkbox', '', '', 10.18, 0, 1);
+INSERT INTO ConfigurationAdmin (VariableName, heading, prompt, element_type, validation, ValueList, DisplayOrder, GroupDisplayOrder, Install) VALUES ('OutputCompressionLevel', 'la_Text_Website', 'la_config_OutputCompressionLevel', 'text', '', '', 10.19, 0, 1);
INSERT INTO ConfigurationValues VALUES (NULL, 'Columns_Category', '2', 'In-Portal', 'Categories')
INSERT INTO ConfigurationValues VALUES (NULL, 'DomainSelect','1','In-Portal','in-portal:configure_general')
@@ -194,6 +195,7 @@
INSERT INTO ConfigurationValues VALUES (NULL, 'UseCronForRegularEvent', '0', 'In-Portal', 'in-portal:configure_general');
INSERT INTO ConfigurationValues VALUES (NULL, 'NoPermissionTemplate', 'no_permission', 'In-Portal', 'in-portal:configure_general');
INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('UseOutputCompression', '1', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_general');
INSERT INTO Events VALUES (30, 'USER.ADD', 1, 0, 'In-Portal:Users', 'la_event_user.add', 0)
INSERT INTO Events VALUES (32, 'USER.ADD', 2, 0, 'In-Portal:Users', 'la_event_user.add', 1)
Index: branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql
===================================================================
diff -u -r5634 -r5642
--- branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5634)
+++ branches/unlabeled/unlabeled-1.8.2/admin/install/upgrades/inportal_upgrade_v1.2.1.sql (.../inportal_upgrade_v1.2.1.sql) (revision 5642)
@@ -69,8 +69,11 @@
ALTER TABLE CategoryItems ADD INDEX `Filename` ( `Filename` ( 4 ) );
INSERT INTO ConfigurationAdmin (VariableName, heading, prompt, element_type, validation, ValueList, DisplayOrder, GroupDisplayOrder, Install) VALUES ('UseOutputCompression', 'la_Text_Website', 'la_config_UseOutputCompression', 'checkbox', '', '', 10.18, 0, 1);
-INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('UseOutputCompression', '1', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('UseOutputCompression', '0', 'In-Portal', 'in-portal:configure_general');
+INSERT INTO ConfigurationAdmin (VariableName, heading, prompt, element_type, validation, ValueList, DisplayOrder, GroupDisplayOrder, Install) VALUES ('OutputCompressionLevel', 'la_Text_Website', 'la_config_OutputCompressionLevel', 'text', '', '', 10.19, 0, 1);
+INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('OutputCompressionLevel', '7', 'In-Portal', 'in-portal:configure_general');
+
ALTER TABLE Category ADD l1_CachedNavbar TEXT NOT NULL AFTER CachedNavbar, ADD l2_CachedNavbar TEXT NOT NULL AFTER l1_CachedNavbar, ADD l3_CachedNavbar TEXT NOT NULL AFTER l2_CachedNavbar, ADD l4_CachedNavbar TEXT NOT NULL AFTER l3_CachedNavbar, ADD l5_CachedNavbar TEXT NOT NULL AFTER l4_CachedNavbar;
UPDATE Modules SET Version = '1.2.1' WHERE Name = 'In-Portal';
\ No newline at end of file
Index: branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php
===================================================================
diff -u -r5637 -r5642
--- branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php (.../debugger.php) (revision 5637)
+++ branches/unlabeled/unlabeled-1.59.2/core/kernel/utility/debugger.php (.../debugger.php) (revision 5642)
@@ -882,7 +882,7 @@
$this->IsFatalError = true;
// append debugger report to data in buffer & clean buffer afterwards
$buffer_content = $this->breakOutofBuffering(false) . $this->printReport(true);
- echo $this->constOn('DBG_COMPRESS_OUTPUT') ? gzencode($buffer_content) : $buffer_content;
+ echo $this->constOn('DBG_COMPRESS_OUTPUT') ? gzencode($buffer_content, DBG_COMPRESSION_LEVEL) : $buffer_content;
exit;
}
}