diff --git a/README.md b/README.md index a95f42f0..2d5541c3 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,6 @@ The files contained herein are represent the code that drives the server for the This code is distributed under the terms set forth in [info/license.md](info/license.md). -For more information about The Lacuna Expanse visit http://www.lacunaexpanse.com/ +For more information about The Lacuna Expanse visit http://tlecommunity.com/ -For more information about The Lacuna Expanse Developers Program visit http://www.lacunaexpanse.com/developers +For more information about The Lacuna Expanse Developers Program visit http://tlecommunity.com/developers diff --git a/info/constitution.md b/info/constitution.md index a8339873..492e8229 100644 --- a/info/constitution.md +++ b/info/constitution.md @@ -2,8 +2,8 @@ ## Preamble -The players of the Lacuna Expanse (http://www.lacunaexpanse.com) are its citizens. Their rights are defined and -protected by this document. +The players of the Lacuna Expanse (http://tlecommunity.com) are its citizens. Their rights are defined and protected by +this document. Lacuna Expanse Corp, a corporation registered in Madison, Wisconsin, in the United States of America owns the intellectual property and trademarks of the Lacuna Expanse. Through this document it cedes some of its authority to the diff --git a/lib/Lacuna/DB/Result/Building/Archaeology.pm b/lib/Lacuna/DB/Result/Building/Archaeology.pm index 8d8fc23f..13d6a97d 100644 --- a/lib/Lacuna/DB/Result/Building/Archaeology.pm +++ b/lib/Lacuna/DB/Result/Building/Archaeology.pm @@ -647,7 +647,7 @@ before finish_work => sub { my $body = $self->body; $body->add_glyph($ore); my $empire = $body->empire; - my $server_url = Lacuna->config->get('server_url'); + my $assets_url = Lacuna->config->get('assets_url'); $empire->send_predefined_message( tags => ['Alert'], filename => 'glyph_discovered.txt', @@ -655,7 +655,7 @@ before finish_work => sub { attachments => { image => { title => $ore, - url => $server_url.'assets/glyphs/'.$ore.'.png', + url => $assets_url.'glyphs/'.$ore.'.png', } } ); diff --git a/lib/Lacuna/DB/Result/Captcha.pm b/lib/Lacuna/DB/Result/Captcha.pm index f95ebead..90d40fde 100644 --- a/lib/Lacuna/DB/Result/Captcha.pm +++ b/lib/Lacuna/DB/Result/Captcha.pm @@ -16,8 +16,14 @@ __PACKAGE__->add_columns( sub uri { my $self = shift; - my $filename = $self->guid eq 'dummy' ? 'dummy.png' : $self->guid.'.png'; - return Lacuna->config->get('server_url').'captcha/'.$filename; + my $server_url = Lacuna->config->get('server_url'); + + if ($self->guid eq 'dummy') { + return $server_url.'dummy-captcha.png'; + } + + my $filename = $self->guid.'.png'; + return $server_url.'captcha/'.$filename; } diff --git a/lib/Lacuna/DB/Result/Empire.pm b/lib/Lacuna/DB/Result/Empire.pm index f34ede5f..8691d2ce 100644 --- a/lib/Lacuna/DB/Result/Empire.pm +++ b/lib/Lacuna/DB/Result/Empire.pm @@ -387,8 +387,8 @@ sub add_medal { } if ($send_message && !$self->skip_medal_messages) { my $name = $medal->name; - my $server_url = Lacuna->config->get('server_url'); - my $image = $server_url.'assets/medal/'.$type.'.png'; + my $assets_url = Lacuna->config->get('assets_url'); + my $image = $assets_url.'medal/'.$type.'.png'; $self->send_predefined_message( tags => ['Medal'], filename => 'medal.txt', diff --git a/lib/Lacuna/Web.pm b/lib/Lacuna/Web.pm index 61542d09..1fe1f659 100644 --- a/lib/Lacuna/Web.pm +++ b/lib/Lacuna/Web.pm @@ -105,7 +105,7 @@ sub wrapper { } close $file; if ($options->{logo}) { - $content = ''.$content; + $content = ''.$content; } return [ sprintf($html, ($options->{title} || 'The Lacuna Expanse'), $options->{head_tags}, $content), { status => $options->{status} } ]; } diff --git a/lib/Lacuna/Web/Admin.pm b/lib/Lacuna/Web/Admin.pm index 7c2d04a1..4098b2d3 100644 --- a/lib/Lacuna/Web/Admin.pm +++ b/lib/Lacuna/Web/Admin.pm @@ -32,7 +32,7 @@ sub www_send_test_message { {Planet '.$empire->home_planet->id.' '.$empire->home_planet->name.'} {Alliance 1 Fake Alliance} {Starmap 0 0 The Center of the Map} - [http://www.lacunaexpanse.com] + [https://tlecommunity.com] ', subject => 'Test Message', tags => ['Alert'], @@ -1042,8 +1042,8 @@ sub www_set_alliance_logo { } my $out = ''; - my $server_url = Lacuna->config->get('server_url'); - my $full_url = $server_url.'assets/alliances/' . $image . '.png'; + my $assets_url = Lacuna->config->get('assets_url'); + my $full_url = $assets_url.'alliances/' . $image . '.png'; my $response = LWP::UserAgent->new->head($full_url); if ($response->is_success) { diff --git a/lib/Lacuna/Web/MissionCurator.pm b/lib/Lacuna/Web/MissionCurator.pm index 4f505805..9ffccb5d 100644 --- a/lib/Lacuna/Web/MissionCurator.pm +++ b/lib/Lacuna/Web/MissionCurator.pm @@ -112,9 +112,9 @@ sub www_default {
  • View Mission Payout History
  • Download Mission Stats
  • Mission Repository
    • -
  • Mission Forum [missions@lacunaexpanse.com]
    • -
  • Curators Forum [missioncurators@lacunaexpanse.com]
    • -
  • Mission Editor
    • + + +
  • Mission Editor
    • '; return $self->wrap($out);