diff --git a/Havana-Web/src/main/java/org/alexdev/http/Routes.java b/Havana-Web/src/main/java/org/alexdev/http/Routes.java
index bc904b5..1bd1f0e 100644
--- a/Havana-Web/src/main/java/org/alexdev/http/Routes.java
+++ b/Havana-Web/src/main/java/org/alexdev/http/Routes.java
@@ -281,6 +281,7 @@ public class Routes {
RouteManager.addRoute("/api/advertisement/get_url", AdvertisementController::getUrl);
RouteManager.addRoute("/api/verify/get/*", VerifyController::get);
RouteManager.addRoute("/api/verify/clear/*", VerifyController::clear);
+ RouteManager.addRoute("/habbo-imaging/*", ImagerController::imager_redirect);
// Housekeeping
RouteManager.addRoute("/" + HOUSEKEEPING_PATH + "", HousekeepingController::dashboard);
diff --git a/Havana-Web/src/main/java/org/alexdev/http/controllers/api/ImagerController.java b/Havana-Web/src/main/java/org/alexdev/http/controllers/api/ImagerController.java
new file mode 100644
index 0000000..b2b46d5
--- /dev/null
+++ b/Havana-Web/src/main/java/org/alexdev/http/controllers/api/ImagerController.java
@@ -0,0 +1,66 @@
+package org.alexdev.http.controllers.api;
+
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.alexdev.duckhttpd.response.ResponseBuilder;
+import org.alexdev.duckhttpd.server.connection.WebConnection;
+import org.alexdev.duckhttpd.util.MimeType;
+import org.alexdev.havana.util.config.GameConfiguration;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHeaders;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.params.BasicHttpParams;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.params.HttpParams;
+import org.apache.http.util.EntityUtils;
+
+import java.net.HttpURLConnection;
+
+public class ImagerController {
+ public static void imager_redirect(WebConnection webConnection) {
+ boolean sentFurniResponse = false;
+
+ var reqConfig = RequestConfig.custom()
+ .setConnectTimeout(GameConfiguration.getInstance().getInteger("site.imaging.timeout"))
+ .build();
+
+ try (final var httpClient = HttpClientBuilder.create()
+ .setDefaultRequestConfig(reqConfig)
+ .build()) {
+
+ HttpGet request = new HttpGet(GameConfiguration.getInstance().getString("site.imaging.path") + webConnection.request().uri());
+ request.addHeader(HttpHeaders.USER_AGENT, "Imager");
+
+ try (var r = httpClient.execute(request)) {
+ HttpEntity entity = r.getEntity();
+
+ if (entity != null) {
+ if (r.getStatusLine().getStatusCode() == HttpResponseStatus.OK.code()) {
+ FullHttpResponse response = ResponseBuilder.create(
+ HttpResponseStatus.OK, entity.getContentType().getValue(), EntityUtils.toByteArray(entity)
+ );
+
+ webConnection.send(response);
+ sentFurniResponse = true;
+ }
+ }
+ }
+ } catch (Exception ignored) {
+ ignored.printStackTrace();
+ } finally {
+ if (!sentFurniResponse) {
+ FullHttpResponse response = ResponseBuilder.create(
+ HttpResponseStatus.NO_CONTENT, MimeType.getContentType("png"), new byte[0]
+ );
+ webConnection.send(response);
+ }
+ }
+ }
+}
diff --git a/Havana-Web/src/main/java/org/alexdev/http/util/HtmlUtil.java b/Havana-Web/src/main/java/org/alexdev/http/util/HtmlUtil.java
index a67acaa..6001f9c 100644
--- a/Havana-Web/src/main/java/org/alexdev/http/util/HtmlUtil.java
+++ b/Havana-Web/src/main/java/org/alexdev/http/util/HtmlUtil.java
@@ -74,7 +74,7 @@ public class HtmlUtil {
}
public static String createFigureLink(String figure, String sex) {
- return "https://cdn.classichabbo.com/habbo-imaging/avatarimage?figure=" + figure + "&size=s&direction=4&head_direction=4&crr=0&gesture=sml&frame=1";
+ return "{{ site.habboImagingPath }}/habbo-imaging/avatarimage?figure=" + figure + "&size=s&direction=4&head_direction=4&crr=0&gesture=sml&frame=1";
}
public static String encodeToString(BufferedImage image, String type) {
diff --git a/Havana-Web/src/main/java/org/alexdev/http/util/config/WebSettingsConfigWriter.java b/Havana-Web/src/main/java/org/alexdev/http/util/config/WebSettingsConfigWriter.java
index c638816..581dd63 100644
--- a/Havana-Web/src/main/java/org/alexdev/http/util/config/WebSettingsConfigWriter.java
+++ b/Havana-Web/src/main/java/org/alexdev/http/util/config/WebSettingsConfigWriter.java
@@ -14,7 +14,8 @@ public class WebSettingsConfigWriter implements ConfigWriter {
config.put("site.name", "Habbo");
config.put("site.path", "http://localhost");
config.put("static.content.path", "http://localhost");
- config.put("site.imaging.path", "http://localhost");
+ config.put("site.imaging.path", "http://localhost:5000");
+ config.put("site.imaging.timeout", "30000");
config.put("hotel.check.online", "true");
diff --git a/figuredata.xml b/figuredata.xml
new file mode 100644
index 0000000..6d23a40
--- /dev/null
+++ b/figuredata.xml
@@ -0,0 +1,2 @@
+
+FFCB98 E3AE7D C99263 AE7748 945C2F 6E482C FFC680 F4AC54 DC9B4C FFDBC1 FFB696 FF987F F0DCA3 F5DA88 DFC375 EFD17D C89F56 A89473 B87560 9C543F 6E392C EAEFD0 E2E4B0 D5D08C C4A7B3 C2C4A7 C5C0C2 F1E5DA B3BDC3 4C311E 644628 926338 A97C44 B3957F BD9562 C2A896 CA9072 CBBC90 D1A78C D1BCAD D7BCA9 D7CBA3 D8A595 D8B07E E0BD91 E0D0C5 E2DBB9 E3D38D E7C9A3 EDD7BB EEE7E0 EFC3B6 F1D6B4 F8E5DA FDDACF FFCC99 FFD6A9 DFA66F D1803A FFEEB9 F6D059 F2B11D 9A5D2E AC5300 783400 D8D3D9 918D98 4A4656 F29159 9E3D3B 5C4332 FF8746 FC610C DE3900 D2FF00 FFFFFF E5FF09 A3FF8F 339966 3A7B93 FFBDBC DE34A4 9F5699 D5F9FB 6699CC E71B0A 95FFFA 2D2D2D 00FA00 0A0A0A 105262 106262 1E3214 20B4A4 234CAF 248954 282828 292929 298BB4 2DA5E9 319CF6 31F6DE 322F3E 323235 325B6A 3296FA 333333 394194 463C14 4A6A18 4B5A5A 4D3223 4F87C0 579E1F 5A480A 5A837B 624A41 625A20 626262 646D6C 662608 666666 674E3B 6A3910 736346 781414 784215 786D5A 7B1894 7D5B17 80557C 833141 8A4924 8B1820 8C694B 8C967E 904839 926338 946220 947BAC 948B6A 94BD29 94DFFF 94FFD5 976D3E 9CF068 9E3F0B A08C64 A4A4A4 A4DEFF A55A18 A7272C A97C44 B29B86 B2A590 B3957F B429CD B4EE29 B58B5C B9A16E BD9562 BD9CFF BDBD9D C21A86 C29C57 C2A896 C2E3E8 C376C4 C4FFFF C54A29 C59462 C8D2E6 C96B2F CA5A1E CA5A33 CA9072 CBBC90 CD99C7 CF6254 D1A78C D1BCAD D2C8CC D45B0A D4FE80 D54173 D5FF9C D7BCA9 D7CBA3 D8A595 D8B07E DA945E DB7C62 DCDCC8 DDA934 DE73DE DEDEDE DFDAB4 DFDABE E0BA78 E0BD91 E0D0C5 E1CC78 E2DBB9 E63139 E6A4F6 E7C9A3 E7E92D EA5959 ECFFED EDD7BB EEE7E0 EEEEEE EFC3B6 F1D6B4 F6AC31 F73B32 F8E5DA FDA61E FDDACF FE6D6D FE834D FF0000 FF006A FF4814 FF4C2F FF5F9B FF7329 FF7383 FF7BDE FF9C62 FFA772 FFADAE FFBC42 FFBDBD FFBE73 FFC53A FFCD94 FFCD9B FFDC7A FFE639 FFE673 FFEAAC FFEAAD FFEEC5 FFFFFF EEEEEE A4A4A4 595959 F6E179 E7B027 A86B19 F8C790 EB7E43 C74400 FFBFC2 ED5C50 9F2B31 E7D1EE AC94B3 7E5B90 ACC9E6 6D80BB 544A81 C5EDE6 75B7C7 4F7AA2 BBF3BD 6BAE61 456F40 D2FF00 EDFF9A BABB3D 7A7D22 F3E1AF 96743D 6B573B FFFFFF FFF41D FF9211 FF27A6 FF1300 FF6D8F E993FF C600AD 9B001D 76FF2D 1CDC00 AFF203 00B9A8 94FFEC 1BD2FF 1F55FF 0219A5 3A5341 1E1E1E 003F1D 096E16 105262 106262 121D6D 1F1F1F 20B4A4 20B913 2828C8 292929 298BB4 2F2D26 319CF6 31F6DE 333333 336633 365E8A 378BE8 37E8C5 394194 3B7AC0 3D3D3D 406A65 43001A 456283 4A6A18 4C882B 5A837B 5CC445 5F5F5F 624A41 625A20 626262 656A40 666666 687450 6A3910 6A405C 6A4A40 779FBB 795E53 7B1894 7B5818 7C8F7D 7D0004 7D0034 833141 87D7CD 88E0DE 8B1820 946220 947BAC 948B6A 94BD29 94FFD5 95784E 983E4F 98863E 9FD787 A4A4A4 A4DEFF A88139 ADD0FF AFDCDF B3FCFF B429CD B4EE29 B6396D B79BFF B8E737 BA9D73 BAAD68 BAC7FF BB2430 BD9CFF BDFFC8 C0B4C7 C1C1C1 C1D2DB C54A29 C59462 C6B3D6 C745D9 CA2221 CDCDFF CDFFB3 D1DFAF D1FFD4 D54173 D5FF9C D68C8C D7C187 D9457E D97145 DE73DE DEDEDE DFAFD1 DFCBAF E63139 E6A4F6 E8B137 E8FFFF EEEEEE F64C3E F6AC31 F9A0A0 FF006A FF1092 FF45D6 FF7329 FF7383 FF7BDE FF8516 FF9C62 FFB3D7 FFB6DE FFBDBD FFC800 FFC92B FFCD94 FFCE64 FFD2B3 FFE639 FFE673 FFEDB3 FFEE6D FFEEC5 FFFF00 FFFF66 FFFFFA FFFFFF
\ No newline at end of file
diff --git a/tools/www-tpl/default-en/base/tag_search.tpl b/tools/www-tpl/default-en/base/tag_search.tpl
index c32206f..22a67b1 100644
--- a/tools/www-tpl/default-en/base/tag_search.tpl
+++ b/tools/www-tpl/default-en/base/tag_search.tpl
@@ -29,7 +29,7 @@
{% if habboTag.getUserId() > 0 %}
{% set player = habboTag.getUserData() %}
-
+
{{ player.getName() }}
@@ -45,7 +45,7 @@
{% if habboTag.getGroupId() > 0 %}
{% set group = habboTag.getGroupData() %}
-
+
{{ group.getName() }}
diff --git a/tools/www-tpl/default-en/client_connection_failed.tpl b/tools/www-tpl/default-en/client_connection_failed.tpl
index db37f63..dac4c45 100644
--- a/tools/www-tpl/default-en/client_connection_failed.tpl
+++ b/tools/www-tpl/default-en/client_connection_failed.tpl
@@ -31,7 +31,7 @@ document.habboLoggedIn = false;
var habboName = null;
var habboReqPath = "";
var habboStaticFilePath = "{{ site.staticContentPath }}/web-gallery";
-var habboImagerUrl = "{{ site.habboImagingPath }}/habbo-imaging/";
+var habboImagerUrl = "{{ site.sitePath }}/habbo-imaging/";
var habboPartner = "";
window.name = "client";
diff --git a/tools/www-tpl/default-en/client_error.tpl b/tools/www-tpl/default-en/client_error.tpl
index af59dfc..567b603 100644
--- a/tools/www-tpl/default-en/client_error.tpl
+++ b/tools/www-tpl/default-en/client_error.tpl
@@ -29,7 +29,7 @@ var habboName = "Alex";
var ad_keywords = "";
var habboReqPath = "{{ site.sitePath }}";
var habboStaticFilePath = "{{ site.staticContentPath }}/web-gallery";
-var habboImagerUrl = "{{ site.habboImagingPath }}/habbo-imaging/";
+var habboImagerUrl = "{{ site.sitePath }}/habbo-imaging/";
var habboPartner = "";
window.name = "client";
if (typeof HabboClient != "undefined") { HabboClient.windowName = "client"; }
diff --git a/tools/www-tpl/default-en/collectables.tpl b/tools/www-tpl/default-en/collectables.tpl
index 081d704..7acba81 100644
--- a/tools/www-tpl/default-en/collectables.tpl
+++ b/tools/www-tpl/default-en/collectables.tpl
@@ -99,7 +99,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
{% if hasCollectable %}
-
+
{{ collectableName }}
March 2019
{{ collectableDescription }}
@@ -141,7 +141,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
{% endif %}
-
+
{{ entry.getName() }}
{{ entry.getDescription() }}
diff --git a/tools/www-tpl/default-en/community.tpl b/tools/www-tpl/default-en/community.tpl
index e4b2c00..4ad332a 100644
--- a/tools/www-tpl/default-en/community.tpl
+++ b/tools/www-tpl/default-en/community.tpl
@@ -326,7 +326,7 @@ var discussionMoreDataHelper = new MoreDataHelper("discussions-toggle-more-data-
-
{% set num = num + 1 %}
{% endfor %}
diff --git a/tools/www-tpl/default-en/groups/discussion_replies.tpl b/tools/www-tpl/default-en/groups/discussion_replies.tpl
index b4abada..919b1c3 100644
--- a/tools/www-tpl/default-en/groups/discussion_replies.tpl
+++ b/tools/www-tpl/default-en/groups/discussion_replies.tpl
@@ -94,11 +94,11 @@
{% endif %}
Messages: {{ reply.getForumMessages() }}
-
+
{% if reply.hasGroupBadge() %}
-
+
{% endif %}
{% if reply.hasBadge() %}
diff --git a/tools/www-tpl/default-en/groups/discussions/previewpost.tpl b/tools/www-tpl/default-en/groups/discussions/previewpost.tpl
index c2f8e15..2da572c 100644
--- a/tools/www-tpl/default-en/groups/discussions/previewpost.tpl
+++ b/tools/www-tpl/default-en/groups/discussions/previewpost.tpl
@@ -10,11 +10,11 @@
Messages: {{ userReplies }}
-
+
{% if hasGroup %}
-
+
{% endif %}
{% if hasBadge %}
diff --git a/tools/www-tpl/default-en/groups/discussions/previewtopic.tpl b/tools/www-tpl/default-en/groups/discussions/previewtopic.tpl
index e5e8bdb..75a9724 100644
--- a/tools/www-tpl/default-en/groups/discussions/previewtopic.tpl
+++ b/tools/www-tpl/default-en/groups/discussions/previewtopic.tpl
@@ -10,11 +10,11 @@
Messages: {{ userReplies }}
-
+
{% if hasGroup %}
-
+
{% endif %}
{% if hasBadge %}
diff --git a/tools/www-tpl/default-en/groups/habblet/group_settings.tpl b/tools/www-tpl/default-en/groups/habblet/group_settings.tpl
index 990430a..038af3b 100644
--- a/tools/www-tpl/default-en/groups/habblet/group_settings.tpl
+++ b/tools/www-tpl/default-en/groups/habblet/group_settings.tpl
@@ -3,7 +3,7 @@
-
+
diff --git a/tools/www-tpl/default-en/habblet/community_hot_groups.tpl b/tools/www-tpl/default-en/habblet/community_hot_groups.tpl
index 88e26d7..761bd3b 100644
--- a/tools/www-tpl/default-en/habblet/community_hot_groups.tpl
+++ b/tools/www-tpl/default-en/habblet/community_hot_groups.tpl
@@ -22,7 +22,7 @@
{% else %}
{% set status = "even" %}
{% endif %}
-
+
{{ i + 1}}. {% autoescape 'html' %}{{ group.name }}{% endautoescape %}
{% set i = i + 1 %}
@@ -44,7 +44,7 @@
{% else %}
{% set status = "even" %}
{% endif %}
-
+
{{ i + 1 }}. {% autoescape 'html' %}{{ group.name }}{% endautoescape %}
{% set i = i + 1 %}
diff --git a/tools/www-tpl/default-en/habblet/hot_groups.tpl b/tools/www-tpl/default-en/habblet/hot_groups.tpl
index 2d4b89d..59418be 100644
--- a/tools/www-tpl/default-en/habblet/hot_groups.tpl
+++ b/tools/www-tpl/default-en/habblet/hot_groups.tpl
@@ -21,7 +21,7 @@
{% else %}
{% set status = "even" %}
{% endif %}
-
+
{% autoescape 'html' %}{{ group.name }}{% endautoescape %}
{% set i = i + 1 %}
diff --git a/tools/www-tpl/default-en/habblet/invite_searchContent.tpl b/tools/www-tpl/default-en/habblet/invite_searchContent.tpl
index 37e70f8..30c8b69 100644
--- a/tools/www-tpl/default-en/habblet/invite_searchContent.tpl
+++ b/tools/www-tpl/default-en/habblet/invite_searchContent.tpl
@@ -2,7 +2,7 @@
{% set num = 0 %}
{% for details in searchResults %}
- {% if num % 2 == 0 %}
+ {% if num % 2 == 0 %}
{{ details.getName() }}
diff --git a/tools/www-tpl/default-en/habblet/minimail/minimail_messages.tpl b/tools/www-tpl/default-en/habblet/minimail/minimail_messages.tpl
index fedb885..10e355a 100644
--- a/tools/www-tpl/default-en/habblet/minimail/minimail_messages.tpl
+++ b/tools/www-tpl/default-en/habblet/minimail/minimail_messages.tpl
@@ -56,7 +56,7 @@
{{ minimailMessage.getDate() }}
-
+
{% if minimailLabel == "sent" %}
To: {{ minimailMessage.getTarget().getName() }}
{% elseif minimailLabel == "inbox" %}
diff --git a/tools/www-tpl/default-en/homes/widget/group_info_widget.tpl b/tools/www-tpl/default-en/homes/widget/group_info_widget.tpl
index 79f8dbe..a57b975 100644
--- a/tools/www-tpl/default-en/homes/widget/group_info_widget.tpl
+++ b/tools/www-tpl/default-en/homes/widget/group_info_widget.tpl
@@ -16,7 +16,7 @@
{% autoescape 'html' %}
-
+
{% for group in groupsList %}
-
+
{% autoescape 'html' %}
diff --git a/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl b/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
index a579f92..fb7c289 100644
--- a/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
+++ b/tools/www-tpl/default-en/homes/widget/guestbook/add.tpl
@@ -6,7 +6,7 @@
-
+
{% if hasDeletePermission %}
diff --git a/tools/www-tpl/default-en/homes/widget/guestbook/preview.tpl b/tools/www-tpl/default-en/homes/widget/guestbook/preview.tpl
index 7a172b5..b8d63a4 100644
--- a/tools/www-tpl/default-en/homes/widget/guestbook/preview.tpl
+++ b/tools/www-tpl/default-en/homes/widget/guestbook/preview.tpl
@@ -1,7 +1,7 @@
-
+
diff --git a/tools/www-tpl/default-en/homes/widget/habblet/avatarinfo.tpl b/tools/www-tpl/default-en/homes/widget/habblet/avatarinfo.tpl
index 9b23dea..34391cc 100644
--- a/tools/www-tpl/default-en/homes/widget/habblet/avatarinfo.tpl
+++ b/tools/www-tpl/default-en/homes/widget/habblet/avatarinfo.tpl
@@ -2,7 +2,7 @@
-
+
diff --git a/tools/www-tpl/default-en/homes/widget/habblet/friendsearchpaging.tpl b/tools/www-tpl/default-en/homes/widget/habblet/friendsearchpaging.tpl
index 6a0acd3..470a76b 100644
--- a/tools/www-tpl/default-en/homes/widget/habblet/friendsearchpaging.tpl
+++ b/tools/www-tpl/default-en/homes/widget/habblet/friendsearchpaging.tpl
@@ -27,7 +27,7 @@
{% if friends > 0 %}
{% for friend in friendsList %}
-
+
{{ friend.getFormatLastOnline("dd-MM-yyyy") }}
diff --git a/tools/www-tpl/default-en/homes/widget/habblet/groupinfo.tpl b/tools/www-tpl/default-en/homes/widget/habblet/groupinfo.tpl
index 2417495..68907a5 100644
--- a/tools/www-tpl/default-en/homes/widget/habblet/groupinfo.tpl
+++ b/tools/www-tpl/default-en/homes/widget/habblet/groupinfo.tpl
@@ -1,7 +1,7 @@
-
+
0 %}
{% for member in membersList %}
-
+
{{ member.getUser().getCreatedAt() }}
diff --git a/tools/www-tpl/default-en/homes/widget/profile_widget.tpl b/tools/www-tpl/default-en/homes/widget/profile_widget.tpl
index edfa7c0..bf58679 100644
--- a/tools/www-tpl/default-en/homes/widget/profile_widget.tpl
+++ b/tools/www-tpl/default-en/homes/widget/profile_widget.tpl
@@ -40,7 +40,7 @@ Event.observe("widget-{{ sticker.getId() }}-edit", "click", function(e) { openEd
{% if hasFavouriteGroup %}
-
+
{% endif %}
{% if hasBadge %}
@@ -50,7 +50,7 @@ Event.observe("widget-{{ sticker.getId() }}-edit", "click", function(e) { openEd
{% endautoescape %}
{% autoescape 'html' %}
diff --git a/tools/www-tpl/default-en/housekeeping/dashboard.tpl b/tools/www-tpl/default-en/housekeeping/dashboard.tpl
index 3737589..a61d9a5 100644
--- a/tools/www-tpl/default-en/housekeeping/dashboard.tpl
+++ b/tools/www-tpl/default-en/housekeeping/dashboard.tpl
@@ -90,7 +90,7 @@
{{ player.id }}
{{ player.name }} - Transactons
{{ player.email }}
-
+
{{ player.motto }}
{{ player.credits }}
{{ player.pixels }}
diff --git a/tools/www-tpl/default-en/housekeeping/users_search.tpl b/tools/www-tpl/default-en/housekeeping/users_search.tpl
index 708f6e3..236aa1e 100644
--- a/tools/www-tpl/default-en/housekeeping/users_search.tpl
+++ b/tools/www-tpl/default-en/housekeeping/users_search.tpl
@@ -56,7 +56,7 @@
{{ player.id }}
{{ player.name }}
{{ player.email }}
-
+
{{ player.mission }}
{{ player.credits }}
{{ player.pixels }}
diff --git a/tools/www-tpl/default-en/me.tpl b/tools/www-tpl/default-en/me.tpl
index b2f2d7d..fe033a9 100644
--- a/tools/www-tpl/default-en/me.tpl
+++ b/tools/www-tpl/default-en/me.tpl
@@ -146,7 +146,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
{% if playerDetails.motto.toLowerCase() == "crikey" %}
{% else %}
-
+
{% endif %}
@@ -702,7 +702,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
{% endif %}
{% set i = i + 1 %}
-
+
{{ group.getName }}
{% endfor %}
@@ -741,7 +741,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
{% else %}
{% set status = "odd" %}
{% endif %}
-
+
{% if group.getRoomId() > 0 %}
{% endif %}
@@ -839,7 +839,7 @@ document.observe("dom:loaded", function() {
{% else %}
{% set status = "even" %}
{% endif %}
-
+
{% autoescape 'html' %}{{ group.name }}{% endautoescape %}
{% set i = i + 1 %}
diff --git a/tools/www-tpl/default-en/register.tpl b/tools/www-tpl/default-en/register.tpl
index bea8b81..54d7975 100644
--- a/tools/www-tpl/default-en/register.tpl
+++ b/tools/www-tpl/default-en/register.tpl
@@ -399,25 +399,25 @@ if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine
You don't have Flash installed. This is why we can only show you a selection of pre-generated {{ site.siteName }}s. If you install Flash, you'll be able to choose from the hundreds of different options!
Girls
-
+
-
+
-
Boys
-
+
-
+
-
diff --git a/tools/www-tpl/default-en/welcome.tpl b/tools/www-tpl/default-en/welcome.tpl
index 64ae90f..6f95b61 100644
--- a/tools/www-tpl/default-en/welcome.tpl
+++ b/tools/www-tpl/default-en/welcome.tpl
@@ -175,7 +175,7 @@ body { behavior: url({{ site.staticContentPath }}/web-gallery/js/csshover.htc);
-
+
Welcome {{ playerDetails.getName() }}!
When arriving to your room, you will be asked if you'd like to meet {{ site.siteName }} Guides. {{ site.siteName }} guides are experienced {{ site.siteName }} players.