Skip to content
This repository was archived by the owner on Nov 25, 2020. It is now read-only.

Commit 4bb318b

Browse files
committed
Throw error when trying to move current super-admin inside a sub-group. Clean the code by the way.
1 parent b920b73 commit 4bb318b

File tree

12 files changed

+256
-165
lines changed

12 files changed

+256
-165
lines changed

core/src/plugins/access.ajxp_conf/i18n/de.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,13 @@
183183
"158" => "Freigabebenutzer", // user type shared
184184
"159" => "Gast",
185185
"160" => "Die Gruppe wurde erfolgreich erstellt",
186-
);
186+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
187+
"162" => "You are not authorized to update user %s",
188+
"163" => "Roles reordered for user %s",
189+
"164" => "Successfully updated roles",
190+
"165" => "Successfully saved user preferences",
191+
"166" => "Successfully set lock (%1) on user (%2)",
192+
"167" => "Successfully unlocked user (%s)",
193+
"168" => "%1 users were moved to group %2",
194+
"169" => "No users were moved, there must have been something wrong!",
195+
);

core/src/plugins/access.ajxp_conf/i18n/en.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,14 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Group was successfully created",
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
185195
);

core/src/plugins/access.ajxp_conf/i18n/es.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,13 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Group was successfully created",
185-
);
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
);

core/src/plugins/access.ajxp_conf/i18n/fi.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,4 +185,13 @@
185185
"158" => "Shared", // user type shared
186186
"159" => "Guest",
187187
"160" => "Group was successfully created",
188-
);
188+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
189+
"162" => "You are not authorized to update user %s",
190+
"163" => "Roles reordered for user %s",
191+
"164" => "Successfully updated roles",
192+
"165" => "Successfully saved user preferences",
193+
"166" => "Successfully set lock (%1) on user (%2)",
194+
"167" => "Successfully unlocked user (%s)",
195+
"168" => "%1 users were moved to group %2",
196+
"169" => "No users were moved, there must have been something wrong!",
197+
);

core/src/plugins/access.ajxp_conf/i18n/fr.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,13 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Le groupe a été créé avec succès.",
185-
);
185+
"161" => "Vous essayez de bouger votre propre utilisateur dans un groupe, et vous allez perdre les droits de super-utilisateur. Veuillez vous logger sous un autre utilisateur admin pour faire cette opération. Arrêt.",
186+
"162" => "Vous n'êtes pas autorisé à éditer l'utilisateur %s",
187+
"163" => "Les rôles ont été ré-ordonnés pour l'utilisateur %s",
188+
"164" => "Les rôles ont bien été mis à jour.",
189+
"165" => "Les préférences de l'utilisateur ont bien été mises à jour.",
190+
"166" => "Un blocage de type %1 a été ajouté à %2",
191+
"167" => "Le blocage a bien été enlevé pour l'utilisateur %s",
192+
"168" => "%1 utilisateurs ont été bougés dans le groupe %2",
193+
"169" => "Aucun utilisateurs n'ont été modifié, il y a une erreur!",
194+
);

core/src/plugins/access.ajxp_conf/i18n/hu.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,4 +184,13 @@
184184
"158" => "Shared", // user type shared
185185
"159" => "Guest",
186186
"160" => "Group was successfully created",
187-
);
187+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
188+
"162" => "You are not authorized to update user %s",
189+
"163" => "Roles reordered for user %s",
190+
"164" => "Successfully updated roles",
191+
"165" => "Successfully saved user preferences",
192+
"166" => "Successfully set lock (%1) on user (%2)",
193+
"167" => "Successfully unlocked user (%s)",
194+
"168" => "%1 users were moved to group %2",
195+
"169" => "No users were moved, there must have been something wrong!",
196+
);

core/src/plugins/access.ajxp_conf/i18n/it.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,13 @@
182182
"158" => "Condiviso", // user type shared
183183
"159" => "Ospite",
184184
"160" => "Gruppo creato con successo",
185-
);
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
);

core/src/plugins/access.ajxp_conf/i18n/nl.php

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?php
22
/*
3-
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4-
* This file is part of Pydio.
5-
*
6-
* Pydio is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU Affero General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* Pydio is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Affero General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Affero General Public License
17-
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18-
*
19-
* The latest code can be found at <https://pydio.com>.
20-
*/
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <https://pydio.com>.
20+
*/
2121
$mess=array(
2222
"1" => "Configuratie Gegevens",
2323
"2" => "Gebruikers & Groepen",
@@ -182,5 +182,13 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Group was successfully created",
185-
);
186-
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
);

core/src/plugins/access.ajxp_conf/i18n/pt.php

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,4 +182,13 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Group was successfully created",
185-
);
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
);

core/src/plugins/access.ajxp_conf/i18n/ru.php

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?php
22
/*
3-
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4-
* This file is part of Pydio.
5-
*
6-
* Pydio is free software: you can redistribute it and/or modify
7-
* it under the terms of the GNU Affero General Public License as published by
8-
* the Free Software Foundation, either version 3 of the License, or
9-
* (at your option) any later version.
10-
*
11-
* Pydio is distributed in the hope that it will be useful,
12-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
* GNU Affero General Public License for more details.
15-
*
16-
* You should have received a copy of the GNU Affero General Public License
17-
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18-
*
19-
* The latest code can be found at <https://pydio.com>.
20-
*/
3+
* Copyright 2007-2013 Charles du Jeu - Abstrium SAS <team (at) pyd.io>
4+
* This file is part of Pydio.
5+
*
6+
* Pydio is free software: you can redistribute it and/or modify
7+
* it under the terms of the GNU Affero General Public License as published by
8+
* the Free Software Foundation, either version 3 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* Pydio is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU Affero General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU Affero General Public License
17+
* along with Pydio. If not, see <http://www.gnu.org/licenses/>.
18+
*
19+
* The latest code can be found at <https://pydio.com>.
20+
*/
2121
$mess=array(
2222
"1" => "Данные конфигурации",
2323
"2" => "Пользователи & Группы",
@@ -182,4 +182,13 @@
182182
"158" => "Shared", // user type shared
183183
"159" => "Guest",
184184
"160" => "Group was successfully created",
185-
);
185+
"161" => "You are attempting to move yourself inside a group, and you will loose super-admininistrative rights. Please login as another user if you really want to do that. Aborting.",
186+
"162" => "You are not authorized to update user %s",
187+
"163" => "Roles reordered for user %s",
188+
"164" => "Successfully updated roles",
189+
"165" => "Successfully saved user preferences",
190+
"166" => "Successfully set lock (%1) on user (%2)",
191+
"167" => "Successfully unlocked user (%s)",
192+
"168" => "%1 users were moved to group %2",
193+
"169" => "No users were moved, there must have been something wrong!",
194+
);

0 commit comments

Comments
 (0)