Merge pull request #12 from Quackster/master

merge from master

Havana-Server/src/main/java/org/alexdev/havana/dao/mysql/ItemDao.java

@@ -204,7 +204,7 @@ public class ItemDao {
 
         try {
             sqlConnection = Storage.getStorage().getConnection();
-            preparedStatement = Storage.getStorage().prepare("SELECT * FROM vw_items WHERE id = ?", sqlConnection);
+            preparedStatement = Storage.getStorage().prepare("SELECT * FROM items WHERE id = ?", sqlConnection);
             preparedStatement.setLong(1, itemId);
             resultSet = preparedStatement.executeQuery();
 

Havana-Server/src/main/java/org/alexdev/havana/util/config/ServerConfiguration.java

@@ -158,7 +158,7 @@ public class ServerConfiguration {
      * @return value
      */
     public static String getString(String key) {
-        return config.getOrDefault(key, key);
+        return config.getOrDefault(key, "");
     }
 
     /**

Havana-Web/src/main/java/org/alexdev/http/HavanaWeb.java

@@ -52,6 +52,10 @@ public class HavanaWeb {
         settings.setTemplateBase(TwigTemplate.class);
         settings.setSaveSessions(true);
 
+        if (ServerConfiguration.getString("page.encoding").length() > 0) {
+            settings.setPageEncoding(ServerConfiguration.getString("page.encoding"));
+        }
+
         // Spammers
         /*Settings.getInstance().getBlockIpv4().add("192.190");
         Settings.getInstance().getBlockIpv4().add("79.108");

Havana-Web/src/main/java/org/alexdev/http/controllers/site/ClientController.java

@@ -111,7 +111,7 @@ public class ClientController {
         var ssoTicket = playerDetails.getSsoTicket();
 
         // Update sso ticket
-        if (GameConfiguration.getInstance().getBoolean("reset.sso.after.login") || ssoTicket.isBlank()) {
+        if (GameConfiguration.getInstance().getBoolean("reset.sso.after.login") || ssoTicket == null || ssoTicket.isBlank()) {
             ssoTicket = UUID.randomUUID().toString();
             PlayerDao.setTicket(webConnection.session().getInt("user.id"), ssoTicket);
         }

Havana-Web/src/main/java/org/alexdev/http/util/config/WebServerConfigWriter.java

@@ -27,6 +27,8 @@ public class WebServerConfigWriter implements ConfigWriter {
 
         config.put("template.directory", "tools/www-tpl");
         config.put("template.name", "default-en");
+
+        config.put("page.encoding", "utf-8");
         return config;
     }
 
@@ -53,6 +55,8 @@ public class WebServerConfigWriter implements ConfigWriter {
         writer.println("[Template]");
         writer.println("template.directory=" + config.get("template.directory"));
         writer.println("template.name=" + config.get("template.name"));
+        writer.println("");
+        writer.println("page.encoding=" + config.get("page.encoding"));
         writer.flush();
         writer.close();
     }

tools/scripts/run_web.sh

@@ -2,4 +2,4 @@
 
 CLASSPATH=Havana-Web.jar:lib/ini4j-0.5.4.jar:lib/pebble-3.1.5.jar:lib/Havana-Server.jar:lib/HikariCP-3.4.1.jar:lib/mariadb-java-client-2.3.0.jar:lib/commons-configuration2-2.2.jar:lib/commons-text-1.5.jar:lib/htmlcompressor-maven-plugin-1.3.jar:lib/commons-io-2.5.jar:lib/velocity-tools-2.0.jar:lib/struts-taglib-1.3.8.jar:lib/struts-tiles-1.3.8.jar:lib/struts-core-1.3.8.jar:lib/commons-validator-1.6.jar:lib/geoip2-2.12.0.jar:lib/httpclient-4.5.5.jar:lib/duckHTTPD-all.jar:lib/jsoup-1.13.1.jar:lib/slf4j-log4j12-1.7.25.jar:lib/gson-2.8.0.jar:lib/mail-1.4.7.jar:lib/lazysodium-java-5.0.1.jar:lib/resource-loader-2.0.1.jar:lib/jna-5.8.0.jar:lib/unbescape-1.1.6.RELEASE.jar:lib/slf4j-api-1.7.30.jar:lib/commons-lang3-3.9.jar:lib/commons-chain-1.1.jar:lib/commons-digester-1.8.1.jar:lib/commons-beanutils-1.9.2.jar:lib/commons-logging-1.2.jar:lib/velocity-1.6.2.jar:lib/commons-collections-3.2.2.jar:lib/httpcore-4.4.9.jar:lib/commons-codec-1.10.jar:lib/netty-all-4.1.33.Final.jar:lib/log4j-1.2.17.jar:lib/commons-lang-2.6.jar:lib/spring-security-crypto-5.7.3.jar:lib/bcprov-jdk15on-1.70.jar:lib/chesslib-1.1.1.jar:lib/htmlcompressor-1.5.2.jar:lib/yuicompressor-2.4.6.jar:lib/jsp-api-2.1.jar:lib/json-20090211.jar:lib/maven-plugin-api-3.0.3.jar:lib/activation-1.1.jar:lib/maxmind-db-1.2.2.jar:lib/jackson-databind-2.9.5.jar:lib/jackson-core-2.9.5.jar:lib/jackson-annotations-2.9.5.jar:lib/js-1.6R7.jar:lib/dom4j-1.1.jar:lib/oro-2.0.8.jar:lib/sslext-1.2-0.jar:lib/maven-model-3.0.3.jar:lib/maven-artifact-3.0.3.jar:lib/sisu-inject-plexus-2.1.1.jar:lib/antlr-2.7.2.jar:lib/plexus-utils-2.0.6.jar:lib/plexus-component-annotations-1.5.5.jar:lib/plexus-classworlds-2.4.jar:lib/sisu-inject-bean-2.1.1.jar:lib/sisu-guice-2.9.4-no_aop.jar
 
-java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath $CLASSPATH org.alexdev.havana.Havana
+java -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -classpath $CLASSPATH org.alexdev.http.HavanaWeb