[JM-1321] Auto-truncate too long summary, and use a more appropriate string...

[JM-1321] Auto-truncate too long summary, and use a more appropriate string for time zone setting log.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/branches@10193 b35dd754-fafc-0310-a699-88a17e54d16e

openfire_3_5_1/src/java/org/jivesoftware/openfire/security/DefaultSecurityAuditProvider.java

@@ -13,6 +13,7 @@ import org.jivesoftware.database.SequenceManager;
 import org.jivesoftware.database.DbConnectionManager;
 import org.jivesoftware.util.JiveConstants;
 import org.jivesoftware.util.Log;
+import org.jivesoftware.util.StringUtils;
 import org.jivesoftware.openfire.XMPPServer;
 
 import java.util.List;
@@ -28,7 +29,7 @@ import java.sql.*;
 public class DefaultSecurityAuditProvider implements SecurityAuditProvider {
 
     private static final String LOG_ENTRY =
-            "INSERT INTO jiveSecurityAuditLog VALUES(?,?,?,?,?,?)";
+            "INSERT INTO jiveSecurityAuditLog(msgID,username,entryStamp,summary,node,details) VALUES(?,?,?,?,?,?)";
     private static final String GET_EVENTS =
             "SELECT msgID,username,entryStamp,summary,node,details FROM jiveSecurityAuditLog";
     private static final String GET_EVENT =
@@ -57,7 +58,7 @@ public class DefaultSecurityAuditProvider implements SecurityAuditProvider {
             pstmt.setLong(1, msgID);
             pstmt.setString(2, username);
             pstmt.setLong(3, new Date().getTime());
-            pstmt.setString(4, summary);
+            pstmt.setString(4, StringUtils.abbreviate(summary, 250));
             pstmt.setString(5, XMPPServer.getInstance().getServerInfo().getHostname());
             pstmt.setString(6, details);
             pstmt.executeUpdate();

openfire_3_5_1/src/web/server-locale.jsp

@@ -37,7 +37,7 @@
             TimeZone tz = TimeZone.getTimeZone(timeZoneID);
             JiveGlobals.setTimeZone(tz);
             // Log the event
-            webManager.logEvent("updated time zone to "+tz, null);
+            webManager.logEvent("updated time zone to "+tz.getID(), tz.toString());
         }
         catch (Exception e) {
             Log.error(e);
@@ -50,7 +50,7 @@
             else {
                 JiveGlobals.setLocale(newLocale);
                 // Log the event
-                webManager.logEvent("updated locale to "+newLocale, null);
+                webManager.logEvent("updated locale to "+newLocale.getDisplayName(), null);
                 response.sendRedirect("server-locale.jsp?success=true");
                 return;
             }