Index: in-bulletin/install/english.lang =================================================================== --- in-bulletin/install/english.lang (revision 13756) +++ in-bulletin/install/english.lang (working copy) @@ -1,5 +1,5 @@ - - m/d/Yg:i Am/d/Yg:i:s A.,utf-8http://docs.in-portal.org/eng/index.php2 + + Q2Vuc29yZWQgV29yZA== VXNlcg== @@ -39,6 +39,24 @@ TnVtYmVyIG9mIFBvc3Rz VG9waWMgVGV4dA== VG9waWMgVmlld3M= + QWRkIFBlbmRpbmcgVG9waWM= + QWRkIFRvcGlj + RGVsZXRlIFRvcGlj + TG9jay9VbmxvY2sgVG9waWNz + TW9kaWZ5IFRvcGljIFBlbmRpbmc= + TW9kaWZ5IFRvcGlj + VG9waWMgT3duZXIgRGVsZXRl + T3duZXIgTW9kaWZ5IFRvcGljIFBlbmRpbmc= + VG9waWMgT3duZXIgTW9kaWZ5 + UmF0ZSBUb3BpYw== + QWRkIFRvcGljIFJlcGx5 + RGVsZXRlIFRvcGlj + UmVwbHkgVG9waWMgTW9kaWZ5 + UG9zdCBPd25lciBEZWxldGU= + UG9zdCBPd25lciBNb2RpZnk= + VmlldyBUb3BpYyBSZXBseQ== + Q29tbWVudCBUb3BpYw== + VmlldyBUb3BpYw== TmV3IHBvc3RzIChkYXlzKQ== TnVtYmVyIG9mIHBvc3RzIHBlciBwYWdl UG9zdHM= @@ -110,14 +128,6 @@ UG9zdGVkIEJ5 VG9waWMgSUQ= VG9waWMgVGV4dA== - TG9jay9VbmxvY2sgVG9waWNz - TW9kaWZ5IFRvcGljIFBlbmRpbmc= - VG9waWMgT3duZXIgRGVsZXRl - T3duZXIgTW9kaWZ5IFRvcGljIFBlbmRpbmc= - VG9waWMgT3duZXIgTW9kaWZ5 - UG9zdCBPd25lciBEZWxldGU= - UG9zdCBPd25lciBNb2RpZnk= - Q29tbWVudCBUb3BpYw== U3ViamVjdDogTmV3IFByaXZhdGUgTWVzc2FnZQoKWW91IGhhdmUgYSBuZXcgcHJpdmF0ZSBtZXNzYWdlIGhhcyBhcnJpdmVkLg== Index: in-bulletin/install/install_data.sql =================================================================== --- in-bulletin/install/install_data.sql (revision 13756) +++ in-bulletin/install/install_data.sql (working copy) @@ -83,24 +83,24 @@ INSERT INTO ItemTypes VALUES (3, 'In-Bulletin', 'bb', 'Topic', 'TopicText', 'OwnerId', 'Views', 'CachedRating', 'la_ItemTab_Topics', 1, '', 'clsTopic', 'Topic'); INSERT INTO ItemTypes VALUES (30, 'In-Bulletin', 'posting', 'Posting', 'Subject', 'CreatedById', NULL, NULL, 'la_ItemTab_Posts', 0, '', '', 'Post'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'lu_PermName_Topic.View_desc', 'lu_PermName_Topic.View_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'lu_PermName_Topic.Add_desc', 'lu_PermName_Topic.Add_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'lu_PermName_Topic.Add.Pending_desc', 'lu_PermName_Topic.Add.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'lu_PermName_Topic.Delete_desc', 'lu_PermName_Topic.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'lu_PermName_Topic.Modify_desc', 'lu_PermName_Topic.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'lu_PermName_Topic.Reply.Delete_desc', 'lu_PermName_Topic.Reply.Delete_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'lu_PermName_Topic.Reply.View_desc', 'lu_PermName_Topic.Reply.View_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'lu_PermName_Topic.Reply.Add_desc', 'lu_PermName_Topic.Reply.Add_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'lu_PermName_Topic.Reply.Modify_desc', 'lu_PermName_Topic.Reply.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'lu_PermName_Topic.Rate_desc', 'lu_PermName_Topic.Rate_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'lu_PermName_Topic.Review_desc', 'lu_PermName_Topic.Review_desc', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'lu_PermName_Topic.Reply.Owner.Modify_desc', 'lu_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'lu_PermName_Topic.Reply.Owner.Delete_desc', 'lu_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'lu_PermName_Topic.Owner.Delete_desc', 'lu_PermName_Topic.Owner.Delete_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'lu_PermName_Topic.Modify.Pending_desc', 'lu_PermName_Topic.Modify.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'lu_PermName_Topic.Owner.Modify.Pending_desc', 'lu_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'lu_PermName_Topic.Owner.Modify_desc', 'lu_PermName_Topic.Owner.Modify_error', 'In-Bulletin'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'lu_PermName_Topic.Lock_desc', 'lu_PermName_Topic.Lock_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.VIEW', 'la_PermName_Topic.View_desc', 'la_PermName_Topic.View_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD', 'la_PermName_Topic.Add_desc', 'la_PermName_Topic.Add_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.ADD.PENDING', 'la_PermName_Topic.Add.Pending_desc', 'la_PermName_Topic.Add.Pending_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.DELETE', 'la_PermName_Topic.Delete_desc', 'la_PermName_Topic.Delete_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY', 'la_PermName_Topic.Modify_desc', 'la_PermName_Topic.Modify_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.DELETE', 'la_PermName_Topic.Reply.Delete_desc', 'la_PermName_Topic.Reply.Delete_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.VIEW', 'la_PermName_Topic.Reply.View_desc', 'la_PermName_Topic.Reply.View_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.ADD', 'la_PermName_Topic.Reply.Add_desc', 'la_PermName_Topic.Reply.Add_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.MODIFY', 'la_PermName_Topic.Reply.Modify_desc', 'la_PermName_Topic.Reply.Modify_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.RATE', 'la_PermName_Topic.Rate_desc', 'la_PermName_Topic.Rate_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REVIEW', 'la_PermName_Topic.Review_desc', 'la_PermName_Topic.Review_desc', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.MODIFY', 'la_PermName_Topic.Reply.Owner.Modify_desc', 'la_PermName_Topic.Reply.Owner.Modify_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.REPLY.OWNER.DELETE', 'la_PermName_Topic.Reply.Owner.Delete_desc', 'la_PermName_Topic.Reply.Owner.Delete_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.DELETE', 'la_PermName_Topic.Owner.Delete_desc', 'la_PermName_Topic.Owner.Delete_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.MODIFY.PENDING', 'la_PermName_Topic.Modify.Pending_desc', 'la_PermName_Topic.Modify.Pending_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY.PENDING', 'la_PermName_Topic.Owner.Modify.Pending_desc', 'la_PermName_Topic.Owner.Modify.Pending_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.OWNER.MODIFY', 'la_PermName_Topic.Owner.Modify_desc', 'la_PermName_Topic.Owner.Modify_error', 'In-Bulletin'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'TOPIC.LOCK', 'la_PermName_Topic.Lock_desc', 'la_PermName_Topic.Lock_error', 'In-Bulletin'); INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT count(*) FROM <%prefix%>Topic WHERE Status=1', NULL, 'la_prompt_ActiveTopics', 0, 1); INSERT INTO StatItem VALUES (DEFAULT, 'In-Bulletin', 'SELECT COUNT(*) AS TotalTopics FROM <%prefix%>Topic', NULL, 'la_prompt_TopicsTotal', 0, 2); Index: in-commerce/install/english.lang =================================================================== --- in-commerce/install/english.lang (revision 13756) +++ in-commerce/install/english.lang (working copy) @@ -164,6 +164,8 @@ VHlwZQ== V2VpZ2h0 UHJvZml0 + UXR5 + QmFja29yZGVyZWQ= UXR5IEluIFN0b2Nr UXR5SW5TdG9ja01pbg== UXR5IE9uIE9yZGVy @@ -334,7 +336,6 @@ RnJvbSBkYXRlL3RpbWU= R2F0ZXdheQ== R3JvdW5kIERlbGl2ZXJ5 - VXNlciBHcm91cA== VXNlciBHcm91cHMgU2VsZWN0aW9u SW5zdHJ1Y3Rpb25z SW5zdXJhbmNlIENvc3Q= @@ -491,6 +492,7 @@ SXJhbmlhbiBSaWFs SWNlbGFuZCBLcm9uYQ== SVNPIENvZGUgd2lsbCBiZSB1c2VkIGlmIGxlZnQgYmxhbms= + YmFja29yZGVyZWQ= UHJvZHVjdHM= SmFtYWljYW4gRG9sbGFy Sm9yZGFuaWFuIERpbmFy @@ -602,6 +604,13 @@ RGlzYWJsZSBTaGlwcGluZyBUeXBl RW5hYmxlIFNoaXBwaW5nIFF1b3RpbmcgRW5naW5lcw== RGlzYWJsZSBTaGlwcGluZyBRdW90aW5nIEVuZ2luZXM= + QWRkIFByb2R1Y3Q= + RGVsZXRlIFByb2R1Y3Q= + TW9kaWZ5IFByb2R1Y3Q= + UmF0ZSBQcm9kdWN0 + Q29tbWVudCBQcm9kdWN0 + Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc= + VmlldyBQcm9kdWN0 TWFudWZhY3R1cmVycyBwZXIgcGFnZQ== TWFudWZhY3R1cmVycyBwZXIgcGFnZSBvbiBhIHNob3J0IGxpc3Rpbmc= TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdl @@ -909,6 +918,8 @@ TmV3IFRheCBab25l TmV3IEFmZmlsaWF0ZQ== TmV3IEFmZmlsaWF0ZSBQbGFu + TmV3IENvdXBvbg== + TmV3IERpc2NvdW50 TmV3IE9yZGVy TmV3IFByaWNpbmcgTGltaXQ= QWRkIG5ldyBwcm9kdWN0cw== @@ -980,13 +991,6 @@ TGFzdCBRdWF0ZXI= VGhpcyBpcyB5b3VyIHByb2ZpbGUgYWRkcmVzcy4gSXQgd2lsbCBiZSB1cGRhdGVkIGlmIHlvdSBlZGl0IHRoZSBhZGRyZXNzIGJlbG93Lg== TWFudWZhY3R1cmVy - QWRkIFByb2R1Y3Q= - RGVsZXRlIFByb2R1Y3Q= - TW9kaWZ5IFByb2R1Y3Q= - UmF0ZSBQcm9kdWN0 - Q29tbWVudCBQcm9kdWN0 - Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc= - VmlldyBQcm9kdWN0 U2hpcG1lbnQ= U2hpcHBpbmcgVHlwZQ== Q29tbWVudCB0aGlzIFByb2R1Y3Q= Index: in-commerce/install/install_data.sql =================================================================== --- in-commerce/install/install_data.sql (revision 13756) +++ in-commerce/install/install_data.sql (working copy) @@ -321,13 +321,13 @@ INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131); INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'lu_PermName_Product.Rate_desc', 'lu_PermName_Product.Rate_error', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'lu_PermName_Product.Review_desc', 'lu_PermName_Product.Review_error', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'lu_PermName_Product.Review_Pending_desc', ' lu_PermName_Product.Review_Pending_error', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'lu_PermName_Product.Add_desc', 'lu_PermName_Product.Add_error', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'lu_PermName_Product.Delete_desc', 'lu_PermName_Product.Delete_error', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'lu_PermName_Product.Modify_desc', 'lu_PermName_Product.Modify_desc', 'In-Commerce'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'lu_PermName_Product.View_desc', 'lu_PermName_Product.View_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'la_PermName_Product.Rate_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'la_PermName_Product.Review_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', ' la_PermName_Product.Review_Pending_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'la_PermName_Product.Add_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'la_PermName_Product.Delete_error', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'la_PermName_Product.Modify_desc', 'In-Commerce'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'la_PermName_Product.View_error', 'In-Commerce'); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId}); INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId}); Index: in-commerce/install/upgrades.sql =================================================================== --- in-commerce/install/upgrades.sql (revision 13756) +++ in-commerce/install/upgrades.sql (working copy) @@ -165,4 +165,15 @@ UPDATE Phrase SET Module = 'Core' WHERE Phrase IN ('la_btn_Add', 'la_fld_RecipientName', 'la_fld_SenderName'); DELETE FROM Permissions WHERE Permission LIKE 'in-commerce:incommerce_configemail%'; -# ===== v 5.1.0-B2 ===== \ No newline at end of file +# ===== v 5.1.0-B2 ===== + +# ===== v 5.1.0-RC1 ===== +UPDATE Phrase +SET PhraseType = 1 +WHERE Phrase IN ( + 'la_col_Qty', 'la_col_QtyBackordered', 'la_ItemBackordered', 'la_ship_all_together', + 'la_ship_backorders_upon_avail', 'la_ship_backorder_separately', 'la_tooltip_New_Coupon', + 'la_tooltip_New_Discount' +); + +DELETE FROM Phrase WHERE Phrase = 'la_comm_ProductsByManuf'; \ No newline at end of file Index: in-link/install/english.lang =================================================================== --- in-link/install/english.lang (revision 13756) +++ in-link/install/english.lang (working copy) @@ -62,6 +62,18 @@ TGluayBWYWxpZGF0aW9uIGZvciBJbmRpdmlkdWFsIExpc3Rpbmdz QXBwcm92ZSBQYWlkIExpc3Rpbmdz RGVjbGluZSBQYWlkIExpc3Rpbmdz + UGVuZGluZyBMaW5r + QWRkIExpbms= + RGVsZXRlIExpbms= + TW9kaWZ5IExpbmsgUGVuZGluZw== + TW9kaWZ5IExpbms= + TGluayBEZWxldGUgYnkgT3duZXI= + TGluayBNb2RpZnkgUGVuZGluZyBieSBPd25lcg== + TGluayBNb2RpZnkgYnkgT3duZXI= + UmF0ZSBMaW5r + Q29tbWVudCBMaW5r + UmV2aWV3IExpbmsgUGVuZGluZw== + VmlldyBMaW5r QWN0aXZlIExpbmtz RGlzYWJsZWQgTGlua3M= RWRpdG9yJ3MgUGljayBMaW5rcw== @@ -115,18 +127,6 @@ U3RhcnQgTmV3IFZhbGlkYXRpb24= UmVzZXQgVmFsaWRhdGlvbiBTdGF0dXM= VXNlIGdyaWQgdG8gQXBwcm92ZSAvIERlY2xpbmU= - UGVuZGluZyBMaW5r - QWRkIExpbms= - RGVsZXRlIExpbms= - TW9kaWZ5IExpbmsgUGVuZGluZw== - TW9kaWZ5IExpbms= - TGluayBEZWxldGUgYnkgT3duZXI= - TGluayBNb2RpZnkgUGVuZGluZyBieSBPd25lcg== - TGluayBNb2RpZnkgYnkgT3duZXI= - UmF0ZSBMaW5r - Q29tbWVudCBMaW5r - UmV2aWV3IExpbmsgUGVuZGluZw== - VmlldyBMaW5r U3ViamVjdDogTmV3IExpbmsgIjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgbGluayB0byBvdXIgd2Vic2l0ZSE8YnIgLz4NCjxiciAvPg0KTGluayBkZXRhaWwgYXJlIGxpc3RlZCBiZWxvdzo8YnIgLz4NCjxiciAvPg0KTGluayBOYW1lOiA8aW5wMjpsX0ZpZWxkIG5hbWU9Ik5hbWUiLz4gPGJyIC8+DQo8aW5wMjptX2lmIGNoZWNrPSJsX0ZpZWxkIiBuYW1lPSJVcmwiPiBMaW5rIFdlYnNpdGU6IDxpbnAyOmxfRmllbGQgbmFtZT0iVXJsIi8+PGJyIC8+DQo8L2lucDI6bV9pZj4gPGlucDI6bV9pZiBjaGVjaz0ibF9GaWVsZCIgbmFtZT0iRGVzY3JpcHRpb24iPiBEZXNjcmlwdGlvbjogPGlucDI6bF9GaWVsZCBuYW1lPSJEZXNjcmlwdGlvbiIvPjxiciAvPg0KPC9pbnAyOm1faWY+IDxiciAvPg0KPGJyIC8+DQpZb3UgY2FuIHZpZXcgeW91ciBsaW5rIGhlcmUgPGEgaHJlZj0iPGlucDI6bF9MaW5rTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOmxfRmllbGQgbmFtZT0iTmFtZSIvPjwvYT4= Index: in-link/install/install_data.sql =================================================================== --- in-link/install/install_data.sql (revision 13756) +++ in-link/install/install_data.sql (working copy) @@ -113,18 +113,18 @@ INSERT INTO ItemTypes VALUES (4, 'In-Link', 'l', 'Link', 'Name', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_Links', 1, 'in-link/admin/addlink.php', 'clsLink', 'Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'lu_PermName_Link.Add_desc', 'lu_PermName_Link.Add_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'lu_PermName_Link.View_desc', 'lu_PermName_Link.View_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'lu_PermName_Link.Add.Pending_desc', 'lu_PermName_Link.Add.Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'lu_PermName_Link.Modify_desc', 'lu_PermName_Link.Modify_desc', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'lu_PermName_Link.Delete_desc', 'lu_PermName_Link.Delete_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'lu_PermName_Link.Rate_desc', 'lu_PermName_Link.Rate_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'lu_PermName_Link.Review_desc', 'lu_PermName_Link.Review_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'lu_PermName_Link.Review_Pending_desc', ' lu_PermName_Link.Review_Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'lu_PermName_Link.Modify.Pending_desc', 'lu_PermName_Link.Modify.Pending_desc', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'lu_PermName_Link.Owner.Modify_desc', 'lu_PermName_Link.Owner.Modify_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'lu_PermName_Link.Owner.Modify.Pending_desc', 'lu_PermName_Link.Owner.Modify.Pending_error', 'In-Link'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'lu_PermName_Link.Owner.Delete_desc', 'lu_PermName_Link.Owner.Delete_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD', 'la_PermName_Link.Add_desc', 'la_PermName_Link.Add_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.VIEW', 'la_PermName_Link.View_desc', 'la_PermName_Link.View_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.ADD.PENDING', 'la_PermName_Link.Add.Pending_desc', 'la_PermName_Link.Add.Pending_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY', 'la_PermName_Link.Modify_desc', 'la_PermName_Link.Modify_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.DELETE', 'la_PermName_Link.Delete_desc', 'la_PermName_Link.Delete_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.RATE', 'la_PermName_Link.Rate_desc', 'la_PermName_Link.Rate_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW', 'la_PermName_Link.Review_desc', 'la_PermName_Link.Review_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.REVIEW.PENDING', 'la_PermName_Link.Review_Pending_desc', ' la_PermName_Link.Review_Pending_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.MODIFY.PENDING', 'la_PermName_Link.Modify.Pending_desc', 'la_PermName_Link.Modify.Pending_desc', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY', 'la_PermName_Link.Owner.Modify_desc', 'la_PermName_Link.Owner.Modify_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.MODIFY.PENDING', 'la_PermName_Link.Owner.Modify.Pending_desc', 'la_PermName_Link.Owner.Modify.Pending_error', 'In-Link'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'LINK.OWNER.DELETE', 'la_PermName_Link.Owner.Delete_desc', 'la_PermName_Link.Owner.Delete_error', 'In-Link'); INSERT INTO SearchConfig VALUES ('Link', 'OrgId', 0, 0, 'lu_fielddesc_link_orgid', 'lu_field_orgid', 'In-Link', 'la_text_link', 19, DEFAULT, 0, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO SearchConfig VALUES ('Link', 'NewItem', 0, 1, 'lu_fielddesc_link_newitem', 'lu_field_newitem', 'In-Link', 'la_text_link', 18, DEFAULT, 0, 'boolean', NULL, NULL, NULL, NULL, NULL, NULL, NULL); Index: in-news/install/english.lang =================================================================== --- in-news/install/english.lang (revision 13756) +++ in-news/install/english.lang (working copy) @@ -1,5 +1,5 @@ - - m/d/Yg:i Am/d/Yg:i:s A.,utf-8http://docs.in-portal.org/eng/index.php2 + + QXV0aG9y RGF0ZQ== @@ -46,6 +46,18 @@ T3JkZXIgYXJ0aWNsZXMgYnk= QW5kIHRoZW4gYnk= U29ydCBDb21tZW50cyBieQ== + QWRkIFBlbmRpbmcgTmV3cw== + QWRkIE5ld3M= + RGVsZXRlIE5ld3M= + TW9kaWZ5IEFydGljbGUgUGVuZGluZw== + TW9kaWZ5IE5ld3M= + QXJ0aWNsZSBEZWxldGUgYnkgT3duZXI= + QXJ0aWNsZSBNb2RpZnkgUGVuZGluZyBieSBPd25lcg== + QXJ0aWNsZSBNb2RpZnkgYnkgT3duZXI= + UmF0ZSBOZXdz + UmV2aWV3IE5ld3MgUGVuZGluZw== + Q29tbWVudCBBcnRpY2xl + VmlldyBOZXdz QWN0aXZlIEFydGljbGVz QXZlcmFnZSBSYXRpbmcgb2YgQXJ0aWNsZXM= VG90YWwgQXJ0aWNsZSBDb21tZW50cw== @@ -77,8 +89,6 @@ TmV3cw== TmV3IEFydGljbGU= TmV3IEFydGljbGU= - UmV2aWV3IE5ld3MgUGVuZGluZw== - Q29tbWVudCBBcnRpY2xl U3ViamVjdDogWW91ciBOZXcgQXJ0aWNsZSAiPGlucDI6bl9GaWVsZCBuYW1lPSJUaXRsZSIvPiIgLSBBZGRlZAoKVGhhbmsgeW91IGZvciBzdWJtaXR0aW5nIHlvdXIgQXJ0aWNsZSB0byBvdXIgd2Vic2l0ZSE8YnIvPjxici8+DQ1BcnRpY2xlIGRldGFpbHMgYXJlIGxpc3RlZCBiZWxvdzo8YnIvPjxici8+DQ1BcnRpY2xlIFRpdGxlOiA8aW5wMjpuX0ZpZWxkIG5hbWU9IlRpdGxlIi8+PGJyLz4NPGlucDI6bV9pZiBjaGVjaz0ibl9GaWVsZCIgbmFtZT0iQm9keSI+DUJvZHk6IDxpbnAyOm5fRmllbGQgbmFtZT0iQm9keSIvPjxici8+DTwvaW5wMjptX2lmPg08YnIvPjxici8+DQ1Zb3UgY2FuIHZpZXcgeW91ciBhcnRpY2xlIGhlcmUgPGEgaHJlZj0iPGlucDI6bl9BcnRpY2xlTGluayB0ZW1wbGF0ZT0iX19kZWZhdWx0X18iLz4iPjxpbnAyOm5fRmllbGQgbmFtZT0iVGl0bGUiLz48L2E+ Index: in-news/install/install_data.sql =================================================================== --- in-news/install/install_data.sql (revision 13756) +++ in-news/install/install_data.sql (working copy) @@ -60,18 +60,18 @@ INSERT INTO ItemTypes VALUES (2, 'In-News', 'n', 'News', 'Title', 'CreatedById', 'Hits', 'CachedRating', 'la_ItemTab_News', 1, 'in-news/admin/addarticle.php', 'clsNews', 'Article'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'lu_PermName_News.Add_desc', 'lu_PermName_News.Add_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'lu_PermName_News.View_desc', 'lu_PermName_News.View_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'lu_PermName_News.Add.Pending_desc', 'lu_PermName_News.Add.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'lu_PermName_News.Modify_desc', 'lu_PermName_News.Modify_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'lu_PermName_News.Delete_desc', 'lu_PermName_News.Delete_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'lu_PermName_News.Rate_desc', 'lu_PermName_News.Rate_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'lu_PermName_News.Review_desc', 'lu_PermName_News.Review_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'lu_PermName_News.Review.Pending_desc', 'lu_PermName_News.Review.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'lu_PermName_News.Modify.Pending_desc', 'lu_PermName_News.Modify.Pending_desc', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'lu_PermName_News.Owner.Modify_desc', 'lu_PermName_News.Owner.Modify_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'lu_PermName_News.Owner.Modify.Pending_desc', 'lu_PermName_News.Owner.Modify.Pending_error', 'In-News'); -INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'lu_PermName_News.Owner.Delete_desc', 'lu_PermName_News.Owner.Delete_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD', 'la_PermName_News.Add_desc', 'la_PermName_News.Add_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.VIEW', 'la_PermName_News.View_desc', 'la_PermName_News.View_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.ADD.PENDING', 'la_PermName_News.Add.Pending_desc', 'la_PermName_News.Add.Pending_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY', 'la_PermName_News.Modify_desc', 'la_PermName_News.Modify_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.DELETE', 'la_PermName_News.Delete_desc', 'la_PermName_News.Delete_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.RATE', 'la_PermName_News.Rate_desc', 'la_PermName_News.Rate_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW', 'la_PermName_News.Review_desc', 'la_PermName_News.Review_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.REVIEW.PENDING', 'la_PermName_News.Review.Pending_desc', 'la_PermName_News.Review.Pending_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.MODIFY.PENDING', 'la_PermName_News.Modify.Pending_desc', 'la_PermName_News.Modify.Pending_desc', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY', 'la_PermName_News.Owner.Modify_desc', 'la_PermName_News.Owner.Modify_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.MODIFY.PENDING', 'la_PermName_News.Owner.Modify.Pending_desc', 'la_PermName_News.Owner.Modify.Pending_error', 'In-News'); +INSERT INTO PermissionConfig VALUES (DEFAULT, 'NEWS.OWNER.DELETE', 'la_PermName_News.Owner.Delete_desc', 'la_PermName_News.Owner.Delete_error', 'In-News'); INSERT INTO SearchConfig VALUES ('News', 'Title', 1, 1, 'lu_fielddesc_news_title', 'lu_field_title', 'In-News', 'la_text_article', 2, DEFAULT, 2, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT INTO SearchConfig VALUES ('News', 'Excerpt', 1, 1, 'lu_fielddesc_news_excerpt', 'lu_field_excerpt', 'In-News', 'la_text_article', 3, DEFAULT, 1, 'text', NULL, NULL, NULL, NULL, NULL, NULL, NULL);