Index: trunk/admin/install/upgrades/changelog_1_1_5.txt =================================================================== diff -u -N -r3478 -r3484 --- trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3478) +++ trunk/admin/install/upgrades/changelog_1_1_5.txt (.../changelog_1_1_5.txt) (revision 3484) @@ -9,190 +9,7 @@ File in-portal/kernel/include/parseditem.php changed File in-portal/kernel/include/relationship.php changed File in-portal/kernel/units/categories/categories_event_handler.php changed -File in-portal/themes/inlink2/access_denied.tpl is removed -File in-portal/themes/inlink2/add_link.tpl is removed -File in-portal/themes/inlink2/add_review.tpl is removed -File in-portal/themes/inlink2/box_search.tpl is removed -File in-portal/themes/inlink2/box_subscribe.tpl is removed -File in-portal/themes/inlink2/box_suggest.tpl is removed -File in-portal/themes/inlink2/confirm.tpl is removed -File in-portal/themes/inlink2/custom_field.tpl is removed -File in-portal/themes/inlink2/details.tpl is removed -File in-portal/themes/inlink2/display_cat_search.tpl is removed -File in-portal/themes/inlink2/display_link_search.tpl is removed -File in-portal/themes/inlink2/display_search_results.tpl is removed -File in-portal/themes/inlink2/error.tpl is removed -File in-portal/themes/inlink2/favorites.tpl is removed -File in-portal/themes/inlink2/footer.tpl is removed -File in-portal/themes/inlink2/header.tpl is removed -File in-portal/themes/inlink2/index.tpl is removed -File in-portal/themes/inlink2/list_cats.tpl is removed -File in-portal/themes/inlink2/list_fav_links.tpl is removed -File in-portal/themes/inlink2/list_feature_links.tpl is removed -File in-portal/themes/inlink2/list_links.tpl is removed -File in-portal/themes/inlink2/list_rel_cats.tpl is removed -File in-portal/themes/inlink2/list_reviews.tpl is removed -File in-portal/themes/inlink2/login.tpl is removed -File in-portal/themes/inlink2/menu_navigation.tpl is removed -File in-portal/themes/inlink2/menu_user.tpl is removed -File in-portal/themes/inlink2/modify.tpl is removed -File in-portal/themes/inlink2/modify_link.tpl is removed -File in-portal/themes/inlink2/new.tpl is removed -File in-portal/themes/inlink2/pick.tpl is removed -File in-portal/themes/inlink2/pop.tpl is removed -File in-portal/themes/inlink2/profile.tpl is removed -File in-portal/themes/inlink2/rate.tpl is removed -File in-portal/themes/inlink2/registration.tpl is removed -File in-portal/themes/inlink2/reviews.tpl is removed -File in-portal/themes/inlink2/search_advanced_cats.tpl is removed -File in-portal/themes/inlink2/search_advanced_links.tpl is removed -File in-portal/themes/inlink2/send_password.tpl is removed -File in-portal/themes/inlink2/send_password_confirm.tpl is removed -File in-portal/themes/inlink2/show_cats.tpl is removed -File in-portal/themes/inlink2/show_links.tpl is removed -File in-portal/themes/inlink2/show_related_cats.tpl is removed -File in-portal/themes/inlink2/sort_cats.tpl is removed -File in-portal/themes/inlink2/sort_links.tpl is removed -File in-portal/themes/inlink2/statistics.tpl is removed -File in-portal/themes/inlink2/style.css is removed -File in-portal/themes/inlink2/sub_pages.tpl is removed -File in-portal/themes/inlink2/subscribe.tpl is removed -File in-portal/themes/inlink2/suggest_cat.tpl is removed -File in-portal/themes/inlink2/top.tpl is removed -File in-portal/themes/inlink2/addreview/review_confirm.tpl is removed -File in-portal/themes/inlink2/addreview/review_confirm_new.tpl is removed -File in-portal/themes/inlink2/addreview/review_confirm_pending.tpl is removed -File in-portal/themes/inlink2/addreview/review_form.tpl is removed -File in-portal/themes/inlink2/advsearch/adv_searchtype_options.tpl is removed -File in-portal/themes/inlink2/advsearch/advsearch_item.tpl is removed -File in-portal/themes/inlink2/advsearch/advsearch_type.tpl is removed -File in-portal/themes/inlink2/advsearch/alt_item_form.tpl is removed -File in-portal/themes/inlink2/advsearch/alt_item_form_last.tpl is removed -File in-portal/themes/inlink2/advsearch/item_form.tpl is removed -File in-portal/themes/inlink2/advsearch/item_form_last.tpl is removed -File in-portal/themes/inlink2/edit_link/modify_confirm.tpl is removed -File in-portal/themes/inlink2/edit_link/modify_confirm_pending.tpl is removed -File in-portal/themes/inlink2/edit_link/modify_link_element.tpl is removed -File in-portal/themes/inlink2/edit_link/modify_link_form.tpl is removed -File in-portal/themes/inlink2/favorites/list_favorites.tpl is removed -File in-portal/themes/inlink2/favorites/no_favorites.tpl is removed -File in-portal/themes/inlink2/images/arrow.gif is removed -File in-portal/themes/inlink2/images/brand_logo.gif is removed -File in-portal/themes/inlink2/images/chinese_big5.gif is removed -File in-portal/themes/inlink2/images/chinese_gb.gif is removed -File in-portal/themes/inlink2/images/default.gif is removed -File in-portal/themes/inlink2/images/dice.gif is removed -File in-portal/themes/inlink2/images/dutch.gif is removed -File in-portal/themes/inlink2/images/english.gif is removed -File in-portal/themes/inlink2/images/finnish.gif is removed -File in-portal/themes/inlink2/images/folder.gif is removed -File in-portal/themes/inlink2/images/french.gif is removed -File in-portal/themes/inlink2/images/german.gif is removed -File in-portal/themes/inlink2/images/icon1.gif is removed -File in-portal/themes/inlink2/images/icon10.gif is removed -File in-portal/themes/inlink2/images/icon11.gif is removed -File in-portal/themes/inlink2/images/icon2.gif is removed -File in-portal/themes/inlink2/images/icon3.gif is removed -File in-portal/themes/inlink2/images/icon4.gif is removed -File in-portal/themes/inlink2/images/icon5.gif is removed -File in-portal/themes/inlink2/images/icon6.gif is removed -File in-portal/themes/inlink2/images/icon7.gif is removed -File in-portal/themes/inlink2/images/icon8.gif is removed -File in-portal/themes/inlink2/images/icon9.gif is removed -File in-portal/themes/inlink2/images/inlink2_logo.gif is removed -File in-portal/themes/inlink2/images/italian.gif is removed -File in-portal/themes/inlink2/images/polish.gif is removed -File in-portal/themes/inlink2/images/portuguese.gif is removed -File in-portal/themes/inlink2/images/right_logo.gif is removed -File in-portal/themes/inlink2/images/romanian.gif is removed -File in-portal/themes/inlink2/images/russian.gif is removed -File in-portal/themes/inlink2/images/spacer.gif is removed -File in-portal/themes/inlink2/images/spanish.gif is removed -File in-portal/themes/inlink2/images/star.gif is removed -File in-portal/themes/inlink2/images/star_rate.gif is removed -File in-portal/themes/inlink2/images/swedish.gif is removed -File in-portal/themes/inlink2/images/thai.gif is removed -File in-portal/themes/inlink2/images/ticon0.gif is removed -File in-portal/themes/inlink2/images/ticon1.gif is removed -File in-portal/themes/inlink2/images/ticon10.gif is removed -File in-portal/themes/inlink2/images/ticon11.gif is removed -File in-portal/themes/inlink2/images/ticon12.gif is removed -File in-portal/themes/inlink2/images/ticon13.gif is removed -File in-portal/themes/inlink2/images/ticon14.gif is removed -File in-portal/themes/inlink2/images/ticon15.gif is removed -File in-portal/themes/inlink2/images/ticon16.gif is removed -File in-portal/themes/inlink2/images/ticon17.gif is removed -File in-portal/themes/inlink2/images/ticon18.gif is removed -File in-portal/themes/inlink2/images/ticon19.gif is removed -File in-portal/themes/inlink2/images/ticon2.gif is removed -File in-portal/themes/inlink2/images/ticon20.gif is removed -File in-portal/themes/inlink2/images/ticon21.gif is removed -File in-portal/themes/inlink2/images/ticon3.gif is removed -File in-portal/themes/inlink2/images/ticon4.gif is removed -File in-portal/themes/inlink2/images/ticon5.gif is removed -File in-portal/themes/inlink2/images/ticon6.gif is removed -File in-portal/themes/inlink2/images/ticon7.gif is removed -File in-portal/themes/inlink2/images/ticon8.gif is removed -File in-portal/themes/inlink2/images/ticon9.gif is removed -File in-portal/themes/inlink2/images/tr.gif is removed -File in-portal/themes/inlink2/lang_menu/lang_menu_element.tpl is removed -File in-portal/themes/inlink2/login/box_login.tpl is removed -File in-portal/themes/inlink2/login/loggedin.tpl is removed -File in-portal/themes/inlink2/login/login.tpl is removed -File in-portal/themes/inlink2/login/notloggedin.tpl is removed -File in-portal/themes/inlink2/mailing_list/confirm_subscribe.tpl is removed -File in-portal/themes/inlink2/mailing_list/confirm_unsubscribe.tpl is removed -File in-portal/themes/inlink2/mailing_list/error.tpl is removed -File in-portal/themes/inlink2/mailing_list/subscribe.tpl is removed -File in-portal/themes/inlink2/mailing_list/unsubscribe.tpl is removed -File in-portal/themes/inlink2/misc/form_error.tpl is removed -File in-portal/themes/inlink2/misc/form_prompt.tpl is removed -File in-portal/themes/inlink2/misc/form_prompt_error.tpl is removed -File in-portal/themes/inlink2/profile/english_countries.tpl is removed -File in-portal/themes/inlink2/profile/myinfo_dob.tpl is removed -File in-portal/themes/inlink2/rate/rate_confirm.tpl is removed -File in-portal/themes/inlink2/rate/rate_duplicate.tpl is removed -File in-portal/themes/inlink2/rate/rate_form.tpl is removed -File in-portal/themes/inlink2/rating/0.gif is removed -File in-portal/themes/inlink2/rating/0_half.gif is removed -File in-portal/themes/inlink2/rating/1.gif is removed -File in-portal/themes/inlink2/rating/1_half.gif is removed -File in-portal/themes/inlink2/rating/2.gif is removed -File in-portal/themes/inlink2/rating/2_half.gif is removed -File in-portal/themes/inlink2/rating/3.gif is removed -File in-portal/themes/inlink2/rating/3_half.gif is removed -File in-portal/themes/inlink2/rating/4.gif is removed -File in-portal/themes/inlink2/rating/4_half.gif is removed -File in-portal/themes/inlink2/rating/5.gif is removed -File in-portal/themes/inlink2/register/english_countries.tpl is removed -File in-portal/themes/inlink2/register/register_confirm.tpl is removed -File in-portal/themes/inlink2/register/register_dob.tpl is removed -File in-portal/themes/inlink2/register/register_notallowed.tpl is removed -File in-portal/themes/inlink2/register/register_pending.tpl is removed -File in-portal/themes/inlink2/relevance/0.gif is removed -File in-portal/themes/inlink2/relevance/1.gif is removed -File in-portal/themes/inlink2/relevance/10.gif is removed -File in-portal/themes/inlink2/relevance/2.gif is removed -File in-portal/themes/inlink2/relevance/3.gif is removed -File in-portal/themes/inlink2/relevance/4.gif is removed -File in-portal/themes/inlink2/relevance/5.gif is removed -File in-portal/themes/inlink2/relevance/6.gif is removed -File in-portal/themes/inlink2/relevance/7.gif is removed -File in-portal/themes/inlink2/relevance/8.gif is removed -File in-portal/themes/inlink2/relevance/9.gif is removed -File in-portal/themes/inlink2/search_results/cat_search_results.tpl is removed -File in-portal/themes/inlink2/search_results/error.tpl is removed -File in-portal/themes/inlink2/search_results/link_search_results.tpl is removed -File in-portal/themes/inlink2/search_results/list_search_cats.tpl is removed -File in-portal/themes/inlink2/search_results/list_search_links.tpl is removed -File in-portal/themes/inlink2/search_results/search_count.tpl is removed -File in-portal/themes/inlink2/suggest_cat/suggest_cat_confirm.tpl is removed -File in-portal/themes/inlink2/suggest_cat/suggest_cat_confirm_pending.tpl is removed -File in-portal/themes/inlink2/suggest_cat/suggest_cat_form.tpl is removed -File in-portal/themes/inlink2/suggest_link/suggest_confirm.tpl is removed -File in-portal/themes/inlink2/suggest_link/suggest_confirm_pending.tpl is removed -File in-portal/themes/inlink2/suggest_link/suggest_link_form.tpl is removed -File in-portal/themes/inlink2/theme_menu/theme_menu_element.tpl is removed + File kernel4_dev/kernel4/application.php changed File kernel4_dev/kernel4/parser/tags.php changed File kernel4_dev/kernel4/processors/main_processor.php changed Index: trunk/kernel/units/users/users_event_handler.php =================================================================== diff -u -N -r3344 -r3484 --- trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3344) +++ trunk/kernel/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3484) @@ -15,9 +15,9 @@ { $http_query =& $this->Application->recallObject('HTTPQuery'); $get = $http_query->getRedirectParams(); - + $t = $this->Application->GetVar('t'); - $get['js_redirect'] = 1; + $get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect'); $this->Application->Redirect($t ? $t : 'index', $get); } } @@ -78,7 +78,9 @@ $next_template = $this->Application->GetVar('next_template'); if($next_template) $event->redirect = $next_template; - $event->SetRedirectParam('js_redirect', 1); + if ($this->Application->ConfigValue('UseJSRedirect')) { + $event->SetRedirectParam('js_redirect', 1); + } } else { @@ -117,7 +119,9 @@ $session->SetField('GroupList', $group_list); $this->Application->StoreVar('UserGroups', $group_list); - $event->SetRedirectParam('js_redirect', 1); + if ($this->Application->ConfigValue('UseJSRedirect')) { + $event->SetRedirectParam('js_redirect', 1); + } } /** Index: trunk/core/units/users/users_event_handler.php =================================================================== diff -u -N -r3344 -r3484 --- trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3344) +++ trunk/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 3484) @@ -15,9 +15,9 @@ { $http_query =& $this->Application->recallObject('HTTPQuery'); $get = $http_query->getRedirectParams(); - + $t = $this->Application->GetVar('t'); - $get['js_redirect'] = 1; + $get['js_redirect'] = $this->Application->ConfigValue('UseJSRedirect'); $this->Application->Redirect($t ? $t : 'index', $get); } } @@ -78,7 +78,9 @@ $next_template = $this->Application->GetVar('next_template'); if($next_template) $event->redirect = $next_template; - $event->SetRedirectParam('js_redirect', 1); + if ($this->Application->ConfigValue('UseJSRedirect')) { + $event->SetRedirectParam('js_redirect', 1); + } } else { @@ -117,7 +119,9 @@ $session->SetField('GroupList', $group_list); $this->Application->StoreVar('UserGroups', $group_list); - $event->SetRedirectParam('js_redirect', 1); + if ($this->Application->ConfigValue('UseJSRedirect')) { + $event->SetRedirectParam('js_redirect', 1); + } } /** Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.5.sql =================================================================== diff -u -N -r3476 -r3484 --- trunk/admin/install/upgrades/inportal_upgrade_v1.1.5.sql (.../inportal_upgrade_v1.1.5.sql) (revision 3476) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.5.sql (.../inportal_upgrade_v1.1.5.sql) (revision 3484) @@ -1,3 +1,6 @@ INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('Perpage_Review', '10', 'In-Portal', ''); +INSERT INTO ConfigurationValues (VariableName, VariableValue, ModuleOwner, Section) VALUES ('UseJSRedirect', '0', 'In-Portal', 'in-portal:configure_general'); +INSERT INTO ConfigurationAdmin VALUES ('UseJSRedirect', 'la_Text_Website', 'la_config_use_js_redirect', 'checkbox', '', '', 17, 0); + UPDATE Modules SET Version = '1.1.5' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/admin/include/help/configure_general.txt =================================================================== diff -u -N -r3392 -r3484 --- trunk/kernel/admin/include/help/configure_general.txt (.../configure_general.txt) (revision 3392) +++ trunk/kernel/admin/include/help/configure_general.txt (.../configure_general.txt) (revision 3484) @@ -29,8 +29,8 @@
  • Use mod_rewrite � enabling this option will instruct In-portal to generate URLs in a human-readable, search engine friendly format. This option may be enabled only for websites running on the Apache web server with the mod_rewrite module available and configured to allow directory-specific settings via .htaccess files. Please consult your hosting provider to make sure that your server meets these requirements. Before enabling this option, you should copy the .htaccess file from the /tools directory to the root directory of In-portal installation. Even when this option is enabled, In-portal will still recognize the default URL format and any old links or bookmarks will still work. However, with this option enabled, In-portal will always generate URLs in the new format when navigating the site, even if you started from an old-formatted URL.
  • Use mod_rewrite with SSL � this option specifies whether the new URL format should be used when redirecting to an SSL connection (configured by Requre SSL for login & checkout option). Generally, this option should be off when using a shared SSL certificate.
  • File not found (404) template � the template name relative to theme base folder, which will be displayed when requested URL is not found on the server. +
  • Use JavaScript redirection after login/logout (for IIS) - if set to on then JavaScript redirection is used instead of HTTP redirection after login, logout and session expiration. This setting is required when running In-portal on IIS web server, which is not able to set cookies and issue HTTP redirection in one request. -
  • Time zone of the server � this setting controls the time zone your server is located in. This refers to the system time that your server will report to In-portal scripts. You can find out this information from your server administrator.
  • Time zone of the site � this setting controls your time zone. This will determine what time zone you will see on all of the date/time stamps issued by the system. Index: trunk/admin/install/langpacks/english.lang =================================================================== diff -u -N -r3386 -r3484 --- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 3386) +++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 3484) @@ -108,6 +108,7 @@ VGltZSB6b25lIG9mIHRoZSBzaXRl U1NMIEZ1bGwgVVJMIChodHRwczovL3d3dy5kb21haW4uY29tL3BhdGgp VGltZSB6b25lIG9mIHRoZSBzZXJ2ZXI= + VXNlIEphdmFTY3JpcHQgcmVkaXJlY3Rpb24gYWZ0ZXIgbG9naW4vbG9nb3V0IChmb3IgSUlTKQ== VXNlIE1PRCBSRVdSSVRF RW5hYmxlIE1PRF9SRVdSSVRFIGZvciBTU0w= V2Vic2l0ZSBhZGRyZXNz @@ -133,7 +134,7 @@ VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbGluayBvdXRwdXQgc2V0dGluZ3M= VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2Ugc2VhcmNoIHNldHRpbmdzIGFuZCBmaWVsZHM= SW4tTGluayBHZW5lcmFsIENvbmZpZ3VyYXRpb24gT3B0aW9ucw== - VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgcGFpZCBsaXN0aW5ncw== + VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgcGFpZCBsaXN0aW5ncw== VGhpcyBzZWN0aW9uIGFsbG93cyB0byBydW4gdmFsaWRhdGlvbiBvbiB0aGUgbGlua3M= VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbmV3eiBzZXR0aW5ncw== VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgSW4tbmV3eiBjdXN0b20gZmllbGRz @@ -150,7 +151,7 @@ VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIGdlbmVyYWwgY2F0ZWdvcnkgc2V0dGluZ3M= VGhpcyBpcyBhIGdlbmVyYWwgY29uZmd1cmF0aW9uIHNlY3Rpb24= VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgcmVnaW9uYWwgc2V0dGluZ3MsIG1hbmFnZSBhbmQgZWRpdCBsYW5ndWFnZXM= - VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgQ1NTIHN0eWxlc2hlZXRzIGZvciB0aGVtZXMu + VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgQ1NTIHN0eWxlc2hlZXRzIGZvciB0aGVtZXMu VGhpcyBzZWN0aW9uIGFsbG93cyB0byBtYW5hZ2UgdGhlbWVzIGFuZCBlZGl0IHRoZSBpbmRpdmlkdWFsIHRlbXBsYXRlcw== VGhpcyBzZWN0aW9uIGFsbG93cyB5b3UgdG8gY29uZmlndXJlIGdlbmVyYWwgdXNlciBzZXR0aW5ncw== VGhpcyBzZWN0aW9uIHNob3dzIGFsbCBlLW1haWxzIHNlbnQgYnkgSW4tUG9ydGFs @@ -226,8 +227,8 @@ QXBwcm92ZSBVc2Vy RGVueSBVc2Vy Rm9yZ290IFBhc3N3b3Jk - TWVtYmVyc2hpcCBleHBpcmF0aW9uIG5vdGljZQ== - TWVtYmVyc2hpcCBleHBpcmVk + TWVtYmVyc2hpcCBleHBpcmF0aW9uIG5vdGljZQ== + TWVtYmVyc2hpcCBleHBpcmVk UGFzc3dvcmQgQ29uZmlybWF0aW9u VXNlciBzdWJzY3JpYmVk U3VnZ2VzdCB0byBhIGZyaWVuZA== @@ -375,7 +376,7 @@ KEdNVCAtMDk6MDAp TWFyZ2lucw== TUI= - R3JvdXAgTWVtYmVyc2hpcCBFeHBpcmF0aW9uIFJlbWluZGVyIChkYXlzKQ== + R3JvdXAgTWVtYmVyc2hpcCBFeHBpcmF0aW9uIFJlbWluZGVyIChkYXlzKQ== TWFpbiBNZW51 TWV0cmlj TWlzc2luZyBJbiBUaGVtZQ== @@ -793,7 +794,7 @@ V2FybmluZyE= V2VpZ2h0 Wmlw - U2Vzc2lvbiBSZWZlcnJlciBDaGVja2luZw== + U2Vzc2lvbiBSZWZlcnJlciBDaGVja2luZw== bGFfUmF0aW5n QWxyZWFkeSB2b3RlZA== UmVtb3ZlIEZyb20= @@ -1343,7 +1344,7 @@ VXBkYXRpbmcgQ29uZmlndXJhdGlvbg== VXBkYXRpbmcgUnVsZXM= QWxsb3cgbmV3IHVzZXIgcmVnaXN0cmF0aW9u - QXNzaWduIEFsbCBVc2VycyBUbyBHcm91cA== + QXNzaWduIEFsbCBVc2VycyBUbyBHcm91cA== VmFsaWRhdGUgZS1tYWlsIGFkZHJlc3M= QXNzaWduIHVzZXJzIG5vdCBsb2dnZWQgaW4gdG8gZ3JvdXA= QXNzaWduIHJlZ2lzdGVyZWQgdXNlcnMgdG8gZ3JvdXA= @@ -1547,7 +1548,7 @@ VXNlciBuYW1lIGlzIHRvbyBzaG9ydA== V3JvbmcgZmlsZSB0eXBl - YQ== + YQ== QWdl Y2Mx Y2My @@ -1561,7 +1562,7 @@ bGM0 bGM1 bGM2 - U2FtcGxlRmllbGQ= + U2FtcGxlRmllbGQ= U2V4 VGVzdA== dWMx @@ -1571,6 +1572,7 @@ dWM1 dWM2 dXNlcl9haW0= + dXNlcl9mcm9t dXNlcl9pY3E= dXNlcl9pbnRlcmVzdHM= dXNlcl9tc24= @@ -2099,40 +2101,40 @@ dGVzdCAy - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB2YWxpZGF0ZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiB2YWxpZGF0ZWQu - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg== - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiB1bnN1YnNjcmliZWQKCllvdSBoYXZlIHN1Y2Nlc3NmdWxseSB1bnN1YnNyaWJlZCBmcm9tIDxpbnA6bV9wYWdlX3RpdGxlIC8+IG1haWxpbmcgbGlzdC4= + WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE1lbWJlcnNoaXAgZXhwaXJhdGlvbiBub3RpY2UKCk1lbWJlcnNoaXAgZXhwaXJhdGlvbiBub3RpY2U= + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2hlY2sgb3V0IHRoaXMgc2l0ZQoKSGksDQoNClRoaXMgbWVzc2FnZSBoYXMgYmVlbiBzZW50IHRvIHlvdSBmcm9tIG9uZSBvZiB5b3VyIGZyaWVuZHMuDQpDaGVjayBvdXQgdGhpcyBzaXRlOiA8YSBocmVmPSI8aW5wOm1fdGhlbWVfdXJsIF9wYWdlPSJjdXJyZW50Ii8+Ij48aW5wOm1fcGFnZV90aXRsZSAvPjwvYT4h WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEEgY2F0ZWdvcnkgaGFzIGJlZW4gZGVsZXRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVsZXRlZC4= - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSB1c2VyIGhhcyBzdWJzY3JpYmVkCgpBIHVzZXIgaGFzIHN1YnNjcmliZWQgdG8gPGlucDptX3BhZ2VfdGl0bGUgLz4gbWFpbGluZyBsaXN0Lg== + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiBhcHByb3ZlZAoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iLg== + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBkZW5pZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBkZW5pZWQu + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogWW91IGhhdmUgYmVlbiB1bnN1YnNjcmliZWQKCllvdSBoYXZlIHN1Y2Nlc3NmdWxseSB1bnN1YnNyaWJlZCBmcm9tIDxpbnA6bV9wYWdlX3RpdGxlIC8+IG1haWxpbmcgbGlzdC4= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVGhlIHNpdGUgaGFzIGJlZW4gc3VnZ2VzdGVkCgpBIHZpc2l0b3Igc3VnZ2VzdGVkIHlvdXIgc2l0ZSB0byBhIGZyaWVuZC4= - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGFuZCB5b3VyIHBhc3N3b3JkIGlzICI8aW5wOnRvdXNlciBfRmllbGQ9InBhc3N3b3JkIiAvPiIuDQo= + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQgKHBlbmRpbmcpCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZCwgcGVuZGluZyB5b3VyIGNvbmZpcm1hdGlvbi4gIFBsZWFzZSByZXZpZXcgdGhlIGNhdGVnb3J5IGFuZCBhcHByb3ZlIG9yIGRlbnkgaXQu + WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wOnRvdXNlciBfRmllbGQ9IkxvZ2luIiAvPiIgaGFzIGJlZW4gYWRkZWQu + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSB1c2VyIGhhcyBzdWJzY3JpYmVkCgpBIHVzZXIgaGFzIHN1YnNjcmliZWQgdG8gPGlucDptX3BhZ2VfdGl0bGUgLz4gbWFpbGluZyBsaXN0Lg== WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE1lbWJlcnNoaXAgZXhwaXJlZAoKTWVtYmVyc2hpcCBleHBpcmVk WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IFVzZXIgcmVnaXN0ZXJlZAoKQSBuZXcgdXNlciAiPGlucDp0b3VzZXIgX0ZpZWxkPSJMb2dpbiIgLz4iIGhhcyByZWdpc3RlcmVkIGFuZCBpcyBwZW5kaW5nIGFkbWluaXN0cmF0aXZlIGFwcHJvdmFsLg== - WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wOnRvdXNlciBfRmllbGQ9IkxvZ2luIiAvPiIgaGFzIGJlZW4gYWRkZWQu - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYXBwcm92ZWQu - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBkZW5pZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiBkZW5pZWQu WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4= - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQgKHBlbmRpbmcpCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZCwgcGVuZGluZyB5b3VyIGNvbmZpcm1hdGlvbi4gIFBsZWFzZSByZXZpZXcgdGhlIGNhdGVnb3J5IGFuZCBhcHByb3ZlIG9yIGRlbnkgaXQu WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE1lbWJlcnNoaXAgZXhwaXJlZAoKTWVtYmVyc2hpcCBleHBpcmVk - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCllvdXIgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVuaWVkLg== - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg== WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE1lbWJlcnNoaXAgZXhwaXJhdGlvbiBub3RpY2UKCk1lbWJlcnNoaXAgZXhwaXJhdGlvbiBub3RpY2U= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCkEgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGRlbmllZC4= + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYXBwcm92ZWQu + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKV2VsY29tZSB0byBJbi1wb3J0YWwhDQpZb3VyIHVzZXIgcmVnaXN0cmF0aW9uIGhhcyBiZWVuIGFwcHJvdmVkLiBZb3VyIHVzZXIgbmFtZSBpcyAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGFuZCB5b3VyIHBhc3N3b3JkIGlzICI8aW5wOnRvdXNlciBfRmllbGQ9InBhc3N3b3JkIiAvPiIuDQo= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIG1vZGlmaWVkLg== - U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4= + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhcHByb3ZlZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg== + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCllvdXIgY2F0ZWdvcnkgc3VnZ2VzdGlvbiAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gZGVuaWVkLg== WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQWNjZXNzIGRlbmllZAoKWW91ciByZWdpc3RyYXRpb24gdG8gPGlucDptX3BhZ2VfdGl0bGUgLz4gaGFzIGJlZW4gZGVuaWVkLg== WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZWxldGVkCgpBIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBkZWxldGVkLg== WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB1bnN1YnNyaWJlZAoKQSB1c2VyIGhhcyB1bnN1YnNjcmliZWQu - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogUGFzc3dvcmQgcmVzZXQgY29uZmlybWF0aW9uCgpIZWxsbywNCg0KSXQgc2VlbXMgdGhhdCB5b3UgaGF2ZSByZXF1ZXN0ZWQgYSBwYXNzd29yZCByZXNldCBmb3IgeW91ciBJbi1wb3J0YWwgYWNjb3VudC4gSWYgeW91IHdvdWxkIGxpa2UgdG8gcHJvY2VlZCBhbmQgY2hhbmdlIHRoZSBwYXNzd29yZCwgcGxlYXNlIGNsaWNrIG9uIHRoZSBsaW5rIGJlbG93Og0KPGlucDptX2NvbmZpcm1fcGFzc3dvcmRfbGluayAvPg0KDQpZb3Ugd2lsbCByZWNlaXZlIGEgc2Vjb25kIGVtYWlsIHdpdGggeW91ciBuZXcgcGFzc3dvcmQgc2hvcnRseS4NCg0KSWYgeW91IGJlbGlldmUgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBlbWFpbCBpbiBlcnJvciwgcGxlYXNlIGlnbm9yZSB0aGlzIGVtYWlsLiBZb3VyIHBhc3N3b3JkIHdpbGwgbm90IGJlIGNoYW5nZWQgdW5sZXNzIHlvdSBoYXZlIGNsaWNrZWQgb24gdGhlIGFib3ZlIGxpbmsuDQo= - + U3ViamVjdDogQ2F0ZWdvcnkgYWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wOm1fY2F0ZWdvcnlfZmllbGQgX0ZpZWxkPSJOYW1lIiBfU3RyaXBIVE1MPSIxIi8+IiBoYXMgYmVlbiBhZGRlZC4= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogUGFzc3dvcmQgcmVzZXQgY29uZmlybWF0aW9uCgpIZWxsbywNCg0KSXQgc2VlbXMgdGhhdCB5b3UgaGF2ZSByZXF1ZXN0ZWQgYSBwYXNzd29yZCByZXNldCBmb3IgeW91ciBJbi1wb3J0YWwgYWNjb3VudC4gSWYgeW91IHdvdWxkIGxpa2UgdG8gcHJvY2VlZCBhbmQgY2hhbmdlIHRoZSBwYXNzd29yZCwgcGxlYXNlIGNsaWNrIG9uIHRoZSBsaW5rIGJlbG93Og0KPGlucDptX2NvbmZpcm1fcGFzc3dvcmRfbGluayAvPg0KDQpZb3Ugd2lsbCByZWNlaXZlIGEgc2Vjb25kIGVtYWlsIHdpdGggeW91ciBuZXcgcGFzc3dvcmQgc2hvcnRseS4NCg0KSWYgeW91IGJlbGlldmUgeW91IGhhdmUgcmVjZWl2ZWQgdGhpcyBlbWFpbCBpbiBlcnJvciwgcGxlYXNlIGlnbm9yZSB0aGlzIGVtYWlsLiBZb3VyIHBhc3N3b3JkIHdpbGwgbm90IGJlIGNoYW5nZWQgdW5sZXNzIHlvdSBoYXZlIGNsaWNrZWQgb24gdGhlIGFib3ZlIGxpbmsuDQo= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBhZGRlZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gYWRkZWQu WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciBhcHByb3ZlZAoKVXNlciAiPGlucDp0b3VzZXIgX0ZpZWxkPSJVc2VyTmFtZSIgLz4iIGhhcyBiZWVuIGFwcHJvdmVkLg== - WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLVBvcnRhbCBSZWdpc3RyYXRpb24KCkRlYXIgPGlucDp0b3VzZXIgX0ZpZWxkPSJGaXJzdE5hbWUiIC8+IDxpbnA6dG91c2VyIF9GaWVsZD0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnA6bV9wYWdlX3RpdGxlIC8+LiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4= - WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogTG9zdCBwYXNzd29yZAoKWW91ciBsb3N0IHBhc3N3b3JkIGhhcyBiZWVuIHJlc2V0LiBZb3VyIG5ldyBwYXNzd29yZCBpczogIjxpbnA6dG91c2VyIF9GaWVsZD0iUGFzc3dvcmQiIC8+Ii4= WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogU3Vic2NyaXB0aW9uIGNvbmZpcm1hdGlvbgoKWW91IGhhdmUgc3Vic2NyaWJlZCB0byA8aW5wOm1fcGFnZV90aXRsZSAvPiBtYWlsaW5nIGxpc3Qu + WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLVBvcnRhbCBSZWdpc3RyYXRpb24KCkRlYXIgPGlucDp0b3VzZXIgX0ZpZWxkPSJGaXJzdE5hbWUiIC8+IDxpbnA6dG91c2VyIF9GaWVsZD0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnA6bV9wYWdlX3RpdGxlIC8+LiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4= + WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogVXNlciB2YWxpZGF0ZWQKClVzZXIgIjxpbnA6dG91c2VyIF9GaWVsZD0iVXNlck5hbWUiIC8+IiBoYXMgYmVlbiB2YWxpZGF0ZWQu WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -N -r3476 -r3484 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3476) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 3484) @@ -51,6 +51,7 @@ 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 ConfigurationAdmin VALUES ('UseJSRedirect', 'la_Text_Website', 'la_config_use_js_redirect', 'checkbox', '', '', 17, 0); INSERT INTO ConfigurationValues VALUES ('Columns_Category', '2', 'In-Portal', 'Categories') INSERT INTO ConfigurationValues VALUES ('DomainSelect','1','In-Portal','in-portal:configure_general') @@ -178,6 +179,7 @@ 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'); +INSERT INTO ConfigurationValues VALUES ('UseJSRedirect', '0', '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)