Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql =================================================================== diff -u -r3310 -r3356 --- trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql (.../inportal_upgrade_v1.1.4.sql) (revision 3310) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql (.../inportal_upgrade_v1.1.4.sql) (revision 3356) @@ -1,12 +1,14 @@ INSERT INTO ConfigurationValues VALUES ('SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('UseModRewrite', '0', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationValues VALUES ('UseModRewriteWithSSL', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_Text_Website', 'la_promt_ReferrerCheck', 'checkbox', NULL , NULL , '9', '1'); INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 8, 1); INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_Text_Website', 'la_config_use_modrewrite', 'checkbox', '', '', 14, 1); -INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 15, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseModRewriteWithSSL', 'la_Text_Website', 'la_config_use_modrewrite_with_ssl', 'checkbox', '', '', 15, 1); +INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 16, 0); ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL; Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r3236 -r3356 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3236) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3356) @@ -47,9 +47,10 @@ INSERT INTO ConfigurationAdmin VALUES ('Require_SSL', 'la_Text_Website', 'la_config_require_ssl', 'checkbox', '', '', 12, '1'); INSERT INTO ConfigurationAdmin VALUES ('Force_HTTP_When_SSL_Not_Required', 'la_Text_Website', 'la_config_force_http', 'checkbox', '', '', 13, '1'); INSERT INTO ConfigurationAdmin VALUES ('SessionCookieName', 'la_Text_Website', 'la_prompt_session_cookie_name', 'text', '', '', 8, 1); -INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_Text_Website', 'la_config_use_modrewrite', 'checkbox', '', '', 14, 1); INSERT INTO ConfigurationAdmin VALUES ('SessionReferrerCheck', 'la_Text_Website', 'la_promt_ReferrerCheck', 'checkbox', NULL , NULL , '9', '1'); -INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 15, 0); +INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_Text_Website', 'la_config_use_modrewrite', 'checkbox', '', '', 14, 1); +INSERT INTO ConfigurationAdmin VALUES ('UseModRewriteWithSSL', 'la_Text_Website', 'la_config_use_modrewrite_with_ssl', 'checkbox', '', '', 15, 1); +INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 16, 0); INSERT INTO ConfigurationValues VALUES ('Columns_Category', '2', 'In-Portal', 'Categories') INSERT INTO ConfigurationValues VALUES ('DomainSelect','1','In-Portal','in-portal:configure_general') @@ -173,6 +174,7 @@ INSERT INTO ConfigurationValues VALUES ('Force_HTTP_When_SSL_Not_Required', '1', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('SessionCookieName', 'sid', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('UseModRewrite', '0', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationValues VALUES ('UseModRewriteWithSSL', '0', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('SessionReferrerCheck', '1', 'In-Portal', 'in-portal:configure_general'); INSERT INTO ConfigurationValues VALUES ('ErrorTemplate', 'error_notfound', 'In-Portal', 'in-portal:configure_general');