0000990: Check that all configuration variables being used

Index: install/english.lang =================================================================== --- install/english.lang (revision 14954) +++ install/english.lang (working copy) @@ -693,7 +693,6 @@ <PHRASE Label="la_link_sortfield2_prompt" Module="Core" Type="1">QW5kIHRoZW4gYnk=</PHRASE> <PHRASE Label="la_link_sortfield_prompt" Module="Core" Type="1">T3JkZXIgbGlua3MgYnk=</PHRASE> <PHRASE Label="la_Link_URL" Module="Core" Type="1">VVJM</PHRASE> ~~- <PHRASE Label="la_link_urlstatus_prompt" Module="Core" Type="1">RGlzcGxheSBsaW5rIFVSTCBpbiBzdGF0dXMgYmFy</PHRASE>~~ <PHRASE Label="la_Linux" Module="Core" Type="1">TGludXg=</PHRASE> <PHRASE Label="la_Local" Module="Core" Type="1">TG9jYWw=</PHRASE> <PHRASE Label="la_LocalImage" Module="Core" Type="1">TG9jYWwgSW1hZ2U=</PHRASE> @@ -1204,7 +1203,6 @@ <PHRASE Label="la_text_RecordsUpdated" Module="Core" Type="1">cmVjb3JkcyB1cGRhdGVk</PHRASE> <PHRASE Label="la_text_RequiredFields" Module="Core" Type="1">UmVxdWlyZWQgZmllbGRz</PHRASE> <PHRASE Label="la_Text_Restore_Heading" Module="Core" Type="1">SGVyZSB5b3UgY2FuIHJlc3RvcmUgeW91ciBkYXRhYmFzZSBmcm9tIGEgcHJldmlvdXNseSBiYWNrZWQgdXAgc25hcHNob3QuIFJlc3RvcmluZyB5b3VyIGRhdGFiYXNlIHdpbGwgZGVsZXRlIGFsbCBvZiB5b3VyIGN1cnJlbnQgZGF0YSBhbmQgbG9nIHlvdSBvdXQgb2YgdGhlIHN5c3RlbS4=</PHRASE> ~~- <PHRASE Label="la_Text_Restrictions" Module="Core" Type="1">UmVzdHJpY3Rpb25z</PHRASE>~~ <PHRASE Label="la_text_Review" Module="Core" Type="1">Q29tbWVudA==</PHRASE> <PHRASE Label="la_Text_Reviews" Module="Core" Type="1">Q29tbWVudHM=</PHRASE> <PHRASE Label="la_Text_RootCategory" Module="Core" Type="1">TW9kdWxlIFJvb3QgU2VjdGlvbg==</PHRASE> @@ -1526,9 +1524,7 @@ <PHRASE Label="la_users_guest_group" Module="Core" Type="1">QXNzaWduIHVzZXJzIG5vdCBsb2dnZWQgaW4gdG8gZ3JvdXA=</PHRASE> <PHRASE Label="la_users_new_group" Module="Core" Type="1">QXNzaWduIHJlZ2lzdGVyZWQgdXNlcnMgdG8gZ3JvdXA=</PHRASE> <PHRASE Label="la_users_password_auto" Module="Core" Type="1">QXNzaWduIHBhc3N3b3JkIGF1dG9tYXRpY2FsbHk=</PHRASE> ~~- <PHRASE Label="la_users_review_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSBDb21tZW50cyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>~~ <PHRASE Label="la_users_subscriber_group" Module="Core" Type="1">QXNzaWduIG1haWxpbmcgbGlzdCBzdWJzY3JpYmVycyB0byBncm91cA==</PHRASE> ~~- <PHRASE Label="la_users_votes_deny" Module="Core" Type="1">TnVtYmVyIG9mIGRheXMgdG8gZGVueSBtdWx0aXBsZSB2b3RlcyBmcm9tIHRoZSBzYW1lIHVzZXI=</PHRASE>~~ <PHRASE Label="la_US_UK" Module="Core" Type="1">VVMvVUs=</PHRASE> <PHRASE Label="la_ValidationEmail" Module="Core" Type="1">RS1tYWlsIGFkZHJlc3M=</PHRASE> <PHRASE Label="la_Value" Module="Core" Type="1">VmFsdWU=</PHRASE> Index: install/install_data.sql =================================================================== --- install/install_data.sql (revision 14949) +++ install/install_data.sql (working copy) @@ -122,8 +122,6 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Default_Registration_Country', '', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_DefaultRegistrationCountry', 'select', NULL, '=+||<SQL+>SELECT l%3$s_Name AS OptionName, CountryStateId AS OptionValue FROM <PREFIX>CountryStates WHERE Type = 1 ORDER BY OptionName</SQL>', 10.13, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.14, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'DefaultSettingsUserId', '-1', 'In-Portal:Users', 'in-portal:configure_users', 'la_title_General', 'la_prompt_DefaultUserId', 'text', NULL, NULL, 10.15, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Votes_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_Text_Restrictions', 'la_users_votes_deny', 'text', '', '', 20.01, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'User_Review_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_Text_Restrictions', 'la_users_review_deny', 'text', '', '', 20.02, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_MaxImageCount', '5', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_MaxImageCount', 'text', '', '', 30.01, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_ThumbnailImageWidth', '120', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_ThumbnailImageWidth', 'text', '', '', 30.02, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'u_ThumbnailImageHeight', '120', 'In-Portal:Users', 'in-portal:configure_users', 'la_section_ImageSettings', 'la_config_ThumbnailImageHeight', 'text', '', '', 30.03, 0, 0, NULL); Index: install/upgrades.sql =================================================================== --- install/upgrades.sql (revision 14954) +++ install/upgrades.sql (working copy) @@ -2497,3 +2497,9 @@ UPDATE Phrase SET l<%PRIMARY_LANGUAGE%>_ColumnTranslation = l<%PRIMARY_LANGUAGE%>_Translation WHERE PhraseKey IN ('LA_FLD_ADDRESSLINE1', 'LA_FLD_ADDRESSLINE2', 'LA_FLD_CITY', 'LA_FLD_COMPANY', 'LA_FLD_FAX', 'LA_FLD_STATE', 'LA_FLD_ZIP'); + +DELETE FROM Phrase +WHERE PhraseKey IN ('LA_TEXT_RESTRICTIONS', 'LA_USERS_REVIEW_DENY', 'LA_USERS_VOTES_DENY'); + +DELETE FROM ConfigurationValues +WHERE VariableName IN ('User_Review_Deny', 'User_Votes_Deny');

Index: in-bulletin/install/english.lang =================================================================== --- in-bulletin/install/english.lang (revision 14949) +++ in-bulletin/install/english.lang (working copy) @@ -50,7 +50,6 @@ <PHRASE Label="la_PermName_Topic.Reply.View_desc" Module="In-Bulletin" Type="1">VmlldyBUb3BpYyBSZXBseQ==</PHRASE> <PHRASE Label="la_PermName_Topic.Review_desc" Module="In-Bulletin" Type="1">Q29tbWVudCBUb3BpYw==</PHRASE> <PHRASE Label="la_PermName_Topic.View_desc" Module="In-Bulletin" Type="1">VmlldyBUb3BpYw==</PHRASE> ~~- <PHRASE Label="la_posts_newdays_prompt" Module="In-Bulletin" Type="1">TmV3IHBvc3RzIChkYXlzKQ==</PHRASE>~~ <PHRASE Label="la_posts_perpage_prompt" Module="In-Bulletin" Type="1">TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl</PHRASE> <PHRASE Label="la_posts_subheading" Module="In-Bulletin" Type="1">UG9zdHM=</PHRASE> <PHRASE Label="la_prompt_ActiveTopics" Module="In-Bulletin" Type="1">QWN0aXZlIFRvcGljcw==</PHRASE> @@ -140,4 +139,4 @@ <EVENT MessageType="html" Event="TOPIC.MODIFY.PENDING" Type="1">U3ViamVjdDogVG9waWMgTW9kaWZpY2F0aW9ucyAiPGlucDI6YmJfRmllbGQgbmFtZT0iVG9waWNUZXh0Ii8+IiBwZW5kaW5nCgpVc2VyIHN1Ym1pdHRlZCB0byB0b3BpYyBtb2RpZmljYXRpb25zIGFuZCBwZW5kaW5nIGZvciBhcHByb3ZhbC48YnI+PGJyPg0KDQpUb3BpYzogPGlucDI6YmJfRmllbGQgbmFtZT0iVG9waWNUZXh0Ii8+</EVENT> </EVENTS> </LANGUAGE> ~~-</LANGUAGES>~~ +</LANGUAGES> \ No newline at end of file Index: in-bulletin/install/install_data.sql =================================================================== --- in-bulletin/install/install_data.sql (revision 14949) +++ in-bulletin/install/install_data.sql (working copy) @@ -1,6 +1,4 @@ # Section "in-bulletin:configuration_output": ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_OpenTag', '', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_Highlight_CloseTag', '', 'In-Bulletin', 'in-bulletin:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.01, 2, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortField', 'LastPostDate', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield_prompt', 'select', '', 'TopicText=la_opt_TopicText||Posts=la_opt_NumberOfPosts||CreatedOn=la_opt_CreatedOn||LastPostDate=la_opt_LastUpdated||Views=la_opt_TopicViews||CachedRating=la_opt_Rating||LastPoser=la_opt_LastPoster||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 3) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Topic_SortOrder2', 'desc', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_topic_sortfield2_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 10.02, 2, 1, NULL); @@ -18,7 +16,6 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'topic_RatingDelay_Value', '1', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.11, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'AutoTopicLockPosts', '0', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Topics', 'la_prompt_PostsToLock', 'text', NULL, NULL, 10.12, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_Postings', '25', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_posts_subheading', 'la_posts_perpage_prompt', 'text', '', '', 20.01, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Posts_NewDays', '5', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_posts_subheading', 'la_posts_newdays_prompt', 'text', '', '', 20.02, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Perpage_TopicReviews', '10', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_Text_Reviews', 'la_review_perpage_prompt', 'text', NULL, NULL, 30.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_CategoryTemplate', '/in-bulletin/designs/section', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_CategoryTemplate', 'text', '', '', 40.01, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'bb_ItemTemplate', 'in-bulletin/topics/topic_detail', 'In-Bulletin', 'in-bulletin:configuration_output', 'la_section_Templates', 'la_fld_ItemTemplate', 'text', '', '', 40.02, 0, 0, NULL); Index: in-bulletin/install/upgrades.sql =================================================================== --- in-bulletin/install/upgrades.sql (revision 14949) +++ in-bulletin/install/upgrades.sql (working copy) @@ -244,4 +244,10 @@ WHERE DisplayName IN ( 'lu_field_notifyowneronchanges', 'lu_field_topicid', 'lu_field_ownerid', 'lu_field_topictext', 'lu_field_postedby', 'lu_field_lastpostid' ~~-);~~ \ No newline at end of file +); + +DELETE FROM Phrase +WHERE PhraseKey IN ('LA_POSTS_NEWDAYS_PROMPT'); + +DELETE FROM ConfigurationValues +WHERE VariableName IN ('Topic_Highlight_OpenTag', 'Topic_Highlight_CloseTag', 'Posts_NewDays'); Index: in-commerce/install/english.lang =================================================================== --- in-commerce/install/english.lang (revision 14953) +++ in-commerce/install/english.lang (working copy) @@ -11,8 +11,6 @@ <PHRASE Label="la_AFN" Module="In-Commerce" Type="1">QWZnaGFuaQ==</PHRASE> <PHRASE Label="la_ALL" Module="In-Commerce" Type="1">TGVjaw==</PHRASE> <PHRASE Label="la_Allowed" Module="In-Commerce" Type="1">QWxsb3dlZA==</PHRASE> ~~- <PHRASE Label="la_AllowOrderDifferentTypes" Module="In-Commerce" Type="1">QWxsb3cgb3JkZXJpbmcgb2YgcHJvZHVjdHMgd2l0aCBkaWZmZXJlbnQgdHlwZXM=</PHRASE>~~ ~~- <PHRASE Label="la_AllowOrderingInNonPrimaryCurrency" Module="In-Commerce" Type="1">QWxsb3cgb3JkZXJpbmcgaW4gbm9uLXByaW1hcnkgY3VycmVuY2llcw==</PHRASE>~~ <PHRASE Label="la_AllowOrderMoreThanAvailable" Module="In-Commerce" Type="1">QWxsb3cgb3JkZXJpbmcgb2YgbW9yZSBxdWFudGl0eSB0aGFuIGF2YWlsYWJsZSBhcyBiYWNrb3JkZXI=</PHRASE> <PHRASE Label="la_AMD" Module="In-Commerce" Type="1">QXJtZW5pYW4gRHJhbQ==</PHRASE> <PHRASE Label="la_ANG" Module="In-Commerce" Type="1">TmV0aGVybGFuZHMgQW50aWxsYW4gR3VpbGRlcg==</PHRASE> Index: in-commerce/install/install_data.sql =================================================================== --- in-commerce/install/install_data.sql (revision 14949) +++ in-commerce/install/install_data.sql (working copy) @@ -21,19 +21,17 @@ # Section "in-commerce:general": INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_RequireLoginBeforeCheckout', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_orders_RequireLogin', 'checkbox', NULL, NULL, 10.01, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Allow_Order_Different_Types', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_AllowOrderDifferentTypes', 'checkbox', NULL, NULL, 10.02, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Enable_Backordering', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_EnableBackordering', 'checkbox', NULL, NULL, 10.03, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Process_Backorders_Auto', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_ProcessBackorderingAuto', 'checkbox', NULL, NULL, 10.04, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Next_Order_Number', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_orders_NextOrderNumber', 'text', NULL, NULL, 10.05, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Order_Number_Format_P', '6', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderMainNumberDigits', 'text', NULL, NULL, 10.06, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Order_Number_Format_S', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderSecNumberDigits', 'text', NULL, NULL, 10.07, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_RecurringChargeInverval', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_RecurringChargeInverval', 'text', NULL, NULL, 10.08, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AutoProcessRecurringOrders', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_AutoProcessRecurringOrders', 'checkbox', NULL, NULL, 10.09, 0, 0, NULL); ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxAddresses', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaxAddresses', 'text', NULL, NULL, 10.1, 0, 0, NULL);~~ -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_MaskProcessedCreditCards', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaskProcessedCreditCards', 'checkbox', NULL, NULL, 10.11, 0, 0, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.12, '0', '0', NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AllowOrderingInNonPrimaryCurrency', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_AllowOrderingInNonPrimaryCurrency', 'checkbox', NULL, NULL, 20.01, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_ExchangeRateSource', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_ExchangeRateSource', 'select', NULL, '2=la_FederalReserveBank||3=la_EuropeanCentralBank||1=la_BankOfLatvia', 20.02, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Enable_Backordering', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_EnableBackordering', 'checkbox', NULL, NULL, 10.02, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Process_Backorders_Auto', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_ProcessBackorderingAuto', 'checkbox', NULL, NULL, 10.03, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Next_Order_Number', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_orders_NextOrderNumber', 'text', NULL, NULL, 10.04, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Order_Number_Format_P', '6', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderMainNumberDigits', 'text', NULL, NULL, 10.05, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_Order_Number_Format_S', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_OrderSecNumberDigits', 'text', NULL, NULL, 10.06, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_RecurringChargeInverval', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_RecurringChargeInverval', 'text', NULL, NULL, 10.07, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AutoProcessRecurringOrders', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_AutoProcessRecurringOrders', 'checkbox', NULL, NULL, 10.08, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'MaxAddresses', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaxAddresses', 'text', NULL, NULL, 10.09, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_MaskProcessedCreditCards', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_MaskProcessedCreditCards', 'checkbox', NULL, NULL, 10.1, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'OrderVATIncluded', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Orders', 'la_config_OrderVATIncluded', 'checkbox', NULL, NULL, 10.11, '0', '0', NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_ExchangeRateSource', '3', 'In-Commerce', 'in-commerce:general', 'la_Text_Currencies', 'la_ExchangeRateSource', 'select', NULL, '2=la_FederalReserveBank||3=la_EuropeanCentralBank||1=la_BankOfLatvia', 20.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_DefaultCouponDuration', '14', 'In-Commerce', 'in-commerce:general', 'la_Text_Coupons', 'la_conf_DefaultCouponDuration', 'text', NULL, NULL, 30.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_RegisterAsAffiliate', '0', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_register_as_affiliate', 'checkbox', NULL, '', 40.01, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Comm_AffiliateStorageMethod', '1', 'In-Commerce', 'in-commerce:general', 'la_Text_Affiliates', 'la_prompt_affiliate_storage_method', 'radio', NULL, '1=la_opt_Session||2=la_opt_PermanentCookie', 40.02, 0, 1, NULL); Index: in-commerce/install/upgrades.sql =================================================================== --- in-commerce/install/upgrades.sql (revision 14949) +++ in-commerce/install/upgrades.sql (working copy) @@ -240,4 +240,22 @@ (DEFAULT, 'p', 'Price', 'range', 1, 11), (DEFAULT, 'p', 'EditorsPick', 'radio', 1, NULL); ~~-DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME';~~ \ No newline at end of file +DELETE FROM Phrase WHERE PhraseKey = 'LA_COL_ITEMNAME'; + +DELETE FROM Phrase +WHERE PhraseKey IN ('LA_ALLOWORDERINGINNONPRIMARYCURRENCY', 'LA_ALLOWORDERDIFFERENTTYPES'); + +DELETE FROM ConfigurationValues +WHERE VariableName IN ('Comm_AllowOrderingInNonPrimaryCurrency', 'Comm_Allow_Order_Different_Types'); + +UPDATE ConfigurationValues +SET DisplayOrder = 20.01 +WHERE VariableName = 'Comm_ExchangeRateSource'; + +UPDATE ConfigurationValues +SET DisplayOrder = DisplayOrder - 0.01 +WHERE VariableName IN ( + 'Comm_Enable_Backordering', 'Comm_Process_Backorders_Auto', 'Comm_Next_Order_Number', 'Comm_Order_Number_Format_P', + 'Comm_Order_Number_Format_S', 'Comm_RecurringChargeInverval', 'Comm_AutoProcessRecurringOrders', 'MaxAddresses', + 'Comm_MaskProcessedCreditCards', 'OrderVATIncluded' +); Index: in-link/install/english.lang =================================================================== --- in-link/install/english.lang (revision 14949) +++ in-link/install/english.lang (working copy) @@ -41,9 +41,13 @@ <PHRASE Label="la_IncreaseBy" Module="In-Link" Type="1">SW5jcmVhc2UgQnk=</PHRASE> <PHRASE Label="la_ItemTab_Links" Module="In-Link" Type="1">TGlua3M=</PHRASE> <PHRASE Label="la_link_AllowFreeListings" Module="In-Link" Type="1">QWxsb3cgRnJlZSBMaXN0aW5ncw==</PHRASE> + <PHRASE Label="la_Link_Description" Module="In-Link" Type="1">TGluayBEZXNjcmlwdGlvbg==</PHRASE> <PHRASE Label="la_link_EnhancedLinks" Module="In-Link" Type="1">RW5oYW5jZWQgTGlzdGluZ3M=</PHRASE> + <PHRASE Label="la_Link_Hits" Module="In-Link" Type="1">SGl0cw==</PHRASE> + <PHRASE Label="la_Link_Name" Module="In-Link" Type="1">TGluayBOYW1l</PHRASE> <PHRASE Label="la_link_sortreviews2_prompt" Module="In-Link" Type="1">YW5kIHRoZW4gYnk=</PHRASE> <PHRASE Label="la_link_sortreviews_prompt" Module="In-Link" Type="1">U29ydCBDb21tZW50cyBieQ==</PHRASE> + <PHRASE Label="la_Link_URL" Module="In-Link" Type="1">VVJM</PHRASE> <PHRASE Label="la_menu_Grouping" Module="In-Link" Type="1">R3JvdXBpbmcgQnk=</PHRASE> <PHRASE Label="la_NotChecked" Module="In-Link" Type="1">Tm90IENoZWNrZWQ=</PHRASE> <PHRASE Label="la_NotPendingRenewal" Module="In-Link" Type="1">Tm8=</PHRASE> @@ -165,4 +169,4 @@ <EVENT MessageType="html" Event="LINK.VALIDATION.RESULTS" Type="1">U3ViamVjdDogTGluayBWYWxpZGF0aW9uIFJlc3VsdHMgKDxpbnAyOmxhbmcuY3VycmVudF9DdXJyZW50RGF0ZSBmb3JtYXQ9ImQtTS1ZIi8+KQoKTGluayBWYWxpZGF0aW9uIENvbXBsZXRlZCBvbiA8aW5wMjpsYW5nLmN1cnJlbnRfQ3VycmVudERhdGUgZm9ybWF0PSJkLU0tWSIvPiBhdCA8aW5wMjpsYW5nLmN1cnJlbnRfQ3VycmVudERhdGUgZm9ybWF0PSJIOmk6cyIvPjxiciAvPjxiciAvPg0KDQo8aW5wMjpsaW5rLXZhbGlkYXRpb24uaW52YWxpZF9Jbml0TGlzdCBwZXJfcGFnZT0iLTEiLz4NCjxpbnAyOm1faWYgY2hlY2s9ImxpbmstdmFsaWRhdGlvbi5pbnZhbGlkX1RvdGFsUmVjb3JkcyI+DQoJVGhlZXNlIGxpbmtzIHdlcmUgbWFya2VkIGFzIGludmFsaWQgZHVyaW5nIHZhbGlkYXRpb24gcHJvY2Vzczo8YnIgLz4NCg0KCTxpbnAyOm1fRGVmaW5lRWxlbWVudCBuYW1lPSJsaW5rX2VsZW1lbnQiPg0KCQk8bGk+DQoJCQk8aW5wMjpGaWVsZCBuYW1lPSJMaW5rTmFtZSIvPiAoPGlucDI6Q2F0ZWdvcnlOYW1lLz4pDQoJCTwvbGk+DQoJPC9pbnAyOm1fRGVmaW5lRWxlbWVudD4NCg0KCTx1bD4NCgkJPGlucDI6bGluay12YWxpZGF0aW9uLmludmFsaWRfUHJpbnRMaXN0IHJlbmRlcl9hcz0ibGlua19lbGVtZW50Ii8+DQoJPC91bD4NCjxpbnAyOm1fZWxzZS8+DQoJQWxsIGxpbmtzIGFwcGVhciB0byBiZSB2YWxpZC4NCjwvaW5wMjptX2lmPg==</EVENT> </EVENTS> </LANGUAGE> ~~-</LANGUAGES>~~ +</LANGUAGES> \ No newline at end of file Index: in-link/install/install_data.sql =================================================================== --- in-link/install/install_data.sql (revision 14949) +++ in-link/install/install_data.sql (working copy) @@ -1,7 +1,4 @@ # Section "in-link:configuration_output": ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_OpenTag', '', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_Highlight_CloseTag', '', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_RatingToPop', '5', 'In-Link', 'in-link:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortField', 'Name', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield_prompt', 'select', '', 'Name=la_Link_Name||Description=la_Link_Description||Url=la_Link_URL||CreatedOn=la_opt_CreatedOn||Hits=la_Link_Hits||CachedRating=la_opt_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 4) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortOrder', 'asc', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield_prompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.01, 2, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_SortField2', 'Description', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_sortfield2_prompt', 'select', '', 'Name=la_Link_Name||Description=la_Link_Description||Url=la_Link_URL||CreatedOn=la_opt_CreatedOn||Hits=la_Link_Hits||CachedRating=la_opt_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 4) AND (IsSystem = 0)</SQL>', 10.02, 1, 1, NULL); @@ -15,15 +12,14 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_EnhancedLinks', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_EnhancedLinks', 'checkbox', '', '', 10.09, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_AllowFreeListings', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_AllowFreeListings', 'checkbox', '', '', 10.1, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ShowPick', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_editorspick_prompt', 'checkbox', '', '', 10.11, 0, 1, NULL); ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_UrlStatus', '', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_link_urlstatus_prompt', 'checkbox', '', '', 10.12, 0, 1, NULL);~~ -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.13, 1, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.13, 2, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.14, 1, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.14, 2, 1, NULL); ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_MaxCategories', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.15, 0, 1, NULL);~~ -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableGoogleMaps', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_LinkEnableGoogleMaps', 'checkbox', NULL, NULL, 10.16, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableLinkContactForm', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_EnableLinkContactForm', 'checkbox', NULL, NULL, 10.17, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ReciprocalLinkChecking', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_ReciprocalLinkChecking', 'checkbox', NULL, NULL, 10.18, 0, 0, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'text', '', 'style="width: 50px;"', 10.12, 1, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_ReviewDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupReviews', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.12, 2, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Value', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'text', '', 'style="width: 50px;"', 10.13, 1, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'link_RatingDelay_Interval', '2419200', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_prompt_DupRating', 'select', '', '1=la_opt_Sec||60=la_opt_Min||3600=la_opt_Hour||86400=la_opt_Day||604800=la_opt_Week||2419200=la_opt_Month||29030400=la_opt_Year', 10.13, 2, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_MaxCategories', '3', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_MaxCategories', 'text', NULL, NULL, 10.14, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableGoogleMaps', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_fld_LinkEnableGoogleMaps', 'checkbox', NULL, NULL, 10.15, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_EnableLinkContactForm', '1', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_EnableLinkContactForm', 'checkbox', NULL, NULL, 10.16, 0, 1, NULL); +INSERT INTO ConfigurationValues VALUES(DEFAULT, 'ReciprocalLinkChecking', '0', 'In-Link', 'in-link:configuration_output', 'la_Text_Links', 'la_config_ReciprocalLinkChecking', 'checkbox', NULL, NULL, 10.17, 0, 0, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsSort', 'CreatedOn', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.01, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsOrder', 'desc', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews_prompt', 'select', '', 'asc=la_common_Ascending||desc=la_common_Descending', 20.01, 2, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Link_ReviewsSort2', 'ReviewText', 'In-Link', 'in-link:configuration_output', 'la_Text_Reviews', 'la_link_sortreviews2_prompt', 'select', '', 'ReviewText=la_opt_CommentText||CreatedOn=la_opt_CreatedOn', 20.02, 1, 1, NULL); @@ -39,28 +35,11 @@ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'l_FullImageHeight', '450', 'In-Link', 'in-link:configuration_output', 'la_section_ImageSettings', 'la_config_FullImageHeight', 'text', '', '', 40.05, 0, 0, NULL); # Section "in-link:configuration_search": ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_LinkId', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_ReviewById', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Priority', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Status', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_EditorsPick', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_ResourceId', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_HotItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_PopItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_NewItem', '1', 'In-Link', 'in-link:configuration_search', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Keyword_links', '90', 'In-Link', 'in-link:configuration_search', 'la_config_SearchRel_DefaultKeyword', 'la_text_keyword', 'text', NULL, NULL, 0, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Pop_links', '5', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultPop', 'la_text_popularity', 'text', NULL, NULL, 0, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Rating_links', '5', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultRating', 'la_prompt_Rating', 'text', NULL, NULL, 0, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'SearchRel_Increase_links', '30', 'In-Link', 'in-link:configuration_search', 'la_config_DefaultIncreaseImportance', 'la_text_increase_importance', 'text', NULL, NULL, 0, 0, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_ShowMultiple_links', '0', 'In-Link', 'in-link:configuration_search', 'la_config_ShowMultiple', 'la_Text_MultipleShow', 'text', NULL, NULL, 0, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Description', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Description', 'checkbox', '', '', 1, 0, 1, NULL); ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Name', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Name', 'checkbox', '', '', 2, 0, 1, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Url', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Url', 'checkbox', '', '', 5, 0, 1, NULL);~~ -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CreatedOn', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CreatedOn', 'checkbox', '', '', 5, 0, 1, NULL); ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_Hits', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_Hits', 'checkbox', '', '', 6, 0, 1, NULL);~~ -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedRating', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedRating', 'checkbox', '', '', 7, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedVotesQty', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedVotesQty', 'checkbox', '', '', 8, 0, 1, NULL); -INSERT INTO ConfigurationValues VALUES(DEFAULT, 'Search_Link_CatchedReviewsQty', '1', 'In-Link', 'in-link:configuration_search', 'la_Text_Link_Search', 'la_Link_CatchedReviewsQty', 'checkbox', '', '', 9, 0, 1, NULL); INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'LINK.ADD', NULL, 1, 1, 'In-Link', 'Add Link', 1, 1, 1); INSERT INTO Events (EventId, Event, ReplacementTags, Enabled, FrontEndOnly, Module, Description, Type, AllowChangingSender, AllowChangingRecipient) VALUES(DEFAULT, 'LINK.ADD', NULL, 1, 0, 'In-Link', 'Add Link', 0, 1, 1); Index: in-link/install/upgrades.sql =================================================================== --- in-link/install/upgrades.sql (revision 14949) +++ in-link/install/upgrades.sql (working copy) @@ -155,3 +155,29 @@ UPDATE ConfigurationValues SET DisplayOrder = DisplayOrder - 0.01 WHERE VariableName IN ('l_EnableLinkContactForm', 'ReciprocalLinkChecking'); + +UPDATE Phrase +SET Module = 'In-Link' +WHERE PhraseKey IN ('LA_LINK_CREATEDON', 'LA_LINK_DESCRIPTION', 'LA_LINK_HITS', 'LA_LINK_NAME', 'LA_LINK_URL'); + +DELETE FROM Phrase +WHERE PhraseKey IN ( + 'LA_LINK_URLSTATUS_PROMPT', 'LA_TEXT_LINK_SEARCH', 'LA_LINK_CATCHEDRATING', + 'LA_LINK_CATCHEDREVIEWSQTY', 'LA_LINK_CATCHEDVOTESQTY' +); + +DELETE FROM ConfigurationValues +WHERE VariableName IN ( + 'Link_Highlight_OpenTag', 'Link_Highlight_CloseTag', 'Link_RatingToPop', 'Link_UrlStatus', + 'Search_Link_CatchedRating', 'Search_Link_CatchedReviewsQty', 'Search_Link_CatchedVotesQty', + 'Search_Link_CreatedOn', 'Search_Link_Description', 'Search_Link_EditorsPick', 'Search_Link_Hits', + 'Search_Link_HotItem', 'Search_Link_LinkId', 'Search_Link_Name', 'Search_Link_NewItem', 'Search_Link_PopItem', + 'Search_Link_Priority', 'Search_Link_ResourceId', 'Search_Link_ReviewById', 'Search_Link_Status', 'Search_Link_Url' +); + +UPDATE ConfigurationValues +SET DisplayOrder = DisplayOrder - 0.01 +WHERE VariableName IN ( + 'link_ReviewDelay_Value', 'link_ReviewDelay_Interval', 'link_RatingDelay_Value', 'link_RatingDelay_Interval', + 'l_MaxCategories', 'l_EnableGoogleMaps', 'l_EnableLinkContactForm', 'ReciprocalLinkChecking' +); Index: in-news/install/install_data.sql =================================================================== --- in-news/install/install_data.sql (revision 14949) +++ in-news/install/install_data.sql (working copy) @@ -1,6 +1,4 @@ # Section "in-news:configuration_output": ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_Highlight_OpenTag', '', 'In-News', 'in-news:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ ~~-INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_Highlight_CloseTag', '', 'In-News', 'in-news:configuration_output', '', '', '', NULL, NULL, 0, 0, 0, NULL);~~ INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField', 'CreatedOn', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.01, 1, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortOrder', 'desc', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield_pompt', 'select', '', 'asc=la_common_ascending||desc=la_common_descending', 10.01, 2, 1, NULL); INSERT INTO ConfigurationValues VALUES(DEFAULT, 'News_SortField2', 'Title', 'In-News', 'in-news:configuration_output', 'la_Text_Articles', 'la_news_sortfield2_pompt', 'select', '', 'Title=la_Article_Title||Excerpt=la_Article_Excerpt||Author=la_Article_Author||CreatedOn=la_Article_Date||Hits=la_Article_Hits||CachedRating=la_Article_Rating||<SQL>SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM <PREFIX>CustomField WHERE (Type = 2) AND (IsSystem = 0)</SQL>', 10.02, 1, 1, NULL); Index: in-news/install/upgrades.sql =================================================================== --- in-news/install/upgrades.sql (revision 14949) +++ in-news/install/upgrades.sql (working copy) @@ -119,4 +119,8 @@ # ===== v 5.1.3 ===== UPDATE Phrase SET `Module` = 'Core' ~~-WHERE PhraseKey = 'LA_FLD_STARTDATE';~~ \ No newline at end of file +WHERE PhraseKey = 'LA_FLD_STARTDATE'; + +# ===== v 5.2.0-B1 ===== +DELETE FROM ConfigurationValues +WHERE VariableName IN ('News_Highlight_OpenTag', 'News_Highlight_CloseTag');

Issue History
Date Modified	Username	Field	Change
2012-07-25 05:32	alex	Note Added: 0005009
2012-07-25 05:32	alex	Status	resolved => closed
2012-01-03 04:43	alex	Changeset attached	5.2.x r14969
2011-12-30 08:58	alex	Note Added: 0004367
2011-12-30 08:58	alex	Status	reviewed and tested => resolved
2011-12-30 08:58	alex	Fixed in Version	=> 5.2.0-B1
2011-12-30 08:58	alex	Resolution	open => fixed
2011-12-30 08:58	alex	Assigned To	!COMMUNITY => alex
2011-12-30 08:58	alex	Changeset attached	5.2.x r14964
2011-12-30 08:58	alex	Note Added: 0004366
2011-12-30 08:58	alex	Status	needs testing => reviewed and tested
2011-12-30 08:57	alex	Changeset attached	5.2.x r14963
2011-12-30 08:57	alex	Changeset attached	5.2.x r14962
2011-12-30 08:57	alex	Changeset attached	5.2.x r14961
2011-12-30 08:57	alex	Changeset attached	5.2.x r14960
2011-12-30 08:56	alex	Time Estimate Removed	2 =>
2011-12-30 08:56	alex	Assigned To	alex => !COMMUNITY
2011-12-30 08:56	alex	Developer	=> alex
2011-12-30 08:56	alex	Status	needs work => needs testing
2011-12-30 08:56	alex	Note Added: 0004365
2011-12-30 08:55	alex	File Added: search_toolkit.rar
2011-12-30 08:54	alex	File Added: remove_unused_settings_modules.patch
2011-12-30 08:54	alex	File Added: remove_unused_settings_core.patch
2011-12-30 07:24	alex	Note Added: 0004364
2011-12-30 07:23	alex	Additional Information Updated	View Revisions
2011-12-07 22:25	Dmitry	Assigned To	erik => alex
2011-10-22 05:38	alex	Estimate Points	=> 1
2011-09-27 04:14	alex	Time Estimate Added	2
2011-09-27 04:14	alex	Additional Information Updated	View Revisions
2011-09-26 04:21	alex	Additional Information Updated	View Revisions
2011-09-24 11:43	Dmitry	Assigned To	=> erik
2011-09-24 11:43	Dmitry	Status	active => needs work
2011-09-24 11:43	Dmitry	Target Version	Icebox => 5.2.0
2011-02-05 08:02	alex	Target Version	5.2.0 => Icebox
2011-02-05 08:02	alex	New Issue
2011-02-05 08:02	alex	Reference	=> https://groups.google.com/d/topic/in-portal-bugs/Al4Ifpdg0sQ/discussion
2011-02-05 08:02	alex	Change Log Message	=> Checked all configuration variables are actually used

Notes
(0004364) alex (manager) 2011-12-30 07:24	Following configuration variables were deleted: =============================================== User_Review_Deny User_Votes_Deny Comm_AllowOrderingInNonPrimaryCurrency Comm_Allow_Order_Different_Types Link_Highlight_OpenTag Link_Highlight_CloseTag Link_RatingToPop Link_UrlStatus News_Highlight_CloseTag News_Highlight_OpenTag Posts_NewDays Topic_Highlight_CloseTag Topic_Highlight_OpenTag Search_Link_CatchedRating Search_Link_CatchedReviewsQty Search_Link_CatchedVotesQty Search_Link_CreatedOn Search_Link_Description Search_Link_EditorsPick Search_Link_Hits Search_Link_HotItem Search_Link_LinkId Search_Link_Name Search_Link_NewItem Search_Link_PopItem Search_Link_Priority Search_Link_ResourceId Search_Link_ReviewById Search_Link_Status Search_Link_Url I haven't found usage of these variables, but maybe they are used in non-obvous way: ==================================================================================== eBay_RefundTypeAttributeId eBay_ReturnPolicyAttributeId eBay_ReturnPolicyAttributeValue eBay_ReturnPolicyCharacteristicsSetId eBay_ReturnPolicyDetailsAttributeId eBay_ReturnRequestDaysAttributeId

(0004365) alex (manager) 2011-12-30 08:56	I've used "search_toolkit.rar" to search for config variable usages.

(0004366) alex (manager) 2011-12-30 08:58	Will test all together later.

(0004367) alex (manager) 2011-12-30 08:58	Fix committed to 5.2.x branch. Commit Message: Fixes 0000990: Check that all configuration variables being used

(0005009) alex (manager) 2012-07-25 05:32	Since 5.2.0 version was released.

Related Changesets
In-Portal CMS: 5.2.x r14969 Timestamp: 2012-01-03 04:43:33 Author: alex [ Details ] [ Diff ]	Bug 0000990: Check that all configuration variables being used 1. forgot to remove In-Link phrases from Core language pack
	mod - /in-portal/branches/5.2.x/core/install/english.lang	[ Diff ] [ File ]

In-Portal CMS: 5.2.x r14964 Timestamp: 2011-12-30 08:58:28 Author: alex [ Details ] [ Diff ]	Fixes 0000990: Check that all configuration variables being used
	mod - /in-portal/branches/5.2.x/core/install/english.lang	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/install_data.sql	[ Diff ] [ File ]
	mod - /in-portal/branches/5.2.x/core/install/upgrades.sql	[ Diff ] [ File ]

Modules :: In-News: 5.2.x r14963 Timestamp: 2011-12-30 08:57:32 Author: alex [ Details ] [ Diff ]	Bug 0000990: Check that all configuration variables being used
	mod - /modules/in-news/branches/5.2.x/install/install_data.sql	[ Diff ] [ File ]
	mod - /modules/in-news/branches/5.2.x/install/upgrades.sql	[ Diff ] [ File ]

Modules :: In-Link: 5.2.x r14962 Timestamp: 2011-12-30 08:57:25 Author: alex [ Details ] [ Diff ]	Bug 0000990: Check that all configuration variables being used
	mod - /modules/in-link/branches/5.2.x/install/english.lang	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.2.x/install/install_data.sql	[ Diff ] [ File ]
	mod - /modules/in-link/branches/5.2.x/install/upgrades.sql	[ Diff ] [ File ]

Modules :: In-Commerce: 5.2.x r14961 Timestamp: 2011-12-30 08:57:15 Author: alex [ Details ] [ Diff ]	Bug 0000990: Check that all configuration variables being used
	mod - /w/in-commerce/branches/5.2.x/install/english.lang	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/install/install_data.sql	[ Diff ] [ File ]
	mod - /w/in-commerce/branches/5.2.x/install/upgrades.sql	[ Diff ] [ File ]

Modules :: In-Bulletin: 5.2.x r14960 Timestamp: 2011-12-30 08:57:04 Author: alex [ Details ] [ Diff ]	Bug 0000990: Check that all configuration variables being used
	mod - /modules/in-bulletin/branches/5.2.x/install/english.lang	[ Diff ] [ File ]
	mod - /modules/in-bulletin/branches/5.2.x/install/install_data.sql	[ Diff ] [ File ]
	mod - /modules/in-bulletin/branches/5.2.x/install/upgrades.sql	[ Diff ] [ File ]

Relationships [ Relation Graph ] [ Dependency Graph ]

In-Portal Issue Tracker