From f513b43289b9ff2b00fe843ce4b5f2d73e66df6c Mon Sep 17 00:00:00 2001 From: Quackster Date: Sat, 14 Jan 2023 15:24:44 +1000 Subject: [PATCH] Update how calls to habbo-imaging are handled --- .../main/java/org/alexdev/http/Routes.java | 1 + .../controllers/api/ImagerController.java | 66 +++++++++++++++++++ .../java/org/alexdev/http/util/HtmlUtil.java | 2 +- .../util/config/WebSettingsConfigWriter.java | 3 +- figuredata.xml | 2 + tools/www-tpl/default-en/base/tag_search.tpl | 4 +- .../default-en/client_connection_failed.tpl | 2 +- tools/www-tpl/default-en/client_error.tpl | 2 +- tools/www-tpl/default-en/collectables.tpl | 4 +- tools/www-tpl/default-en/community.tpl | 2 +- .../default-en/groups/discussion_replies.tpl | 4 +- .../groups/discussions/previewpost.tpl | 4 +- .../groups/discussions/previewtopic.tpl | 4 +- .../groups/habblet/group_settings.tpl | 2 +- .../habblet/community_hot_groups.tpl | 4 +- .../www-tpl/default-en/habblet/hot_groups.tpl | 2 +- .../habblet/invite_searchContent.tpl | 2 +- .../habblet/minimail/minimail_messages.tpl | 2 +- .../homes/widget/group_info_widget.tpl | 2 +- .../default-en/homes/widget/groups_widget.tpl | 2 +- .../default-en/homes/widget/guestbook/add.tpl | 2 +- .../homes/widget/guestbook/preview.tpl | 2 +- .../homes/widget/habblet/avatarinfo.tpl | 2 +- .../widget/habblet/friendsearchpaging.tpl | 2 +- .../homes/widget/habblet/groupinfo.tpl | 2 +- .../widget/habblet/membersearchpaging.tpl | 2 +- .../homes/widget/profile_widget.tpl | 4 +- .../default-en/housekeeping/dashboard.tpl | 2 +- .../default-en/housekeeping/users_search.tpl | 2 +- tools/www-tpl/default-en/me.tpl | 8 +-- tools/www-tpl/default-en/register.tpl | 12 ++-- tools/www-tpl/default-en/welcome.tpl | 2 +- 32 files changed, 114 insertions(+), 44 deletions(-) create mode 100644 Havana-Web/src/main/java/org/alexdev/http/controllers/api/ImagerController.java create mode 100644 figuredata.xml 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 @@ + +FFCB98E3AE7DC99263AE7748945C2F6E482CFFC680F4AC54DC9B4CFFDBC1FFB696FF987FF0DCA3F5DA88DFC375EFD17DC89F56A89473B875609C543F6E392CEAEFD0E2E4B0D5D08CC4A7B3C2C4A7C5C0C2F1E5DAB3BDC34C311E644628926338A97C44B3957FBD9562C2A896CA9072CBBC90D1A78CD1BCADD7BCA9D7CBA3D8A595D8B07EE0BD91E0D0C5E2DBB9E3D38DE7C9A3EDD7BBEEE7E0EFC3B6F1D6B4F8E5DAFDDACFFFCC99FFD6A9DFA66FD1803AFFEEB9F6D059F2B11D9A5D2EAC5300783400D8D3D9918D984A4656F291599E3D3B5C4332FF8746FC610CDE3900D2FF00FFFFFFE5FF09A3FF8F3399663A7B93FFBDBCDE34A49F5699D5F9FB6699CCE71B0A95FFFA2D2D2D00FA000A0A0A1052621062621E321420B4A4234CAF248954282828292929298BB42DA5E9319CF631F6DE322F3E323235325B6A3296FA333333394194463C144A6A184B5A5A4D32234F87C0579E1F5A480A5A837B624A41625A20626262646D6C662608666666674E3B6A3910736346781414784215786D5A7B18947D5B1780557C8331418A49248B18208C694B8C967E904839926338946220947BAC948B6A94BD2994DFFF94FFD5976D3E9CF0689E3F0BA08C64A4A4A4A4DEFFA55A18A7272CA97C44B29B86B2A590B3957FB429CDB4EE29B58B5CB9A16EBD9562BD9CFFBDBD9DC21A86C29C57C2A896C2E3E8C376C4C4FFFFC54A29C59462C8D2E6C96B2FCA5A1ECA5A33CA9072CBBC90CD99C7CF6254D1A78CD1BCADD2C8CCD45B0AD4FE80D54173D5FF9CD7BCA9D7CBA3D8A595D8B07EDA945EDB7C62DCDCC8DDA934DE73DEDEDEDEDFDAB4DFDABEE0BA78E0BD91E0D0C5E1CC78E2DBB9E63139E6A4F6E7C9A3E7E92DEA5959ECFFEDEDD7BBEEE7E0EEEEEEEFC3B6F1D6B4F6AC31F73B32F8E5DAFDA61EFDDACFFE6D6DFE834DFF0000FF006AFF4814FF4C2FFF5F9BFF7329FF7383FF7BDEFF9C62FFA772FFADAEFFBC42FFBDBDFFBE73FFC53AFFCD94FFCD9BFFDC7AFFE639FFE673FFEAACFFEAADFFEEC5FFFFFFEEEEEEA4A4A4595959F6E179E7B027A86B19F8C790EB7E43C74400FFBFC2ED5C509F2B31E7D1EEAC94B37E5B90ACC9E66D80BB544A81C5EDE675B7C74F7AA2BBF3BD6BAE61456F40D2FF00EDFF9ABABB3D7A7D22F3E1AF96743D6B573BFFFFFFFFF41DFF9211FF27A6FF1300FF6D8FE993FFC600AD9B001D76FF2D1CDC00AFF20300B9A894FFEC1BD2FF1F55FF0219A53A53411E1E1E003F1D096E16105262106262121D6D1F1F1F20B4A420B9132828C8292929298BB42F2D26319CF631F6DE333333336633365E8A378BE837E8C53941943B7AC03D3D3D406A6543001A4562834A6A184C882B5A837B5CC4455F5F5F624A41625A20626262656A406666666874506A39106A405C6A4A40779FBB795E537B18947B58187C8F7D7D00047D003483314187D7CD88E0DE8B1820946220947BAC948B6A94BD2994FFD595784E983E4F98863E9FD787A4A4A4A4DEFFA88139ADD0FFAFDCDFB3FCFFB429CDB4EE29B6396DB79BFFB8E737BA9D73BAAD68BAC7FFBB2430BD9CFFBDFFC8C0B4C7C1C1C1C1D2DBC54A29C59462C6B3D6C745D9CA2221CDCDFFCDFFB3D1DFAFD1FFD4D54173D5FF9CD68C8CD7C187D9457ED97145DE73DEDEDEDEDFAFD1DFCBAFE63139E6A4F6E8B137E8FFFFEEEEEEF64C3EF6AC31F9A0A0FF006AFF1092FF45D6FF7329FF7383FF7BDEFF8516FF9C62FFB3D7FFB6DEFFBDBDFFC800FFC92BFFCD94FFCE64FFD2B3FFE639FFE673FFEDB3FFEE6DFFEEC5FFFF00FFFF66FFFFFAFFFFFF \ 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' %} -
      +
      report {% 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 @@
    • - Alex + Alex
      {% 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 @@
        - test + test

        {{ avatar.getName() }}

        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.getUsername() }}

        {{ 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 @@

        -
        +

        report 0 %} {% for member in membersList %}
      • -
        +

        {{ member.getUser().getName() }}

        {{ 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 %}
        - {{ user.getName() }} + {{ user.getName() }}
        {% 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 %} - {{ playerDetails.getName() }} + {{ playerDetails.getName() }} {% 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);
        - {{ site.playerName }} + {{ site.playerName }}
        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.