Merge branch 'develop' into phoenix

BNETDocs · Mar 6, 2018 · ee62742 · ee62742
2 parents ec1a617 + 633106e
commit ee62742
Show file tree

Hide file tree

Showing 19 changed files with 82 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@
 *.jar
 *.log
 *.patch
+*.pyc
 *.rar
 *.swp
 *.tar

diff --git a/README.md b/README.md
@@ -2,18 +2,8 @@
 
 [![Build Status](https://travis-ci.org/BNETDocs/bnetdocs-web.svg?branch=phoenix)](https://travis-ci.org/BNETDocs/bnetdocs-web)
 
-BNETDocs is a web content management system (CMS) and documentation software
-for the Battle.net&trade; online gaming service's protocol. It provides a means
-for documenting the protocol and encouraging discussion on it.
-
-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. BNETDocs does not
-provide a warranty of any kind to the nature of its content. All aforementioned
-trademarks are the property of their respective owners. See the LICENSE file at
-the root of this repository for more info.
+BNETDocs is a documentation and discussion website for Blizzard Entertainment's
+Battle.net&trade; and in-game protocols.
 
 **BNETDocs: Phoenix** is the successor to
 [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)
 
 ## Contributing
 Please read the [CONTRIBUTING.md](/CONTRIBUTING.md) file.
+
+## Copyright Disclaimer
+This project is licensed under the AGPLv3. A copy of the GNU Affero General
+Public License can be found [here](/LICENSE.txt).
+
+    BNETDocs, the documentation and discussion website for Blizzard protocols
+    Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+BNETDocs is a documentation and discussion website for Blizzard Entertainment's
+Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
+content is offered as is and without warranty. BNETDocs content may be
+inaccurate as it is solely from third-party observations. BNETDocs is not
+affiliated or partnered with Blizzard Entertainment in absolutely any way.
+Battle.net&trade; is a registered trademark of Blizzard Entertainment.
diff --git a/src/main.php b/src/main.php
@@ -1,7 +1,7 @@
 <?php
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/BNETDocs.js b/src/static/a/BNETDocs.js
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/comments.css b/src/static/a/comments.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/credits.css b/src/static/a/credits.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/forms.css b/src/static/a/forms.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/main-mobile.css b/src/static/a/main-mobile.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/main.css b/src/static/a/main.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify
@@ -252,7 +252,7 @@ footer.main-page {
   overflow: hidden;
   padding: 0px 0px 0px 224px;
   text-align: center;
-  width: 1000px;
+  width: 968px;
 }
 footer.main-page.slim {
   overflow: hidden;

diff --git a/src/static/a/news.css b/src/static/a/news.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/packet.css b/src/static/a/packet.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/servers.css b/src/static/a/servers.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2018  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/static/a/userprofile.css b/src/static/a/userprofile.css
@@ -1,6 +1,6 @@
 /**
- *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website
- *  Copyright (C) 2008-2017  Carl Bennett
+ *  BNETDocs, the documentation and discussion website for Blizzard protocols
+ *  Copyright (C) 2003-2018  "Arta", Don Cullen "Kyro", Carl Bennett, others
  *  This file is part of BNETDocs.
  *
  *  BNETDocs is free software: you can redistribute it and/or modify

diff --git a/src/templates/Legal.phtml b/src/templates/Legal.phtml
@@ -16,6 +16,16 @@ require("./header.inc.phtml");
       <article>
         <header>Disclaimer &amp; Terms of Service</header>
         <section>
+          <p>
+BNETDocs is a documentation and discussion website for Blizzard Entertainment's
+Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
+content is offered as is and without warranty. BNETDocs content may be
+inaccurate as it is solely from third-party observations. BNETDocs is not
+affiliated or partnered with Blizzard Entertainment in absolutely any way.
+Battle.net&trade;, Starcraft&trade;, Warcraft&trade;, and Diablo&trade; are
+trademarks or registered trademarks of Blizzard Entertainment, Inc., in the U.S.
+and/or other countries.
+          </p>
           <p>By using this website, you understand and/or agree to the following:</p>
           <ol class="decimal">
             <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>

diff --git a/src/templates/footer.inc.phtml b/src/templates/footer.inc.phtml
@@ -9,8 +9,17 @@ use \CarlBennett\MVC\Libraries\Common;
 ?>
     </main>
     <footer class="main-page<?php if (isset($slim_ui) && $slim_ui) { ?> slim<?php } ?>">
-      <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/>
-      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/>
+      <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>
+      <p style="font-size:smaller;">
+BNETDocs is a documentation and discussion website for Blizzard Entertainment's
+Battle.net&trade; and in-game protocols. You hereby acknowledge that BNETDocs
+content is offered as is and without warranty. BNETDocs content may be
+inaccurate as it is solely from third-party observations. BNETDocs is not
+affiliated or partnered with Blizzard Entertainment in absolutely any way.
+Battle.net&trade;, Starcraft&trade;, Warcraft&trade;, and Diablo&trade; are
+trademarks or registered trademarks of Blizzard Entertainment, Inc., in the U.S.
+and/or other countries.
+      </p>
     </footer>
 <?php echo Logger::getTimingFooter(); ?>
   </body>

diff --git a/src/views/Packet/IndexCpp.php b/src/views/Packet/IndexCpp.php
@@ -21,8 +21,8 @@ public function render(Model &$model) {
     }
 
     echo "/**\n";
-    echo " *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
-    echo " *  Copyright (C) 2008-2017  Carl Bennett\n";
+    echo " *  BNETDocs, the documentation and discussion website for Blizzard protocols\n";
+    echo " *  Copyright (C) 2003-2018  \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
     echo " *  <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
     echo " *\n";
     echo " *  BNETDocs is free software: you can redistribute it and/or modify\n";

diff --git a/src/views/Packet/IndexJava.php b/src/views/Packet/IndexJava.php
@@ -21,8 +21,8 @@ public function render(Model &$model) {
     }
 
     echo "/**\n";
-    echo " *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
-    echo " *  Copyright (C) 2008-2017  Carl Bennett\n";
+    echo " *  BNETDocs, the documentation and discussion website for Blizzard protocols\n";
+    echo " *  Copyright (C) 2003-2018  \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
     echo " *  <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
     echo " *\n";
     echo " *  BNETDocs is free software: you can redistribute it and/or modify\n";

diff --git a/src/views/Packet/IndexPHP.php b/src/views/Packet/IndexPHP.php
@@ -24,8 +24,8 @@ public function render(Model &$model) {
 
     echo "<?php\n";
     echo "/**\n";
-    echo " *  BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
-    echo " *  Copyright (C) 2008-2017  Carl Bennett\n";
+    echo " *  BNETDocs, the documentation and discussion website for Blizzard protocols\n";
+    echo " *  Copyright (C) 2003-2018  \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
     echo " *  <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
     echo " *\n";
     echo " *  BNETDocs is free software: you can redistribute it and/or modify\n";

diff --git a/src/views/Packet/IndexVB.php b/src/views/Packet/IndexVB.php
@@ -21,8 +21,8 @@ public function render(Model &$model) {
     }
 
     echo "'\n";
-    echo "'  BNETDocs, the Battle.net(TM) protocol documentation and discussion website\n";
-    echo "'  Copyright (C) 2008-2017  Carl Bennett\n";
+    echo "'  BNETDocs, the documentation and discussion website for Blizzard protocols\n";
+    echo "'  Copyright (C) 2003-2018  \"Arta\", Don Cullen \"Kyro\", Carl Bennett, others\n";
     echo "'  <" . Common::relativeUrlToAbsolute("/legal") . ">\n";
     echo "'\n";
     echo "'  BNETDocs is free software: you can redistribute it and/or modify\n";