Skip to content

Commit ee62742

Browse files
carlbennettcarlbennett
committed
Merge branch 'develop' into phoenix
2 parents ec1a617 + 633106e commit ee62742

19 files changed

+82
-45
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*.jar
1111
*.log
1212
*.patch
13+
*.pyc
1314
*.rar
1415
*.swp
1516
*.tar

‎README.md

+29-12
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,8 @@
22

33
[![Build Status](https://travis-ci.org/BNETDocs/bnetdocs-web.svg?branch=phoenix)](https://travis-ci.org/BNETDocs/bnetdocs-web)
44

5-
BNETDocs is a web content management system (CMS) and documentation software
6-
for the Battle.net™ online gaming service's protocol. It provides a means
7-
for documenting the protocol and encouraging discussion on it.
8-
9-
BNETDocs is in no way affiliated with or endorsed by Blizzard
10-
Entertainment™ or its brands, and is not intended to compete with
11-
or undermine Blizzard Entertainment™ or Battle.net™. Persons using
12-
this software understand that the information provided within is collected
13-
knowledge from years of observations and may be inaccurate. BNETDocs does not
14-
provide a warranty of any kind to the nature of its content. All aforementioned
15-
trademarks are the property of their respective owners. See the LICENSE file at
16-
the root of this repository for more info.
5+
BNETDocs is a documentation and discussion website for Blizzard Entertainment's
6+
Battle.net™ and in-game protocols.
177

188
**BNETDocs: Phoenix** is the successor to
199
[BNETDocs: Redux](https://github.com/BNETDocs/bnetdocs-web/tree/redux).
@@ -91,3 +81,30 @@ Try accessing this endpoint: [local.bnetdocs.org](https://local.bnetdocs.org)
9181

9282
## Contributing
9383
Please read the [CONTRIBUTING.md](/CONTRIBUTING.md) file.
84+
85+
## Copyright Disclaimer
86+
This project is licensed under the AGPLv3. A copy of the GNU Affero General
87+
Public License can be found [here](/LICENSE.txt).
88+
89+
BNETDocs, the documentation and discussion website for Blizzard protocols
90+
Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
91+
92+
This program is free software: you can redistribute it and/or modify
93+
it under the terms of the GNU Affero General Public License as published by
94+
the Free Software Foundation, either version 3 of the License, or
95+
(at your option) any later version.
96+
97+
This program is distributed in the hope that it will be useful,
98+
but WITHOUT ANY WARRANTY; without even the implied warranty of
99+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
100+
GNU Affero General Public License for more details.
101+
102+
You should have received a copy of the GNU Affero General Public License
103+
along with this program. If not, see <http://www.gnu.org/licenses/>.
104+
105+
BNETDocs is a documentation and discussion website for Blizzard Entertainment's
106+
Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
107+
content is offered as is and without warranty. BNETDocs content may be
108+
inaccurate as it is solely from third-party observations. BNETDocs is not
109+
affiliated or partnered with Blizzard Entertainment in absolutely any way.
110+
Battle.net&trade; is a registered trademark of Blizzard Entertainment.

‎src/main.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
4-
* Copyright (C) 2008-2017 Carl Bennett
3+
* BNETDocs, the documentation and discussion website for Blizzard protocols
4+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
55
* This file is part of BNETDocs.
66
*
77
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/BNETDocs.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/comments.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/credits.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/forms.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/main-mobile.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/main.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify
@@ -252,7 +252,7 @@ footer.main-page {
252252
overflow: hidden;
253253
padding: 0px 0px 0px 224px;
254254
text-align: center;
255-
width: 1000px;
255+
width: 968px;
256256
}
257257
footer.main-page.slim {
258258
overflow: hidden;

‎src/static/a/news.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/packet.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/servers.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2018 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/static/a/userprofile.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* BNETDocs, the Battle.net(TM) protocol documentation and discussion website
3-
* Copyright (C) 2008-2017 Carl Bennett
2+
* BNETDocs, the documentation and discussion website for Blizzard protocols
3+
* Copyright (C) 2003-2018 "Arta", Don Cullen "Kyro", Carl Bennett, others
44
* This file is part of BNETDocs.
55
*
66
* BNETDocs is free software: you can redistribute it and/or modify

‎src/templates/Legal.phtml

+10
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ require("./header.inc.phtml");
1616
<article>
1717
<header>Disclaimer &amp; Terms of Service</header>
1818
<section>
19+
<p>
20+
BNETDocs is a documentation and discussion website for Blizzard Entertainment's
21+
Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
22+
content is offered as is and without warranty. BNETDocs content may be
23+
inaccurate as it is solely from third-party observations. BNETDocs is not
24+
affiliated or partnered with Blizzard Entertainment in absolutely any way.
25+
Battle.net&trade;, Starcraft&trade;, Warcraft&trade;, and Diablo&trade; are
26+
trademarks or registered trademarks of Blizzard Entertainment, Inc., in the U.S.
27+
and/or other countries.
28+
</p>
1929
<p>By using this website, you understand and/or agree to the following:</p>
2030
<ol class="decimal">
2131
<li>BNETDocs is in no way affiliated with or endorsed by Blizzard Entertainment or its brands, and is not intended to compete with or undermine Blizzard or Battle.net&trade;.</li>

‎src/templates/footer.inc.phtml

+11-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,17 @@ use \CarlBennett\MVC\Libraries\Common;
99
?>
1010
</main>
1111
<footer class="main-page<?php if (isset($slim_ui) && $slim_ui) { ?> slim<?php } ?>">
12-
<a href="https://github.com/BNETDocs/bnetdocs-web/tree/<?php echo VersionInfo::$version->bnetdocs[1]; ?>" rel="external" title="Contribute to the BNETDocs source code!">BNETDocs <?php echo VersionInfo::$version->bnetdocs[0]; ?></a> &copy; 2003-2018 <a href="<?php echo Common::relativeUrlToAbsolute("/legal"); ?>" rel="external" title="BNETDocs Legal Policies">BNETDocs</a><br/>
13-
BNETDocs is in no way affiliated with or endorsed by Blizzard Entertainment&trade; or its brands, and is not intended to compete with or undermine Blizzard Entertainment&trade; or Battle.net&trade;. Persons using this software understand that the information provided within is collected knowledge from years of observations and may be inaccurate. All aforementioned trademarks are the property of their respective owners.<br/>
12+
<p><?php if ( VersionInfo::$version->bnetdocs ) { ?><a href="https://github.com/BNETDocs/bnetdocs-web/tree/<?php echo VersionInfo::$version->bnetdocs[1]; ?>" rel="external" title="Contribute to the BNETDocs source code!">BNETDocs <?php echo VersionInfo::$version->bnetdocs[0]; ?></a><?php } else { ?>(Development)<?php } ?> &copy; 2003-2018 BNETDocs | <a href="<?php echo Common::relativeUrlToAbsolute("/legal"); ?>" rel="external" title="BNETDocs Legal Policies">Legal page</a></p>
13+
<p style="font-size:smaller;">
14+
BNETDocs is a documentation and discussion website for Blizzard Entertainment's
15+
Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
16+
content is offered as is and without warranty. BNETDocs content may be
17+
inaccurate as it is solely from third-party observations. BNETDocs is not
18+
affiliated or partnered with Blizzard Entertainment in absolutely any way.
19+
Battle.net&trade;, Starcraft&trade;, Warcraft&trade;, and Diablo&trade; are
20+
trademarks or registered trademarks of Blizzard Entertainment, Inc., in the U.S.
21+
and/or other countries.
22+
</p>
1423
</footer>
1524
<?php echo Logger::getTimingFooter(); ?>
1625
</body>

‎src/views/Packet/IndexCpp.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public function render(Model &$model) {
2121
}
2222

2323
echo "/**\n";
24-
echo " * BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
25-
echo " * Copyright (C) 2008-2017 Carl Bennett\n";
24+
echo " * BNETDocs, the documentation and discussion website for Blizzard protocols\n";
25+
echo " * Copyright (C) 2003-2018 \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
2626
echo " * <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
2727
echo " *\n";
2828
echo " * BNETDocs is free software: you can redistribute it and/or modify\n";

‎src/views/Packet/IndexJava.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public function render(Model &$model) {
2121
}
2222

2323
echo "/**\n";
24-
echo " * BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
25-
echo " * Copyright (C) 2008-2017 Carl Bennett\n";
24+
echo " * BNETDocs, the documentation and discussion website for Blizzard protocols\n";
25+
echo " * Copyright (C) 2003-2018 \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
2626
echo " * <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
2727
echo " *\n";
2828
echo " * BNETDocs is free software: you can redistribute it and/or modify\n";

‎src/views/Packet/IndexPHP.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ public function render(Model &$model) {
2424

2525
echo "<?php\n";
2626
echo "/**\n";
27-
echo " * BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
28-
echo " * Copyright (C) 2008-2017 Carl Bennett\n";
27+
echo " * BNETDocs, the documentation and discussion website for Blizzard protocols\n";
28+
echo " * Copyright (C) 2003-2018 \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
2929
echo " * <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
3030
echo " *\n";
3131
echo " * BNETDocs is free software: you can redistribute it and/or modify\n";

‎src/views/Packet/IndexVB.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public function render(Model &$model) {
2121
}
2222

2323
echo "'\n";
24-
echo "' BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
25-
echo "' Copyright (C) 2008-2017 Carl Bennett\n";
24+
echo "' BNETDocs, the documentation and discussion website for Blizzard protocols\n";
25+
echo "' Copyright (C) 2003-2018 \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
2626
echo "' <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
2727
echo "'\n";
2828
echo "' BNETDocs is free software: you can redistribute it and/or modify\n";

0 commit comments

Comments
 (0)