diff options
| author |  Ugnich Anton | 2013-11-19 08:49:49 +0700 |
|---|---|---|
| committer | Ugnich Anton | 2013-11-19 08:49:49 +0700 |
| commit | 11b8004d621d69b4e65b2efefc526b9900515738 (patch) | |
| tree | e9941fbf16f767425b0f361978d09c41252804f4 /src | |
| parent | 796c55d1591acc0188c0c269409d914f0dce12c5 (diff) | |
small bugfix, search, -places
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/com/juick/http/www/Main.java | 2 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/PageTemplates.java | 6 | ||||
| -rw-r--r-- | src/java/com/juick/http/www/UserThread.java | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/java/com/juick/http/www/Main.java b/src/java/com/juick/http/www/Main.java index 8b760e44..249ae53c 100644 --- a/src/java/com/juick/http/www/Main.java +++ b/src/java/com/juick/http/www/Main.java @@ -62,7 +62,7 @@ public class Main extends HttpServlet { Class.forName("com.mysql.jdbc.Driver"); sql = DriverManager.getConnection("jdbc:mysql://localhost/juick?autoReconnect=true&user=" + conf.getProperty("mysql_username", "") + "&password=" + conf.getProperty("mysql_password", "")); - sqlSearch = DriverManager.getConnection("jdbc:mysql://127.0.0.1:9306/juick?autoReconnect=true&characterEncoding=utf8&maxAllowedPacket=512000&relaxAutoCommit=true&user=root&password="); + sqlSearch = DriverManager.getConnection("jdbc:mysql://127.0.0.1:9306?autoReconnect=true&characterEncoding=utf8&maxAllowedPacket=512000", "", ""); /* xmpp = new XmppConnectionComponent(new JID("www.juick.com"), conf.getProperty("xmpp_password", ""), "127.0.0.1", 5347, false); xmpp.addListener((XmppListener) this); diff --git a/src/java/com/juick/http/www/PageTemplates.java b/src/java/com/juick/http/www/PageTemplates.java index c7118277..d3733305 100644 --- a/src/java/com/juick/http/www/PageTemplates.java +++ b/src/java/com/juick/http/www/PageTemplates.java @@ -41,7 +41,7 @@ import ru.sape.Sape; public class PageTemplates { public static Sape sape = null; - private static SimpleDateFormat sdfSQL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S"); + private static SimpleDateFormat sdfSQL = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private static SimpleDateFormat sdfSimple = new SimpleDateFormat("d MMM"); private static SimpleDateFormat sdfFull = new SimpleDateFormat("d MMM yyyy"); private static SimpleDateFormat sdfJS = new SimpleDateFormat("yyyy,MM,dd,HH,mm,ss"); @@ -454,9 +454,7 @@ public class PageTemplates { out.print(" · " + rb.getString("Sponsored")); } out.println("</div>"); - if (msg.Place != null) { - out.println(" <div class=\"msg-place\"><a href=\"/places/" + msg.Place.pid + "\">" + msg.Place.name + "</a></div>"); - } + out.print(" <div class=\"msg-txt\">" + txt + "</div>"); if (msg.AttachmentType != null) { diff --git a/src/java/com/juick/http/www/UserThread.java b/src/java/com/juick/http/www/UserThread.java index 1e81a728..c7158f39 100644 --- a/src/java/com/juick/http/www/UserThread.java +++ b/src/java/com/juick/http/www/UserThread.java @@ -133,9 +133,6 @@ public class UserThread { out.println(" <div class=\"msg-menu\"><a href=\"#\" onclick=\"showMessageLinksDialog(" + msg.MID + "); return false\"></a></div>"); out.println(" <div class=\"msg-header\"><a href=\"/" + msg.User.UName + "/\">@" + msg.User.UName + "</a>:" + tags + "</div>"); out.println(" <div class=\"msg-ts\">" + PageTemplates.formatJSLocalTime(msg.TimestampString) + "</div>"); - if (msg.Place != null) { - out.println(" <div class=\"msg-place\"><a href=\"/places/" + msg.Place.pid + "\">" + msg.Place.name + "</a></div>"); - } out.println(" <div class=\"msg-txt\">" + txt + "</div>"); if (msg.AttachmentType != null) { |