Display a nice user friendly page when user does not exist. JM-947

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6900 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -421,7 +421,7 @@ chatroom.history.settings.label_show_message_number_content=Zobraz\u00ed ur\u010
 
 error.admin_privileges=Nem\u00e1te administr\u00e1torsk\u00e1 opr\u00e1vn\u011bn\u00ed po\u017eadovan\u00e9 pro proveden\u00ed t\u00e9to operace.
 error.requested_user_not_found=Po\u017eadovan\u00fd u\u017eivatel nebyl nalezen.
-error.specific_user_not_found=Po\u017eadovan\u00fd u\u017eivatel ({0}) nebyl nalezen.
+error.specific_user_not_found=Po\u017eadovan\u00fd u\u017eivatel nebyl nalezen: {0}.
 error.not_found_group=Po\u017eadovan\u00e1 skupina nebyla nalezena.
 error.exception=V\u00fdjimka:
 

src/i18n/wildfire_i18n_de.properties

@@ -411,7 +411,7 @@ chatroom.history.settings.label_show_message_number_content= - Eine bestimmte An
 
 error.admin_privileges=Keine ausreichenden Administrationsprivilegian um diese Aktion durchzuf\u00fchren.
 error.requested_user_not_found=Der angeforderte Benutzer wurde nicht gefunden.
-error.specific_user_not_found=Der angeforderte Benutzer ({0}) wurde nicht gefunden.
+error.specific_user_not_found=Der angeforderte Benutzer wurde nicht gefunden: {0}.
 error.not_found_group=Die angeforderte Gruppe wurde nicht gefunden.
 error.exception=Fehler:
 

src/i18n/wildfire_i18n_en.properties

@@ -627,7 +627,7 @@ chatroom.history.settings.label_show_message_number_content=Show a specific numb
 
 error.admin_privileges=You don't have admin privileges to perform this operation.
 error.requested_user_not_found=The requested user was not found.
-error.specific_user_not_found=The requested user ({0}) was not found.
+error.specific_user_not_found=The requested user was not found: {0}
 error.not_found_group=The requested group was not found.
 error.exception=Exception:
 

src/i18n/wildfire_i18n_es.properties

@@ -400,7 +400,7 @@ chatroom.history.settings.label_show_message_number_content=Mostrar un n\u00fame
 
 error.admin_privileges=No tiene privilegios de administrador para realizar esta operaci\u00f3n.
 error.requested_user_not_found=El usuario solicitado no fue encontrado.
-error.specific_user_not_found=El usuario solicitado ({0}) no fue encontrado.
+error.specific_user_not_found=El usuario solicitado no fue encontrado: {0}
 error.not_found_group=El grupo solicitado no fue encontrado.
 error.exception=Excepci\u00f3n:
 

src/i18n/wildfire_i18n_fr.properties

@@ -365,7 +365,7 @@ chatroom.history.settings.label_show_message_number_content = Affiche le nombre
 # Error Page
 error.admin_privileges = Vous n'avez pas les privil\u00E8ges administrateur pour effecteuer     cette op\u00E9ration.
 error.requested_user_not_found = L'utilisateur demand\u00E9 n'a pas \u00E9t\u00E9 trouv\u00E9.
-error.specific_user_not_found = L'utilisateur demand\u00E9 ({0}) n'a pas \u00E9t\u00E9 trouv\u00E9.
+error.specific_user_not_found = L'utilisateur demand\u00E9 n'a pas \u00E9t\u00E9 trouv\u00E9: {0}.
 error.not_found_group = Le groupe demand\u00E9 n'a pas \u00E9t\u00E9 trouv\u00E9.
 error.exception = Exception \:
 # Error serverdown Page

src/i18n/wildfire_i18n_nl.properties

@@ -408,7 +408,7 @@ chatroom.history.settings.label_show_message_number_content=Toon een bepaald aan
 
 error.admin_privileges=U hebt geen beheerdersrechten om deze bewerking uit te voeren.
 error.requested_user_not_found=De opgevraagde gebruiker is niet gevonden.
-error.specific_user_not_found=De opgevraagde gebruiker ({0}) is niet gevonden.
+error.specific_user_not_found=De opgevraagde gebruiker is niet gevonden: {0}.
 error.not_found_group=De opgevraagde groep is niet gevonden.
 error.exception=Uitzondering:
 

src/i18n/wildfire_i18n_pl_PL.properties

@@ -411,7 +411,7 @@ chatroom.history.settings.label_show_message_number_content=Pokazuj okre\u015blo
 
 error.admin_privileges=Nie masz praw administratora do wykonania tej operacji.
 error.requested_user_not_found=U\u017cytkownik nie znaleziony.
-error.specific_user_not_found=Nie znaleziono u\u017cytkownika ({0}).
+error.specific_user_not_found=Nie znaleziono u\u017cytkownika: {0}.
 error.not_found_group=Grupa nie zosta\u0142a znaleziona.
 error.exception=Wyj\u0105tek:
 

src/i18n/wildfire_i18n_pt_BR.properties

@@ -419,7 +419,7 @@ chatroom.history.settings.label_show_message_number_content=Mostrar um n\u00fame
 
 error.admin_privileges=Voc\u00ea n\u00e3o tem privil\u00e9gios de administrador para executar esta opera\u00e7\u00e3o.
 error.requested_user_not_found=O usu\u00e1rio solicitado n\u00e3o foi encontrado.
-error.specific_user_not_found=O usu\u00e1rio solicitado ({0}) n\u00e3o foi encontrado.
+error.specific_user_not_found=O usu\u00e1rio solicitado n\u00e3o foi encontrado: {0}.
 error.not_found_group=O grupo solicitado n\u00e3o foi encontrado.
 error.exception=Exce\u00e7\u00e3o:
 

src/web/user-properties.jsp

@@ -57,7 +57,6 @@
         user = webManager.getUserManager().getUser(username);
     }
     catch (UserNotFoundException unfe) {
-        user = webManager.getUserManager().getUser(username);
     }
 
     PresenceManager presenceManager = webManager.getPresenceManager();
@@ -114,6 +113,15 @@
     </tr>
 </thead>
 <tbody>
+    <% if (user == null) { %>
+    <tr>
+        <td colspan="2" align="center">
+            <fmt:message key="error.specific_user_not_found">
+                <fmt:param value="<%= username%>" />
+            </fmt:message>
+        </td>
+    </tr>
+    <% } else { %>
     <tr>
         <td class="c1">
             <fmt:message key="user.create.username" />:
@@ -221,13 +229,14 @@
             %>
         </td>
     </tr>
+    <% } %>
 </tbody>
 </table>
 </div>
 
 <br><br>
 
-<% if (!UserManager.getUserProvider().isReadOnly()) { %>
+<% if (user != null && !UserManager.getUserProvider().isReadOnly()) { %>
 
 <form action="user-edit-form.jsp">
 <input type="hidden" name="username" value="<%= user.getUsername() %>">