Index: trunk/admin/install/upgrades/changelog_1_1_2.txt
===================================================================
diff -u -r2806 -r2851
--- trunk/admin/install/upgrades/changelog_1_1_2.txt	(.../changelog_1_1_2.txt)	(revision 2806)
+++ trunk/admin/install/upgrades/changelog_1_1_2.txt	(.../changelog_1_1_2.txt)	(revision 2851)
@@ -72,6 +72,8 @@
 File in-portal/admin/import/step3.php changed
 File in-portal/admin/import/step4.php changed
 File in-portal/admin/include/elements.php changed
+File in-portal/admin/include/mainscript.js changed
+File in-portal/admin/include/mainscript.php changed
 File in-portal/admin/install/inportal_data.sql changed
 File in-portal/admin/install/inportal_remove.sql changed
 File in-portal/admin/install/inportal_schema.sql changed
@@ -178,8 +180,10 @@
 File in-portal/kernel/admin_templates/incs/footer.tpl changed
 File in-portal/kernel/admin_templates/incs/form_blocks.tpl changed
 File in-portal/kernel/admin_templates/incs/grid_blocks.tpl changed
+File in-portal/kernel/admin_templates/incs/header.tpl changed
 File in-portal/kernel/admin_templates/incs/is.js changed
 File in-portal/kernel/admin_templates/incs/script.js changed
+File in-portal/kernel/admin_templates/incs/style.css changed
 File in-portal/kernel/admin_templates/incs/toolbar.js changed
 File in-portal/kernel/admin_templates/regional/email_messages_edit.tpl changed
 File in-portal/kernel/admin_templates/regional/languages_edit.tpl changed
@@ -197,6 +201,7 @@
 File in-portal/kernel/include/portaluser.php changed
 File in-portal/kernel/include/usersession.php changed
 File in-portal/kernel/include/adodb/drivers/adodb-mysql.inc.php changed
+File in-portal/kernel/units/categories/categories_config.php changed
 File in-portal/kernel/units/categories/categories_event_handler.php changed
 File in-portal/kernel/units/categories/categories_item.php changed
 File in-portal/kernel/units/categories/categories_tag_processor.php changed
@@ -280,6 +285,7 @@
 File cmseditor/editor/dialog/fck_link/fck_link.js changed
 File cmseditor/editor/dialog/images/s.gif is new
 File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed
+File cmseditor/editor/filemanager/browser/default/connectors/php/connector.php changed
 File cmseditor/editor/filemanager/browser/default/images/s.gif is new
 File cmseditor/editor/js/fckeditorcode_gecko_1.js changed
 File cmseditor/editor/js/fckeditorcode_gecko_2.js changed
@@ -299,11 +305,9 @@
 Added label "la_config_ssl_url" of type "1"
 Added label "la_from_date" of type "1"
 Added label "la_monday" of type "1"
-Added label "la_prompt_affiliate_storage_method" of type "1"
 Added label "la_sunday" of type "1"
 Added label "la_tab_PackageContent" of type "1"
 Added label "la_tab_Visits" of type "1"
-Added label "la_title_AffiliatePaymentTypes" of type "1"
 Added label "la_title_Visits" of type "1"
 Added label "la_ToolTip_DeleteAll" of type "1"
 Added label "la_to_date" of type "1"
@@ -312,57 +316,57 @@
 Added label "lu_fieldcustom__a" of type "2"
 Added label "lu_fieldcustom__samplefield" of type "2"
 Added label "lu_fld_primary_translation" of type "0"
+Added label "lu_LogoutText" of type "0"
 Added label "lu_prompt_email" of type "0"
+Added label "lu_reset" of type "0"
 Added label "lu_visit_DirectReferer" of type "0"
 Changed event "USER.ADD" of type "1"
-Changed event "USER.PSWD" of type "0"
-Added event "USER.MEMBERSHIP.EXPIRED" of type "1"
-Added event "USER.SUGGEST" of type "1"
-Added event "USER.ADD.PENDING" of type "1"
-Added event "USER.ADD" of type "1"
-Added event "USER.SUBSCRIBE" of type "1"
-Removed event "CATEGORY.ADD.PENDING" of type "0"
+Changed event "CATEGORY.ADD.PENDING" of type "1"
+Changed event "USER.DENY" of type "1"
+Changed event "USER.PSWD" of type "1"
+Changed event "CATEGORY.MODIFY" of type "1"
 Removed event "USER.SUBSCRIBE" of type "1"
-Changed event "USER.SUGGEST" of type "1"
-Changed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "1"
-Changed event "USER.VALIDATE" of type "1"
-Changed event "USER.UNSUBSCRIBE" of type "0"
-Changed event "USER.PSWD" of type "0"
+Removed event "USER.MEMBERSHIP.EXPIRED" of type "0"
+Removed event "USER.SUGGEST" of type "1"
+Removed event "USER.VALIDATE" of type "0"
+Added event "USER.SUGGEST" of type "0"
+Added event "CATEGORY.DELETE" of type "1"
+Added event "USER.APPROVE" of type "0"
+Added event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "0"
 Changed event "USER.MEMBERSHIP.EXPIRED" of type "1"
-Changed event "USER.ADD.PENDING" of type "1"
+Changed event "USER.DENY" of type "1"
 Changed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "0"
 Changed event "CATEGORY.MODIFY" of type "1"
 Changed event "USER.APPROVE" of type "1"
 Changed event "USER.SUGGEST" of type "0"
 Changed event "USER.APPROVE" of type "0"
 Changed event "CATEGORY.DELETE" of type "1"
+Changed event "CATEGORY.ADD.PENDING" of type "1"
+Changed event "USER.ADD" of type "1"
+Changed event "USER.SUBSCRIBE" of type "1"
+Changed event "USER.SUGGEST" of type "1"
+Changed event "USER.MEMBERSHIP.EXPIRED" of type "1"
+Changed event "USER.MEMBERSHIP.EXPIRED" of type "0"
+Changed event "USER.PSWD" of type "1"
 Changed event "CATEGORY.DENY" of type "1"
-Changed event "CATEGORY.APPROVE" of type "0"
+Changed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "1"
+Changed event "USER.VALIDATE" of type "0"
 Changed event "CATEGORY.APPROVE" of type "1"
 Changed event "CATEGORY.MODIFY" of type "0"
-Changed event "USER.UNSUBSCRIBE" of type "1"
+Changed event "CATEGORY.APPROVE" of type "0"
 Changed event "USER.DENY" of type "0"
-Changed event "CATEGORY.ADD" of type "0"
 Changed event "CATEGORY.DENY" of type "0"
-Removed event "USER.ADD.PENDING" of type "0"
+Changed event "CATEGORY.ADD" of type "0"
 Changed event "USER.UNSUBSCRIBE" of type "1"
-Changed event "USER.DENY" of type "0"
-Changed event "CATEGORY.ADD" of type "1"
+Changed event "USER.ADD.PENDING" of type "0"
 Changed event "CATEGORY.ADD" of type "0"
+Changed event "USER.UNSUBSCRIBE" of type "1"
+Changed event "USER.DENY" of type "0"
 Changed event "USER.ADD.PENDING" of type "0"
-Changed event "CATEGORY.DENY" of type "0"
-Changed event "CATEGORY.APPROVE" of type "1"
-Changed event "CATEGORY.MODIFY" of type "0"
-Changed event "CATEGORY.DENY" of type "1"
-Changed event "CATEGORY.APPROVE" of type "0"
-Changed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "1"
-Changed event "CATEGORY.ADD" of type "1"
-Changed event "USER.APPROVE" of type "1"
-Changed event "CATEGORY.DELETE" of type "1"
-Changed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "0"
-Changed event "USER.VALIDATE" of type "1"
-Changed event "USER.APPROVE" of type "0"
-Changed event "CATEGORY.MODIFY" of type "1"
-Changed event "USER.UNSUBSCRIBE" of type "0"
-Changed event "CATEGORY.ADD.PENDING" of type "0"
-Changed event "USER.SUGGEST" of type "0"
+Added event "USER.APPROVE" of type "1"
+Removed event "CATEGORY.DENY" of type "0"
+Removed event "CATEGORY.APPROVE" of type "1"
+Removed event "CATEGORY.MODIFY" of type "0"
+Removed event "CATEGORY.DENY" of type "1"
+Removed event "CATEGORY.APPROVE" of type "0"
+Removed event "USER.MEMBERSHIP.EXPIRATION.NOTICE" of type "1"