diff --git a/app/bootstrap.php b/app/bootstrap.php new file mode 100644 index 0000000..c955a74 --- /dev/null +++ b/app/bootstrap.php @@ -0,0 +1,41 @@ + 'classes/Article.php', + 'ArticleComment' => 'classes/ArticleComment.php', + 'EpisodeComment' => 'classes/EpisodeComment.php', + 'Project' => 'classes/Project.php', + 'Show' => 'classes/Show.php', + 'User' => 'classes/User.php', + + 'DatabaseModule' => 'modules/DatabaseModule.php', + 'CommunityModule' => 'modules/CommunityModule.php', + 'DisplayModule' => 'modules/DisplayModule.php', + 'ParserModule' => 'modules/ParserModule.php', + + 'CommunityHub' => 'hubs/CommunityHub.php' +]; + +spl_autoload_register(function ($class) { + if (!isset(MAP[$class])) return false; + require_once '../app/' . MAP[$class]; + return true; +}); diff --git a/app/library.php b/app/library.php index e9544ca..5a9b87b 100755 --- a/app/library.php +++ b/app/library.php @@ -7,24 +7,6 @@ /// */ - ini_set('display_errors', 'On'); - error_reporting(E_ALL | E_STRICT); - - // ---------------------------------------------------------------------------- // - // ---------------------------------------------------------------------------- // - /// Includes, so we can use them elsewhere without having to call them each time. - - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/User.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/Show.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/Article.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/Project.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/ArticleComment.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Classes/EpisodeComment.php"); - - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Modules/DisplayModule.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Modules/DatabaseModule.php"); - include($_SERVER["DOCUMENT_ROOT"] . "/Resources/Scripts/PHP/Modules/CommunityModule.php"); - // ---------------------------------------------------------------------------- // // ---------------------------------------------------------------------------- // /// Misc functions - used for who-knows-what and who-knows-when. @@ -83,8 +65,7 @@ // This function serves to prevent tags within HTML getting into things. It's basically a symbol cleaner. // Kudos to Atli from Dream.In.Code for showing me htmlentities()! function magicClean($text) { - $text = htmlentities($text, ENT_QUOTES, "UTF-8"); - return $text; + return htmlentities($text, ENT_QUOTES, "UTF-8"); } // Hash a password thousands of times using a random salt. diff --git a/app/modules/DisplayModule.php b/app/modules/DisplayModule.php index 0513baa..d739abb 100755 --- a/app/modules/DisplayModule.php +++ b/app/modules/DisplayModule.php @@ -1,20 +1,4 @@ - - - - - - -
- - -CANTTOUCH; - - die($page); - } - +ListedArticle = GetTemplate('articles/listedarticle'); $this->Article4Reading = GetTemplate('articles/articlebody'); $this->FeaturedArticle = GetTemplate('articles/featured'); @@ -48,7 +32,7 @@ CANTTOUCH; $this->CommentBox = GetTemplate('comments/commentbox'); $this->CommentForm = GetTemplate('comments/commentform'); - + */ } /* ------------------------------------------------------------------------------------------------------- */ diff --git a/app/templates/footer.htm b/app/templates/footer.php similarity index 100% rename from app/templates/footer.htm rename to app/templates/footer.php diff --git a/app/templates/header.htm b/app/templates/header.htm deleted file mode 100755 index 9c31930..0000000 --- a/app/templates/header.htm +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - Stuff, Community, Fun | Mad Splash! - - - - - - - - - - - - - - -
- - - -
\ No newline at end of file diff --git a/app/templates/header.php b/app/templates/header.php new file mode 100755 index 0000000..5124072 --- /dev/null +++ b/app/templates/header.php @@ -0,0 +1,41 @@ + + + + + + Stuff, Community, Fun | Mad Splash! + + + + + + + + + + +
+ + + +
diff --git a/app/templates/home.htm b/app/templates/home.php similarity index 88% rename from app/templates/home.htm rename to app/templates/home.php index 3509809..ba64dd4 100755 --- a/app/templates/home.htm +++ b/app/templates/home.php @@ -1,32 +1,32 @@
 
- +

Latest Updates

- +
frontPageArticles(); + //$display->frontPageArticles(); ?>
- + Read more news »
- +
- +

Latest socials

- +
- +
- +
- +
- +
-
\ No newline at end of file + diff --git a/app/templates/slider.htm b/app/templates/slider.php similarity index 100% rename from app/templates/slider.htm rename to app/templates/slider.php diff --git a/app/templates/tandc.htm b/app/templates/tandc.htm index 5ca7b4c..dbf94d2 100755 --- a/app/templates/tandc.htm +++ b/app/templates/tandc.htm @@ -8,34 +8,34 @@
 
- +

1. Terms

- +

- By accessing this web site, you are agreeing to be bound by these - web site Terms and Conditions of Use, all applicable laws and regulations, - and agree that you are responsible for compliance with any applicable local - laws. If you do not agree with any of these terms, you are prohibited from - using or accessing this site. The materials contained in this web site are + By accessing this web site, you are agreeing to be bound by these + web site Terms and Conditions of Use, all applicable laws and regulations, + and agree that you are responsible for compliance with any applicable local + laws. If you do not agree with any of these terms, you are prohibited from + using or accessing this site. The materials contained in this web site are protected by applicable copyright and trade mark law.

- +
- +

2. Use License

- +
  1. - Permission is granted to download copies of the materials - (information or software) on Mad Splash's web site for personal, - non-commercial viewing and usage only. This is the grant of a license, + Permission is granted to download copies of the materials + (information or software) on Mad Splash's web site for personal, + non-commercial viewing and usage only. This is the grant of a license, not a transfer of title, and under this license you may not: - +
    1. use the materials for any commercial purpose without express permission from the CEO/President of Mad Splash;
    2. attempt to decompile or reverse engineer any software contained on Mad Splash's web site;
      3. @@ -47,67 +47,67 @@ This license shall automatically terminate if you violate any of these restrictions and may be terminated by Mad Splash at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format.
    - +
    - +

    3. Disclaimer

    - +

    The materials on Mad Splash's web site are provided "as is". Mad Splash makes no implied warranties, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, Mad Splash does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site.

    - +
    - +

    4. Limitations

    - +

    In no event shall Mad Splash or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on Mad Splash's Internet site, even if Mad Splash or a Mad Splash authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.

    - +
    - +

    5. Revisions and Errata

    - +

    The materials appearing on Mad Splash's web site could include technical, typographical, or photographic errors. Mad Splash does not warrant that any of the materials on its web site are accurate, complete, or current. Mad Splash may make changes to the materials contained on its web site at any time without notice. Mad Splash does not, however, make any commitment to update the materials.

    - +
    - +

    6. Links

    - +

    Mad Splash has not reviewed all of the sites linked to its Internet web site and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by Mad Splash of the site. Use of any such linked web site is at the user's own risk.

    - +
    - +

    7. Site Terms of Use Modifications

    - +

    Mad Splash may revise these terms of use for its web site at any time without notice. By using this web site you are agreeing to be bound by the then current version of these Terms and Conditions of Use.

    - +
    - +

    8. Governing Law

    - +

    Any claim relating to Mad Splash's web site shall be governed by the laws of the State of Kansas without regard to its conflict of law provisions.

- +
-
\ No newline at end of file + diff --git a/public/index.php b/public/index.php index ff3f222..22a808a 100755 --- a/public/index.php +++ b/public/index.php @@ -1,5 +1,9 @@ + echo render('footer');