Skip to content

Commit f7dfb95

Browse files
carlbennettcarlbennett
committed
Merge branch 'develop' into phoenix
2 parents 72e904f + b32ed91 commit f7dfb95

File tree

11 files changed

+125
-22
lines changed

11 files changed

+125
-22
lines changed

‎etc/config.sample.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
"battleforthenet": "",
66
"vultr": ""
77
},
8-
"discord_url": "https://discord.gg/u87WVeu",
8+
"discord": {
9+
"invite_code": "u87WVeu",
10+
"server_id": 405789880749260820
11+
},
912
"donations": {
1013
"btc_address": "",
1114
"paypal_url": ""

‎src/controllers/Discord.php‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?php
2+
3+
namespace BNETDocs\Controllers;
4+
5+
use \BNETDocs\Models\Discord as DiscordModel;
6+
7+
use \CarlBennett\MVC\Libraries\Common;
8+
use \CarlBennett\MVC\Libraries\Controller;
9+
use \CarlBennett\MVC\Libraries\Router;
10+
use \CarlBennett\MVC\Libraries\View;
11+
12+
use \DateTime;
13+
use \DateTimeZone;
14+
15+
class Discord extends Controller {
16+
17+
public function &run( Router &$router, View &$view, array &$args ) {
18+
19+
$model = new DiscordModel();
20+
21+
$model->discord_url = 'https://discord.gg/';
22+
$model->discord_url .= Common::$config->bnetdocs->discord->invite_code;
23+
$model->discord_server_id = Common::$config->bnetdocs->discord->server_id;
24+
25+
$view->render( $model );
26+
27+
$model->_responseCode = 200;
28+
$model->_responseHeaders[ 'Content-Type' ] = $view->getMimeType();
29+
$model->_responseTTL = 0;
30+
31+
return $model;
32+
33+
}
34+
35+
}

‎src/controllers/Donate.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace BNETDocs\Controllers;
44

5-
use \BNETDocs\Libraries\VersionInfo;
65
use \BNETDocs\Models\Donate as DonateModel;
76
use \CarlBennett\MVC\Libraries\Common;
87
use \CarlBennett\MVC\Libraries\Controller;

‎src/controllers/Welcome.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ public function &run( Router &$router, View &$view, array &$args ) {
1414

1515
$model = new WelcomeModel();
1616

17-
$model->discord_url = Common::$config->bnetdocs->discord_url;
18-
1917
$view->render( $model );
2018

2119
$model->_responseCode = 200;

‎src/main.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,9 @@ function main() {
9696
$router->addRoute( // URL: /credits
9797
"#^/credits/?$#", "Credits", "CreditsHtml"
9898
);
99+
$router->addRoute( // URL: /discord
100+
"#^/discord/?$#", "Discord", "DiscordHtml"
101+
);
99102
$router->addRoute( // URL: /document/:id.txt
100103
"#^/document/(\d+)\.txt#", "Document\\View", "Document\\ViewPlain"
101104
);

‎src/models/Discord.php‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?php
2+
3+
namespace BNETDocs\Models;
4+
5+
use \CarlBennett\MVC\Libraries\Model;
6+
7+
class Discord extends Model {
8+
9+
public $discord_url;
10+
11+
}

‎src/models/Welcome.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,4 @@
44

55
use \CarlBennett\MVC\Libraries\Model;
66

7-
class Welcome extends Model {
8-
9-
public $discord_url;
10-
11-
}
7+
class Welcome extends Model {}

‎src/templates/Discord.phtml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?php
2+
3+
namespace BNETDocs\Templates;
4+
5+
use \CarlBennett\MVC\Libraries\Common;
6+
use \CarlBennett\MVC\Libraries\Pair;
7+
8+
$title = 'Discord';
9+
$description = 'Join our Discord and have a chat with us!';
10+
11+
$this->opengraph->attach( new Pair( 'url', '/discord' ));
12+
$this->opengraph->attach( new Pair( 'type', 'article' ));
13+
14+
$this->additional_css[] = "/a/forms.css";
15+
require( './header.inc.phtml' );
16+
?>
17+
<article>
18+
<header>Discord</header>
19+
<section>
20+
<h2>Who's Online</h2><br/>
21+
<iframe style="display:block;margin:auto;" src="https://discordapp.com/widget?id=<?=filter_var( $this->getContext()->discord_server_id, FILTER_SANITIZE_FULL_SPECIAL_CHARS )?>&theme=dark" width="80%" height="400" allowtransparency="true" frameborder="0"></iframe>
22+
<h2>What is Discord?</h2><br/>
23+
<p><a href="https://discordapp.com/">Discord</a> is a free voice, video, and text chat app made for gamers.</p>
24+
<p>The Discord app can be accessed on PCs, browsers, and mobile phones. Users can direct message other users and congregate by joining servers.</p>
25+
<p>From small to large communities, millions of users are using Discord to chat securely in real-time. BNETDocs is no exception.</p>
26+
<h2>How to Join</h2>
27+
<p style="text-align:center;"><a class="button" href="<?php echo Common::relativeUrlToAbsolute( $this->getContext()->discord_url ); ?>">Click this invite link</a></p>
28+
<p><strong><a href="<?php echo Common::relativeUrlToAbsolute( $this->getContext()->discord_url ); ?>">Join our Discord</a></strong> and chat with other gamers like you! Our community is open to the public and we welcome new users.</p>
29+
</section>
30+
</article>
31+
<?php require( './footer.inc.phtml' ); ?>

‎src/templates/Welcome.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require("./header.inc.phtml");
2525
<img class="welcome-logo-gnome" alt="Gnome Icon" title="Gnome Icon" src="<?php echo Common::relativeUrlToAbsolute('/a/gnome_l.gif'); ?>"/>
2626
<p>To that end, if you would like to support us, there are a few ways you can do so. You could:</p>
2727
<p><ul>
28-
<li><a href="<?php echo Common::relativeUrlToAbsolute($this->getContext()->discord_url); ?>">join our Discord</a> and have a chat,</li>
28+
<li><a href="<?php echo Common::relativeUrlToAbsolute('/discord'); ?>">join our Discord</a> and have a chat,</li>
2929
<li><a href="<?php echo Common::relativeUrlToAbsolute('/user/register'); ?>">register</a> an account and add your knowledge to our site,</li>
3030
<li><a href="<?php echo Common::relativeUrlToAbsolute('/donate'); ?>">donate</a> to costs of running this website,</li>
3131
<li>help <a href="<?php echo Common::relativeUrlToAbsolute('https://github.com/BNETDocs/bnetdocs-web'); ?>">develop this website</a>,</li>

‎src/templates/header.inc.phtml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,27 +102,25 @@ $_campaign_vultr = (
102102
<header class="main-page"><a href="<?php echo Common::relativeUrlToAbsolute($_header_navigation_config->front_page); ?>"><img src="<?php echo Common::relativeUrlToAbsolute("/a/VSZX0bJ.png"); ?>" style="float:left;margin-right:6px;height:32px;"/> BNETDocs</a> <span id="mobile-nav">&#9776;</span><?php echo $_campaign_vultr; ?></header>
103103
<?php if (!(isset($slim_ui) && $slim_ui)) { ?>
104104
<nav>
105-
<a>Navigation</a>
105+
<a>Info Hub</a>
106106
<a href="<?php echo Common::relativeUrlToAbsolute("/welcome"); ?>">Welcome</a>
107-
<a href="<?php echo Common::relativeUrlToAbsolute("/news"); ?>">News</a>
108107
<a href="<?php echo Common::relativeUrlToAbsolute("/credits"); ?>">Contributors</a>
109-
<a href="<?php echo Common::relativeUrlToAbsolute("/user/index"); ?>">Members</a>
110-
<a href="<?php echo Common::relativeUrlToAbsolute("/servers"); ?>">Server List</a>
108+
<a href="<?php echo Common::relativeUrlToAbsolute("/discord"); ?>">Discord</a>
111109
<a href="<?php echo Common::relativeUrlToAbsolute("/donate"); ?>">Donate</a>
112-
<a href="<?php echo Common::relativeUrlToAbsolute("/legal"); ?>">Legal Policies</a>
113-
<a href="<?php echo Common::relativeUrlToAbsolute("//files.bnetdocs.org/"); ?>">BNETDocs Archive</a>
114-
<a href="<?php echo Common::relativeUrlToAbsolute("//redux.bnetdocs.org/"); ?>">BNETDocs Redux</a>
115-
<a>Account Management</a>
110+
<a href="<?php echo Common::relativeUrlToAbsolute("/user/index"); ?>">Members</a>
111+
<a href="<?php echo Common::relativeUrlToAbsolute("/news"); ?>">News</a>
112+
<a href="<?php echo Common::relativeUrlToAbsolute("/servers"); ?>">Servers</a>
113+
<a>Account</a>
116114
<?php if ($_header_user) { ?>
117115
<a href="<?php echo Common::relativeUrlToAbsolute("/user/logout"); ?>">Logout</a>
118116
<a href="<?php echo Common::relativeUrlToAbsolute("/user/changepassword"); ?>">Change Password</a>
119117
<a href="<?php echo Common::relativeUrlToAbsolute("/user/update"); ?>">Update Profile</a>
120118
<a href="<?php echo Common::relativeUrlToAbsolute($_header_user_url); ?>">View Profile</a>
121119
<?php } else { ?>
122-
<a href="<?php echo Common::relativeUrlToAbsolute("/user/login"); ?>">Account Login</a>
123-
<a href="<?php echo Common::relativeUrlToAbsolute("/user/register"); ?>">Create Account</a>
120+
<a href="<?php echo Common::relativeUrlToAbsolute("/user/login"); ?>">Log In</a>
121+
<a href="<?php echo Common::relativeUrlToAbsolute("/user/register"); ?>">Create</a>
124122
<?php } ?>
125-
<a>Documentation</a>
123+
<a>The Docs</a>
126124
<a href="<?php echo Common::relativeUrlToAbsolute("/document/index"); ?>">Document Index</a>
127125
<?php if (!$_header_navigation_config->hide_search_documents) { ?>
128126
<a href="<?php echo Common::relativeUrlToAbsolute("/document/search"); ?>">Search Documents</a>
@@ -137,8 +135,12 @@ $_campaign_vultr = (
137135
<?php if (!$_header_navigation_config->hide_popular_packets) { ?>
138136
<a href="<?php echo Common::relativeUrlToAbsolute("/packet/popular"); ?>">Popular Packets</a>
139137
<?php } ?>
138+
<a>Other Pages</a>
139+
<a href="<?php echo Common::relativeUrlToAbsolute("//files.bnetdocs.org/"); ?>">File Archive</a>
140+
<a href="<?php echo Common::relativeUrlToAbsolute("/legal"); ?>">Legal Policies</a>
141+
<a href="<?php echo Common::relativeUrlToAbsolute("//redux.bnetdocs.org/"); ?>">BNETDocs Redux</a>
140142
<?php if ($_header_staff) { ?>
141-
<a>Administration</a>
143+
<a>Site Admin</a>
142144
<a href="<?php echo Common::relativeUrlToAbsolute("/document/create"); ?>">Create Document</a>
143145
<a href="<?php echo Common::relativeUrlToAbsolute("/news/create"); ?>">Create News Post</a>
144146
<a href="<?php echo Common::relativeUrlToAbsolute("/packet/create"); ?>">Create Packet</a>

0 commit comments

Comments
 (0)