diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index dfca7158fa..8b3c4cb0ba 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -466,8 +466,6 @@ else { echo "\n"; } -//echo "

".print_r($array_categories, true)."



"; - //setting search script echo "\n"; - - - //include the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/core/users/app_languages.php b/core/users/app_languages.php index ddc159adb6..60b36fe80b 100644 --- a/core/users/app_languages.php +++ b/core/users/app_languages.php @@ -232,21 +232,11 @@ $text['message-copy']['pl'] = "Skopiowano poprawnie"; $text['message-copy']['uk'] = "Скопійовано"; $text['message-copy']['sv-se'] = "Kopiering Slutförd"; -$text['message-cannot_delete_own_account']['en-us'] = "You cannot delete your own user account. - -Please login as a different user, then try again."; -$text['message-cannot_delete_own_account']['es-cl'] = "No se puede eliminar su propia cuenta de usuario. - -Por favor, iniciar sesión como un usuario diferente, vuelva a intentarlo."; -$text['message-cannot_delete_own_account']['pt-pt'] = "Você não pode excluir a sua própria conta de usuário. - -Identifique-se como um usuário diferente, em seguida, tente novamente."; -$text['message-cannot_delete_own_account']['fr-fr'] = "Vous ne pouvez pas supprimer votre propre compte utilisateur. - -Se il vous plaît vous identifier en tant qu'utilisateur différent, puis réessayez."; -$text['message-cannot_delete_own_account']['pl'] = "Nie można usunąć własnego konta użytkownika. - - Zaloguj się jako inny użytkownik i spróbuj ponownie."; +$text['message-cannot_delete_own_account']['en-us'] = "You cannot delete your own user account.\\n\\nPlease login as a different user, then try again."; +$text['message-cannot_delete_own_account']['es-cl'] = "No se puede eliminar su propia cuenta de usuario.\\n\\nPor favor, iniciar sesión como un usuario diferente, vuelva a intentarlo."; +$text['message-cannot_delete_own_account']['pt-pt'] = "Você não pode excluir a sua própria conta de usuário.\\n\\nIdentifique-se como um usuário diferente, em seguida, tente novamente."; +$text['message-cannot_delete_own_account']['fr-fr'] = "Vous ne pouvez pas supprimer votre propre compte utilisateur.\\n\\nSe il vous plaît vous identifier en tant qu'utilisateur différent, puis réessayez."; +$text['message-cannot_delete_own_account']['pl'] = "Nie można usunąć własnego konta użytkownika.\\n\\n Zaloguj się jako inny użytkownik i spróbuj ponownie."; $text['message-cannot_delete_own_account']['uk'] = "Ви не можете видалити власний обліковий запис. Будь ласка, увійдіть під іншим користувачем, потім повторіть спробу."; $text['message-cannot_delete_own_account']['sv-se'] = "Du kan inte ta bort ditt egna användarkonto. Logg ain som en annan användare och försök igen."; @@ -298,6 +288,14 @@ $text['label-status']['pl'] = "Status"; $text['label-status']['uk'] = "Статус"; $text['label-status']['sv-se'] = "Status"; +$text['label-search']['en-us'] = "Search..."; +$text['label-search']['es-cl'] = "Buscar..."; +$text['label-search']['pt-pt'] = "Pesquisa..."; +$text['label-search']['fr-fr'] = "Recherche..."; +$text['label-search']['nl-nl'] = ""; +$text['label-search']['pt-br'] = "Pesquisa..."; +$text['label-search']['pl'] = "Szukaj ..."; + $text['label-permission_permissions']['en-us'] = "Permissions"; $text['label-permission_permissions']['es-cl'] = "Permisos"; $text['label-permission_permissions']['pt-pt'] = "Permissões"; diff --git a/core/users/group_permissions.php b/core/users/group_permissions.php index 74ede2a60f..4c91b980d5 100644 --- a/core/users/group_permissions.php +++ b/core/users/group_permissions.php @@ -343,6 +343,7 @@ require_once "resources/require.php"; echo " \n"; echo " \n"; echo " "; + echo " \n"; echo " "; echo " \n"; echo " \n"; @@ -364,6 +365,10 @@ require_once "resources/require.php"; $app_name = $app['name']; $description = $app['description']['en-us']; + //used to hide apps, even if permissions don't exist + $array_apps_unique[] = str_replace(' ','_',strtolower($app['name'])); + + echo "
"; echo "".$app_name."
\n"; if ($description != '') { echo $description."
\n"; } echo "
"; @@ -371,19 +376,24 @@ require_once "resources/require.php"; echo "\n"; echo " \n"; echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; foreach ($app['permissions'] as $permission_index => $row) { $checked = ($permissions_db_checklist[$row['name']] == "true") ? "checked='checked'" : null; - echo "\n"; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "\n"; $c = ($c == 0) ? 1 : 0; + //populate search/filter arrays + $array_apps[] = str_replace(' ','_',strtolower($app['name'])); + $array_permissions[] = $row['name']; + $array_descriptions[] = str_replace('"','\"',$row['description']); + $app_permissions[$app_index][] = "perm_".$app_index."_".$permission_index; } @@ -391,27 +401,65 @@ require_once "resources/require.php"; echo " \n"; echo " \n"; echo "
".$text['label-permission_permissions']."".$text['label-permission_description']."".$text['label-permission_permissions']."".$text['label-permission_description']."
".$row['name']."".$row['description']." 
"; - echo "
\n"; + echo "
\n\n"; + } //end foreach echo "
"; unset($sql, $result, $row_count); - echo "\n"; - echo "\n"; +//check or uncheck all category checkboxes + echo "\n"; + +//setting search script + echo "\n"; + //show the footer require_once "resources/footer.php";