Index: admin_templates/categories/cache_updater.tpl
===================================================================
--- admin_templates/categories/cache_updater.tpl (revision 13756)
+++ admin_templates/categories/cache_updater.tpl (working copy)
@@ -15,13 +15,13 @@
|
- " onclick="goto_url('');" class="button" />
+ ');" class="button" />
|
|
- " onclick="javascript:window_close();" class="button" />
+
|
Index: install.php
===================================================================
--- install.php (revision 13756)
+++ install.php (working copy)
@@ -930,7 +930,7 @@
if ($this->currentStep == -1) {
// step after last step -> redirect to admin
- $this->Application->Redirect('index', null, '', 'index.php');
+ $this->Application->Redirect('index', Array (), '', 'index.php');
}
}
Index: install/english.lang
===================================================================
--- install/english.lang (revision 13756)
+++ install/english.lang (working copy)
@@ -463,6 +463,7 @@
RnJvbSBFbWFpbA==
RnJvbnQtRW5kIE9ubHk=
QWxsb3cgUmVnaXN0cmF0aW9uIG9uIEZyb250LWVuZA==
+ VXNlciBHcm91cA==
SUQ=
R3JvdXAgTmFtZQ==
SGVpZ2h0
@@ -730,6 +731,7 @@
TmV4dCBzZWN0aW9u
Tm8=
Tm9uZQ==
+ Tm8gUGVybWlzc2lvbnM=
b2Y=
T2Zm
T24=
@@ -841,6 +843,19 @@
U2VuZCBFLW1haWwgdG8gR3JvdXBzIGluIEFkbWlu
QmFuIFVzZXJz
U2VuZCBFLW1haWwgdG8gVXNlcnMgaW4gQWRtaW4=
+ QWRtaW4gTG9naW4=
+ QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=
+ QWRkIENhdGVnb3J5
+ RGVsZXRlIENhdGVnb3J5
+ TW9kaWZ5IENhdGVnb3J5
+ VmlldyBDYXRlZ29yeQ==
+ QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=
+ RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==
+ RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp
+ QWxsb3cgZmF2b3JpdGVz
+ QWxsb3cgTG9naW4=
+ Q2hhbmdlIFVzZXIgUHJvZmlsZXM=
+ U2hvdyBMYW5ndWFnZSBUYWdz
UmVhZC1Pbmx5IEFjY2VzcyBUbyBEYXRhYmFzZQ==
Tm90IFRyYW5zbGF0ZWQ=
VHJhbnNsYXRlZA==
@@ -989,6 +1004,7 @@
SW1hZ2U=
SW1hZ2UgU2V0dGluZ3M=
VXNlciBJdGVtcw==
+ TWVtb3J5IENhY2hl
TWVzc2FnZQ==
U2VjdGlvbiBPdmVydmlldw==
U2VjdGlvbiBQcm9wZXJ0aWVz
@@ -1453,9 +1469,6 @@
V2luZG93cw==
eWVhcg==
WWVz
- WW91IG11c3QgZW50ZXIgYSBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIHRvIHJldHJpdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9u
- VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gRS1tYWlsIG5vdCBmb3VuZA==
- VXNlciBhY2NvdW50IHdpdGggZ2l2ZW4gVXNlcm5hbWUgbm90IGZvdW5k
U3ViLXNlY3Rpb25zIFF1YW50aXR5
TmF2aWdhdGlvbiBCYXI=
UmF0aW5n
@@ -1492,19 +1505,6 @@
QXV0by1EZXRlY3Q=
Q29va2llcw==
UXVlcnkgU3RyaW5nIChTSUQp
- QWRtaW4gTG9naW4=
- QWRkIFBlbmRpbmcgQ2F0ZWdvcnk=
- QWRkIENhdGVnb3J5
- RGVsZXRlIENhdGVnb3J5
- TW9kaWZ5IENhdGVnb3J5
- VmlldyBDYXRlZ29yeQ==
- QXBwZW5kIHBocGluZm8gdG8gYWxsIHBhZ2VzIChEZWJ1Zyk=
- RGlzcGxheSBJdGVtIFF1ZXJpZXMgKERlYnVnKQ==
- RGlzcGxheSBJdGVtIExpc3QgUXVlcmllcyAoRGVidWcp
- QWxsb3cgZmF2b3JpdGVz
- QWxsb3cgTG9naW4=
- Q2hhbmdlIFVzZXIgUHJvZmlsZXM=
- U2hvdyBMYW5ndWFnZSBUYWdz
U3ViamVjdDogTmV3IENhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIC0gQWRkZWQKCllvdXIgc3VnZ2VzdGVkIGNhdGVnb3J5ICI8aW5wMjpjX0ZpZWxkIG5hbWU9Ik5hbWUiLz4iIGhhcyBiZWVuIGFkZGVkLg==
Index: install/install_data.sql
===================================================================
--- install/install_data.sql (revision 13756)
+++ install/install_data.sql (working copy)
@@ -483,19 +483,19 @@
(307, 2, 225, 'AK', NULL),
(306, 2, 225, 'AL', NULL);
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'lu_PermName_Category.View_desc', 'lu_PermName_Category.View_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'lu_PermName_Category.Add_desc', 'lu_PermName_Category.Add_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'lu_PermName_Category.Delete_desc', 'lu_PermName_Category.Delete_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'lu_PermName_Category.AddPending_desc', 'lu_PermName_Category.AddPending_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'lu_PermName_Category.Modify_desc', 'lu_PermName_Category.Modify_error', 'In-Portal');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'lu_PermName_Admin_desc', 'lu_PermName_Admin_error', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'lu_PermName_Login_desc', 'lu_PermName_Admin_error', 'Front');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'lu_PermName_Debug.Item_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'lu_PermName_Debug.List_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'lu_PermName_Debug.Info_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'lu_PermName_Profile.Modify_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'lu_PermName_ShowLang_desc', '', 'Admin');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'lu_PermName_favorites_desc', 'lu_PermName_favorites_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.VIEW', 'la_PermName_Category.View_desc', 'la_PermName_Category.View_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD', 'la_PermName_Category.Add_desc', 'la_PermName_Category.Add_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.DELETE', 'la_PermName_Category.Delete_desc', 'la_PermName_Category.Delete_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.ADD.PENDING', 'la_PermName_Category.AddPending_desc', 'la_PermName_Category.AddPending_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'CATEGORY.MODIFY', 'la_PermName_Category.Modify_desc', 'la_PermName_Category.Modify_error', 'In-Portal');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'ADMIN', 'la_PermName_Admin_desc', 'la_PermName_Admin_error', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'LOGIN', 'la_PermName_Login_desc', 'la_PermName_Admin_error', 'Front');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.ITEM', 'la_PermName_Debug.Item_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.LIST', 'la_PermName_Debug.List_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'DEBUG.INFO', 'la_PermName_Debug.Info_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PROFILE.MODIFY', 'la_PermName_Profile.Modify_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'SHOWLANG', 'la_PermName_ShowLang_desc', '', 'Admin');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'FAVORITES', 'la_PermName_favorites_desc', 'la_PermName_favorites_error', 'In-Portal');
INSERT INTO PermissionConfig VALUES (DEFAULT, 'SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin');
INSERT INTO PermCache VALUES (DEFAULT, 0, 1, '11,12,13,14,15');
Index: install/upgrades.sql
===================================================================
--- install/upgrades.sql (revision 13756)
+++ install/upgrades.sql (working copy)
@@ -1899,4 +1899,32 @@
DELETE FROM Permissions WHERE Permission LIKE 'in-portal:user_email%';
DELETE FROM Phrase WHERE Phrase IN ('la_fld_FromToUser', 'la_col_FromToUser');
-# ===== v 5.1.0-B2 =====
\ No newline at end of file
+# ===== v 5.1.0-B2 =====
+
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase SET Module = 'Core' WHERE Phrase = 'la_fld_Group';
+
+UPDATE PermissionConfig
+SET
+ Description = REPLACE(Description, 'lu_PermName_', 'la_PermName_'),
+ ErrorMessage = REPLACE(ErrorMessage, 'lu_PermName_', 'la_PermName_');
+
+UPDATE Phrase
+SET
+ Phrase = REPLACE(Phrase, 'lu_PermName_', 'la_PermName_'),
+ PhraseKey = REPLACE(PhraseKey, 'LU_PERMNAME_', 'LA_PERMNAME_'),
+ PhraseType = 1
+WHERE PhraseKey LIKE 'LU_PERMNAME_%';
+
+UPDATE Phrase
+SET
+ Phrase = 'la_no_permissions',
+ PhraseKey = 'LA_NO_PERMISSIONS',
+ PhraseType = 1
+WHERE PhraseKey = 'LU_NO_PERMISSIONS';
+
+UPDATE Phrase
+SET PhraseType = 0
+WHERE PhraseKey IN (
+ 'LU_FERROR_FORGOTPW_NODATA', 'LU_FERROR_UNKNOWN_USERNAME', 'LU_FERROR_UNKNOWN_EMAIL'
+);
\ No newline at end of file
Index: units/users/users_event_handler.php
===================================================================
--- units/users/users_event_handler.php (revision 13756)
+++ units/users/users_event_handler.php (working copy)
@@ -223,7 +223,7 @@
$object =& $user_helper->getUserObject();
if ($result == LOGIN_RESULT_NO_PERMISSION) {
- $object->SetError('ValidateLogin', 'no_permission', 'lu_no_permissions');
+ $object->SetError('ValidateLogin', 'no_permission', 'la_no_permissions');
}
else {
$object->SetID(USER_GUEST);