diff --git a/app/classes/Show.php b/app/classes/Show.php index 77ba9d1..fbe1615 100755 --- a/app/classes/Show.php +++ b/app/classes/Show.php @@ -13,7 +13,7 @@ private $db; - private $ThumbPath = "http://localhost:8888/Resources/Images/Thumbs/Show/"; + private $ThumbPath = "http://localhost:8888//assets/images/Thumbs/Show/"; diff --git a/app/library.php b/app/library.php index 5a9b87b..95d8531 100755 --- a/app/library.php +++ b/app/library.php @@ -128,18 +128,18 @@ '', '
  • $1
    • ', - '', - '', - '', - '', - '', - '', - '', - '', - '', - '', + '', + '', + '', + '', + '', + '', + '', + '', + '', + '', '
    CODE 
    $1
    ', - '' + '' ); $rtrn = preg_replace($input, $output, $data); diff --git a/app/modules/DisplayModule.php b/app/modules/DisplayModule.php index d739abb..9553720 100755 --- a/app/modules/DisplayModule.php +++ b/app/modules/DisplayModule.php @@ -145,7 +145,7 @@ if($first) { echo << - {$article->Title} + {$article->Title} {$cBox} @@ -159,7 +159,7 @@ FIRST; } else { echo <<
    - + {$cBox} diff --git a/app/supernav.php b/app/supernav.php deleted file mode 100755 index 86c9d99..0000000 --- a/app/supernav.php +++ /dev/null @@ -1,88 +0,0 @@ - -
    - Heyas, {$user[1]}! You can go to your User CP or logout. -
    - -
    -   - - -
    - - -
      - -
    • - - - The RPG
      - Our up-and-coming web-and-text-based RPG. Play! -
      • - - -
    • -
      - Follow us here, too:
      - -
      -   - -
      - -
      -
      -
      • -
    -
    -
    - -SUPERNAV; - } else { - echo << -
    - Hey there, Guest. You can login - or register here. -
    - -
    -   - - -
    - - -
      - -
    • - - - The RPG
      - Our up-and-coming web-and-text-based RPG. Play! -
      • - - -
    • -
      - Follow us here, too:
      - -
      -   - -
      - -
      -
      -
      • -
    -
    -
    - -SUPERNAV; - } -?> diff --git a/app/templates/blog/footer.htm b/app/templates/blog/footer.htm index a807841..5c1ff7b 100755 --- a/app/templates/blog/footer.htm +++ b/app/templates/blog/footer.htm @@ -2,14 +2,14 @@
    - + Privacy | The T&C

    Copyright © 2014, Mad Splash.
    All trademarked stuff is the property of it's respective owner(s).

    - +

    OTHER STUFFS

    - +

    PROJECTS

      @@ -29,4 +29,4 @@
    - \ No newline at end of file + diff --git a/app/templates/blog/header.htm b/app/templates/blog/header.htm index 321c768..9863c7d 100755 --- a/app/templates/blog/header.htm +++ b/app/templates/blog/header.htm @@ -1,59 +1,59 @@ - + Blog | Mad Splash! - + - + - + - +
    - - + +
    - +

    THE BLOG

    - - -
    \ No newline at end of file + + + diff --git a/app/templates/comments/commentbox.php b/app/templates/comments/commentbox.php index 5858d3a..7f4eeba 100755 --- a/app/templates/comments/commentbox.php +++ b/app/templates/comments/commentbox.php @@ -1,22 +1,22 @@ -
    - {{{u}}} + {{{u}}} {{{u}}}
    - +

    {{{c}}}

    - +
    - + Posted on {{{d}}} - +
    TMP; -?> \ No newline at end of file +?> diff --git a/app/templates/community/extras/verified.php b/app/templates/community/extras/verified.php index e17af05..e62d3c6 100755 --- a/app/templates/community/extras/verified.php +++ b/app/templates/community/extras/verified.php @@ -1,39 +1,39 @@ - Congratulations, {{{u}}}!
    You're bona fide verified. - - - - + + - +

    You're officially a verified member of the Mad Splash community. Not only have you gained access to all our awesome, but you've also recieved a shiny new forum badge in recognition of your accomplishment! - +

    - + For sake of convenience, you can log in right here.

    - - + +
    - +
    - +
    - +

    - + - +
    TMP; -?> \ No newline at end of file +?> diff --git a/app/templates/community/extras/verifiederror.php b/app/templates/community/extras/verifiederror.php index f9ccd74..42aa895 100755 --- a/app/templates/community/extras/verifiederror.php +++ b/app/templates/community/extras/verifiederror.php @@ -1,17 +1,17 @@ - Well, this is embarrassing. - +

    It seems that somehow, there was an error in verifying your account. You can rest assured we'll fix this glitch in the future, but for now you'll just be given a new verification email. - +

    - + Sorry about that...

    - - + + TMP; -?> \ No newline at end of file +?> diff --git a/app/templates/community/footer.htm b/app/templates/community/footer.htm index a807841..5c1ff7b 100755 --- a/app/templates/community/footer.htm +++ b/app/templates/community/footer.htm @@ -2,14 +2,14 @@
    - + Privacy | The T&C

    Copyright © 2014, Mad Splash.
    All trademarked stuff is the property of it's respective owner(s).

    - +

    OTHER STUFFS

    - +

    PROJECTS

      @@ -29,4 +29,4 @@
    - \ No newline at end of file + diff --git a/app/templates/community/header.htm b/app/templates/community/header.htm index ccbf04e..38f9e6a 100755 --- a/app/templates/community/header.htm +++ b/app/templates/community/header.htm @@ -1,67 +1,67 @@ - + The Community | Mad Splash! - + - + - + - + - +
    - - + + -
    \ No newline at end of file + diff --git a/app/templates/community/login.htm b/app/templates/community/login.htm index 18d7dc1..bd4c0b5 100755 --- a/app/templates/community/login.htm +++ b/app/templates/community/login.htm @@ -4,48 +4,48 @@

    LOGIN

    - - + +
     
    - +

    Sign In

    - - + +
    - +
    Forgot your password? - +

    - + - + - - - + + +
    - +

    Don't Have an Account?

    - - - + + +
    - +
    -
    \ No newline at end of file + diff --git a/app/templates/community/verify.htm b/app/templates/community/verify.htm index 9657181..d720d80 100755 --- a/app/templates/community/verify.htm +++ b/app/templates/community/verify.htm @@ -4,27 +4,27 @@

    VERIFY

    - - + +
     
    - +
    VerifyUser($_GET['code'], $_GET['username'])) { include('extras/verified.php'); - + echo str_replace("{{{u}}}", $_GET['username'], $extra); } else { include('extras/verifiederror.php'); - + echo $extra; } ?> - +
    -
    \ No newline at end of file + diff --git a/app/templates/emails/newsletter.php b/app/templates/emails/newsletter.php index 25ae12d..3b6d5f7 100755 --- a/app/templates/emails/newsletter.php +++ b/app/templates/emails/newsletter.php @@ -1,35 +1,35 @@ - - - + + - + - - - + + +
    {{{m}}}
    - + TMP; -?> \ No newline at end of file +?> diff --git a/app/templates/emails/verification.php b/app/templates/emails/verification.php index 64f2e3f..115a10a 100755 --- a/app/templates/emails/verification.php +++ b/app/templates/emails/verification.php @@ -1,44 +1,44 @@ - - - + + - + - - - + + +

    Hey there, {{{u}}}!

    - +

    Thanks for signing up on Mad Splash! With this account, you'll have free access to all our content. Well, except the stuff that costs moolah. All you have to do now is just verify your account! - +

    - + Click here to verify your account!

    - + TMP; -?> \ No newline at end of file +?> diff --git a/app/templates/footer.php b/app/templates/footer.php index bc82be8..d679d51 100755 --- a/app/templates/footer.php +++ b/app/templates/footer.php @@ -2,14 +2,14 @@
    - + Privacy | The T&C

    Copyright © 2014, Mad Splash.
    All trademarked stuff is the property of it's respective owner(s).

    - +

    OTHER STUFFS

    - +

    PROJECTS

      @@ -29,4 +29,4 @@
    - \ No newline at end of file + diff --git a/app/templates/header.php b/app/templates/header.php index 5124072..63cc50d 100755 --- a/app/templates/header.php +++ b/app/templates/header.php @@ -5,22 +5,22 @@ Stuff, Community, Fun | Mad Splash! - - + + - + - +
    - +
    diff --git a/app/templates/projects/main.htm b/app/templates/projects/main.htm index 86f8035..7b32deb 100755 --- a/app/templates/projects/main.htm +++ b/app/templates/projects/main.htm @@ -4,21 +4,21 @@

    PROJECTS

    - - - + + +
     
    - + categoryNav(); ?> - +

    Mad Splash Projects

    - + @@ -30,21 +30,21 @@

    Games

    '; $display->Projects('game'); echo '
    '; - + echo '

    Books

    '; $display->Projects('book'); echo '
    '; - + echo '

    Shows

    '; $display->Projects('show'); echo '
    '; } ?> - + - +

    Free Stuffs

    @@ -52,7 +52,7 @@ $display->daPromos(); ?>
    - +

    What's our goal?

    @@ -61,6 +61,6 @@

    - +
    - \ No newline at end of file + diff --git a/app/templates/slider.php b/app/templates/slider.php index 2a017ef..8200482 100755 --- a/app/templates/slider.php +++ b/app/templates/slider.php @@ -1,6 +1,6 @@
    -
    +
    + style="background: url('/assets/images/Covers/SlideLinks/CIOButton.png') no-repeat top center;">-->
    -
    \ No newline at end of file + diff --git a/app/templates/supernav.php b/app/templates/supernav.php new file mode 100755 index 0000000..473a2d6 --- /dev/null +++ b/app/templates/supernav.php @@ -0,0 +1,45 @@ +
    + +
    + Heyas, {$user[1]}! You can go to your User CP or logout. +
    + +
    + Hey there, Guest. You can login + or register here. +
    + + +
    +   + + +
    + + +
      + +
    • + + + The RPG
      + Our up-and-coming web-and-text-based RPG. Play! +
      • + + +
    • +
      + Follow us here, too:
      + +
      +   + +
      + +
      +
      +
      • +
    +
    +
    +
    diff --git a/app/templates/tandc.htm b/app/templates/tandc.php similarity index 100% rename from app/templates/tandc.htm rename to app/templates/tandc.php diff --git a/app/templates/tictactoe.php b/app/templates/tictactoe.php new file mode 100644 index 0000000..047fbd5 --- /dev/null +++ b/app/templates/tictactoe.php @@ -0,0 +1,495 @@ + + +
    +
    +
    + +
    +
     
    + +

    Set's Tic-Tac-Toe

    + +
    +
    + + +
    + + +
    + + + +
    +
    +
    diff --git a/public/assets/css/CustomFonts.css b/public/assets/css/CustomFonts.css index 1bc2a20..bed82e6 100755 --- a/public/assets/css/CustomFonts.css +++ b/public/assets/css/CustomFonts.css @@ -1,56 +1,56 @@ @font-face { font-family: 'Bebas'; - src: url('../Fonts/BebasNeue-webfont.eot'); - src: url('../Fonts/BebasNeue-webfont.eot?#iefix') format('embedded-opentype'), - url('../Fonts/BebasNeue-webfont.woff') format('woff'), - url('../Fonts/BebasNeue-webfont.ttf') format('truetype'), - url('../Fonts/BebasNeue-webfont.svg#BebasNeueRegular') format('svg'); + src: url('/assets/fonts/BebasNeue-webfont.eot'); + src: url('/assets/fonts/BebasNeue-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/BebasNeue-webfont.woff') format('woff'), + url('/assets/fonts/BebasNeue-webfont.ttf') format('truetype'), + url('/assets/fonts/BebasNeue-webfont.svg#BebasNeueRegular') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: "Minecraft"; - src: url("../Fonts/Minecraft_font.eot?") format("eot"), - url("../Fonts/Minecraft_font.woff") format("woff"), - url("../Fonts/Minecraft_font.ttf") format("truetype"), - url("../Fonts/Minecraft_font.svg#Minecraft") format("svg"); + src: url("/assets/fonts/Minecraft_font.eot?") format("eot"), + url("/assets/fonts/Minecraft_font.woff") format("woff"), + url("/assets/fonts/Minecraft_font.ttf") format("truetype"), + url("/assets/fonts/Minecraft_font.svg#Minecraft") format("svg"); font-weight:normal; font-style:normal; } @font-face { font-family: 'Candara'; - src: url('../Fonts/candara-webfont.eot'); - src: url('../Fonts/candara-webfont.eot?#iefix') format('embedded-opentype'), - url('../Fonts/candara-webfont.woff') format('woff'), - url('../Fonts/candara-webfont.ttf') format('truetype'), - url('../Fonts/candara-webfont.svg#CandaraRegular') format('svg'); + src: url('/assets/fonts/candara-webfont.eot'); + src: url('/assets/fonts/candara-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/candara-webfont.woff') format('woff'), + url('/assets/fonts/candara-webfont.ttf') format('truetype'), + url('/assets/fonts/candara-webfont.svg#CandaraRegular') format('svg'); } @font-face { font-family: 'CandaraB'; - src: url('../Fonts/candarab-webfont.eot'); - src: url('../Fonts/candarab-webfont.eot?#iefix') format('embedded-opentype'), - url('../Fonts/candarab-webfont.woff') format('woff'), - url('../Fonts/candarab-webfont.ttf') format('truetype'), - url('../Fonts/candarab-webfont.svg#CandaraBold') format('svg'); + src: url('/assets/fonts/candarab-webfont.eot'); + src: url('/assets/fonts/candarab-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/candarab-webfont.woff') format('woff'), + url('/assets/fonts/candarab-webfont.ttf') format('truetype'), + url('/assets/fonts/candarab-webfont.svg#CandaraBold') format('svg'); } @font-face { font-family: 'Handwriting'; - src: url('../Fonts/SF_Arch_Rival-webfont.eot'); - src: url('../Fonts/SF_Arch_Rival-webfont.eot?#iefix') format('embedded-opentype'), - url('../Fonts/SF_Arch_Rival-webfont.woff') format('woff'), - url('../Fonts/SF_Arch_Rival-webfont.ttf') format('truetype'), - url('../Fonts/SF_Arch_Rival-webfont.svg#sf_arch_rivalregular') format('svg'); + src: url('/assets/fonts/SF_Arch_Rival-webfont.eot'); + src: url('/assets/fonts/SF_Arch_Rival-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/SF_Arch_Rival-webfont.woff') format('woff'), + url('/assets/fonts/SF_Arch_Rival-webfont.ttf') format('truetype'), + url('/assets/fonts/SF_Arch_Rival-webfont.svg#sf_arch_rivalregular') format('svg'); } @font-face { font-family: 'ZeroNero'; - src: url('../Fonts/zeronero-webfont.eot'); - src: url('../Fonts/zeronero-webfont.eot?#iefix') format('embedded-opentype'), - url('../Fonts/zeronero-webfont.woff') format('woff'), - url('../Fonts/zeronero-webfont.ttf') format('truetype'), - url('../Fonts/zeronero-webfont.svg#zeroneroblack') format('svg'); -} \ No newline at end of file + src: url('/assets/fonts/zeronero-webfont.eot'); + src: url('/assets/fonts/zeronero-webfont.eot?#iefix') format('embedded-opentype'), + url('/assets/fonts/zeronero-webfont.woff') format('woff'), + url('/assets/fonts/zeronero-webfont.ttf') format('truetype'), + url('/assets/fonts/zeronero-webfont.svg#zeroneroblack') format('svg'); +} diff --git a/public/index.php b/public/index.php index 22a808a..4f54ab8 100755 --- a/public/index.php +++ b/public/index.php @@ -3,26 +3,16 @@ $DM = new DisplayModule(); + const PAGES = ['home', 'tandc', 'privacy', 'tictactoe']; + echo render('header'); - if (!empty($_GET['page'])) { - $page = "home"; - - $TmpPage = basename($_GET['page']); - - // If it's not a disallowed path, and if the file exists, update $page - if (!in_array($TmpPage, $LockedPages) && file_exists("Pieces/{$TmpPage}.htm")) { - $page = $TmpPage; - } - } else { - $page = "home"; - } + $page = !empty($_GET['page']) && in_array($_GET['page'], PAGES) ? $_GET['page'] : 'home'; if($page == "home") { echo render('slider'); } - // Include $page echo render($page); echo render('footer'); diff --git a/test.html b/test.html index 6aacf8c..e151a6d 100755 --- a/test.html +++ b/test.html @@ -1,783 +1,495 @@ - - - - - - Mad Splash! - Stuffs, Community, Fun - - - - - - - - - - - - - - -
    - - - -
    - -
    -
    -
    - -
    -
     
    - -

    Set's Tic-Tac-Toe

    + + +
    +
    +
    + +
    +
     
    + +

    Set's Tic-Tac-Toe

    + +
    +
    + + +
    + + +
    + + + +
    +
    +